cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-09-01 02:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,171 Commits 175 Branches 0 Tags
8f20c7d021dc7e4c3cc05b7d173cb6c7282debb1
Commit Graph

3171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 0e332c18d0 fix bug on development 2024-01-11 14:46:07 +08:00
edmondlang aa57a79ab7 fix ExportsInvoiceTransactions - $row is inside an array 2024-01-11 11:22:46 +08:00
edmondlang b5958a95fb Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-01-11 10:56:18 +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
edmondlang 82f8eac478 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-01-10 15:34:48 +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
edmondlang 79bc1dff91 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	config/logging.php
 2024-01-08 18:28:08 +08:00
edmondlang 435927ba19 update code fix po 2024-01-08 18:07:04 +08:00
edmondlang 9a39976ed0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-po 2024-01-08 17:49:06 +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 8d30467486 Merge branch 'fix-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-01-02 19:40:58 +08:00
edmondlang c599ae5887 code update 2024-01-02 19:40:38 +08:00
edmondlang 77c8f776dc Merge branches 'development' and 'fix-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-01-02 19:37:13 +08:00
edmondlang 6cac8e6e09 code update 2024-01-02 19:36:47 +08:00
edmondlang dcb9f15028 Merge branch 'fix-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-01-02 19:32:30 +08:00
edmondlang 72a945613a fix po 2024-01-02 19:32:02 +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
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
edmondlang 528c3689db Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-28 22:54:26 +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 18ea70ccd6 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-26 22:32:05 +08:00
JiaSheng 9c0f77790c add filters to statement mapping 2023-12-26 22:31:33 +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
edmondlang 0abebbe167 comment route_logs migration 2023-12-19 00:12:18 +08:00
edmondlang e72e037ed4 revert 2023-12-19 00:08:53 +08:00
edmondlang 84e787f05e test update 2023-12-19 00:02:10 +08:00
edmondlang ed44b09483 Merge branch 'create-index-for-tables' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 23:23:28 +08:00