cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-27 16:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,553 Commits 175 Branches 0 Tags
8648cd401f57e29a12c828d7fa5dc0f2cac2de04
Commit Graph

3553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aqqil Azman 8648cd401f Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-07 09:59:15 +08:00
Aqqil Azman 7013dd4256 added table headers due to account oversight on the database structure, mixing Marking and Ref No up 2024-08-07 09:58:39 +08:00
Dillon Ngo e732e475bf Fix some merge conflict done wrong 2024-08-07 07:55:21 +08:00
Dillon Ngo 191a787ecc Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:23:58 +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 714e1ad340 Merge branch 'dillon/66.1-payment-bank-details' into development 2024-08-07 07:13:08 +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
Jia Sheng 9f72823932 Merge branch 'manual-po-segment-update' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-06 23:11:14 +08:00
Jia Sheng 53950459e2 show warning on manual po, add periodic 1688 manual po 2024-08-06 22:33:07 +08:00
Aqqil Azman 966c5522ae Merge branch 'pending-order-export-fomart-rearrangement' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-06 19:42:46 +08:00
Aqqil Azman 7e9ffd67e2 rearrange the pending order based on account and PM's request 2024-08-06 19:40:25 +08:00
edmondlang 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
edmondlang a90c3644c8 Update c2c display amount 2024-08-05 22:27:59 +08:00
Dillon Ngo 68fa965d7b Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' 
Sorry voucher minor UI update

See merge request CIEFWorldwideSdnBhd/exchange-2.0!170
 2024-08-04 13:28:49 +00:00
Dillon Ngo 0e7b9d113a Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 21:25:22 +08:00
Dillon Ngo bce914a3d3 Sorry voucher minor UI update 2024-08-04 21:24:56 +08:00
Dillon Ngo 5248dfd281 Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' 
Fix a problem where voucherify campaign vouchers limit not displaying with...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!169
 2024-08-03 20:04:05 +00:00
Dillon Ngo a7e422646c Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 03:56:17 +08:00
Dillon Ngo 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
Dillon Ngo f44f5d3ffd Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 03:23:12 +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 14f2bd7f2c Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' 
Sorry Voucher Implementation - temporary work around on 403 issue, backend permission issue

See merge request CIEFWorldwideSdnBhd/exchange-2.0!168
 2024-08-03 17:36:09 +00: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 02e3dce557 Merge branch 'dillon/63.3-sorry-voucher-debug' into 'master' 
Sorry voucher implementation problem debug

See merge request CIEFWorldwideSdnBhd/exchange-2.0!167
 2024-08-03 16:36:40 +00:00
Dillon Ngo b0a1971ca1 Merge branch 'dillon/63.3-sorry-voucher-debug' into development 2024-08-04 00:32:26 +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
Aqqil Azman 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
edmondlang 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
edmondlang 049d3cc098 fix adding remark error 2024-08-02 01:18:56 +08:00
Aqqil Azman 8d45a30dc7 included file types File-Upload-Component 2024-08-01 13:15:13 +08:00
Aqqil Azman 38e3f8a998 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 2024-08-01 08:52:59 +08:00
omair saleh bd5ef4a0d2 Merge branch 'supplier-bill-group-dashboard' into 'master' 
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier

See merge request CIEFWorldwideSdnBhd/exchange-2.0!165
 2024-07-31 16:33:17 +00:00
Jia Sheng cb9090ec03 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-31 22:39:46 +08: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
Aqqil Azman 3bcae87661 added required props to remark-form-component and fix errors from console 2024-07-31 12:25:05 +08:00
Aqqil Azman 11bd2fd3b8 amend E2E activation service message to "..minimum amount is CNY 1000.." 2024-07-31 10:16:33 +08:00
Aqqil Azman ef90e45325 parsing remark component content to remark tabble 2024-07-30 17:56:38 +08:00
Aqqil Azman 356c226528 added emit submit form 2024-07-30 17:56:19 +08:00
Aqqil Azman 1f07402c2a remark post attempt for pending PO approval 2024-07-29 14:25:19 +08:00
Aqqil Azman f94984d01e added create_po_issue_remark and changed create_login_issue_remark to create_issue_remark 2024-07-29 14:24:39 +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 7ed66f6414 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-25 18:01:05 +08:00
Dillon Ngo 05ceb32ac2 Sorry Voucher with new features enhancement requested by KS 2024-07-25 17:57:20 +08:00
Aqqil Azman bfe1aa5efd changed api route and api name for issue remark 2024-07-25 14:58:41 +08:00
Aqqil Azman 0769d4d67c changed create_login_issue_remark_api into create_issue_remark 2024-07-25 14:58:17 +08:00
Aqqil Azman 12ba031e57 updated the front end, everything should be working aside from the 1688 underpaid, overpaid workflow 2024-07-25 11:27:53 +08:00
Aqqil Azman 5b88b0ee2e added api for po issue remark 2024-07-25 11:27:21 +08:00