 Dillon Ngo
|
9c890926be
|
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
|
2024-10-15 16:02:32 +08:00 |
|
|
Dillon Ngo
|
258a20f118
|
Laravel Vapor - Fix a 504 error at /bookings/urgent page
|
2024-10-15 16:02:23 +08:00 |
|
|
Dillon Ngo
|
59f8376ee6
|
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
|
2024-10-15 15:40:57 +08:00 |
|
|
Dillon Ngo
|
c9d3bc4b93
|
Laravel Vapor - Fix a 504 error at /bookings/urgent page
|
2024-10-15 15:40:49 +08:00 |
|
|
Dillon Ngo
|
b7ae897163
|
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
|
2024-10-15 15:15:16 +08:00 |
|
|
Dillon Ngo
|
10b0e2340c
|
Laravel Vapor - Fix a 504 error at /bookings/urgent page
|
2024-10-15 15:15:07 +08:00 |
|
|
Dillon Ngo
|
53aaf64498
|
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
|
2024-10-15 14:55:26 +08:00 |
|
|
Dillon Ngo
|
c44017486c
|
Laravel Vapor - Fix a 504 error at /bookings/urgent page
|
2024-10-15 14:55:11 +08:00 |
|
|
Dillon Ngo
|
c03df14827
|
Merge branch 'development' into vapor/development
|
2024-10-15 00:52:46 +08:00 |
|
|
Dillon Ngo
|
d07e7cc68d
|
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
|
2024-10-12 00:10:43 +08:00 |
|
|
Dillon Ngo
|
cc00b1c74c
|
Laravel Vapor - New custom channel logs
|
2024-10-12 00:10:20 +08:00 |
|
|
Dillon Ngo
|
cec2231005
|
Merge branch 'dillon/34.7-jenkins-vapor' into vapor/development
|
2024-10-11 23:54:21 +08:00 |
|
|
Dillon Ngo
|
d479aae2bc
|
Merge branch 'master' into dillon/34.7-jenkins-vapor
|
2024-10-11 22:57:55 +08:00 |
|
|
Dillon Ngo
|
6b68194294
|
Merge branch 'dillon/71-exchange-benchmarking' into development
|
2024-10-09 14:23:36 +08:00 |
|
|
Dillon Ngo
|
3dfc0d9b06
|
Middleware to log all request path
|
2024-10-09 14:21:52 +08:00 |
|
|
Dillon Ngo
|
5642cadbbd
|
Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development
|
2024-09-04 12:53:49 +08:00 |
|
|
Dillon Ngo
|
fabc7522ae
|
Merge branch 'master' into dillon/34.6-jenkins-vapor
|
2024-09-03 17:42:44 +08:00 |
|
|
Dillon Ngo
|
8b3afd7385
|
Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into development
|
2024-08-25 12:53:22 +08:00 |
|
|
Dillon Ngo
|
b7fd252bf0
|
Voucherify - New promotion voucher (PROM150%) setup
|
2024-08-25 12:43:33 +08:00 |
|
|
Dillon Ngo
|
be2f760628
|
Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development
|
2024-08-23 13:41:08 +08:00 |
|
|
Dillon Ngo
|
811057173d
|
Merge branch 'dillon/63.7-company-with-multiple-employees' into dillon/34.6-jenkins-vapor
|
2024-08-23 13:36:18 +08:00 |
|
|
Dillon Ngo
|
12e6386c04
|
Merge branch 'dillon/63.7-company-with-multiple-employees' into development
|
2024-08-21 22:16:22 +08:00 |
|
|
Dillon Ngo
|
be063d985a
|
Merge branch 'dillon/57.1-second-voucher-first-milestone' into development
|
2024-08-21 22:13:58 +08:00 |
|
|
Dillon Ngo
|
2905edef5e
|
Amendment meant to resolve merge conflict in development branch from branch dillon/63.6-company-with-multiple-employees
|
2024-08-21 22:04:09 +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 |
|
|
Dillon Ngo
|
a07be04c4c
|
Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development
|
2024-08-14 02:22:35 +08:00 |
|
|
Dillon Ngo
|
1ba95de72d
|
Merge branch 'master' into dillon/34.6-jenkins-vapor
|
2024-08-14 02:13:51 +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 |
|