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

1976 Commits

Author SHA1 Message Date
Dillon Ngo a4e4cfaa6f Merge branch 'dillon/63.7-company-with-multiple-employees' into development 2024-08-23 12:24:39 +08:00
Dillon Ngo 8c9264b26a Solve a problem where voucher cannot be added to a user account if user does not exist at Voucherify 2024-08-23 12:24:18 +08:00
Dillon Ngo 12e6386c04 Merge branch 'dillon/63.7-company-with-multiple-employees' into development 2024-08-21 22:16:22 +08:00
Dillon Ngo be063d985a Merge branch 'dillon/57.1-second-voucher-first-milestone' into development 2024-08-21 22:13:58 +08:00
Dillon Ngo 2905edef5e Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees 2024-08-21 22:04:09 +08:00
Dillon Ngo d8c53d11d7 Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees 2024-08-21 22:00:46 +08:00
Dillon Ngo 3b14a2d1d0 Merge branch 'dillon/63.6-company-with-multiple-employees' into development 2024-08-20 17:31:08 +08:00
Dillon Ngo 6093ce896e Allow user account to see and use all vouchers that belongs to all employees under the same company in checkout 2024-08-20 17:21:00 +08:00
Dillon Ngo 78c6bf36fa Merge branch 'dillon/63.4-debugging' into development 2024-08-18 19:56:40 +08:00
Dillon Ngo 89ca4b48ac Merge branch 'dillon/63.5-ui-update' into development 2024-08-17 09:07:29 +08:00
edmondlang 886a7b2767 delete refund 2024-08-14 09:48:51 +08:00
edmondlang 78c4b4db63 delete refund 2024-08-14 09:44:19 +08:00
Dillon Ngo 45533c9179 Quick fix on error when lock booking info forwarded to voucherify 2024-08-13 14:55:05 +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 f24c1b6263 Merge branch 'fix-wrong-currency-rate-group-command' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-refund-outstanding 2024-08-12 23:11: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
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
Dillon Ngo f3303493c4 Merge branch 'dillon/68-exchange-debugging-refund' into 'master' 
Fix an error with refund for transaction that used a voucher earlier, get...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!174
 2024-08-12 14:30:09 +00: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 a36b6f5e57 Comments on code 2024-08-12 10:48:35 +08:00
Dillon Ngo 9cadaafbe7 Merge branch dillon/66.2-exchange-debug into development 2024-08-12 10:32:56 +08:00
Dillon Ngo 77e314c52b Quick fix on recipient_bank_account is null error on frontend 2024-08-12 10:25:57 +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
Jia Sheng 3767b41522 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-08 21:45:38 +08:00
Jia Sheng 5be2b60e1c update to fix for round up precision 2024-08-08 21:45:00 +08:00
Dillon Ngo 191a787ecc Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:23:58 +08:00
Dillon Ngo 039d8deeea Fix some breaking changes that is already deployed to master branch 2024-08-07 07:23:45 +08:00
Dillon Ngo 714e1ad340 Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:13:08 +08:00
Dillon Ngo 32833064b3 Fix some breaking changes that is already deployed to master branch 2024-08-07 06:56:49 +08:00
Dillon Ngo 6160ec0651 Merge branch 'master' into dillon/66.1-payment-bank-details 2024-08-07 06:49:31 +08:00
Dillon Ngo 3bd708ed0e Recipient Bank Details to follow payment overriding the default attached to Booking 2024-08-07 06:46:17 +08:00
Dillon Ngo f44f5d3ffd Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 03:23:12 +08:00
Dillon Ngo 8973e7b50f Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month 2024-08-04 03:22:53 +08:00
Dillon Ngo bdf0a3afeb Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue 2024-08-04 01:35:18 +08:00
Dillon Ngo b0a1971ca1 Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 00:32:26 +08:00
Dillon Ngo 8b50b89449 Sorry voucher debug 2024-08-04 00:32:12 +08:00
Dillon Ngo de11cdb13c Merge branch 'dillon/63.2-sorry-voucher' into 'master' 
Sorry Voucher Implementation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!166
 2024-08-03 15:09:34 +00:00
edmondlang 6b2f674c17 Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-02 01:20:15 +08:00
Jia Sheng cb9090ec03 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-31 22:39:46 +08:00
Jia Sheng 7e42bda76e make 1688 supplier in supplier currency order dashboard has the same flow as other supplier 2024-07-31 22:39:04 +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
Dillon Ngo 7ed66f6414 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-25 18:01:05 +08:00
Dillon Ngo 05ceb32ac2 Sorry Voucher with new features enhancement requested by KS 2024-07-25 17:57:20 +08:00
edmondlang c340c9d4d8 1688 work flow 2024-07-23 22:58:36 +08:00