639ccd3927
fix login error handler & add new modern warehouse
2022-04-18 23:40:08 +08:00
e9b7de47fa
on hold packing list export
2022-04-15 14:17:43 +08:00
3c942af883
on hold packing list export
2022-04-15 14:17:20 +08:00
baa9f79272
on hold packing list export
2022-04-15 14:00:13 +08:00
a7593e4ab2
export-arrived-parcel
2022-04-11 23:29:39 +08:00
8ecb306e92
update final touch up for last delivery integration
2022-04-09 20:43:00 +08:00
918fd0d17d
update final touch up for last delivery integration
2022-04-09 20:41:48 +08:00
559de29acf
update field change value of 'Pickup_Address_Type' from sender to Default'
...
export multiple sheet with the correct name of each field
2022-04-09 15:10:54 +08:00
3e87f320bf
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-04-07 11:45:56 +08:00
0fa0d8daab
Shipping portal - export function for Delivery list (only 'Pending Arrangement' tab)
2022-04-06 13:30:16 +08:00
4e53e1b48a
updates last mile intergration - add functions
...
- admin cancel order
- add filter to display only active orders
- hide customer page
- show parcel weight as total weight (quantity * weight per quantity)
- in create order form
- order table
- export excel
- update export excel, only include the data of the selected Ids
2022-04-05 10:45:30 +08:00
c69c043576
fix the user ui, create delivery order, delivery customer dashboard
2022-04-03 19:10:06 +08:00
745655dbfa
last mile intergration
2022-04-02 15:21:14 +08:00
3a5f404294
Tidy Up Export Customer activity details, add new filter - minOrders and minCbm
2022-03-23 00:53:16 +08:00
9b79f16faa
Merge branch 'api-to-update-segment-constants' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-22 21:55:24 +08:00
519408c2b5
lawas and Limbang show kk warehouse
2022-03-17 09:55:46 +08:00
53907e2463
lawas and Limbang show kk warehouse
2022-03-17 09:52:24 +08:00
10e6f6045e
lawas and Limbang show kk warehouse
2022-03-17 09:51:36 +08:00
c06cec5b41
lawas and Limbang show kk warehouse
2022-03-17 09:47:31 +08:00
cfe611d05d
lawas and Limbang show kk warehouse
2022-03-17 09:45:24 +08:00
b9b79ca65a
Shipping Portal - Api to update segment (general, state, postcode)
2022-03-17 01:01:01 +08:00
3ff81d4f00
fix qr remark
2022-03-16 09:46:23 +08:00
eabfeb6724
Merge branch 'transaction-invoice' into 'development'
...
payment transaction
See merge request CIEFWorldwideSdnBhd/shipping-portal!109
2022-03-14 03:10:20 +00:00
5d9e621920
payment document approve
2022-03-12 20:06:10 +08:00
ced07a293e
update the createRemarkLogic, so all modules are able to use it
...
create a RemarkFormComponent
update order page to use this API
clean up old remark API
2022-03-10 19:39:47 +08:00
36236144ce
update downloadQrPdfController
2022-03-09 20:06:31 +08:00
83091caa46
create company module remark and ui
2022-03-09 18:51:23 +08:00
eb6f313c77
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-09 18:33:18 +08:00
0ae05f05b6
update qr for yd orders
2022-03-09 11:03:57 +08:00
a44ad3df3a
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-08 19:05:46 +08:00
de56c21734
payment transaction
2022-03-08 16:55:31 +08:00
8701620dcf
add warehouse remark to qr pdf
2022-03-08 10:12:59 +08:00
3462430474
Delivery List, Pending Delivery List
...
Customer Profile
2022-02-26 16:55:56 +08:00
f037352a28
cretae update document reference function
2022-02-23 18:13:57 +08:00
0496851286
update settings add state charges TAB
2022-02-21 16:11:39 +08:00
ffe39f40ff
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into merge-dev-conflict
2022-02-12 20:06:27 +08:00
d97357f33a
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into transaction-invoice
2022-02-11 14:38:57 +08:00
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
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
3dbcf81cc3
pull
2022-02-08 18:05:01 +08:00
e3cfb002a5
Merge branch 'master' into 'customer_latest_order_date_export_master'
...
# Conflicts:
# app/Http/Controllers/Exports/ExportCustomersToExcelController.php
# routes/web.php
2022-01-27 03:50:27 +00:00
0a8109ae9e
null order packing list, assign packing list
2022-01-26 17:32:14 +08:00
96131c5b33
export packing list
2022-01-14 14:03:40 +08:00
ea34c74f6d
fix monthly report
2022-01-11 19:46:18 +08:00
3a69ce6972
fix monthly report
2022-01-11 19:43:54 +08:00
83fc73acec
fix monthly report
2022-01-11 19:42:13 +08:00
e8613bd6d9
fix monthly report
2022-01-11 19:39:43 +08:00
3e4f627cbe
fix monthly report
2022-01-11 19:37:05 +08:00
a870d259f9
fix monthly report
2022-01-11 19:30:22 +08:00
ed0db2e372
fix monthly report
2022-01-11 19:28:20 +08:00
omair saleh
edmondlang
ahmedsophyudden
Leong Chee Siong