edmondlang
a2c7eddf7b
update payment and billing
2022-08-07 17:11:26 +08:00
edmondlang
cd59debee4
update CUSTOM SEGMENTS price api
2022-08-06 01:46:06 +08:00
edmondlang
b984f931e1
update admin payments and billings page - add address and postcode
2022-08-05 23:40:59 +08:00
edmondlang
2b1fca6b2e
if company doesn't have billing address - hide generate invoice and show create billing address modal
2022-08-05 21:24:36 +08:00
edmondlang
30bf744854
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue
2022-08-05 19:53:55 +08:00
omair saleh
3106750be6
update eta arrival date
2022-08-05 15:26:02 +08:00
edmondlang
37887de61d
add invoice in order resources
2022-07-31 20:15:38 +08:00
edmondlang
a6cbec3523
payment-and-billing ui
2022-07-27 20:09:53 +08:00
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
ahmedsophyudden
b4dcc0f049
Create approve shipping invoice endpoint
2022-06-18 22:51:15 +08:00
ahmedsophyudden
866dda9d98
New endpoint to add/edit/delete item in shipping invoice
2022-06-17 09:25:47 +08:00
omair saleh
1ac7657870
Merge branch 'EXCHANGE-648-Shipping-Estimation-Calculator-API' into 'development'
...
implement ShippingEstimationCalculator
See merge request CIEFWorldwideSdnBhd/shipping-portal!132
2022-06-14 07:30:33 +00: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
marjuqi@ad
d4c35a5286
initial commit for ShippingEstimationCalculator
2022-05-17 15:31:17 +07:00
edmondlang
37cdbbb2c4
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-24 23:04:26 +08:00
edmondlang
0634fbf78e
update constant base price
2022-04-22 21:41:02 +08:00
edmondlang
3899dd8416
update base price api
2022-04-22 00:18:12 +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
5fdc6d5719
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-19 15:10:12 +08:00
edmondlang
cfd6757a84
tidy up
2022-04-19 15:09: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
8795f1c203
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-19 11:00:57 +08:00
omair saleh
639ccd3927
fix login error handler & add new modern warehouse
2022-04-18 23:40:08 +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
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
omair saleh
e9b7de47fa
on hold packing list export
2022-04-15 14:17:43 +08:00
omair saleh
3c942af883
on hold packing list export
2022-04-15 14:17:20 +08:00
omair saleh
baa9f79272
on hold packing list export
2022-04-15 14:00:13 +08:00
edmondlang
a7593e4ab2
export-arrived-parcel
2022-04-11 23:29:39 +08:00
omair saleh
8ecb306e92
update final touch up for last delivery integration
2022-04-09 20:43:00 +08:00
omair saleh
918fd0d17d
update final touch up for last delivery integration
2022-04-09 20:41:48 +08:00
edmondlang
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
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
e3284fdf98
export customer order list
2022-04-07 11:36:03 +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
edmondlang
0fa0d8daab
Shipping portal - export function for Delivery list (only 'Pending Arrangement' tab)
2022-04-06 13:30:16 +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
edmondlang
6f9320f3a4
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-04-03 19:13:24 +08:00