cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 05:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,248 Commits 175 Branches 0 Tags
a45507a2cfcdc8e4b0f8fa1eef33d99d7f4582c7
Commit Graph

525 Commits

Author SHA1 Message Date
Sai0224 b67257b42f Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-02-24 12:16:33 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
Sai0224 ec0ebe3812 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-21 21:14:51 +08:00
edmondlang 9aa75630ff update code for refund booking 2024-02-21 00:20:45 +08:00
edmondlang b7bc14b98f Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
 2024-02-19 01:10:43 +08:00
edmondlang 48247abbd4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 
# Conflicts:
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
 2024-02-19 01:00:51 +08:00
edmondlang 609b71f549 code upfate for refund booking 2024-02-19 00:57:42 +08:00
edmondlang f083434390 update refund ui and logic 2024-02-16 14:59:11 +08:00
Dillon Ngo f8230990f4 Revert "Merge branch 'revert-b9668bb6' into 'master'" 
This reverts merge request !157
 2024-02-11 10:28:05 +00:00
Dillon Ngo ea4795e5c8 Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'" 
This reverts merge request !152
 2024-02-11 09:53:09 +00:00
Dillon Ngo b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master' 
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
 2024-02-11 09:16:08 +00:00
Dillon Ngo dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-02-11 16:15:06 +08:00
edmondlang 1fa3164a68 Merge branch 'api-response-time-logging' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-31 13:04:33 +08:00
edmondlang 01f2911ac4 update code - disable request being process twiced 2023-12-31 13:03:51 +08:00
Dillon Ngo bf5ea2b2f2 Code sync from Shipping Portal, independent deployment of Vue Polling, Performance Improvement and tweaking for better user experience 2023-12-30 18:35:17 +08:00
Dillon Ngo 18df0e256b Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor 2023-12-30 01:15:27 +08:00
edmondlang 5240a9b2b0 Merge branch 'api-response-time-logging' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Http/Kernel.php
 2023-12-29 00:51:11 +08:00
edmondlang 7e6c2b5d7c add web response time log 2023-12-28 23:07:06 +08:00
edmondlang 3bac384e28 api response time logging 2023-12-28 22:58:05 +08:00
Steve Ng ca07fc161e add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:49:36 +08:00
Steve Ng 5d0052a671 add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:47:12 +08:00
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
Steve Ng 44fbb14b36 change where condition for import receipts 2023-12-12 16:25:52 +08:00
Steve Ng 7ab1cd47e5 change where condition for import receipts 2023-12-12 16:24:36 +08:00
edmondlang 780bbe7333 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-07 10:09:36 +08:00
Steve Ng 7b936b2ce5 fix bug in import invoice 2023-12-06 21:54:15 +08:00
Steve Ng a1e5d11739 fix bug in import invoice 2023-12-06 21:52:09 +08:00
Steve Ng cad933ed59 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:59:49 +08:00
Steve Ng 1c29e45744 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:58:55 +08:00
JiaSheng 6c0d0be3eb import ambank and cief lite statement 2023-11-30 18:04:00 +08:00
JiaSheng 7ab938ebee Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
 2023-11-24 17:28:22 +08:00
JiaSheng fbd94f01b8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into centralize-izyim-exchange 2023-11-24 17:14:34 +08:00
Steve Ng db4e9e6e95 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:06:37 +08:00
Steve Ng f2cc75a898 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:04:38 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
Steve Ng 84d5af39f5 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:50:59 +08:00
Steve Ng d8a4510fc4 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:49:51 +08:00
edmondlang 1990a843d5 Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-05 17:35:25 +08:00
edmondlang 46f802109e update template 2023-11-05 17:35:06 +08:00
edmondlang 29ca393a7f update template 2023-11-05 17:07:36 +08:00
edmondlang b7a800dee7 update template 2023-11-05 16:58:13 +08:00
edmondlang 4d23e0cb9c Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-04 23:18:03 +08:00
JiaSheng 7d94776543 fix bcmath function bug 2023-11-04 22:28:16 +08:00
JiaSheng f98607bc32 filters update 2023-11-04 11:52:34 +08:00
Steve Ng b3a6a9cdcc fix bug unmapped invoice 2023-11-04 10:48:11 +08:00
Steve Ng db88edabfe fix bug unmapped invoice 2023-11-04 10:45:41 +08:00
JiaSheng c11f6dab7a fix account statement transaction not tally issue 2023-11-04 09:59:16 +08:00
JiaSheng d6754014aa account-statement-pagination 2023-11-04 00:00:58 +08:00
Steve Ng fe46d72891 fix bug of update status of statement transaction owner when update invoice or receipt success, and paginate when next page with filtering date in Pending Export tab, and error on export invoive to autocount 2023-11-01 13:45:05 +08:00