cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 13:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,036 Commits 175 Branches 0 Tags
master
Commit Graph

173 Commits

Author SHA1 Message Date
Jia Sheng 13118cd4a1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-08-26 21:14:18 +08:00
edmondlang 886a7b2767 delete refund 2024-08-14 09:48:51 +08:00
edmondlang 78c4b4db63 delete refund 2024-08-14 09:44:19 +08:00
Jia Sheng 5be2b60e1c update to fix for round up precision 2024-08-08 21:45:00 +08:00
Jia Sheng 7e42bda76e make 1688 supplier in supplier currency order dashboard has the same flow as other supplier 2024-07-31 22:39:04 +08:00
Jia Sheng 1467d0880f update bill group to include the service charge 2024-07-22 00:46:07 +08:00
edmondlang 2a26c58dda Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-07-17 10:22:21 +08:00
Jia Sheng c43e8e3f10 fix partial refund show fully refund 2024-07-13 11:07:43 +08:00
Jia Sheng 4a555afdbf remove log in update group logic 2024-06-18 23:29:10 +08:00
Jia Sheng 3f6dde7462 add cancel bill group function 2024-06-18 23:25:55 +08:00
Jia Sheng 4e33069574 test log 2024-06-18 22:47:53 +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
JiaSheng cb367d0033 bug fix for update booking amount 2024-05-11 00:01:49 +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
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 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
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 daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +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
Dillon Ngo ffd338e287 Vue Polling - Second high priority queue through database 2024-03-14 16:29:26 +08:00
JiaSheng b63cea4c09 update purchase order amount and status upon refund approval 2024-03-12 12:03:49 +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 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
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
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 a28c695aab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-08 21:54:23 +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 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
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
JiaSheng 8e67c219a9 fix wallet pagination 2023-10-20 14:56:35 +08:00
Jia Sheng Lee a0f600037b import purchase order function 2023-10-03 22:35:37 +08:00
JiaSheng 946ee7b6f9 refund booking 2023-09-29 15:42:15 +08:00
JiaSheng cc1229a27f company wallet transaction pagination 2023-09-19 00:09:09 +08:00
edmondlang 1827f4b294 code clean up 2023-09-16 14:37:15 +08:00
JiaSheng c374e46834 add functionality to get transactions from production when creating statement transactions owner 2023-09-13 22:03:32 +08:00
JiaSheng a79ce7e2b7 transaction not tally 2023-08-15 22:56:42 +08:00
edmondlang 2692faa259 credit note 2023-08-01 02:13:40 +08:00