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
ac4fcb05e9
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# resources/views/vendor/js.blade.php
2022-04-17 23:36:42 +08:00
3a5423a308
on hold packing list export
2022-04-15 14:21:08 +08:00
ddd1b7b29e
on hold packing list export
2022-04-15 14:20:20 +08:00
5433c202a7
on hold packing list export
2022-04-15 14:19:32 +08:00
b967e4f9ab
on hold packing list export
2022-04-15 14:18:38 +08:00
baa9f79272
on hold packing list export
2022-04-15 14:00:13 +08:00
10c66dc2dc
export delivery list excel
2022-04-15 11:58:37 +08:00
05d4b7fe36
fix fetch from vt
2022-04-15 11:43:17 +08:00
7fc4568fbf
fix fetch from vt
2022-04-14 13:14:47 +08:00
f55a57c222
fix fetch from vt
2022-04-14 13:12:56 +08:00
301d7b5520
update hywavetech lineclear excel format
2022-04-14 10:15:07 +08:00
9f965109c7
update hywavetech lineclear excel format
2022-04-14 10:01:10 +08:00
108a952ee3
update hywavetech lineclear excel format
2022-04-13 21:56:21 +08:00
88b3dc8b84
fix yd fetch
2022-04-13 14:27:08 +08:00
4b3274f6d5
fix yd fetch
2022-04-13 14:24:50 +08:00
da1b6b1b6d
fix yd fetch
2022-04-13 13:22:23 +08:00
ac0a90c168
fix yd fetch
2022-04-13 13:17:04 +08:00
a5e47324b2
fix yd fetch
2022-04-13 13:11:30 +08:00
863c2874dd
fix yd fetch
2022-04-13 11:50:23 +08:00
129f3ecf10
update crisp to production
2022-04-13 00:25:49 +08:00
6f5f854827
update crisp to production
2022-04-13 00:18:44 +08:00
f4275f20a3
update crisp to production
2022-04-13 00:17:19 +08:00
304337d5e2
update crisp to production
2022-04-12 16:02:00 +08:00
a1cb511125
Merge branch 'export-arrived-parcel' into 'master'
...
export-arrived-parcel
See merge request CIEFWorldwideSdnBhd/shipping-portal!130
2022-04-12 07:10:44 +00:00
8d29a25793
create replica white list
2022-04-12 09:42:27 +08:00
a7593e4ab2
export-arrived-parcel
2022-04-11 23:29:39 +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
f5a0e9cd07
Merge branch 'last-mile-integration' into 'development'
...
update final touch up for last delivery integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!127
2022-04-07 13:28:33 +00:00
4a1905abde
update final touch up for last delivery integration
2022-04-07 21:27:53 +08:00
908c547ddc
Merge branch 'last-mile-integration' into 'development'
...
update final touch up for last delivery integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!126
2022-04-07 13:21:17 +00:00
5d1ff709eb
update final touch up for last delivery integration
2022-04-07 21:20:13 +08:00
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
97ec65e292
Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration
2022-04-07 21:13:21 +08:00
5df226c153
update final touch up for last delivery integration
2022-04-07 21:12:15 +08:00
a5a450a7d4
Merge branch 'export-customer-order-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-07 11:50:03 +08:00
3e87f320bf
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-04-07 11:45:56 +08:00
e3284fdf98
export customer order list
2022-04-07 11:36:03 +08:00
5043b32191
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-06 18:31:15 +08:00
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
5b370a299c
update pending delivery report excel
2022-04-06 16:01:31 +08:00
e57dc231e6
update pending delivery report excel
2022-04-06 16:01:03 +08:00
5727801918
update pending delivery report excel
2022-04-06 15:59:28 +08:00
bf325ff028
update pending delivery report excel
2022-04-06 15:55:31 +08:00
10d62dd8d1
update export delivery list - include state and postcode
2022-04-06 13:53:43 +08:00
0fa0d8daab
Shipping portal - export function for Delivery list (only 'Pending Arrangement' tab)
2022-04-06 13:30:16 +08:00
bb59a444cf
update export excel form
2022-04-06 11:24:24 +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
6f9320f3a4
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-04-03 19:13:24 +08:00
c69c043576
fix the user ui, create delivery order, delivery customer dashboard
2022-04-03 19:10:06 +08:00
edmondlang
omair saleh