 Jia Sheng
|
1ac4c58a18
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-04 23:04:12 +08:00 |
|
|
Jia Sheng
|
659a48d7ad
|
update export refund
|
2024-07-04 23:03:43 +08:00 |
|
|
Jia Sheng
|
975ba1751c
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-02 20:47:19 +08:00 |
|
|
Jia Sheng
|
cf17e9bb11
|
order export refund by created at
|
2024-07-02 20:46:53 +08:00 |
|
 edmondlang
|
e7a63149b3
|
revert update pending_orders, exclude approved refunds order from pending_orders list
|
2024-06-18 13:43:57 +08:00 |
|
|
edmondlang
|
cda6be373f
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 12:49:40 +08:00 |
|
|
edmondlang
|
c91273d15b
|
update pending_orders, exclude approved refunds order from pending_orders list
|
2024-06-18 12:49:12 +08:00 |
|
|
edmondlang
|
ab4f56e4c1
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
|
2024-05-23 13:37:25 +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
|
d0c009443b
|
Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-05-20 11:42:16 +08:00 |
|
|
edmondlang
|
3f5c735a43
|
update export currency vendor order
|
2024-05-20 11:41:21 +08:00 |
|
 Aqqil Azman
|
3b4f3281b1
|
Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-05-17 10:46:54 +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
|
7f2af7adf4
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-05-16 10:56:23 +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
|
27ee291a47
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-05-10 00:00:20 +08:00 |
|
|
edmondlang
|
2ad1841e54
|
clean up web export route
|
2024-05-09 15:46:12 +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
|
9879b16f2a
|
feat: remarks and add remarks
|
2024-04-25 10:22:08 +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 |
|
|
JiaSheng
|
b7505e4501
|
Merge branch '1688-integration' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-31 22:21:40 +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 |
|
 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
|
7ba34965e3
|
Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development
|
2024-03-18 12:22:31 +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
|
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
|
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
|
8914de90cd
|
Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-11 10:49:32 +08:00 |
|