cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-26 16:04:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,602 Commits 175 Branches 0 Tags
a4e4cfaa6f87ccbf63b353bd06e847cad226ea20
Commit Graph

162 Commits

Author SHA1 Message Date
Jia Sheng c60a5d3d88 Merge branch 'fix-wrong-currency-rate-group-command' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-12 22:43:18 +08:00
Jia Sheng 1d5b5f7865 fix group with currency rate more than 100 2024-08-12 22:41:39 +08:00
Jia Sheng d95f4829cb Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-22 00:46:40 +08:00
Jia Sheng 1467d0880f update bill group to include the service charge 2024-07-22 00:46:07 +08:00
edmondlang 2a26c58dda Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-17 10:22:21 +08:00
edmondlang 3e9ceed23a Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-14 19:32:53 +08:00
Jia Sheng ba74a90d87 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 12:23:08 +08:00
Jia Sheng c865b28315 update 2024-07-14 12:22:04 +08:00
Jia Sheng 37e42ed249 Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 11:00:58 +08:00
Jia Sheng 63118efc0b delete duplicated 1688 bank account 2024-07-14 11:00:33 +08:00
Jia Sheng bceaa03e38 Merge branch 'fix-partial-refund-show-fully-refund' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-13 11:08:26 +08:00
Jia Sheng c43e8e3f10 fix partial refund show fully refund 2024-07-13 11:07:43 +08:00
Dillon Ngo 508260221e Merge branch 'dillon/63-voucherify-updates' into development 2024-07-03 18:41:21 +08:00
Dillon Ngo 692789d014 Test sending welcome voucher email through server 2024-07-03 18:41:03 +08:00
Jia Sheng 9fb4ac7d63 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-24 22:45:43 +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 95bcf23fc1 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-24 21:06:30 +08:00
Jia Sheng 84ff900629 comment out booking expired command in kernel 2024-06-24 21:06:05 +08:00
Jia Sheng 28472aed41 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-16 12:12:13 +08:00
JiaSheng b31d592e4a update command logic 2024-06-16 11:50:29 +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
JiaSheng 45bb47e5aa Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-07 17:21:41 +08:00
JiaSheng 4d501c8b7c update log info 2024-03-07 17:21:18 +08:00
JiaSheng 875fb79574 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
 2024-03-07 17:16:22 +08:00
JiaSheng e7ef63c511 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-03-06 15:16:50 +08:00
edmondlang 2d5bbac3b1 update ExpiredBookingCommand logging - add timestamp 2024-03-02 00:32:55 +08:00
JiaSheng 42a399999a uncomment and log to specific file for booking expired command 2024-03-01 23:28:14 +08:00
edmondlang 5cf55453fd show-booking-expired for debug payment not showing 2024-03-01 21:57:06 +08:00
JiaSheng ca2f41e95c fix bug for payment transaction not found after status update to refunded 2024-03-01 08:16:54 +08:00
JiaSheng 5c10539824 resolve supplier refund amount to follow white form rate 2024-02-28 20:53:20 +08:00
JiaSheng 5fd2f6ef7f -complete supplier bill group when oustanding is 0 
-create refund and supplier refund if the request refund order is in white form
 2024-02-28 01:34:39 +08:00
JiaSheng 8d84c970e2 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-27 22:03:04 +08:00
edmondlang f84b04c26c update logging and indentation 2024-02-27 01:08:16 +08:00
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
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 c8cabee97b update 2024-01-15 23:41:12 +08:00
JiaSheng ef43e1616d update 2024-01-14 12:20:28 +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 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
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 18ba789d44 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
#	app/Console/Kernel.php
#	routes/web.php
 2023-10-16 12:14:18 +08:00
edmondlang 5bd7a6104f delete all bulk download files 2023-10-12 19:12:52 +08:00
edmondlang 47ec38bb96 delete all bulk download files 2023-10-12 19:09:56 +08:00
edmondlang 549cd018fa Merge branch 'invoice-adjustment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Console/Kernel.php
 2023-10-12 10:33:50 +08:00