1607 Commits

Author	SHA1	Message	Date
Dillon Ngo	b7fd252bf0	Voucherify - New promotion voucher (PROM150%) setup	2024-08-25 12:43:33 +08:00
Dillon Ngo	834c65ccea	Merge branch 'dillon/63.7-company-with-multiple-employees' into 'master' ... Allow user account to see and use all vouchers that belongs to all employees... See merge request CIEFWorldwideSdnBhd/exchange-2.0!176	2024-08-23 12:12:19 +00:00
edmondlang	eecb351fb3	fix proforma invoice	2024-08-23 16:59:05 +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
edmondlang	bef54204ff	fix proforma invoice	2024-08-23 11:38:38 +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	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
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	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
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	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
Dillon Ngo	039d8deeea	Fix some breaking changes that is already deployed to master branch	2024-08-07 07:23:45 +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	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	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
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	05ceb32ac2	Sorry Voucher with new features enhancement requested by KS	2024-07-25 17:57:20 +08:00
Dillon Ngo	0d60226c44	Sorry Voucher with new features enhancement requested by KS	2024-07-23 19:11:36 +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	fc005a9ef5	Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0	2024-07-14 19:58:52 +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	cb7c38a50d	1688 order reference	2024-07-14 19:15:43 +08:00
Jia Sheng	c865b28315	update	2024-07-14 12:22:04 +08:00
Jia Sheng	63118efc0b	delete duplicated 1688 bank account	2024-07-14 11:00:33 +08:00
Jia Sheng	d1f319582a	alipay service	2024-07-13 14:12:54 +08:00
Jia Sheng	c43e8e3f10	fix partial refund show fully refund	2024-07-13 11:07:43 +08:00
Dillon Ngo	c3961d102e	AbstractRule class update, with abstract authorized function updated to accept a parameter	2024-07-12 13:27:31 +08:00
Jia Sheng	7f16b9ead1	update refund logic where E2E do not refund service charge	2024-07-08 12:30:34 +08:00
Dillon Ngo	929cb2c0a6	Test sending welcome voucher email through server	2024-07-03 19:21:50 +08:00
Dillon Ngo	692789d014	Test sending welcome voucher email through server	2024-07-03 18:41:03 +08:00
Jia Sheng	a4b09cedb1	include refund service charges for partial refund	2024-06-30 12:18:40 +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	84ff900629	comment out booking expired command in kernel	2024-06-24 21:06:05 +08:00
Jia Sheng	4a555afdbf	remove log in update group logic	2024-06-18 23:29:10 +08:00