Commit Graph

1224 Commits

Author SHA1 Message Date
JiaSheng 73819e967e open partial refund, categorize refunds section in dashboard 2024-03-06 20:56:24 +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 f9f7cf74b6 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-27 21:50:47 +08:00
edmondlang 28c0aeff77 dont show payment on homepage if it is in refund process 2024-02-26 00:38:25 +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 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 c8cabee97b update 2024-01-15 23:41:12 +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
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
edmondlang 435927ba19 update code fix po 2024-01-08 18:07:04 +08:00
edmondlang 9a39976ed0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into fix-po 2024-01-08 17:49:06 +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
edmondlang c599ae5887 code update 2024-01-02 19:40:38 +08:00
edmondlang 6cac8e6e09 code update 2024-01-02 19:36:47 +08:00
edmondlang 72a945613a fix po 2024-01-02 19:32:02 +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 6da337b9dc Code sync from Shipping Portal, independent deployment of Vue Polling, additional amendment to run Vue Polling at /billings 2023-12-30 01:26:58 +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
JiaSheng f7ba84acf0 fix customer page booking component transfer type alignment issue 2023-12-07 11:05:41 +08:00
Dillon Ngo a6cf76ea79 Update UI based on kexin feedback 2023-12-03 23:57:00 +08:00
Dillon Ngo 150f6a69d6 Update UI based on kexin feedback 2023-12-03 23:34:36 +08:00
Dillon Ngo 96c00ea66b Update UI based on kexin feedback 2023-12-03 23:19:31 +08:00
Dillon Ngo 19d08242d5 Update UI based on kexin feedback 2023-12-03 23:17:09 +08:00
Dillon Ngo 52c2dade88 Update UI based on kexin feedback 2023-12-03 23:13:52 +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
Dillon Ngo 1ac2ac3102 Voucherify UI update for kexin to take a look 2023-11-29 23:39:15 +08:00
Steve Ng f2cc75a898 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:04:38 +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
Steve Ng 4bf32ac285 fix bug of update status of statement transaction owner when update invoice or receipt success, and paginate when next page with filtering date in Pending Export tab, and error on export invoive to autocount 2023-11-01 13:43:36 +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 910f190075 fixing the unknown tab to list the transactions of is_mapped false and also mapped and status in rejected 2023-10-25 18:03: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