Commit Graph

1249 Commits

Author SHA1 Message Date
Dodowingster 8325188221 refactor: Relocate Export buttons 2024-05-08 15:58:03 +08:00
Dodowingster e58a8de2bf feat: add button for excel file 2024-05-06 14:45:20 +08:00
Dodowingster 04d55aa2d2 feat: txt output btn and xlsl output btn 2024-05-02 15:47:02 +08:00
JiaSheng 7655853a6d -open refund function for all admin (ignore whether the booking has invoice or not)
-when refund is before the whiteform, auto approve the transaction
2024-04-29 21:19:34 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +08:00
edmondlang aeb0be11bf remove - in the invoice discount section, amount is already in negative 2024-04-09 00:20:19 +08:00
edmondlang a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-04-02 11:53:43 +08:00
JiaSheng 3deba3468a -Approve refund - only super admin
-If invoice generated - only super admin can request refund
2024-03-25 15:06:46 +08:00
JiaSheng c95c274db7 update 2024-03-25 00:47:52 +08:00
JiaSheng daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +08:00
Dillon Ngo 01bbb1e21a Amendment on welcome voocher email requested by kexin 2024-03-17 16:06:47 +08:00
edmondlang 0a12bca442 check if have refund in progress 2024-03-17 15:03:46 +08:00
JiaSheng c498aec61d -fix purchase order section state issue when refund request is approved on booking page
-fix supplier bill group dashboard payment issue
2024-03-16 09:44:56 +08:00
edmondlang 10151634a7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-03-15 17:13:58 +08:00
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
Dillon Ngo 36cde82a19 Send welcome email with voucher to user upon successful verification of customer email adddress 2024-03-14 15:52:20 +08:00
JiaSheng b63cea4c09 update purchase order amount and status upon refund approval 2024-03-12 12:03:49 +08:00
JiaSheng 3cd2e24461 add export refunded transactions button 2024-03-11 22:18:10 +08:00
JiaSheng a1bbc69ec5 -update payment amount under payment history section on booking page
-export approved refund payment
2024-03-11 22:13:01 +08:00
JiaSheng b3f97c0ed8 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-03-11 21:09:43 +08:00
JiaSheng 2d34b157f5 update refund section to have 2 tabs, where each tab categorized by full and partial refund 2024-03-11 01:00:38 +08:00
Omair Saleh 6d8cce464c don't paginate the pending currency order page 2024-03-08 03:08:21 +08:00
Omair Saleh 7030041246 fix payment history display transfer status 2024-03-07 11:46:46 +08:00
Omair Saleh 32224f6803 fix payment history display transfer status 2024-03-07 11:43:19 +08:00
Omair Saleh df7f9531e8 fix payment history display transfer status 2024-03-07 11:38:03 +08:00
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