cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

add delivery address to warehouse list

Browse Source
This commit is contained in:
omair saleh
2021-09-08 19:06:58 +08:00
parent 7f8a4af3fe
commit 77e3641be9
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/orders/elements/ParcelComponent.vue
+19 -11
View File
@@ -38,6 +38,22 @@
</div>
<div class="row" v-if="expanded" >
<div class="col bg-white p-t-15 p-b-15">
<div class="row m-b-5">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Description</p>
</div>
<div class="col p-l-5">
<p class="no-margin bold text-info fs-12">{{item.description}}</p>
</div>
</div>
<div class="row" v-if="item.transport.tracking_number">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Tracking Number:</p>
</div>
<div class="col p-l-5">
<p class="no-margin bold text-info fs-12">{{item.transport.tracking_number}}</p>
</div>
</div>
<div class="row m-b-5" v-if="$store.getters.isAdmin">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Marking</p>
@@ -54,20 +70,12 @@
<p class="no-margin bold text-info fs-12">{{item.order.reference}}</p>
</div>
</div>
<div class="row m-b-5">
<div class="row m-b-5" v-if="$store.getters.isAdmin">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Description</p>
<p class="no-margin all-caps fs-10 light">Delivery Address</p>
</div>
<div class="col p-l-5">
<p class="no-margin bold text-info fs-12">{{item.description}}</p>
</div>
</div>
<div class="row" v-if="item.transport.tracking_number">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Tracking Number:</p>
</div>
<div class="col p-l-5">
<p class="no-margin bold text-info fs-12">{{item.transport.tracking_number}}</p>
<p class="no-margin bold text-info fs-12">{{item.order.address.street_one+' '+(item.order.address.street_two ? item.order.address.street_two : '')+', '+ item.order.address.district.name+', '+item.order.address.post_code+' '+item.order.address.state.name+', '+item.order.address.country.name}}</p>
</div>
</div>
</div>
resources/views/pages/warehouse_list.blade.php
+1 -1
View File
@@ -1,7 +1,7 @@
@extends('layouts.base_portal')
@section('inner_content')
<div class="row">
<div class="col-5">
<div class="col-7">
<list-component section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
<template slot="list" slot-scope="{data}">
<parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>