cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,917 Commits 175 Branches 0 Tags
416ec42ebc2034e342b6c7ff45541a51255a3d02
Commit Graph

2917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dillon Ngo 416ec42ebc Merge branch 'dillon/63-voucherify-updates' into 'master' 
Test sending welcome voucher email through server

See merge request CIEFWorldwideSdnBhd/exchange-2.0!164
 2024-07-03 11:22:27 +00:00
Dillon Ngo 929cb2c0a6 Test sending welcome voucher email through server 2024-07-03 19:21:50 +08:00
Dillon Ngo 734acfb8d9 Merge branch 'dillon/63-voucherify-updates' into 'master' 
Test sending welcome voucher email through server

See merge request CIEFWorldwideSdnBhd/exchange-2.0!163
 2024-07-03 11:17:24 +00:00
Dillon Ngo 692789d014 Test sending welcome voucher email through server 2024-07-03 18:41:03 +08:00
Dillon Ngo 47d4a163c4 Merge branch 'dillon/63-voucherify-updates' into 'master' 
Fix welcome voucher email out of alignment issue in yahoo mail

See merge request CIEFWorldwideSdnBhd/exchange-2.0!162
 2024-07-03 04:10:34 +00:00
Dillon Ngo ad06bd4c4c Fix welcome voucher email out of alignment issue in yahoo mail 2024-07-03 12:08:57 +08:00
Jia Sheng cf17e9bb11 order export refund by created at 2024-07-02 20:46:53 +08:00
Jia Sheng a4b09cedb1 include refund service charges for partial refund 2024-06-30 12:18:40 +08:00
Jia Sheng c34bacccfd -fix expired booking command to ignore 1688 as 1688 may not have PO initally 
-create command to revert those fully refunded payment transaction from status EXPIRED to REFUNDED
 2024-06-24 22:45:21 +08:00
Jia Sheng 84ff900629 comment out booking expired command in kernel 2024-06-24 21:06:05 +08:00
edmondlang c91273d15b update pending_orders, exclude approved refunds order from pending_orders list 2024-06-18 12:49:12 +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 40d20dc42e update check duplicate refunds 2024-05-22 23:26:54 +08:00
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +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 4a938b6414 Merge branch 'dillon/51.5-vue-store-update' into 'master' 
Vue Polling - Refactor code to use vuex (code sync from Shipping Portal)

See merge request CIEFWorldwideSdnBhd/exchange-2.0!161
 2024-05-19 19:17:06 +00: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 16a6954a76 changed route view for supplier_order_groupInvoice ti ...group_invoice 2024-05-16 19:19:55 +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 a8a7d0eccd refactor: export currency vendor order routes 2024-05-13 09:59:29 +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
JiaSheng cb367d0033 bug fix for update booking amount 2024-05-11 00:01:49 +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