 edmondlang
|
d76e3cc620
|
fix bug - customer cant see the Purchase Order section
|
2024-07-09 13:07:17 +08:00 |
|
|
edmondlang
|
f4488524fe
|
Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-08 19:10:18 +08:00 |
|
|
edmondlang
|
4f9c6f574e
|
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-08 19:08:01 +08:00 |
|
|
edmondlang
|
a68e919a84
|
Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-08 19:07:46 +08:00 |
|
|
edmondlang
|
91ce365c62
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-08 19:07:29 +08:00 |
|
|
edmondlang
|
726d06871b
|
1688 changes
|
2024-07-08 19:07:06 +08:00 |
|
|
edmondlang
|
28ef7fe7de
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-changes
|
2024-07-08 19:03:37 +08:00 |
|
|
edmondlang
|
93ad34b2b8
|
Merge branch '1688-changes' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-08 18:57:18 +08:00 |
|
|
edmondlang
|
a77481084c
|
Merge branch 'add-note-to-booking-component' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-08 13:29:15 +08:00 |
|
|
edmondlang
|
74e19b1325
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-08 13:28:54 +08:00 |
|
 Jia Sheng
|
6d522fdb97
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-08 12:33:03 +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
|
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 |
|
 Aqqil Azman
|
6a8006c0b0
|
continue workflow, added Issue, approve PO and edit order
|
2024-06-25 13:27:14 +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 |
|
|
Aqqil Azman
|
286ed8c73c
|
added approve_po v-if condition and the order number box for approve_po as well as the designated buttons
|
2024-06-21 17:54:04 +08:00 |
|
|
edmondlang
|
60b1bbeee6
|
admin 1688 work flow template
|
2024-06-21 15:11:10 +08:00 |
|
|
Jia Sheng
|
4a555afdbf
|
remove log in update group logic
|
2024-06-18 23:29:10 +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 |
|