Commit Graph

2821 Commits

Author SHA1 Message Date
JiaSheng c95c274db7 update 2024-03-25 00:47:52 +08:00
JiaSheng 04b8dfb0dd -fix issue where cannot approve PO when we have refunded transaction 2024-03-19 00:23:09 +08:00
JiaSheng daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +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
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
edmondlang be65829dd5 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-03-11 14:05:58 +08:00
JiaSheng 626bec90d2 update export pending order so that partial refund booking show correct amount 2024-03-11 01:14:40 +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 cc8a12c7b0 Merge remote-tracking branch 'origin/master' 2024-03-08 03:08:38 +08:00
Omair Saleh 6d8cce464c don't paginate the pending currency order page 2024-03-08 03:08:21 +08:00
JiaSheng 4d501c8b7c update log info 2024-03-07 17:21:18 +08:00
JiaSheng b0e3467fbe export pending order should not export order with refund in progress 2024-03-07 15:41: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 e7ef63c511 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-03-06 15:16:50 +08:00
edmondlang 2d5bbac3b1 update ExpiredBookingCommand logging - add timestamp 2024-03-02 00:32:55 +08:00
edmondlang 85cd73f577 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into uncomment-booking-expired-command 2024-03-02 00:25:55 +08:00
edmondlang 8b22b49937 remove testing code 2024-03-02 00:25:00 +08:00
JiaSheng 42a399999a uncomment and log to specific file for booking expired command 2024-03-01 23:28:14 +08:00
edmondlang b2dd34106c debug payment not showing issue 2024-03-01 22:51:56 +08:00
edmondlang dfc2ddd09b debug payment not showing issue 2024-03-01 22:49:14 +08:00
edmondlang 5cf55453fd show-booking-expired for debug payment not showing 2024-03-01 21:57:06 +08:00
edmondlang efb909555e debug payment not showing issue 2024-03-01 14:28:52 +08:00
JiaSheng ca2f41e95c fix bug for payment transaction not found after status update to refunded 2024-03-01 08:16:54 +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 8d84c970e2 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-27 22:03:04 +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 f84b04c26c update logging and indentation 2024-02-27 01:08:16 +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 9aa75630ff update code for refund booking 2024-02-21 00:20:45 +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 39d78d2d42 Merge branch 'revert-304379b1' into 'master'
REVERT THE REVERT REINSTATING THE COMMIT WITH MESSAGE: "Proof of concept - Vue Polling a workaround for AWS API Gateway limitation"

See merge request CIEFWorldwideSdnBhd/exchange-2.0!158
2024-02-11 10:30:08 +00: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 304379b147 Merge branch 'revert-b9668bb6' into 'master'
Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'"

See merge request CIEFWorldwideSdnBhd/exchange-2.0!157
2024-02-11 09:54:00 +00:00