1073 Commits

Author SHA1 Message Date
JiaSheng 81c81e3b48 -show remark and categorized in export refund booking
-make refund function available for internal only, not for customer
2024-03-15 10:34:21 +08:00
JiaSheng b63cea4c09 update purchase order amount and status upon refund approval 2024-03-12 12:03:49 +08:00
JiaSheng 5c10539824 resolve supplier refund amount to follow white form rate 2024-02-28 20:53:20 +08:00
JiaSheng 5fd2f6ef7f -complete supplier bill group when oustanding is 0
-create refund and supplier refund if the request refund order is in white form
2024-02-28 01:34:39 +08:00
JiaSheng 767d6c84fe update to bill refund for 1688 supplier 2024-02-25 20:43:01 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
Sai0224 ec0ebe3812 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-21 21:14:51 +08:00
edmondlang df17a8497d comment partial refund function 2024-02-21 00:33:08 +08:00
edmondlang 9e3c34eb73 change payment status when it has been fully refunded 2024-02-20 22:41:28 +08:00
edmondlang 48247abbd4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
# Conflicts:
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
2024-02-19 01:00:51 +08:00
edmondlang 609b71f549 code upfate for refund booking 2024-02-19 00:57:42 +08:00
edmondlang f083434390 update refund ui and logic 2024-02-16 14:59:11 +08:00
Dillon Ngo f8230990f4 Revert "Merge branch 'revert-b9668bb6' into 'master'"
This reverts merge request !157
2024-02-11 10:28:05 +00:00
Dillon Ngo ea4795e5c8 Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'"
This reverts merge request !152
2024-02-11 09:53:09 +00:00
Dillon Ngo b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
2024-02-11 09:16:08 +00:00
Dillon Ngo 7151caa9b8 Proof of concept - Vue Polling a workaround for AWS API Gateway limitation 2024-02-11 16:11:42 +08:00
edmondlang ddcad4969e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-02-06 12:02:06 +08:00
Dillon Ngo 17785cd08f Merge branch 'dillon/41-voucherify-phase-2b' into 'master'
Voucherify minor interface update to allow user easily select and apply available voucher on checkout

See merge request CIEFWorldwideSdnBhd/exchange-2.0!151
2024-01-25 14:00:54 +00:00
JiaSheng 402a2e03bc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-15 23:44:05 +08:00
JiaSheng ef43e1616d update 2024-01-14 12:20:28 +08:00
JiaSheng e5a96e179c add refund transaction under booking payment history, update on admin currency order dashboard to show the correct amount after refunded 2024-01-13 13:27:24 +08:00
edmondlang aa57a79ab7 fix ExportsInvoiceTransactions - $row is inside an array 2024-01-11 11:22:46 +08:00
JiaSheng 836e5f86cc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-10 21:14:44 +08:00
Steve Ng 1e16872933 fix the invoice date for IZYIM when export invoice to autocount 2024-01-09 09:08:44 +08:00
JiaSheng 8a05620edf update 2024-01-08 22:41:59 +08:00
JiaSheng a28c695aab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-08 21:54:23 +08:00
Steve Ng 24d246d721 fix the invoice date for IZYIM when export invoice to autocount and have reject function in mapping review 2024-01-05 12:06:08 +08:00
Steve Ng 74c6ca7330 change posting date to invoice date for shipping portal when export invoice to autocount 2024-01-03 09:08:54 +08:00
Dillon Ngo bf5ea2b2f2 Code sync from Shipping Portal, independent deployment of Vue Polling, Performance Improvement and tweaking for better user experience 2023-12-30 18:35:17 +08:00
Dillon Ngo 18df0e256b Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor 2023-12-30 01:15:27 +08:00
Steve Ng 5d0052a671 add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:47:12 +08:00
JiaSheng b6162f5355 update 2023-12-23 16:29:06 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
Steve Ng 7ab1cd47e5 change where condition for import receipts 2023-12-12 16:24:36 +08:00
Dillon Ngo 1212ec37b8 Fix a decimal problem reported by kexin 2023-12-06 13:37:45 +08:00
Dillon Ngo c7c7ee8c0c Fix a problem on voucher expiration date inaccurate 2023-12-04 12:58:18 +08:00
Steve Ng 1c29e45744 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:58:55 +08:00
Steve Ng d8a4510fc4 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:49:51 +08:00
edmondlang 6fe1ca3e0e update regenerate invoice 2023-11-09 10:21:04 +08:00
edmondlang 51766b6caa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into regenerate-invoice-with-first-bill-no 2023-11-08 00:11:44 +08:00
Steve Ng db88edabfe fix bug unmapped invoice 2023-11-04 10:45:41 +08:00
edmondlang 5c5f54e03b delete booking / expire the order payment 2023-10-30 18:39:19 +08:00
Steve Ng 5b681ac8c0 fixing the structure of export receipt to autocount and import receipt to exchange map failed 2023-10-29 08:44:31 +08:00
Steve Ng 05b5823fe4 fixing unable mapping records and filtering function in Pending Export tab and listing data not same in Pending Export tab with export Invoice to autocount and calculate mapped percentage 2023-10-23 09:21:26 +08:00
JiaSheng 8e67c219a9 fix wallet pagination 2023-10-20 14:56:35 +08:00
edmondlang 24510dbcf1 Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-10-18 15:55:30 +08:00
Jia Sheng Lee 02db4d7d5f fix download file name issue, and disable supplier selectable when data is fetching 2023-10-17 17:20:17 +08:00
Steve Ng f943abcacb reduce queue job statement process qty 2023-10-16 20:06:01 +08:00
edmondlang caff1ab5d5 show error message for bulk download 2023-10-12 18:57:14 +08:00
edmondlang 5b94b87448 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:19:48 +08:00