cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-31 02:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,305 Commits 175 Branches 0 Tags
94ea735211b785796eff174ca61c3aaa4fed0968
Commit Graph

3305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edmondlang 94ea735211 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-16 22:52:14 +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 29bf3f4295 Merge branch 'fix-invoice-not-tally-with-voucherify' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-09 00:20:45 +08:00
edmondlang aeb0be11bf remove - in the invoice discount section, amount is already in negative 2024-04-09 00:20:19 +08:00
edmondlang 4770a5be33 Merge branch 'fix-invoice-not-tally-with-voucherify' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-09 00:05:13 +08:00
JiaSheng 02d28f8fba fix invoice amount not tally when voucher is apply for booking 2024-04-08 21:17:37 +08:00
Dillon Ngo 53a3c4c859 Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-02 21:28:48 +08:00
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 7a3e7d2c62 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-02 20:26:30 +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 c9d04a485a Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-02 15:26:37 +08:00
edmondlang d69b55d586 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-02 15:26:23 +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
Omair Saleh dc61f23fa8 include pending verification status to expirying payment function 2024-04-01 12:59:30 +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
Omair Saleh bb1cb6d44e tidy up whiteform report 2024-03-27 10:11:02 +08:00
Omair Saleh b9765fbcf7 tidy up whiteform report 2024-03-27 10:03:26 +08:00
Omair Saleh eb85793798 tidy up whiteform report 2024-03-27 10:02:25 +08:00
Omair Saleh baa8551b66 tidy up whiteform report 2024-03-27 09:54:58 +08:00
Omair Saleh 9a6e41ff3b tidy up whiteform report 2024-03-27 09:47:42 +08:00
Omair Saleh 937610272c tidy up whiteform report 2024-03-27 09:42:24 +08:00
edmondlang d104e64036 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/web.php
 2024-03-27 01:11:44 +08:00
edmondlang 3af3c95032 show white form transactions in date range 2024-03-27 01:09:55 +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 55818dc8fa Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-19 00:23:33 +08:00
JiaSheng 04b8dfb0dd -fix issue where cannot approve PO when we have refunded transaction 2024-03-19 00:23:09 +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 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 04689864f3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into 'master' 
Dillon/53 voucherify email reminder to user

See merge request CIEFWorldwideSdnBhd/exchange-2.0!159
 2024-03-18 12:01:17 +00:00
Dillon Ngo aeed8db87b Merge branch 'dillon/51.4-explore-multiple-queues' into development 2024-03-18 13:30:09 +08:00
Dillon Ngo 15482469a6 Vue Polling - update info log location for PerfexCRM, standardization exercise 2024-03-18 13:29:51 +08:00
Dillon Ngo 91ffc2614c Merge branch 'dillon/51.4-explore-multiple-queues' into development 2024-03-18 13:25:40 +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 605220eacb Merge branch 'dillon/51.4-explore-multiple-queues' into development 2024-03-18 13:10:57 +08:00
Dillon Ngo 29d17c4f1f Vue Polling - update info log location for PerfexCRM 2024-03-18 13:09:12 +08:00
Dillon Ngo 064fba660b Merge branch 'dillon/51.4-explore-multiple-queues' into development 2024-03-18 12:58:31 +08:00
Dillon Ngo 122888f39a Vue Polling - update info log location when job is not found 2024-03-18 12:58:17 +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