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,652 Commits 175 Branches 0 Tags
development
Commit Graph

254 Commits

Author SHA1 Message Date
Dillon Ngo 89ca4b48ac Merge branch 'dillon/63.5-ui-update' into development 2024-08-17 09:07:29 +08:00
edmondlang ca1d36bac6 fix code merging 2024-08-12 23:39:17 +08:00
edmondlang 204ebf04ca fix merge code error 2024-08-12 23:19:12 +08:00
edmondlang b798f5f92b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-refund-outstanding 
# Conflicts:
#	app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
 2024-08-12 23:10:42 +08:00
Dillon Ngo 13dd19d0a1 Fix an error with refund for transaction that used a voucher earlier, get discount amount for voucher so to get details breakdown 2024-08-12 22:29:04 +08:00
Dillon Ngo 2e09553e26 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-12 22:06:39 +08:00
Dillon Ngo 3b767b2cd3 Merge branch 'dillon/68-exchange-debugging-refund' into development 2024-08-12 22:02:54 +08:00
Jia Sheng 74d3b901ea Merge branch 'fix-refund-outstanding' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/web.php
 2024-08-12 21:26:57 +08:00
Jia Sheng 03472dc6be fix fully refund oustanding 2024-08-12 21:25:48 +08:00
Dillon Ngo cfcc5fbe26 Fix an error with refund for transaction that used a voucher earlier, get discount amount for voucher so to get details breakdown 2024-08-12 09:34:45 +08:00
Dillon Ngo e80ad9a6ec Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details 2024-07-25 19:34:43 +08:00
Jia Sheng f2f12a6eb4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 19:16:07 +08:00
Jia Sheng cb7c38a50d 1688 order reference 2024-07-14 19:15:43 +08:00
edmondlang 91ce365c62 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-08 19:07:29 +08:00
Jia Sheng 7f16b9ead1 update refund logic where E2E do not refund service charge 2024-07-08 12:30:34 +08:00
Jia Sheng 92dea42a44 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-30 12:19:10 +08:00
Jia Sheng a4b09cedb1 include refund service charges for partial refund 2024-06-30 12:18:40 +08:00
edmondlang 27ee291a47 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-10 00:00:20 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng a88e832dc5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-29 21:21:24 +08:00
JiaSheng 7655853a6d -open refund function for all admin (ignore whether the booking has invoice or not) 
-when refund is before the whiteform, auto approve the transaction
 2024-04-29 21:19:34 +08:00
edmondlang 94ea735211 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-16 22:52:14 +08:00
edmondlang 69e9328e74 fix bug cant approve the refund because booking amount cant be updated, error - Booking Amount cannot be less than xxxxx 2024-04-16 22:34:41 +08:00
edmondlang d69b55d586 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-02 15:26:23 +08:00
edmondlang a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-04-02 11:53:43 +08:00
Omair Saleh dc61f23fa8 include pending verification status to expirying payment function 2024-04-01 12:59:30 +08:00
JiaSheng 2825eee224 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-25 15:07:11 +08:00
JiaSheng 3deba3468a -Approve refund - only super admin 
-If invoice generated - only super admin can request refund
 2024-03-25 15:06:46 +08:00
Dillon Ngo 212bd40d28 Merge branch 'dillon/51.4-explore-multiple-queues' into development 2024-03-16 13:27:43 +08:00
JiaSheng 27ca11f0c2 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-15 10:34:50 +08:00
JiaSheng 81c81e3b48 -show remark and categorized in export refund booking 
-make refund function available for internal only, not for customer
 2024-03-15 10:34:21 +08:00
Dillon Ngo ffd338e287 Vue Polling - Second high priority queue through database 2024-03-14 16:29:26 +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 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
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 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 dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-02-11 16:15:06 +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 ef43e1616d update 2024-01-14 12:20:28 +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
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
JiaSheng cbc3fb56d4 fix pay booking by wallet bug 2023-12-07 01:05:17 +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