Commit Graph

2861 Commits

Author SHA1 Message Date
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 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 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 a8c13e9425 comment DB::commit() to fix the database seeder 2024-04-22 18:25:48 +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 aeb0be11bf remove - in the invoice discount section, amount is already in negative 2024-04-09 00:20:19 +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
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 3af3c95032 show white form transactions in date range 2024-03-27 01:09:55 +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 c95c274db7 update 2024-03-25 00:47:52 +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 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 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
Dillon Ngo 01bbb1e21a Amendment on welcome voocher email requested by kexin 2024-03-17 16:06:47 +08:00
edmondlang 0a12bca442 check if have refund in progress 2024-03-17 15:03:46 +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
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 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