Commit Graph

1538 Commits

Author SHA1 Message Date
edmondlang 29507f5120 update remark on transactions 2024-04-25 14:50:59 +08:00
Dodowingster 3383f6b138 initial commit 2024-04-25 13:39:40 +08:00
edmondlang 631282eaf5 add remarks table migration 2024-04-24 18:09:22 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +08:00
edmondlang 69e9328e74 fix bug cant approve the refund because booking amount cant be updated, error - Booking Amount cannot be less than xxxxx 2024-04-16 22:34:41 +08:00
JiaSheng 02d28f8fba fix invoice amount not tally when voucher is apply for booking 2024-04-08 21:17:37 +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
Omair Saleh dc61f23fa8 include pending verification status to expirying payment function 2024-04-01 12:59:30 +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 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
Dillon Ngo 8ac29fff76 Merge branch 'dillon/51.4-explore-multiple-queues' into 'master'
Update info log location and queue with high_priority for processing job faster

See merge request CIEFWorldwideSdnBhd/exchange-2.0!160
2024-03-18 12:10:50 +00:00
Dillon Ngo 15482469a6 Vue Polling - update info log location for PerfexCRM, standardization exercise 2024-03-18 13:29:51 +08:00
Dillon Ngo 1ca7a25aff Vue Polling - update info log location for PerfexCRM, standardization exercise 2024-03-18 13:25:24 +08:00
Dillon Ngo 29d17c4f1f Vue Polling - update info log location for PerfexCRM 2024-03-18 13:09:12 +08:00
Dillon Ngo 122888f39a Vue Polling - update info log location when job is not found 2024-03-18 12:58:17 +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
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 ffd338e287 Vue Polling - Second high priority queue through database 2024-03-14 16:29:26 +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 4d501c8b7c update log info 2024-03-07 17:21:18 +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
JiaSheng 42a399999a uncomment and log to specific file for booking expired command 2024-03-01 23:28:14 +08:00
edmondlang 5cf55453fd show-booking-expired for debug payment not showing 2024-03-01 21:57:06 +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 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