cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-30 09:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-page-ui

Browse Source 
# Conflicts:
#	resources/views/partials/menu.blade.php
This commit is contained in:
edmondlang
2021-09-04 16:30:55 +08:00
parent 51d999e3c8 b049c95ca2
commit b9ab2e9f36
17 changed files with 223 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Addresses/Processors/CreateAddressFromOldAddressProcessor.php
+3 -2
View File
@@ -7,6 +7,7 @@ use App\Classes\Modules\Addresses\Services\CleansOldAddress;
use App\Classes\Modules\Addresses\Services\CreatesAddress;
use App\Classes\Modules\Addresses\Services\FetchesAddress;
use App\Models\OldAddress;
use App\Models\Order;
use Illuminate\Database\Eloquent\Model;
class CreateAddressFromOldAddressProcessor
@@ -44,8 +45,8 @@ class CreateAddressFromOldAddressProcessor
}
if($address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()){
return $address;
if(!$addressable instanceof Order && $address = $addressable->addresses()->where('street_one', $object->getStreetOne())->first()) {
return $address;
}
return $this->createsAddress->execute($addressable, $object);
app/Classes/Modules/PackingLists/Processors/FetchContainersStatusUpdateFromVTPortalProcessor.php
+9 -7
View File
@@ -89,6 +89,8 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
$eta = Carbon::parse($eta);
$etd = Carbon::parse($eta)->subDays(5);
$delayDate = $containerDetails[6];
$containerStatus = $containerDetails[9];
@@ -98,23 +100,23 @@ class FetchContainersStatusUpdateFromVTPortalProcessor
$transport = $container->transports()->first();
if(!$transport){
$transportObject = new TransportObject(TransportType::SEA, null, null, $eta, null, ApprovalStatus::APPROVED);
$transportObject = new TransportObject(TransportType::SEA, null, null, $etd, null, ApprovalStatus::APPROVED);
/** @var Transport $transport */
$transport = $this->createsTransport->execute($transportObject, $container);
$this->createsSchedule->execute($transport, new ScheduleObject($eta->subDays(5), $eta, ApprovalStatus::APPROVED));
$this->createsSchedule->execute($transport, new ScheduleObject($etd, $eta, ApprovalStatus::APPROVED));
}
if($delayDate){
$delayDate = Carbon::parse($delayDate);
$transport = $container->transports()->first();
$schedule = $transport->schedules()->where('eta', '=', $delayDate)->first();
$etd = $delayDate->subDays(5);
if(!$schedule){
$etd = $schedule->etd;
if(!$transport->schedules()->where('eta', '=', $delayDate)->first()) {
$etd = $transport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()->etd;
$transport->schedules()->update(['status' => ApprovalStatus::EXPIRED]);
$this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
}
$this->createsSchedule->execute($transport, new ScheduleObject($etd, $delayDate, ApprovalStatus::APPROVED));
}
if($containerStatus === 'Unstuffing'){
app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+14 -4
View File
@@ -125,6 +125,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
}
$end = $end ? $end : Carbon::now();
$filter = '["ParcelDate:$between$%js%\"'.$start->format('Y-m-d').'T00:00:00.000\"$and$%js%\"'.$end->format('Y-m-d').'T00:00:00.000\"\u0000"]';
$warehouseListRequest = $this->fetchesDataFRomVTPortal->clientRequest('https://portalvt.azurewebsites.net/Services/DataControllerService.asmx/GetPage', 'POST', json_decode('{"controller":"WarehouseList","view":"grid1","request":{"PageIndex":-1,"PageSize":10000,"SortExpression":"ModifiedOn DESC","Filter":'.$filter.'}}'), '');
@@ -132,6 +133,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
$response = $this->fetchesDataFRomVTPortal->getResponseBody($warehouseListRequest);
foreach ($response->Rows as $parcel){
$marking = explode('/', explode('CIEF/', $parcel[5])[1]);
if(!array_key_exists(1, $marking)){
@@ -144,6 +146,7 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
continue;
}
try {
$order = $this->fetchesOrder->execute(['reference' => $orderNumber]);
} catch (ResourceNotFoundException $exception) {
@@ -154,13 +157,16 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
continue;
}
$customerMarking = str_replace(' ', '', str_replace('/', '', str_replace('CIEF/', '', $oldOrder->company->marking)));
$customerMarking = str_replace('/', '', str_replace(' ', '', explode('CIEF/', $oldOrder->company->marking)[1]));
$companyModule = CompanyModule::whereHas('inviters', function($query) use ($customerMarking) {
return $query->where('invitee_reference', '=', $customerMarking);
})->first();
if(!$companyModule) {
if(!$companyModule){
log::error('unknown customer: '.$customerMarking);
continue;
}
@@ -180,6 +186,10 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
$originWarehouse = $this->fetchesCompanyModule->execute(['id' => $warehouseId === 11 ? 3 : 4]);
$order = $this->createOrderProcessor->execute($companyModule->company, $originWarehouse, $address, $orderNumber);
$order->created_at = Carbon::parse($parcel[1]);
$order->save();
}
$packingListReference = $parcel[17];
@@ -217,13 +227,13 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
}
return [];
} catch (\Exception $exception){
Log::error($exception->getMessage());
}
DB::commit();
return [];
}
app/Console/Kernel.php
+20 -5
View File
@@ -29,11 +29,26 @@ class Kernel extends ConsoleKernel
*/
protected function schedule(Schedule $schedule)
{
$schedule->job(FetchWarehouseReceiveListFromVTPortalJob::class)->dailyAt('21:00');
$schedule->job(FetchLoadedContainersFromVTPortalJob::class)->dailyAt('21:15');
$schedule->job(FetchPackingListFromVTPortalJob::class)->dailyAt('21:30');
$schedule->job(FetchContainersStatusUpdateFromVTPortalJob::class)->dailyAt('21:45');
$schedule->job(FetchDeliveryListFromVTPortalJob::class)->dailyAt('22:00');
$schedule->call(function(){
FetchWarehouseReceiveListFromVTPortalJob::withChain([
new FetchLoadedContainersFromVTPortalJob,
new FetchPackingListFromVTPortalJob,
new FetchContainersStatusUpdateFromVTPortalJob,
new FetchDeliveryListFromVTPortalJob
])->dispatch();
})->dailyAt('15:00');
$schedule->call(function(){
FetchWarehouseReceiveListFromVTPortalJob::withChain([
new FetchLoadedContainersFromVTPortalJob,
new FetchPackingListFromVTPortalJob,
new FetchContainersStatusUpdateFromVTPortalJob,
new FetchDeliveryListFromVTPortalJob
])->dispatch();
})->dailyAt('21:00');
}
/**
app/Http/Resources/ContainerResource.php
+1 -1
View File
@@ -20,7 +20,7 @@ class ContainerResource extends JsonResource
'container_type' => $this->container_type,
'container_number' => $this->container_number,
'seal_reference' => $this->seal_reference,
'transport' => TransportResource::collection($this->transports),
'transport' => new TransportResource($this->transports()->first()),
];
}
}
app/Http/Resources/TransportResource.php
+1 -1
View File
@@ -24,7 +24,7 @@ class TransportResource extends JsonResource
'drop_date' => $this->drop_date ? $this->drop_date->format('d-m-Y') : $this->drop_date,
'status' => $this->status,
'current_schedule' => new ScheduleResource($this->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first()),
'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '!=', ApprovalStatus::APPROVED)->get())
'schedule_history' => ScheduleResource::collection($this->schedules()->where('status', '=', ApprovalStatus::EXPIRED)->get())
];
}
}
app/Models/OldOrders.php
+1 -1
View File
@@ -17,7 +17,7 @@ class OldOrders extends Model
*/
public function address(): hasOne
{
return $this->hasOne(OldAddress::class, 'reference_id', 'address_id')->where('type', '=', 1);
return $this->hasOne(OldAddress::class, 'id', 'address_id')->where('type', '=', 1);
}
/**
database/seeders/DeleteOldOrdersSeeder.php
+54
View File
@@ -0,0 +1,54 @@
<?php
namespace Database\Seeders;
use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
use App\Classes\Modules\PackingLists\Processors\FetchContainersStatusUpdateFromVTPortalProcessor;
use App\Models\Address;
use App\Models\Container;
use App\Models\ContainerPackingList;
use App\Models\OldOrders;
use App\Models\Order;
use App\Models\Package;
use App\Models\PackingList;
use App\Models\Schedule;
use App\Models\Step;
use App\Models\Transport;
use Illuminate\Database\Seeder;
class DeleteOldOrdersSeeder extends Seeder
{
/**
* Run the database seeds.
*
* @return void
*/
public function run()
{
Container::truncate();
ContainerPackingList::truncate();
Transport::truncate();
Schedule::truncate();
PackingList::truncate();
Package::truncate();
Step::truncate();
foreach (Order::all() as $order){
$oldOrder = OldOrders::where('marking', '=', $order->reference)->first();
if($oldOrder){
$order->addresses()->forceDelete();
$order->packingLists()->forceDelete();
$order->OrderRoles()->forceDelete();
$order->orderSteps()->forceDelete();
$order->forceDelete();
}
}
}
}
database/seeders/OrdersTableSeeder.php
-1
View File
@@ -21,7 +21,6 @@ class OrdersTableSeeder extends Seeder
*/
public function run()
{
FetchWarehouseReceiveListFromVTPortalJob::withChain([
new FetchLoadedContainersFromVTPortalJob,
new FetchPackingListFromVTPortalJob,
resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+37 -29
View File
@@ -30,25 +30,29 @@
</div>
</div>
</div>
<div class="col-auto">
<div class="col-6">
<div class="row">
<div class="col-auto" v-if="item.employee">
<div class="row align-items-center">
<div class="row align-items-center m-b-5">
<div class="col">
<h6 class="no-margin fs-12">Account Owner</h6>
<h6 class="no-margin">{{item.employee.name}}</h6>
</div>
</div>
<div class="row align-items-center">
<div class="col">
<h6 class="no-margin fs-12">Account Owner</h6>
<h6 class="no-margin">{{item.employee.email}}</h6>
</div>
</div>
</div>
<div class="col-auto" v-if="item.contact">
<div class="row align-items-center">
<div class="row align-items-center m-b-5">
<div class="col">
<h6 class="no-margin fs-12">Contact Number</h6>
<h6 class="no-margin">{{item.contact.phone}}</h6>
</div>
</div>
</div>
<div class="col-auto" v-if="item.contact">
<div class="row align-items-center">
<div class="col">
<h6 class="no-margin fs-12">WeChat ID</h6>
@@ -57,35 +61,39 @@
</div>
</div>
<div class="col-auto">
<div class="row" v-if="item.identification">
<div class="col">
<div class="row align-items-center">
<div class="row">
<div class="col-auto">
<div class="row" v-if="item.identification">
<div class="col">
<h6 class="no-margin fs-12">{{ item.type === 0 ? 'Identification Card' : 'SSM Registration' }}</h6>
<h6 class="no-margin"> {{item.identification.reference}}</h6>
</div>
<div class="col-auto p-l-0" v-for="file in item.identification.files" v-bind:key="file.id" >
<document-file-viewer-component :file="file">
<template slot="button">
<div class="icon-thumbnail fs-14 text-white icon-25 bg-primary btn-rounded m-l-5">
<i class="fa fa-file-image-o fs-14"></i>
</div>
</template>
</document-file-viewer-component>
<div class="row align-items-center">
<div class="col">
<h6 class="no-margin fs-12">{{ item.type === 0 ? 'Identification Card' : 'SSM Registration' }}</h6>
<h6 class="no-margin"> {{item.identification.reference}}</h6>
</div>
<div class="col-auto p-l-0" v-for="file in item.identification.files" v-bind:key="file.id" >
<document-file-viewer-component :file="file">
<template slot="button">
<div class="icon-thumbnail fs-14 text-white icon-25 bg-primary btn-rounded m-l-5">
<i class="fa fa-file-image-o fs-14"></i>
</div>
</template>
</document-file-viewer-component>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row parentContainer" v-if="!item.identification">
<div class="col">
<div class="row">
<div class="col no-padding">
<button class="btn btn-sm btn-success btn-block b-rad-none requestModal" data-type="identificationVerificationModal">Upload Identification</button>
<div class="row parentContainer" v-if="!item.identification">
<div class="col">
<div class="row">
<div class="col no-padding">
<button class="btn btn-sm btn-success btn-block b-rad-none requestModal" data-type="identificationVerificationModal">Upload Identification</button>
</div>
</div>
<modal-component type="identificationVerificationModal">
<identification-verification-form-component section="orderListSection" :data="item"></identification-verification-form-component>
</modal-component>
</div>
</div>
<modal-component type="identificationVerificationModal">
<identification-verification-form-component section="orderListSection" :data="item"></identification-verification-form-component>
</modal-component>
</div>
</div>
</div>
resources/assets/vue/components/orders/elements/PackageComponent.vue
+42 -8
View File
@@ -66,15 +66,29 @@
</div>
</div>
<div class="row p-t-10 p-b-10">
<div class="col-auto p-r-0">
<div class="row justify-content-center">
<div class="col-auto">
<i class="fa fa-check fs-15 p-t-15" :class="{'text-primary': status !== 'Ready To Ship', 'muted': status === 'Ready To Ship'}"></i>
<div class="col-auto p-r-0 p-t-10">
<div class="row" v-for="schedule in item.container.transport.schedule_history" :key="schedule.id">
<div class="col">
<div class="row justify-content-center">
<div class="col-auto">
<i class="fa fa-times fs-15 text-danger"></i>
</div>
</div>
<div class="row justify-content-center">
<div class="col-auto">
<div class="b-l b-dashed b-danger" style="height: 35px;"></div>
</div>
</div>
</div>
</div>
<div class="row justify-content-center">
<div class="col-auto">
<div class="b-l b-dashed " style="height: 40px;" :class="{'b-primary': status === 'Preparing Delivery' || status === 'Delivered', 'b-grey': status !== 'Preparing Delivery' || status !== 'Delivered'}"></div>
<i class="fa fa-check fs-15" :class="{'text-primary': status !== 'Ready To Ship', 'muted': status === 'Ready To Ship'}"></i>
</div>
</div>
<div class="row justify-content-center">
<div class="col-auto">
<div class="b-l b-dashed " style="height: 35px;" :class="{'b-primary': status === 'Preparing Delivery' || status === 'Delivered', 'b-grey': status !== 'Preparing Delivery' || status !== 'Delivered'}"></div>
</div>
</div>
<div class="row justify-content-center">
@@ -84,11 +98,31 @@
</div>
</div>
<div class="col p-l-0">
<div class="row m-b-15" v-for="schedule in item.container.transport.schedule_history" :key="schedule.id">
<div class="col">
<div class="row no-margin">
<div class="col-auto">
<small class="fs-10 all-caps muted">Etd</small>
<h6 class="no-margin small">{{schedule.etd}}</h6>
</div>
<div class="col-auto">
<small class="fs-10 all-caps muted">Eta</small>
<h6 class="no-margin small">{{schedule.eta}}</h6>
</div>
</div>
</div>
</div>
<div class="row m-b-15">
<div class="col">
<div class="col-auto">
<small class="fs-10 all-caps muted">Shipping Date</small>
<h6 class="no-margin small">{{item.container ? item.container.transport[0].current_schedule.etd : 'n/a'}}</h6>
<div class="row no-margin">
<div class="col-auto" v-if="!item.container.transport.schedule_history.length">
<small class="fs-10 all-caps muted">Etd</small>
<h6 class="no-margin small">{{item.container ? item.container.transport.current_schedule.etd : 'n/a'}}</h6>
</div>
<div class="col-auto">
<small class="fs-10 all-caps muted">{{!item.container.transport.schedule_history.length ? 'Eta' : 'Rescheduled Eta' }}</small>
<h6 class="no-margin small">{{item.container ? item.container.transport.current_schedule.eta : 'n/a'}}</h6>
</div>
</div>
</div>
</div>
resources/assets/vue/components/orders/elements/ParcelComponent.vue
+9 -1
View File
@@ -38,7 +38,15 @@
</div>
<div class="row" v-if="expanded" >
<div class="col bg-white p-t-15 p-b-15">
<div class="row m-b-5" v-if="item.transport.tracking_number">
<div class="row m-b-5">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Order Number</p>
</div>
<div class="col p-l-5">
<p class="no-margin bold text-info fs-12">{{item.order.reference}}</p>
</div>
</div>
<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>
resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
+1 -1
View File
@@ -170,7 +170,7 @@
<div class="col">
<div class="row">
<div class="col">
<list-component v-show="!$store.getters.isShowing('createOrderForm')" section="activeOrderListSection" :endpoint="route('api.order.list')" :options="item ? {per_page: 12, status_in: [2], company_module_id: item.company_module.id} : {per_page: 30, status_in: [2]}" :columns=3>
<list-component v-show="!$store.getters.isShowing('createOrderForm')" section="activeOrderListSection" :endpoint="route('api.order.list')" :options="item ? {per_page: 12, order_by: {column: 'created_at', DESC: false}, status_in: [2], company_module_id: item.company_module.id} : {per_page: 30, order_by: {column: 'created_at', DESC: true}, status_in: [2]}" :columns=3>
<template slot="list" slot-scope="{data}">
<order-component :data="data"></order-component>
</template>
resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
+12
View File
@@ -0,0 +1,12 @@
<template>
<div class="row">
<div class="col-5">
<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>
</template>
</list-component>
</div>
</div>
</template>
resources/views/pages/warehouse_list.blade.php
+4
View File
@@ -0,0 +1,4 @@
@extends('layouts.base_portal')
@section('inner_content')
<warehouse-list-section-component></warehouse-list-section-component>
@endsection
resources/views/partials/menu.blade.php
+11
View File
@@ -41,6 +41,17 @@
<a href="{{route('orders')}}"><h6 class="no-margin light fs-18 all-caps">Orders</h6></a>
</div>
</div>
<div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
<div class="col-auto p-r-0">
<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
width="25" height="25"
viewBox="0 0 172 172"
style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M8.6,23.65c-2.37676,0 -4.3,1.92324 -4.3,4.3c0,2.37676 1.92324,4.3 4.3,4.3c2.37676,0 4.3,-1.92324 4.3,-4.3c4.77031,0 8.6,3.82969 8.6,8.6v85.10137c0,8.28926 6.76074,15.05 15.05,15.05h0.50391c0.99941,2.98145 3.72051,5.19863 7.02109,5.19863h4.43438c-0.74746,1.26816 -1.20938,2.72949 -1.20938,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20938,-4.3h66.91875c-0.74746,1.26816 -1.20937,2.72949 -1.20937,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20937,-4.3h4.43437c3.36777,0 6.13926,-2.30117 7.08828,-5.375h0.43672v-2.15c0,-3.90527 -3.04863,-7.12188 -6.87832,-7.45781c0.26035,-0.69707 0.42832,-1.43613 0.42832,-2.21719v-40.85c0,-1.67129 -0.73066,-3.14941 -1.78887,-4.3c1.0582,-1.15059 1.78887,-2.62871 1.78887,-4.3v-43c0,-3.53574 -2.91426,-6.45 -6.45,-6.45h-94.6c-3.53574,0 -6.45,2.91426 -6.45,6.45v43c0,1.67129 0.73066,3.14941 1.78887,4.3c-1.0582,1.15059 -1.78887,2.62871 -1.78887,4.3v40.85c0,0.78105 0.16797,1.52012 0.42832,2.21719c-3.15781,0.27715 -5.75293,2.51953 -6.57598,5.48418h-0.30234c-5.96289,0 -10.75,-4.78711 -10.75,-10.75v-85.10137c0,-7.09668 -5.80332,-12.9 -12.9,-12.9zM49.45,30.1h94.6c1.21777,0 2.15,0.93223 2.15,2.15v43c0,1.21777 -0.93223,2.15 -2.15,2.15c-1.17578,0.0168 -2.11641,0.97422 -2.11641,2.15c0,1.17578 0.94062,2.1332 2.11641,2.15c1.21777,0 2.15,0.93223 2.15,2.15v40.85c0,1.21777 -0.93223,2.15 -2.15,2.15h-94.6c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-40.85c0,-1.21777 0.93223,-2.15 2.15,-2.15c1.17578,-0.0168 2.11641,-0.97422 2.11641,-2.15c0,-1.17578 -0.94063,-2.1332 -2.11641,-2.15c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-43c0,-1.21777 0.93223,-2.15 2.15,-2.15zM88.15,38.7c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM58.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM66.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM75.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM101.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM118.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM126.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM88.15,90.3c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM44.075,131.15h105.35c1.80566,0 3.225,1.41934 3.225,3.225c0,1.80566 -1.41934,3.225 -3.225,3.225h-105.35c-1.80566,0 -3.225,-1.41934 -3.225,-3.225c0,-1.80566 1.41934,-3.225 3.225,-3.225zM55.9,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM137.6,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3z"></path></g></g></svg>
</div>
<div class="col">
<a href="{{route('warehouse.list')}}"><h6 class="no-margin light fs-18 all-caps">Arrived Parcels</h6></a>
</div>
</div>
<div class="row p-t-15 p-b-15 align-items-center justify-content-center" v-if="$store.getters.isAdmin">
<div class="col-auto p-r-0">
<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
routes/web.php
+4
View File
@@ -61,6 +61,10 @@ Route::get('/address', function () {
return view('pages.addresses.index');
})->name('address');
Route::get('/warehouse-list', function () {
return view('pages.warehouse_list');
})->name('warehouse.list');
Route::get('/customer/{marking}', function ($marking) {
$connection = CompanyConnection::where('invitee_reference', $marking)->first();
$id = $connection->invitee->company->id;