cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,987 Commits 175 Branches 0 Tags
13dd19d0a1348c979022de494fdd583813c431ae
Commit Graph

1588 Commits

Author SHA1 Message Date
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 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
Jia Sheng 3f6dde7462 add cancel bill group function 2024-06-18 23:25:55 +08:00
Jia Sheng 4e33069574 test log 2024-06-18 22:47:53 +08:00
JiaSheng b31d592e4a update command logic 2024-06-16 11:50:29 +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
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +08:00
edmondlang 0797f26fe1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-16 17:58:47 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 97a8e34f3d initial commit 2024-05-13 09:58:28 +08:00
JiaSheng cb367d0033 bug fix for update booking amount 2024-05-11 00:01:49 +08:00
edmondlang 8fa956e0d7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-10 00:17:08 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng b8d741f57c fix edit transfer fee bug 2024-05-08 20:07:06 +08:00
JiaSheng 26f8ca87cd fix partial refund bug 2024-05-08 12:58:23 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
Omair Saleh f57b1e625f update estimated delivery date for E2E 2024-04-30 17:49:30 +08:00
Omair Saleh f3e35ec31d Merge remote-tracking branch 'origin/master' 2024-04-30 17:46:42 +08:00
Omair Saleh b528ac66fc update estimated delivery date for E2E 2024-04-30 17:46:25 +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 29507f5120 update remark on transactions 2024-04-25 14:50:59 +08:00