 edmondlang
|
ae60f9ae49
|
Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2024-07-05 01:18:59 +08:00 |
|
|
edmondlang
|
a953f78771
|
update address extra fields
|
2024-07-05 01:18:36 +08:00 |
|
|
edmondlang
|
cf3e7f04e4
|
Merge branches 'master' and 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into address-extra-fields
|
2024-07-05 00:26:12 +08:00 |
|
|
edmondlang
|
57532e9afd
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2024-06-26 13:03:07 +08:00 |
|
|
edmondlang
|
a36c5c3063
|
show group-transaction-with-completed-payments
|
2024-06-26 12:47:44 +08:00 |
|
|
edmondlang
|
4087df6649
|
Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
# app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
# app/Models/Address.php
|
2024-06-12 12:06:00 +08:00 |
|
|
edmondlang
|
9d0924c674
|
address extra fields
|
2024-06-12 12:02:31 +08:00 |
|
 Dillon Ngo
|
bb0ecc42c3
|
Merge branch 'dillon/62-fixes-and-new-features' into development
|
2024-06-02 10:25:30 +08:00 |
|
|
Dillon Ngo
|
df3024186b
|
Redirect a link + New terms and conditions checkbox when creating an order
|
2024-06-02 09:56:56 +08:00 |
|
 Jia Sheng
|
12f8391ca8
|
Merge branch 'fulfilment-banner' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
|
2024-05-20 22:51:54 +08:00 |
|
|
Jia Sheng
|
64fa56c02f
|
fulfilment banner flow update, segment user index list
|
2024-05-20 22:51:22 +08:00 |
|
|
edmondlang
|
bc6a31d458
|
Merge branch 'permits-reminder' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2024-01-30 00:38:46 +08:00 |
|
|
edmondlang
|
f389efa6af
|
add permits edit
|
2024-01-30 00:07:31 +08:00 |
|
|
edmondlang
|
3375934651
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into permits-reminder
# Conflicts:
# routes/api.php
|
2024-01-16 21:16:11 +08:00 |
|
|
edmondlang
|
c79f58d246
|
permits reminder first commit
|
2024-01-16 21:15:29 +08:00 |
|
|
Dillon Ngo
|
8f695401d2
|
Merge branch 'dillon/51-vue-polling-experimental-2' into development
|
2024-01-04 02:33:59 +08:00 |
|
|
Dillon Ngo
|
18df1c0c7b
|
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation
|
2023-12-20 14:47:56 +08:00 |
|
|
Dillon Ngo
|
e7279ec4d0
|
Merge branch 'master' into dillon/46-warehouse-storage-charges-2-merge-conflict
|
2023-12-11 21:29:06 +08:00 |
|
|
Dillon Ngo
|
bef2c05c06
|
Merge branch 'dillon/45-air-shipment-2-update-with-master' into development
|
2023-12-09 12:28:25 +08:00 |
|
|
Dillon Ngo
|
9384236294
|
Added new columns to handle multiple different kind of notification from WePost
|
2023-12-09 12:27:57 +08:00 |
|
|
Dillon Ngo
|
fcbb71de7e
|
Merge branch 'master' into dillon/45-air-shipment-update-with-master
|
2023-12-02 23:59:55 +08:00 |
|
|
Dillon Ngo
|
c519f34bac
|
Merge branch 'dillon/45-air-shipment' into development
|
2023-12-02 17:01:31 +08:00 |
|
|
Dillon Ngo
|
3098bc7d18
|
An api requested by WePost for air shipment for inbound notification
|
2023-12-02 16:59:54 +08:00 |
|
 JiaSheng
