Commit Graph

1787 Commits

Author SHA1 Message Date
Dillon Ngo dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-02-11 16:15:06 +08:00
Dillon Ngo 7151caa9b8 Proof of concept - Vue Polling a workaround for AWS API Gateway limitation 2024-02-11 16:11:42 +08:00
JiaSheng 8f20c7d021 update create booking payment with wallet logic 2024-01-19 21:45:07 +08:00
JiaSheng 42becd0cf5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
2024-01-15 23:47:57 +08:00
JiaSheng 402a2e03bc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-15 23:44:05 +08:00
JiaSheng c8cabee97b update 2024-01-15 23:41:12 +08:00
JiaSheng ef43e1616d update 2024-01-14 12:20:28 +08:00
JiaSheng e5a96e179c add refund transaction under booking payment history, update on admin currency order dashboard to show the correct amount after refunded 2024-01-13 13:27:24 +08:00
edmondlang aa57a79ab7 fix ExportsInvoiceTransactions - $row is inside an array 2024-01-11 11:22:46 +08:00
JiaSheng f56ee08a53 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-10 21:15:37 +08:00
JiaSheng 836e5f86cc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-10 21:14:44 +08:00
Steve Ng e5dc9c4e1b fix the invoice date for IZYIM when export invoice to autocount 2024-01-09 09:12:06 +08:00
Steve Ng 1e16872933 fix the invoice date for IZYIM when export invoice to autocount 2024-01-09 09:08:44 +08:00
JiaSheng 8a05620edf update 2024-01-08 22:41:59 +08:00
JiaSheng a28c695aab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-08 21:54:23 +08:00
Steve Ng 77b93d2c9b fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review 2024-01-05 12:07:53 +08:00
Steve Ng 24d246d721 fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review 2024-01-05 12:06:08 +08:00
edmondlang b2dd059fa4 update logging for GuzzleShippingPortal 2024-01-03 10:12:06 +08:00
Steve Ng 02a37caf5a change posting date to invoice date for shipping portal when export invoice to autocount 2024-01-03 09:10:30 +08:00
Steve Ng 74c6ca7330 change posting date to invoice date for shipping portal when export invoice to autocount 2024-01-03 09:08:54 +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 b6162f5355 update 2023-12-23 16:29:06 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
edmondlang b759be4264 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-20 17:57:31 +08:00
edmondlang 89eaa78ee9 update logging 2023-12-20 17:57:03 +08:00
JiaSheng bf278e438e update group command 2023-12-20 17:41:10 +08:00
JiaSheng 603f29c9d0 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 19:17:32 +08:00
JiaSheng 4d057d0f5f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
update import cief lite
2023-12-18 19:15:34 +08:00
edmondlang 5da5902ba4 Merge branch 'fix-register-issue-with-autofill-credentials' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-13 20:03:45 +08:00
Omair Saleh 1ddf7923a5 show all active services for suppliers when not in segment 2023-12-13 13:38:54 +08:00
Omair Saleh 04da6d2107 Merge remote-tracking branch 'origin/master' 2023-12-13 13:37:13 +08:00
Omair Saleh 7aedaa3c17 show all active services for suppliers when not in segment 2023-12-13 13:36:54 +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
JiaSheng ae94a03a65 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-08 19:56:14 +08:00
JiaSheng a6c4a0350d -Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
-update import ambank statement logic
2023-12-08 19:53:09 +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
JiaSheng cbc3fb56d4 fix pay booking by wallet bug 2023-12-07 01:05:17 +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
Dillon Ngo 120ea642c5 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-06 13:38:03 +08:00