be063d985a
Merge branch 'dillon/57.1-second-voucher-first-milestone' into development
2024-08-21 22:13:58 +08:00
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
3b14a2d1d0
Merge branch 'dillon/63.6-company-with-multiple-employees' into development
2024-08-20 17:31:08 +08:00
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
8331251c98
Merge branch 'dillon/63.5-ui-update' into 'master'
...
Minor UI update to show Terms requested by KS
See merge request CIEFWorldwideSdnBhd/exchange-2.0!175
2024-08-17 01:12:00 +00:00
89ca4b48ac
Merge branch 'dillon/63.5-ui-update' into development
2024-08-17 09:07:29 +08:00
78c4b4db63
delete refund
2024-08-14 09:44:19 +08:00
de008d593e
Minor UI update to show Terms requested by KS
2024-08-13 15:59:07 +08:00
3b767b2cd3
Merge branch 'dillon/68-exchange-debugging-refund' into development
2024-08-12 22:02:54 +08:00
9cadaafbe7
Merge branch dillon/66.2-exchange-debug into development
2024-08-12 10:32:56 +08:00
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
3245abe05d
Merge branch 'dillon/66.1-payment-bank-details' into 'master'
...
New feature to allow recipient bank details to be edited independently (from booking by default) for payment
See merge request CIEFWorldwideSdnBhd/exchange-2.0!171
2024-08-11 16:02:27 +00:00
602b69dcba
show payment method and date
2024-08-09 19:47:58 +08:00
3767b41522
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-08 21:45:38 +08:00
5be2b60e1c
update to fix for round up precision
2024-08-08 21:45:00 +08:00
e732e475bf
Fix some merge conflict done wrong
2024-08-07 07:55:21 +08:00
714e1ad340
Merge branch 'dillon/66.1-payment-bank-details' into development
2024-08-07 07:13:08 +08:00
6160ec0651
Merge branch 'master' into dillon/66.1-payment-bank-details
2024-08-07 06:49:31 +08:00
3bd708ed0e
Recipient Bank Details to follow payment overriding the default attached to Booking
2024-08-07 06:46:17 +08:00
9f72823932
Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-06 23:11:14 +08:00
53950459e2
show warning on manual po, add periodic 1688 manual po
2024-08-06 22:33:07 +08:00
dea49e7e4a
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
...
# Conflicts:
# resources/assets/vue/components/general/forms/C2cConfirmationFormComponent.vue
2024-08-05 22:31:07 +08:00
a90c3644c8
Update c2c display amount
2024-08-05 22:27:59 +08:00
0e7b9d113a
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
2024-08-04 21:25:22 +08:00
bce914a3d3
Sorry voucher minor UI update
2024-08-04 21:24:56 +08:00
a7e422646c
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
2024-08-04 03:56:17 +08:00
79d5471d9e
Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month
2024-08-04 03:56:05 +08:00
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
ae109c47ae
Merge branch 'change-E2E-activation-service' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-08-02 16:37:16 +08:00
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
049d3cc098
fix adding remark error
2024-08-02 01:18:56 +08:00
8d45a30dc7
included file types File-Upload-Component
2024-08-01 13:15:13 +08:00
38e3f8a998
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0
2024-08-01 08:52:59 +08:00
cb9090ec03
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
2024-07-31 22:39:46 +08:00
7e42bda76e
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier
2024-07-31 22:39:04 +08:00
3bcae87661
added required props to remark-form-component and fix errors from console
2024-07-31 12:25:05 +08:00
11bd2fd3b8
amend E2E activation service message to "..minimum amount is CNY 1000.."
2024-07-31 10:16:33 +08:00
ef90e45325
parsing remark component content to remark tabble
2024-07-30 17:56:38 +08:00
356c226528
added emit submit form
2024-07-30 17:56:19 +08:00
1f07402c2a
remark post attempt for pending PO approval
2024-07-29 14:25:19 +08:00
e80ad9a6ec
Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details
2024-07-25 19:34:43 +08:00
0769d4d67c
changed create_login_issue_remark_api into create_issue_remark
2024-07-25 14:58:17 +08:00
12ba031e57
updated the front end, everything should be working aside from the 1688 underpaid, overpaid workflow
2024-07-25 11:27:53 +08:00
324af3bd1c
Merge branch 'dillon/63.2-sorry-voucher' into development
2024-07-24 15:19:02 +08:00
facced08ff
Sorry Voucher with new features enhancement requested by KS
2024-07-24 15:18:49 +08:00
6123bb5285
Finish 1688 Front end workflow, added if else condition for unqiue issues for login, issues and others
2024-07-24 12:10:26 +08:00
c340c9d4d8
1688 work flow
2024-07-23 22:58:36 +08:00
2a04ef5bd2
Merge branch 'dillon/63.2-sorry-voucher' into development
2024-07-23 19:12:40 +08:00
0d60226c44
Sorry Voucher with new features enhancement requested by KS
2024-07-23 19:11:36 +08:00
56fddcea36
fixed link redirection, touch up the interface and added updated order verify
2024-07-23 17:53:18 +08:00
Dillon Ngo
edmondlang
Jia Sheng
Aqqil Azman