 Dillon Ngo
|
be063d985a
|
Merge branch 'dillon/57.1-second-voucher-first-milestone' into development
|
2024-08-21 22:13:58 +08:00 |
|
|
Dillon Ngo
|
d8c53d11d7
|
Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees
|
2024-08-21 22:00:46 +08:00 |
|
|
Dillon Ngo
|
3b14a2d1d0
|
Merge branch 'dillon/63.6-company-with-multiple-employees' into development
|
2024-08-20 17:31:08 +08:00 |
|
|
Dillon Ngo
|
6093ce896e
|
Allow user account to see and use all vouchers that belongs to all employees under the same company in checkout
|
2024-08-20 17:21:00 +08:00 |
|
 edmondlang
|
78c4b4db63
|
delete refund
|
2024-08-14 09:44:19 +08:00 |
|
 Jia Sheng
|
74d3b901ea
|
Merge branch 'fix-refund-outstanding' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# routes/web.php
|
2024-08-12 21:26:57 +08:00 |
|
|
Dillon Ngo
|
a36b6f5e57
|
Comments on code
|
2024-08-12 10:48:35 +08:00 |
|
|
Dillon Ngo
|
9cadaafbe7
|
Merge branch dillon/66.2-exchange-debug into development
|
2024-08-12 10:32:56 +08:00 |
|
|
Dillon Ngo
|
77e314c52b
|
Quick fix on recipient_bank_account is null error on frontend
|
2024-08-12 10:25:57 +08:00 |
|
|
Dillon Ngo
|
714e1ad340
|
Merge branch 'dillon/66.1-payment-bank-details' into development
|
2024-08-07 07:13:08 +08:00 |
|
|
Dillon Ngo
|
6160ec0651
|
Merge branch 'master' into dillon/66.1-payment-bank-details
|
2024-08-07 06:49:31 +08:00 |
|
|
Dillon Ngo
|
3bd708ed0e
|
Recipient Bank Details to follow payment overriding the default attached to Booking
|
2024-08-07 06:46:17 +08:00 |
|
|
Dillon Ngo
|
f44f5d3ffd
|
Merge branch 'dillon/63.3-sorry-voucher-debug' into development
|
2024-08-04 03:23:12 +08:00 |
|
|
Dillon Ngo
|
8973e7b50f
|
Fix a problem where voucherify campaign vouchers limit not displaying with correct info for the month
|
2024-08-04 03:22:53 +08:00 |
|
|
Dillon Ngo
|
de11cdb13c
|
Merge branch 'dillon/63.2-sorry-voucher' into 'master'
Sorry Voucher Implementation
See merge request CIEFWorldwideSdnBhd/exchange-2.0!166
|
2024-08-03 15:09:34 +00:00 |
|
|
Jia Sheng
|
cb9090ec03
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-07-31 22:39:46 +08:00 |
|
|
Jia Sheng
|
7e42bda76e
|
make 1688 supplier in supplier currency order dashboard has the same flow as other supplier
|
2024-07-31 22:39:04 +08:00 |
|
|
Dillon Ngo
|
e80ad9a6ec
|
Merge branch 'dillon/10-edit-bank-details' into dillon/66-payment-bank-details
|
2024-07-25 19:34:43 +08:00 |
|
|
Dillon Ngo
|
2a04ef5bd2
|
Merge branch 'dillon/63.2-sorry-voucher' into development
|
2024-07-23 19:12:40 +08:00 |
|
|
Dillon Ngo
|
0d60226c44
|
Sorry Voucher with new features enhancement requested by KS
|
2024-07-23 19:11:36 +08:00 |
|
|
edmondlang
|
2a26c58dda
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2024-07-17 10:22:21 +08:00 |
|
|
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 |
|
|
Jia Sheng
|
e5bac3db51
|
Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2024-06-18 23:27:57 +08:00 |
|
|
Jia Sheng
|
3f6dde7462
|
add cancel bill group function
|
2024-06-18 23:25:55 +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 |
|
 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 |
|
|
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 |
|
|
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
|
97a8e34f3d
|
initial commit
|
2024-05-13 09:58:28 +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 |
|