cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,652 Commits 175 Branches 0 Tags
development
Commit Graph

1654 Commits

Author SHA1 Message Date
Dillon Ngo 83bff8c9ad Minor checking fix for UI 2024-04-02 21:28:33 +08:00
Dillon Ngo e25f330d3c Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-02 21:09:22 +08:00
Dillon Ngo c6208e5b04 Change place to process second voucher eligibilty check 2024-04-02 21:09:09 +08:00
Dillon Ngo 5da8d5b43c Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-02 20:26:11 +08:00
Dillon Ngo 19ef720bc5 Small fix on UX when applying voucher 2024-04-02 20:25:57 +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
Dillon Ngo d1bcda8029 Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-01 14:04:41 +08:00
Dillon Ngo eb30d41941 Second voucher (first milestone) for user upon reaching 2 completed bookings 2024-04-01 13:56:25 +08:00
JiaSheng b7505e4501 Merge branch '1688-integration' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-31 22:21:40 +08:00
JiaSheng 9c08805d32 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-integration 
# Conflicts:
#	routes/api.php
 2024-03-31 22:21:01 +08:00
JiaSheng 2825eee224 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-25 15:07:11 +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 5f8f3f04ae Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-25 00:48:54 +08:00
JiaSheng c95c274db7 update 2024-03-25 00:47:52 +08:00
JiaSheng 31b58dcc8c Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-18 22:32:36 +08:00
JiaSheng daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +08:00
Dillon Ngo 7ba34965e3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development 2024-03-18 12:22:31 +08:00
Dillon Ngo 01bbb1e21a Amendment on welcome voocher email requested by kexin 2024-03-17 16:06:47 +08:00
edmondlang da044eb82b Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
 2024-03-17 15:05:26 +08:00
edmondlang 0a12bca442 check if have refund in progress 2024-03-17 15:03:46 +08:00
JiaSheng a45507a2cf Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-16 09:47:45 +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
edmondlang ed969913cc Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-15 17:11:44 +08:00
JiaSheng 27ca11f0c2 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-15 10:34:50 +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 62065416b4 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-12 12:04:17 +08:00
JiaSheng b63cea4c09 update purchase order amount and status upon refund approval 2024-03-12 12:03:49 +08:00
JiaSheng e5304672e3 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-11 22:19:27 +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 f42f26e6c3 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-11 01:01:07 +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
JiaSheng 180a267951 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-08 17:05:45 +08:00
Omair Saleh 6d8cce464c don't paginate the pending currency order page 2024-03-08 03:08:21 +08:00
JiaSheng 875fb79574 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
 2024-03-07 17:16:22 +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 12bf3b214d Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-02-25 20:43:35 +08:00
JiaSheng 767d6c84fe update to bill refund for 1688 supplier 2024-02-25 20:43:01 +08:00
Sai0224 b67257b42f Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-02-24 12:16:33 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00