|
8b8edeab36
|
Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
|
2023-11-24 17:30:29 +08:00 |
|
|
Dillon Ngo
|
acf7000580
|
Merge branch 'dillon/48-feedback-form-improvement' into development
|
2023-11-21 19:30:02 +08:00 |
|
|
Dillon Ngo
|
820d96858f
|
Feedback Form Improvement
|
2023-11-21 19:29:40 +08:00 |
|
|
JiaSheng
|
575379adc0
|
centralize izyim exchange
|
2023-11-19 17:14:39 +08:00 |
|
|
Dillon Ngo
|
74f4cfda0c
|
Merge branch 'dillon/46-warehouse-storage-charges' into development
|
2023-11-16 23:05:18 +08:00 |
|
|
Dillon Ngo
|
76e3668563
|
20231109 Meeting Feedback 1 Fixes for warehouse storage charges
|
2023-11-16 22:40:26 +08:00 |
|
|
edmondlang
|
af8444e0d9
|
Merge branch 'wallet-audit' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal
|
2023-10-20 16:30:33 +08:00 |
|
|
edmondlang
|
fcd7fa655c
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-10-19 22:55:05 +08:00 |
|
|
edmondlang
|
e687dd2b9a
|
deletes payment
|
2023-10-19 22:54:21 +08:00 |
|
|
edmondlang
|
544d7907c3
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into wallet-audit
|
2023-10-19 13:43:53 +08:00 |
|
|
edmondlang
|
746f38a4f9
|
Merge branch 'wallet-audit' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
|
2023-10-19 12:48:57 +08:00 |
|
 Jia Sheng Lee
|
2788e349ae
|
manual transfer for admin to upload for bulk invoice payment
|
2023-10-18 15:06:46 +08:00 |
|
|
Dillon
|
a17ed000e1
|
Merge branch 'dillon/44-customer-satisfaction-feedback-project' into development
|
2023-10-04 01:04:20 +08:00 |
|
|
Dillon
|
a5c1ae14b7
|
Shorten feedback url
|
2023-10-04 01:02:19 +08:00 |
|
|
Dillon
|
35aa074c41
|
Merge branch 'dillon/44-customer-satisfaction-feedback-project' into development
|
2023-09-29 02:11:39 +08:00 |
|
|
Dillon
|
5d07598c5e
|
Meeting feedback Fixes and improvement with new sets of questions for customer feedback
|
2023-09-29 01:45:24 +08:00 |
|
|
Dillon
|
973c0f0924
|
Merge branch 'dillon/44-customer-satisfaction-feedback-project' into development
|
2023-09-21 00:47:31 +08:00 |
|
|
Dillon
|
42561a7c56
|
New Customer Satisfaction Feedback Module
|
2023-09-21 00:19:21 +08:00 |
|
|
edmondlang
|
1fbe8e61cb
|
Merge branch 'wallet-credit-note' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Models/CompanyModule.php
|
2023-09-15 17:41:48 +08:00 |
|
|
Dillon
|
60fbe77829
|
Merge branch 'dillon/crisp-help-menu-2' into dillon/44-customer-satisfaction-feedback-project
|
2023-09-14 10:28:04 +08:00 |
|
 Omair Saleh
|
402f64364b
|
export arrived parcel improvements
|
2023-09-01 05:27:13 +08:00 |
|
|
Omair Saleh
|
a3bff9d079
|
export arrived parcel improvements
|
2023-09-01 05:26:32 +08:00 |
|
|
Omair Saleh
|
2a7a448059
|
export arrived parcel improvements
|
2023-09-01 05:25:41 +08:00 |
|
|
Omair Saleh
|
7d855064da
|
export arrived parcel improvements
|
2023-09-01 05:24:47 +08:00 |
|
|
Omair Saleh
|
3945c47f52
|
export arrived parcel improvements
|
2023-09-01 05:20:36 +08:00 |
|
|
Omair Saleh
|
51ab6ce48b
|
export arrived parcel improvements
|
2023-09-01 05:19:33 +08:00 |
|
|
Omair Saleh
|
63b212a66c
|
export arrived parcel improvements
|
2023-09-01 05:13:21 +08:00 |
|