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

670 Commits

Author SHA1 Message Date
edmondlang ec3c596352 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-08-04 00:46:02 +08:00
edmondlang f3eca3dd89 Export Group Transactions CSV 2024-08-03 23:04:47 +08:00
edmondlang b8686ff910 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	routes/apipub.php
 2024-07-18 23:18:10 +08:00
edmondlang e5d6f3f581 wac webhook 2024-07-18 23:11:04 +08:00
edmondlang 514d3da73c Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-07-17 18:14:10 +08:00
edmondlang aa65b333c8 update permits reminder 2024-07-17 18:13:50 +08:00
edmondlang 82a84157b6 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-07-17 18:11:58 +08:00
edmondlang 656c50e047 update permits reminder 2024-07-17 18:11:34 +08:00
edmondlang 58a64784db Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-07-17 17:50:46 +08:00
edmondlang 275157b243 update permits reminder 2024-07-17 17:49:33 +08:00
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 4a2c0db044 Merge branch 'address-extra-fields' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 
# Conflicts:
#	app/Classes/Modules/Addresses/ControllersLogic/UpdateAddressLogic.php
#	package.json
 2024-07-05 00:28:12 +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 be0cd16285 update address extra fields 2024-07-05 00:25:57 +08:00
edmondlang ce4e8b174f Merge branch 'fix-missing-packinglist' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-07-02 13:02:34 +08:00
Dillon Ngo 19c4ee4fda Quick fix 2024-07-01 15:00:14 +08:00
edmondlang 4a9ac3de02 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into address-extra-fields 2024-06-20 10:03:57 +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 42d68a4357 Merge branch 'dillon/46.13-missing-payment-proof-feature' into development 2024-06-09 12:44:43 +08:00
Dillon Ngo e63e3e707f 'Your Payment Proof' feature missing for order with storage invoices through group payment 2024-06-09 12:44:19 +08:00
Dillon Ngo f32fc1976e Merge branch 'dillon/46.13-missing-payment-proof-feature' into development 2024-06-09 12:16:41 +08:00
Dillon Ngo aeaec32dcb 'Your Payment Proof' feature missing for order with storage invoices through group payment 2024-06-09 12:16:18 +08:00
Dillon Ngo cdf5e89a4a Merge branch 'dillon/46.13-missing-payment-proof-feature' into development 2024-06-09 12:01:13 +08:00
Dillon Ngo b000c25e66 'Your Payment Proof' feature missing for order with storage invoices through group payment 2024-06-09 12:00:19 +08:00
edmondlang f8d191267b Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-05-27 00:54:20 +08:00
edmondlang b0eca18343 show packinglist reference for admin only 2024-05-27 00:53:48 +08:00
edmondlang 7cace7e800 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into fulfilment-banner 2024-05-21 00:54:21 +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
Dillon Ngo 69f2b384cf Merge branch 'dillon/51.5-vue-store-update' into 'master' 
Vue Polling - Refactor code to use vuex

See merge request CIEFWorldwideSdnBhd/shipping-portal!220
 2024-05-19 16:06:00 +00:00
Dillon Ngo 39017c5d8f Merge branch 'dillon/51.5-vue-store-update' into development 2024-05-19 23:55:22 +08:00
Dillon Ngo b15866ea16 Vue Polling - Remove comments in code 2024-05-19 23:47:00 +08:00
Dillon Ngo 61a0766e60 Merge branch 'dillon/60-shipping-portal-fixes' into development 2024-05-08 00:57:25 +08:00
edmondlang 4a41c89024 fix MappableTransactionWithDetailsResource.php 2024-05-08 00:30:01 +08:00
edmondlang f3c7c042fc Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-05-08 00:25:40 +08:00
edmondlang f361a7e185 fix MappableTransactionWithDetailsResource.php 2024-05-08 00:24:22 +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
edmondlang b5efe6139d Merge branch 'delete-paid-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-03-30 00:50:14 +08:00
edmondlang 7e029c5610 delete paid group transaction 2024-03-30 00:49:55 +08:00
Dillon Ngo e15170bc7f Merge branch 'dillon/46.9-warehouse-storage-charges-fixes' into 'master' 
Multiple fixes related to storage invoices

See merge request CIEFWorldwideSdnBhd/shipping-portal!212
 2024-03-26 00:44:33 +00:00
edmondlang 898b63cbd2 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-03-14 12:48:41 +08:00
edmondlang 66ddb5da23 update send permits reminder 2024-03-14 12:46:47 +08:00
edmondlang 8da81a4696 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development 2024-03-12 23:52:58 +08:00
edmondlang 11e2390059 update container and container remarks 2024-03-12 23:52:07 +08:00
Dillon Ngo dadf7153d7 Merge branch 'dillon/46.8-warehouse-storage-charges-fixes' into development 2024-03-09 21:20:35 +08:00