 edmondlang
|
9db80220b8
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# resources/assets/vue/components/containers/elements/PackingListComponent.vue
# resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
|
2022-07-23 19:56:06 +08:00 |
|
 omair saleh
|
92b463b78e
|
fix vt packing list api
|
2022-07-18 14:41:46 +08:00 |
|
|
edmondlang
|
0c2c64c637
|
Merge branch 'new-air-shipment-module' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-06-13 23:05:42 +08:00 |
|
|
edmondlang
|
606325706e
|
air shipment module
|
2022-06-13 22:58:41 +08:00 |
|
|
edmondlang
|
4224c3e436
|
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-04-21 09:31:12 +08:00 |
|
|
edmondlang
|
33124d6588
|
update declare postcode and implement api
|
2022-04-21 09:30:56 +08:00 |
|
|
edmondlang
|
08517e8ee7
|
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-04-19 14:58:17 +08:00 |
|
|
edmondlang
|
eb31291e25
|
update warehouse api
|
2022-04-19 14:57:38 +08:00 |
|
|
edmondlang
|
ddbecaae6f
|
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-04-19 13:31:04 +08:00 |
|
|
edmondlang
|
7b88fd5c3c
|
update state charges
|
2022-04-19 13:28:56 +08:00 |
|
|
edmondlang
|
f21708ff57
|
Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# routes/web.php
|
2022-04-17 23:38:10 +08:00 |
|
|
edmondlang
|
3e87f320bf
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
|
2022-04-07 11:45:56 +08:00 |
|
|
omair saleh
|
7169ba423c
|
Merge branch 'last-mile-integration' into 'development'
updates last mile intergration - add functions
See merge request CIEFWorldwideSdnBhd/shipping-portal!118
|
2022-04-06 10:25:09 +00:00 |
|
|
omair saleh
|
2c29e5939e
|
custom clearance status
|
2022-04-05 11:25:56 +08:00 |
|
|
omair saleh
|
6910dce35f
|
custom clearance status
|
2022-04-05 11:23:39 +08:00 |
|
|
omair saleh
|
a19db06b6b
|
custom clearance status
|
2022-04-05 11:20:45 +08:00 |
|
|
edmondlang
|
6f9320f3a4
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
|
2022-04-03 19:13:24 +08:00 |
|
|
omair saleh
|
c69c043576
|
fix the user ui, create delivery order, delivery customer dashboard
|
2022-04-03 19:10:06 +08:00 |
|
|
omair saleh
|
9f9c17977d
|
show delivery delay days
|
2022-03-31 19:44:11 +08:00 |
|
 ahmedsophyudden
|
b9b79ca65a
|
Shipping Portal - Api to update segment (general, state, postcode)
|
2022-03-17 01:01:01 +08:00 |
|
|
edmondlang
|
e2e8f69f90
|
update notification add List Notifications API and UI
|
2022-03-15 16:14:21 +08:00 |
|
|
edmondlang
|
83091caa46
|
create company module remark and ui
|
2022-03-09 18:51:23 +08:00 |
|
 glovetleong
|
ab12494ba5
|
pdf generate
|
2022-03-06 14:44:49 +08:00 |
|
|
omair saleh
|
7998f6e43f
|
show packing list receive date
|
2022-03-05 16:51:30 +08:00 |
|
|
omair saleh
|
eb41d7c2ef
|
show packing list receive date
|
2022-03-05 16:49:19 +08:00 |
|
|
omair saleh
|
686ef83f31
|
group container packing lists by customer
|
2022-03-05 16:38:12 +08:00 |
|
|
omair saleh
|
5fab8224c6
|
group container packing lists by customer
|
2022-03-05 16:36:03 +08:00 |
|
|
omair saleh
|
9e95da84c4
|
group container packing lists by customer
|
2022-03-05 16:34:41 +08:00 |
|
|
omair saleh
|
47624ed8f2
|
fix address approval bug
|
2022-02-25 12:29:02 +08:00 |
|
|
omair saleh
|
69ede16fe9
|
fix address approval bug
|
2022-02-24 17:39:12 +08:00 |
|
|
omair saleh
|
f8f470078c
|
fix address approval bug
|
2022-02-24 17:28:11 +08:00 |
|
|
omair saleh
|
e5f4068bc0
|
fix address approval bug
|
2022-02-24 17:25:40 +08:00 |
|
|
omair saleh
|
e0504c8d79
|
fix address approval bug
|
2022-02-24 17:24:25 +08:00 |
|
|
omair saleh
|
7d273b5ce6
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
|
2022-02-23 21:37:02 +08:00 |
|
|
omair saleh
|
adb9a18651
|
fix unclaimed packing lists
|
2022-02-23 13:51:17 +08:00 |
|
|
omair saleh
|
c932f2b86f
|
fix unclaimed packing lists
|
2022-02-23 13:49:48 +08:00 |
|
|
omair saleh
|
1dc23b088e
|
fix unclaimed packing lists
|
2022-02-23 13:48:34 +08:00 |
|
|
omair saleh
|
47704001dd
|
fix unclaimed packing lists
|
2022-02-23 13:47:18 +08:00 |
|
|
omair saleh
|
d02f395e72
|
fix unclaimed packing lists
|
2022-02-23 13:45:42 +08:00 |
|
|
omair saleh
|
bdfccca2c8
|
fix unclaimed packing lists
|
2022-02-23 13:42:46 +08:00 |
|
|
omair saleh
|
97c900447f
|
fix unclaimed packing lists
|
2022-02-23 13:42:12 +08:00 |
|
|
omair saleh
|
5db4b715e2
|
fix unclaimed packing lists
|
2022-02-23 13:39:16 +08:00 |
|
|
omair saleh
|
745cfef185
|
fix unclaimed packing lists
|
2022-02-23 13:37:19 +08:00 |
|
|
omair saleh
|
85f67db797
|
Merge remote-tracking branch 'origin/development' into development
|
2022-02-23 13:12:53 +08:00 |
|
|
omair saleh
|
284b21ec51
|
fix unclaimed packing lists
|
2022-02-23 13:12:32 +08:00 |
|
|
edmondlang
|
b5b2ba59af
|
add warehouse charges in settings
|
2022-02-21 20:34:25 +08:00 |
|
|
edmondlang
|
0496851286
|
update settings add state charges TAB
|
2022-02-21 16:11:39 +08:00 |
|
|
edmondlang
|
f810168dbb
|
update postcodes area ui
|
2022-02-15 16:44:25 +08:00 |
|
|
edmondlang
|
05b1aedda5
|
Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
# app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
# app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
# app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
# app/Classes/Modules/Segments/Services/CreatesSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
# app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php
# app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
# app/Http/Controllers/Announcements/ListAnnouncementsController.php
# app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
# app/Http/Controllers/Announcements/UpdateAnnouncementController.php
# app/Http/Controllers/Segments/CreateSegmentController.php
# app/Http/Controllers/Segments/DeleteSegmentController.php
# routes/announcement.php
# routes/api.php
# routes/segment.php
# routes/web.php
|
2022-02-09 21:09:17 +08:00 |
|
|
edmondlang
|
7ece556475
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
# app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php
# app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
# resources/assets/vue/components/containers/elements/ContainerComponent.vue
# routes/web.php
|
2022-02-09 21:00:13 +08:00 |
|