cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,393 Commits 175 Branches 0 Tags
939fcdcff80d80b466198a52cd9fc900ce06ac62
Commit Graph

3393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edmondlang 939fcdcff8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-12 10:17:14 +08:00
edmondlang 9a4dba7fdd fix the error mock up white form cannot be created 2024-06-12 10:16:31 +08:00
edmondlang 06a0fb5aec remove testing code 2024-06-09 22:19:03 +08:00
edmondlang a5d90d7049 Merge branch 'ga4-user-id' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-09 22:14:40 +08:00
edmondlang b7b2ab602a gtag push user id 2024-06-09 22:13:56 +08:00
JiaSheng 764b82dc1c Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-09 14:45:14 +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 c293feb210 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
 2024-05-30 22:53:02 +08:00
edmondlang d71050d973 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-30 22:52:05 +08:00
edmondlang c4bbc1a967 after remarks in refund is submitted, reload to get the resource again 2024-05-30 22:51:35 +08:00
Aqqil Azman 07f9e47b9b Merge branch 'refund_remark_refresh_on_pressed' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-29 12:11:16 +08:00
Aqqil Azman c45ddb0497 fixed: remark automatically updates on submit 2024-05-29 12:10:40 +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 ab4f56e4c1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
 2024-05-23 13:37:25 +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 d0c009443b Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-20 11:42:16 +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 29c78e63f9 Merge branch 'dillon/51.5-vue-store-update' into development 2024-05-20 03:05:47 +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 4964721c8e Merge branch 'dillon/51.5-vue-store-update' into development 2024-05-20 02:58:49 +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 b5c4e9cbf8 Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-18 11:26:54 +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 3b4f3281b1 Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-17 10:46: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 7f2af7adf4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-16 10:56:23 +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