 Jia Sheng
|
e4e2a8a9a1
|
Merge branch 'add-note-to-booking-component' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-08 12:10:28 +08:00 |
|
|
Jia Sheng
|
369054c81d
|
-add note under booking payment history
-add additional note when creating booking
|
2024-07-08 12:09:33 +08:00 |
|
|
Jia Sheng
|
eab43a7d05
|
Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-05 20:49:15 +08:00 |
|
|
Jia Sheng
|
e8cb4b8f5a
|
update pdf top header
|
2024-07-05 20:46:48 +08:00 |
|
 edmondlang
|
8d11f54b01
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-04 23:36:57 +08:00 |
|
|
edmondlang
|
17df7fda44
|
Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-04 23:36:18 +08:00 |
|
|
Jia Sheng
|
1ac4c58a18
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-04 23:04:12 +08:00 |
|
|
Jia Sheng
|
659a48d7ad
|
update export refund
|
2024-07-04 23:03:43 +08:00 |
|
|
Jia Sheng
|
0758123216
|
Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-04 22:29:10 +08:00 |
|
|
Jia Sheng
|
c43c635661
|
update
|
2024-07-04 22:28:44 +08:00 |
|
|
Jia Sheng
|
79dd0554b1
|
Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-04 22:08:30 +08:00 |
|
|
Jia Sheng
|
77140ec751
|
-change the heading in pdf from credit note to refund note for those transaction after 02 April 2024
|
2024-07-04 22:07:24 +08:00 |
|
 Dillon Ngo
|
416ec42ebc
|
Merge branch 'dillon/63-voucherify-updates' into 'master'
Test sending welcome voucher email through server
See merge request CIEFWorldwideSdnBhd/exchange-2.0!164
|
2024-07-03 11:22:27 +00:00 |
|
|
Dillon Ngo
|
929cb2c0a6
|
Test sending welcome voucher email through server
|
2024-07-03 19:21:50 +08:00 |
|
|
Dillon Ngo
|
734acfb8d9
|
Merge branch 'dillon/63-voucherify-updates' into 'master'
Test sending welcome voucher email through server
See merge request CIEFWorldwideSdnBhd/exchange-2.0!163
|
2024-07-03 11:17:24 +00:00 |
|
|
Dillon Ngo
|
09b3ffe2d5
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-03 18:41:54 +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 |
|
|
edmondlang
|
6d6ffa003d
|
Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-03 14:55:30 +08:00 |
|
|
edmondlang
|
66c2bb0cca
|
1688 fields changes
|
2024-07-03 14:54:47 +08:00 |
|
|
Dillon Ngo
|
f0205bb674
|
Merge branch 'dillon/63-voucherify-updates' into development
|
2024-07-03 12:13:24 +08:00 |
|
|
Dillon Ngo
|
47d4a163c4
|
Merge branch 'dillon/63-voucherify-updates' into 'master'
Fix welcome voucher email out of alignment issue in yahoo mail
See merge request CIEFWorldwideSdnBhd/exchange-2.0!162
|
2024-07-03 04:10:34 +00:00 |
|
|
Dillon Ngo
|
ad06bd4c4c
|
Fix welcome voucher email out of alignment issue in yahoo mail
|
2024-07-03 12:08:57 +08:00 |
|
|
Jia Sheng
|
975ba1751c
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-02 20:47:19 +08:00 |
|
|
Jia Sheng
|
cf17e9bb11
|
order export refund by created at
|
2024-07-02 20:46:53 +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
|
cd78344495
|
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-24 23:17:09 +08:00 |
|
|
edmondlang
|
1013163fc4
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-24 23:16:48 +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
|
e5bac3db51
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 23:27:57 +08:00 |
|
|
Jia Sheng
|
3f6dde7462
|
add cancel bill group function
|
2024-06-18 23:25:55 +08:00 |
|
|
Jia Sheng
|
204a8e6f5b
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 22:48:45 +08:00 |
|
|
Jia Sheng
|
4e33069574
|
test log
|
2024-06-18 22:47:53 +08:00 |
|
|
edmondlang
|
e7a63149b3
|
revert update pending_orders, exclude approved refunds order from pending_orders list
|
2024-06-18 13:43:57 +08:00 |
|
|
edmondlang
|
040f665bb8
|
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 13:41:27 +08:00 |
|
|
edmondlang
|
cda6be373f
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 12:49:40 +08:00 |
|
|
edmondlang
|
c91273d15b
|
update pending_orders, exclude approved refunds order from pending_orders list
|
2024-06-18 12:49:12 +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 |
|
|
edmondlang
|
939fcdcff8
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-12 10:17:14 +08:00 |
|
|
edmondlang
|
9a4dba7fdd
|
fix the error mock up white form cannot be created
|
2024-06-12 10:16:31 +08:00 |
|
|
edmondlang
|
06a0fb5aec
|
remove testing code
|
2024-06-09 22:19:03 +08:00 |
|
|
edmondlang
|
a5d90d7049
|
Merge branch 'ga4-user-id' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-09 22:14:40 +08:00 |
|
|
edmondlang
|
b7b2ab602a
|
gtag push user id
|
2024-06-09 22:13:56 +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 |
|