cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-27 16:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,922 Commits 175 Branches 0 Tags
e8cb4b8f5ac9b5c8fa2eda92df0a9ef3ef3ca765
Commit Graph

1218 Commits

Author SHA1 Message Date
Dillon Ngo 929cb2c0a6 Test sending welcome voucher email through server 2024-07-03 19:21:50 +08:00
Dillon Ngo 692789d014 Test sending welcome voucher email through server 2024-07-03 18:41:03 +08:00
Jia Sheng a4b09cedb1 include refund service charges for partial refund 2024-06-30 12:18:40 +08:00
JiaSheng ff88dcecf4 -check group total not tally with bill group total due to transfer fee not being included 
-include the transfer fee calculation
-script to update the bill group to include the transfer fee calculation
 2024-06-09 14:44:06 +08:00
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +08:00
edmondlang 0797f26fe1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-16 17:58:47 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 97a8e34f3d initial commit 2024-05-13 09:58:28 +08:00
JiaSheng cb367d0033 bug fix for update booking amount 2024-05-11 00:01:49 +08:00
edmondlang 8fa956e0d7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-10 00:17:08 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng b8d741f57c fix edit transfer fee bug 2024-05-08 20:07:06 +08:00
JiaSheng 26f8ca87cd fix partial refund bug 2024-05-08 12:58:23 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
Omair Saleh f57b1e625f update estimated delivery date for E2E 2024-04-30 17:49:30 +08:00
Omair Saleh f3e35ec31d Merge remote-tracking branch 'origin/master' 2024-04-30 17:46:42 +08:00
Omair Saleh b528ac66fc update estimated delivery date for E2E 2024-04-30 17:46:25 +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
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 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 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