Commit Graph

1288 Commits

Author SHA1 Message Date
Jia Sheng c43c635661 update 2024-07-04 22:28:44 +08:00
Jia Sheng 77140ec751 -change the heading in pdf from credit note to refund note for those transaction after 02 April 2024 2024-07-04 22:07:24 +08:00
Dillon Ngo ad06bd4c4c Fix welcome voucher email out of alignment issue in yahoo mail 2024-07-03 12:08:57 +08:00
edmondlang 9a4dba7fdd fix the error mock up white form cannot be created 2024-06-12 10:16:31 +08:00
JiaSheng ff88dcecf4 -check group total not tally with bill group total due to transfer fee not being included
-include the transfer fee calculation
-script to update the bill group to include the transfer fee calculation
2024-06-09 14:44:06 +08:00
edmondlang c4bbc1a967 after remarks in refund is submitted, reload to get the resource again 2024-05-30 22:51:35 +08:00
Omair Saleh bb31790061 Merge remote-tracking branch 'origin/master' 2024-05-27 12:08:46 +08:00
Omair Saleh 474e6ce406 update express and saver SLA 2024-05-27 12:08:29 +08:00
edmondlang 400a5f6bf9 fix refund remarks 2024-05-23 10:28:27 +08:00
edmondlang 6fd7b2f610 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-update 2024-05-22 23:37:47 +08:00
edmondlang 7feb05d784 make refund remarks required 2024-05-22 22:23:59 +08:00
edmondlang 000c418315 make refund remarks required 2024-05-22 21:17:11 +08:00
JiaSheng 5425c37e52 -request multiple refund
-show remark for refund in dashboard
-show refund remark in export page
2024-05-22 19:28:42 +08:00
edmondlang 16b67c2ea3 Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-05-21 11:16:50 +08:00
edmondlang e5cc4481fe update RefundConfirmationComponent display text 2024-05-20 11:47:29 +08:00
edmondlang 3d107e9009 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-20 11:41:53 +08:00
edmondlang 3f5c735a43 update export currency vendor order 2024-05-20 11:41:21 +08:00
Dillon Ngo 1550ebb3cb Vue Polling - Sync code from Shipping Portal, Refactor code to use vuex 2024-05-20 03:05:36 +08:00
Dillon Ngo 56f89113a8 Vue Polling - Sync code from Shipping Portal, Refactor code to use vuex 2024-05-20 02:34:44 +08:00
edmondlang e6eee4aa93 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-18 11:25:57 +08:00
edmondlang e88cdf75f6 code review - correct indentation & add tooltip 2024-05-18 11:25:40 +08:00
Omair Saleh 4ecebdd977 Merge remote-tracking branch 'origin/master' 2024-05-17 13:43:11 +08:00
Omair Saleh 1ce6b895cc hide the estimate for when the recipient will receive the payment 2024-05-17 13:42:54 +08:00
Aqqil Azman 94680e3cbb renamed blade.php 2024-05-16 19:19:07 +08:00
Aqqil Azman f65702d72b refactor: renamed blade.php to supplier_deliver_order_group_invoice 2024-05-16 19:18:07 +08:00
Aqqil Azman 6686bf43ee feat: realign and changed icons 2024-05-16 19:17:10 +08:00
edmondlang 0797f26fe1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-16 17:58:47 +08:00
Aqqil Azman b49a44c99b feat: invoice export 2024-05-16 12:25:53 +08:00
Aqqil Azman 7fd8d2f1b5 initial commit 2024-05-16 12:25:26 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 1c8d135074 feat: pdf export 2024-05-15 17:38:57 +08:00
Aqqil Azman 79178698cb refactor: Export Buttons to top row 2024-05-13 09:59:04 +08:00
Aqqil Azman 97a8e34f3d initial commit 2024-05-13 09:58:28 +08:00
edmondlang 77df383a74 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-11 00:20:37 +08:00
edmondlang b75ee6d504 fix bug remarks for refund 2024-05-10 00:26:54 +08:00
edmondlang 8fa956e0d7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-10 00:17:08 +08:00
edmondlang 111bfac6b7 fix bug remarks for refund 2024-05-10 00:16:43 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng b8d741f57c fix edit transfer fee bug 2024-05-08 20:07:06 +08:00
JiaSheng be0c7cfaba Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-08 12:44:05 +08:00
Omair Saleh f3413b9c6c change service description 2024-05-07 11:20:14 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
JiaSheng 7655853a6d -open refund function for all admin (ignore whether the booking has invoice or not)
-when refund is before the whiteform, auto approve the transaction
2024-04-29 21:19:34 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +08:00
edmondlang aeb0be11bf remove - in the invoice discount section, amount is already in negative 2024-04-09 00:20:19 +08:00
edmondlang a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-04-02 11:53:43 +08:00
JiaSheng 3deba3468a -Approve refund - only super admin
-If invoice generated - only super admin can request refund
2024-03-25 15:06:46 +08:00
JiaSheng c95c274db7 update 2024-03-25 00:47:52 +08:00
JiaSheng daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +08:00
Dillon Ngo 01bbb1e21a Amendment on welcome voocher email requested by kexin 2024-03-17 16:06:47 +08:00