cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 20:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,679 Commits 149 Branches 1 Tag
development
Commit Graph

201 Commits

Author SHA1 Message Date
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
Omair Saleh 863dc94dad Revert "Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'"" 
This reverts commit a49920973e.
 2024-04-18 02:09:16 +08:00
Omair Saleh a49920973e Revert "Merge branch 'dillon/58-shipping-portal-sst' into 'master'" 
This reverts commit 7cd376a9b5, reversing
changes made to 6176135f85.
 2024-04-16 13:21:07 +08:00
Dillon Ngo b26fea9a49 Merge branch 'dillon/58-shipping-portal-sst' into development 2024-04-07 10:43:32 +08:00
Dillon Ngo 68ce8373e9 SST Impelemtation 2024-04-07 09:27:09 +08:00
Dillon Ngo 4e0f04eae2 Merge branch 'dillon/46.8-warehouse-storage-charges-fixes' into development 2024-03-09 21:43:57 +08:00
Dillon Ngo 56aec95d50 Attempt to resolve gitlab pipeline job error 2024-03-09 21:43:48 +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 ee65e5fcd1 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	routes/web.php
 2024-01-30 00:35:50 +08:00
edmondlang 006a327a5f Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into permits-reminder 2024-01-30 00:34:51 +08:00
Dillon Ngo 064ee3e41a Implement a solution to selectively waived a selected storage invoice 2024-01-24 06:50:18 +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
edmondlang ce86dda0b9 comment on route logs table 2024-01-11 15:52:45 +08:00
Dillon Ngo 8f695401d2 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-01-04 02:33:59 +08:00
edmondlang 55f7637d9c Merge branch 'add-attached-timestamp' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2023-12-30 16:58:29 +08:00
edmondlang 1578085bab add attached timestamp 2023-12-30 16:55:45 +08:00
Dillon Ngo 8ea00e0383 Proof of concept - Vue Polling - Performance Improvement and tweaking for better user experience 2023-12-24 21:59:41 +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 4794251a0c Merge branch 'dillon/48-feedback-form-improvement' into development 2023-12-09 12:50:57 +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 6b09d5facc Minor update on question text 2023-12-08 13:41:00 +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
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 efa7657125 Merge branch 'dillon/44-customer-satisfaction-feedback-project' into development 2023-09-30 18:45:49 +08:00
Dillon b81f3e50ad Filter out help menu questions and answers from been listed in admin feedback q&a list + disabled help menu 2023-09-30 18:45:35 +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
Dillon 60fbe77829 Merge branch 'dillon/crisp-help-menu-2' into dillon/44-customer-satisfaction-feedback-project 2023-09-14 10:28:04 +08:00
Dillon 1060401128 Merge branch 'dillon/crisp-help-menu' into dillon/crisp-help-menu-2 2023-05-04 15:39:54 +08:00
Dillon 3497de9727 Merge branch 'dillon/crisp-help-menu' into development 2023-05-04 15:23:54 +08:00
Dillon 5b00b7b45f Help Menu prototype v0.1 2023-05-04 15:19:04 +08:00
edmondlang 965dfb3098 Merge branch 'multi-payment-final' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
#	app/Classes/ValueObjects/Constants/TransactionType.php
#	routes/web.php
 2023-04-28 18:26:33 +08:00
edmondlang e7c0e17ee4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into multi-payment-final 
# Conflicts:
# app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/api.php
# routes/web.php
 2023-04-28 18:20:42 +08:00