 Jia Sheng
|
f2f12a6eb4
|
Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-14 19:16:07 +08:00 |
|
|
Jia Sheng
|
cb7c38a50d
|
1688 order reference
|
2024-07-14 19:15:43 +08:00 |
|
|
Jia Sheng
|
37e42ed249
|
Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-14 11:00:58 +08:00 |
|
|
Jia Sheng
|
63118efc0b
|
delete duplicated 1688 bank account
|
2024-07-14 11:00:33 +08:00 |
|
|
Jia Sheng
|
830097f857
|
Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-13 14:13:49 +08:00 |
|
|
Jia Sheng
|
d1f319582a
|
alipay service
|
2024-07-13 14:12:54 +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
|
a17812be3b
|
check duplicate refunds
|
2024-05-22 23:22:44 +08:00 |
|
|
edmondlang
|
8fa956e0d7
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking
|
2024-05-10 00:17:08 +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
|
f03d91ba42
|
add remarks for refund
|
2024-05-10 00:00:01 +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 |
|
|
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 |
|
 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 |
|
 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 |
|
|
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 |
|
|
Dillon Ngo
|
7ba34965e3
|
Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development
|
2024-03-18 12:22:31 +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 |
|
|
Sai0224
|
b67257b42f
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-02-24 12:16:33 +08:00 |
|
|
Sai0224
|
25de31ea2e
|
supplier bill payment refund module
|
2024-02-24 12:15:26 +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
|
9aa75630ff
|
update code for refund booking
|
2024-02-21 00:20:45 +08:00 |
|
|
edmondlang
|
b7bc14b98f
|
Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
# resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
# resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
|
2024-02-19 01:10:43 +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
|
609b71f549
|
code upfate for refund booking
|
2024-02-19 00:57:42 +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 |
|
|
Dillon Ngo
|
dcb1dbeca4
|
Merge branch 'dillon/51-vue-polling-experimental-2' into development
|
2024-02-11 16:15:06 +08:00 |
|
|
JiaSheng
|
94596baf13
|
1688 integration
|
2024-01-25 16:52:06 +08:00 |
|
|
Dillon Ngo
|
bf5ea2b2f2
|
Code sync from Shipping Portal, independent deployment of Vue Polling, Performance Improvement and tweaking for better user experience
|
2023-12-30 18:35:17 +08:00 |
|
|
Dillon Ngo
|
18df0e256b
|
Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor
|
2023-12-30 01:15:27 +08:00 |
|
 Steve Ng
|
ca07fc161e
|
add reporting for download history import mapped invoice and receipt and with fix bug
|
2023-12-27 13:49:36 +08:00 |
|
|
Steve Ng
|
5d0052a671
|
add reporting for download history import mapped invoice and receipt and with fix bug
|
2023-12-27 13:47:12 +08:00 |
|
|
JiaSheng
|
7db7ff68a6
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-12-23 16:30:23 +08:00 |
|
|
JiaSheng
|
72797d8885
|
supplier bill group dashboard
|
2023-12-22 18:16:04 +08:00 |
|
|
JiaSheng
|
7ab938ebee
|
Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
|
2023-11-24 17:28:22 +08:00 |
|
|
JiaSheng
|
fbd94f01b8
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into centralize-izyim-exchange
|
2023-11-24 17:14:34 +08:00 |
|
|
Steve Ng
|
db4e9e6e95
|
fix bug for import invoice mapping and export receipts to autocount and mapped completed report
|
2023-11-23 01:06:37 +08:00 |
|
|
Steve Ng
|
f2cc75a898
|
fix bug for import invoice mapping and export receipts to autocount and mapped completed report
|
2023-11-23 01:04:38 +08:00 |
|
|
JiaSheng
|
aca665f580
|
centralize izyim exchange
|
2023-11-19 17:10:33 +08:00 |
|
|
JiaSheng
|
7d94776543
|
fix bcmath function bug
|
2023-11-04 22:28:16 +08:00 |
|
|
JiaSheng
|
f98607bc32
|
filters update
|
2023-11-04 11:52:34 +08:00 |
|
|
JiaSheng
|
c11f6dab7a
|
fix account statement transaction not tally issue
|
2023-11-04 09:59:16 +08:00 |
|
|
JiaSheng
|
d6754014aa
|
account-statement-pagination
|
2023-11-04 00:00:58 +08:00 |
|