 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 |
|
|
edmondlang
|
eb7c91f1f4
|
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:03 +08:00 |
|
|
edmondlang
|
0a12bca442
|
check if have refund in progress
|
2024-03-17 15:03:46 +08:00 |
|
|
Dillon Ngo
|
212bd40d28
|
Merge branch 'dillon/51.4-explore-multiple-queues' into development
|
2024-03-16 13:27:43 +08:00 |
|
 JiaSheng
|
a45507a2cf
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-16 09:47:45 +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 |
|
|
edmondlang
|
ed969913cc
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-15 17:11:44 +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
|
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
|
62065416b4
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-12 12:04:17 +08:00 |
|
|
JiaSheng
|
b63cea4c09
|
update purchase order amount and status upon refund approval
|
2024-03-12 12:03:49 +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
|
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 |
|
|
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 |
|
|
edmondlang
|
be65829dd5
|
Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-03-11 14:05:58 +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 |
|
|
JiaSheng
|
626bec90d2
|
update export pending order so that partial refund booking show correct amount
|
2024-03-11 01:14:40 +08:00 |
|
|
JiaSheng
|
f42f26e6c3
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-11 01:01:07 +08:00 |
|
|
JiaSheng
|
2d34b157f5
|
update refund section to have 2 tabs, where each tab categorized by full and partial refund
|
2024-03-11 01:00:38 +08:00 |
|
|
JiaSheng
|
180a267951
|
Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-08 17:05:45 +08:00 |
|
 Omair Saleh
|
cc8a12c7b0
|
Merge remote-tracking branch 'origin/master'
|
2024-03-08 03:08:38 +08:00 |
|
|
Omair Saleh
|
6d8cce464c
|
don't paginate the pending currency order page
|
2024-03-08 03:08:21 +08:00 |
|
|
JiaSheng
|
45bb47e5aa
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-03-07 17:21:41 +08:00 |
|
|
JiaSheng
|
4d501c8b7c
|
update log info
|
2024-03-07 17:21:18 +08:00 |
|
|
JiaSheng
|
875fb79574
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
|
2024-03-07 17:16:22 +08:00 |
|
|
JiaSheng
|
b0e3467fbe
|
export pending order should not export order with refund in progress
|
2024-03-07 15:41:21 +08:00 |
|
|
Omair Saleh
|
7030041246
|
fix payment history display transfer status
|
2024-03-07 11:46:46 +08:00 |
|
|
Omair Saleh
|
32224f6803
|
fix payment history display transfer status
|
2024-03-07 11:43:19 +08:00 |
|
|
Omair Saleh
|
df7f9531e8
|
fix payment history display transfer status
|
2024-03-07 11:38:03 +08:00 |
|
|
JiaSheng
|
73819e967e
|
open partial refund, categorize refunds section in dashboard
|
2024-03-06 20:56:24 +08:00 |
|
|
JiaSheng
|
e7ef63c511
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard
|
2024-03-06 15:16:50 +08:00 |
|
|
edmondlang
|
2d5bbac3b1
|
update ExpiredBookingCommand logging - add timestamp
|
2024-03-02 00:32:55 +08:00 |
|
|
edmondlang
|
85cd73f577
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into uncomment-booking-expired-command
|
2024-03-02 00:25:55 +08:00 |
|
|
edmondlang
|
8b22b49937
|
remove testing code
|
2024-03-02 00:25:00 +08:00 |
|
|
JiaSheng
|
42a399999a
|
uncomment and log to specific file for booking expired command
|
2024-03-01 23:28:14 +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 |
|