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

Revert "add marking to arrived parcel components"

Browse Source 
This reverts commit 91c8424dc5.
This commit is contained in:
omair saleh
2021-09-06 13:00:31 +08:00
parent 1933030e9a
commit a2f4e1f3fd
6 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
-20
View File
@@ -1,20 +0,0 @@
<?php
namespace App\Classes\General\Eloquent\Filters;
use Illuminate\Database\Eloquent\Builder;
class OrderByArrivalDate implements Filter
{
/**
* @param Builder $builder
* @param $value
* @return Builder|mixed
*/
public static function apply(Builder $builder, $value)
{
return $builder->with('transports');
}
}
app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+3 -4
View File
@@ -124,12 +124,11 @@ class FetchLoadedContainersFromVTPortalProcessor
*/
public function execute(?Carbon $start = null, ?Carbon $end = null){
// DB::beginTransaction();
DB::beginTransaction();
try {
$start = Carbon::parse('01-06-2021');
$start = $start ? $start : Carbon::now()->subMonth();
$startLimit = Carbon::parse('01-06-2021');
$startLimit = Carbon::parse('11-08-2021');
if($start->isBefore($startLimit)){
$start = $startLimit;
@@ -222,7 +221,7 @@ class FetchLoadedContainersFromVTPortalProcessor
}
// DB::commit();
DB::commit();
return [];
}
app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+1 -3
View File
@@ -116,11 +116,9 @@ class FetchWarehouseReceiveListFromVTPortalProcessor
try {
$start = Carbon::parse('01-06-2021');
$start = $start ? $start : Carbon::now()->subMonth();
$startLimit = Carbon::parse('01-06-2021');
$startLimit = Carbon::parse('11-08-2021');
if($start->isBefore($startLimit)){
$start = $startLimit;
resources/assets/vue/components/orders/elements/ParcelComponent.vue
+1 -1
View File
@@ -38,7 +38,7 @@
</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="$store.getters.isAdmin">
<div class="row m-b-5" v-if="$store.getter.isAdmin">
<div class="col-auto p-r-5">
<p class="no-margin all-caps fs-10 light">Marking</p>
</div>
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
+1 -9
View File
@@ -1,12 +1,4 @@
@extends('layouts.base_portal')
@section('inner_content')
<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_arrival_date: true, 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>
<warehouse-list-section-component></warehouse-list-section-component>
@endsection