omair saleh
cdda3ff5e1
Merge branch 'last-mile-integration' into 'development'
...
update final touch up for last delivery integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!125
2022-04-07 13:17:48 +00:00
omair saleh
a50b475525
update final touch up for last delivery integration
2022-04-07 21:16:59 +08:00
omair saleh
27bacd412a
Merge branch 'last-mile-integration' into 'development'
...
Last mile integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!124
2022-04-07 13:13:58 +00:00
omair saleh
97ec65e292
Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration
2022-04-07 21:13:21 +08:00
omair saleh
5df226c153
update final touch up for last delivery integration
2022-04-07 21:12:15 +08:00
edmondlang
424ac600c3
Merge branch 'export-customer-order-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-07 12:31:05 +08:00
edmondlang
715635954a
update file name
2022-04-07 12:30:39 +08:00
edmondlang
a5a450a7d4
Merge branch 'export-customer-order-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-07 11:50:03 +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
edmondlang
2919544769
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into export-customer-order-list
2022-04-07 11:37:10 +08:00
edmondlang
e3284fdf98
export customer order list
2022-04-07 11:36:03 +08:00
omair saleh
114a083627
Merge branch 'last-mile-integration' into 'development'
...
update last mile delivery logo
See merge request CIEFWorldwideSdnBhd/shipping-portal!123
2022-04-07 03:13:22 +00:00
omair saleh
408a3a1211
update last mile delivery logo
2022-04-07 11:12:27 +08:00
omair saleh
bed78c053a
remove memo
2022-04-07 10:59:50 +08:00
omair saleh
32a509d090
Merge branch 'last-mile-integration' into 'development'
...
updates last mile intergration - add functions
See merge request CIEFWorldwideSdnBhd/shipping-portal!122
2022-04-07 01:54:39 +00:00
omair saleh
c53ebf76b3
hide admin menu flashing
2022-04-07 09:53:59 +08:00
omair saleh
bd2b7b236b
Merge branch 'last-mile-integration' into 'development'
...
hide admin menu flashing
See merge request CIEFWorldwideSdnBhd/shipping-portal!121
2022-04-07 01:48:33 +00:00
omair saleh
4085ac4829
hide admin menu flashing
2022-04-07 09:46:22 +08:00
omair saleh
6a08d88031
Merge branch 'last-mile-integration' into 'development'
...
hide admin menu flashing
See merge request CIEFWorldwideSdnBhd/shipping-portal!120
2022-04-07 01:45:16 +00:00
omair saleh
778729b81d
hide admin menu flashing
2022-04-07 09:44:02 +08:00
omair saleh
ef95893c3b
Merge branch 'last-mile-integration' into 'development'
...
update last mile delivery module
See merge request CIEFWorldwideSdnBhd/shipping-portal!119
2022-04-06 10:53:05 +00:00
omair saleh
54c212e905
update last mile delivery module
2022-04-06 18:51:08 +08:00
edmondlang
5043b32191
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-06 18:31:15 +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
5b370a299c
update pending delivery report excel
2022-04-06 16:01:31 +08:00
omair saleh
e57dc231e6
update pending delivery report excel
2022-04-06 16:01:03 +08:00
omair saleh
5727801918
update pending delivery report excel
2022-04-06 15:59:28 +08:00
omair saleh
bf325ff028
update pending delivery report excel
2022-04-06 15:55:31 +08:00
omair saleh
229e757663
Merge branch 'export-delivery-list' into 'master'
...
Export delivery list
See merge request CIEFWorldwideSdnBhd/shipping-portal!117
2022-04-06 07:32:01 +00:00
edmondlang
f8e7573cfd
Merge branch 'export-delivery-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-06 14:37:23 +08:00
edmondlang
10d62dd8d1
update export delivery list - include state and postcode
2022-04-06 13:53:43 +08:00
edmondlang
0fa0d8daab
Shipping portal - export function for Delivery list (only 'Pending Arrangement' tab)
2022-04-06 13:30:16 +08:00
edmondlang
bb59a444cf
update export excel form
2022-04-06 11:24:24 +08:00
edmondlang
45c878a2ed
add orders created date to the table
2022-04-06 10:21:40 +08:00
edmondlang
e871f4b287
hide tick and show only for admin
2022-04-05 20:03:27 +08:00
edmondlang
5aa93b30c7
update container select packing list
2022-04-05 19:05:57 +08:00
edmondlang
8c35601ccd
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-05 19:04:24 +08:00
omair saleh
0ec9226226
add crisp
2022-04-05 13:26:24 +08:00
omair saleh
3286939ccc
Merge remote-tracking branch 'origin/development' into development
2022-04-05 13:21:07 +08:00
omair saleh
3a2146146c
add crisp
2022-04-05 13:20:52 +08:00
edmondlang
6eaa810b67
remove text order list
2022-04-05 11:40:58 +08:00
omair saleh
68d961a681
custom clearance status
2022-04-05 11:38:21 +08: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
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
omair saleh
aef9b82918
Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration
...
# Conflicts:
# resources/views/pages/delivery/admin.blade.php
2022-04-04 19:41:43 +08:00
omair saleh
f96fef94fe
finalize last mile delivery
2022-04-04 19:40:54 +08:00
edmondlang
ab141ae160
update admin view for last mile intergration
2022-04-04 14:21:59 +08:00
edmondlang
bf4830ba7a
update mobile responsive for delivery order form component
2022-04-03 23:47:58 +08:00