cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-31 10:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,331 Commits 175 Branches 0 Tags
23804ecc694b408304be33a9f49eae684fa7b818
Commit Graph

3331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JiaSheng 23804ecc69 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-08 20:07:43 +08:00
JiaSheng b8d741f57c fix edit transfer fee bug 2024-05-08 20:07:06 +08:00
JiaSheng 0cd3e6fd9d add missing receiver in filters to development portal 2024-05-08 15:33:32 +08:00
JiaSheng 26f8ca87cd fix partial refund bug 2024-05-08 12:58:23 +08:00
JiaSheng be0c7cfaba Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-08 12:44:05 +08:00
Omair Saleh f3413b9c6c change service description 2024-05-07 11:20:14 +08:00
JiaSheng 2775b21cd5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-06 17:20:53 +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 a88e832dc5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-29 21:21:24 +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 f63351b715 Merge branch 'remark-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/api.php
#	routes/web.php
 2024-04-25 16:50:48 +08:00
edmondlang 20cb00ed24 update add remark on white form transactions 2024-04-25 16:48:39 +08:00
Dodowingster 32d8b26451 feat: added date and time for remarks 2024-04-25 15:52:38 +08:00
edmondlang 29507f5120 update remark on transactions 2024-04-25 14:50:59 +08:00
Dodowingster 30172a6d7a refactor: proper remark database commit 2024-04-25 14:20:31 +08:00
Dodowingster 7fb4ae724c refactor: adding remarks 2024-04-25 13:40:23 +08:00
Dodowingster a9414712f5 feat: added remark.php 2024-04-25 13:40:04 +08:00
Dodowingster 3383f6b138 initial commit 2024-04-25 13:39:40 +08:00
Dodowingster 9879b16f2a feat: remarks and add remarks 2024-04-25 10:22:08 +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 547dd37405 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-22 18:26:10 +08:00
edmondlang a8c13e9425 comment DB::commit() to fix the database seeder 2024-04-22 18:25:48 +08:00
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