 glovetleong
|
f8a985035e
|
notification
|
2022-02-18 21:57:25 +08:00 |
|
 edmondlang
|
ca3ecb0fda
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-02-17 21:50:55 +08:00 |
|
 omair saleh
|
f5a67f7e97
|
test vt do
|
2022-02-17 15:11:27 +08:00 |
|
|
omair saleh
|
288cced125
|
test vt do
|
2022-02-17 15:10:57 +08:00 |
|
|
omair saleh
|
a76ce39830
|
test vt do
|
2022-02-17 15:09:40 +08:00 |
|
|
omair saleh
|
64467ea4be
|
test vt do
|
2022-02-17 15:07:25 +08:00 |
|
|
edmondlang
|
09e0565988
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-02-15 21:56:22 +08:00 |
|
|
omair saleh
|
fc0809d9d2
|
add remark to yd address on release
|
2022-02-15 14:50:52 +08:00 |
|
|
omair saleh
|
29d1fb893d
|
add remark to yd address on release
|
2022-02-15 11:33:10 +08:00 |
|
|
omair saleh
|
f01640d9f2
|
add remark to yd address on release
|
2022-02-15 11:31:24 +08:00 |
|
|
omair saleh
|
753951a1d2
|
add remark to yd address on release
|
2022-02-15 11:30:43 +08:00 |
|
|
omair saleh
|
552b6f0e1e
|
add remark to yd address on release
|
2022-02-15 11:28:42 +08:00 |
|
|
omair saleh
|
314575e2b6
|
add remark to yd address on release
|
2022-02-15 11:28:10 +08:00 |
|
|
omair saleh
|
2deea66f0a
|
add remark to yd address on release
|
2022-02-15 11:25:40 +08:00 |
|
|
edmondlang
|
aab739737c
|
update code merge
|
2022-02-14 12:22:51 +08:00 |
|
|
edmondlang
|
b03601cec5
|
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into null_order_packing_list_ui
|
2022-02-14 00:09:15 +08:00 |
|
|
edmondlang
|
c040dfe2c3
|
update null_order_packing_list_ul
|
2022-02-14 00:08:37 +08:00 |
|
|
edmondlang
|
0abf617a0d
|
Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into merge-dev-conflict
# 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/RemoveSegmentFromAnnouncementController.php
# app/Http/Controllers/Segments/DeleteSegmentController.php
# routes/announcement.php
# routes/segment.php
# routes/web.php
|
2022-02-12 20:16:33 +08:00 |
|
|
edmondlang
|
ffe39f40ff
|
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into merge-dev-conflict
|
2022-02-12 20:06:27 +08:00 |
|
|
omair saleh
|
6f547b0a2f
|
add remark to yd address on release
|
2022-02-12 19:53:01 +08:00 |
|
|
glovetleong
|
556c9352c8
|
shipping invoice
|
2022-02-12 11:35:12 +08:00 |
|
|
glovetleong
|
d97357f33a
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into transaction-invoice
|
2022-02-11 14:38:57 +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 |
|
|
omair saleh
|
495574e60d
|
Merge remote-tracking branch 'origin/development' into development
|
2022-02-09 19:29:06 +08:00 |
|
|
omair saleh
|
c17c29ad06
|
add owner id filter
|
2022-02-09 19:28:50 +08:00 |
|
|
omair saleh
|
4c8d363e25
|
add owner id filter
|
2022-02-09 19:27:59 +08:00 |
|
|
omair saleh
|
f5df10297e
|
add yd reschedule container logic
|
2022-02-09 19:07:06 +08:00 |
|
|
glovetleong
|
658a669a4d
|
bug
|
2022-02-08 22:52:12 +08:00 |
|
|
glovetleong
|
fdc6a4adc1
|
bug
|
2022-02-08 22:15:18 +08:00 |
|
|
glovetleong
|
3dbcf81cc3
|
pull
|
2022-02-08 18:05:01 +08:00 |
|
|
omair saleh
|
b3bf814d25
|
add yd reschedule container logic
|
2022-02-06 12:08:11 +08:00 |
|
|
omair saleh
|
d489c0091f
|
add yd reschedule container logic
|
2022-02-06 12:01:09 +08:00 |
|
|
omair saleh
|
46699784da
|
fix yd tracking api json line break bug
|
2022-02-06 11:30:56 +08:00 |
|
|
omair saleh
|
31ce575f5f
|
add over weight cbm to yd
|
2022-01-28 11:57:51 +08:00 |
|
|
omair saleh
|
7f7101cce5
|
add over weight cbm to yd
|
2022-01-28 11:37:54 +08:00 |
|
|
omair saleh
|
a892656725
|
fix yd delivery address update api
|
2022-01-27 16:06:59 +08:00 |
|
|
omair saleh
|
86cc7faf30
|
fix yd delivery address update api
|
2022-01-27 16:03:14 +08:00 |
|
|
omair saleh
|
c2ed6ce35e
|
fix yd delivery address update api
|
2022-01-27 15:30:43 +08:00 |
|
|
omair saleh
|
579bcbb17f
|
fix yd delivery address update api
|
2022-01-27 15:18:30 +08:00 |
|
|
omair saleh
|
4d4d9165ce
|
fix yd delivery address update api
|
2022-01-27 15:16:10 +08:00 |
|
|
omair saleh
|
bfcc3e1aae
|
fix yd delivery address update api
|
2022-01-27 15:09:12 +08:00 |
|
|
omair saleh
|
199a18e8dd
|
fix yd delivery address update api
|
2022-01-27 15:08:30 +08:00 |
|
|
omair saleh
|
33277d080a
|
fix yd delivery address update api
|
2022-01-27 15:08:04 +08:00 |
|
|
omair saleh
|
5c86e7fda0
|
fix yd delivery address update api
|
2022-01-27 13:32:19 +08:00 |
|
|
omair saleh
|
efdc235502
|
fix yd delivery address update api
|
2022-01-27 13:30:25 +08:00 |
|
|
omair saleh
|
c89510dda7
|
fix yd delivery address update api
|
2022-01-27 13:28:05 +08:00 |
|
|
omair saleh
|
a6ef50d350
|
fix yd delivery address update api
|
2022-01-27 13:23:56 +08:00 |
|
|
omair saleh
|
e7164e903d
|
fix yd delivery address update api
|
2022-01-27 13:21:20 +08:00 |
|
|
omair saleh
|
3eaeccc8d3
|
fix yd delivery address update api
|
2022-01-27 13:19:55 +08:00 |
|