Commit Graph

520 Commits

Author SHA1 Message Date
Jia Sheng cf17e9bb11 order export refund by created at 2024-07-02 20:46:53 +08:00
edmondlang c91273d15b update pending_orders, exclude approved refunds order from pending_orders list 2024-06-18 12:49:12 +08:00
edmondlang 6fd7b2f610 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-update 2024-05-22 23:37:47 +08:00
edmondlang 40d20dc42e update check duplicate refunds 2024-05-22 23:26:54 +08:00
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +08:00
JiaSheng 5425c37e52 -request multiple refund
-show remark for refund in dashboard
-show refund remark in export page
2024-05-22 19:28:42 +08:00
edmondlang 3f5c735a43 update export currency vendor order 2024-05-20 11:41:21 +08:00
Aqqil Azman 16a6954a76 changed route view for supplier_order_groupInvoice ti ...group_invoice 2024-05-16 19:19:55 +08:00
edmondlang 0797f26fe1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-16 17:58:47 +08:00
Aqqil Azman b49a44c99b feat: invoice export 2024-05-16 12:25:53 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 1c8d135074 feat: pdf export 2024-05-15 17:38:57 +08:00
Aqqil Azman a8a7d0eccd refactor: export currency vendor order routes 2024-05-13 09:59:29 +08:00
edmondlang 948438eeaa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-09 22:35:01 +08:00
edmondlang 2ad1841e54 clean up web export route 2024-05-09 15:46:12 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +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 9879b16f2a feat: remarks and add remarks 2024-04-25 10:22:08 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +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 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
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
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 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 626bec90d2 update export pending order so that partial refund booking show correct amount 2024-03-11 01:14:40 +08:00
JiaSheng b0e3467fbe export pending order should not export order with refund in progress 2024-03-07 15:41:21 +08:00
edmondlang 8b22b49937 remove testing code 2024-03-02 00:25:00 +08:00
edmondlang b2dd34106c debug payment not showing issue 2024-03-01 22:51:56 +08:00
edmondlang dfc2ddd09b debug payment not showing issue 2024-03-01 22:49:14 +08:00
edmondlang 5cf55453fd show-booking-expired for debug payment not showing 2024-03-01 21:57:06 +08:00
edmondlang efb909555e debug payment not showing issue 2024-03-01 14:28:52 +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 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 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
Dillon Ngo b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
2024-02-11 09:16:08 +00:00