From a2f4e1f3fd7ae9307c1b6f37830901f9e5b9271b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 6 Sep 2021 13:00:31 +0800
Subject: [PATCH] Revert "add marking to arrived parcel components"

This reverts commit 91c8424dc5bc9aaf04ccb34f91828d325722173f.
---
 .../Eloquent/Filters/OrderByArrivalDate.php   | 20 -------------------
 ...hLoadedContainersFromVTPortalProcessor.php |  7 +++----
 ...ehouseReceiveListFromVTPortalProcessor.php |  4 +---
 .../orders/elements/ParcelComponent.vue       |  2 +-
 .../WarehouseListSectionComponent.vue         | 12 +++++++++++
 .../views/pages/warehouse_list.blade.php      | 10 +---------
 6 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
 create mode 100644 resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php b/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
deleted file mode 100644
index aae9336c..00000000
--- a/app/Classes/General/Eloquent/Filters/OrderByArrivalDate.php
+++ /dev/null
@@ -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');
-    }
-
-}
\ No newline at end of file
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index ed41ed08..2776124d 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -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 [];
 
     }
diff --git a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
index bc6042b6..476b1426 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchWarehouseReceiveListFromVTPortalProcessor.php
@@ -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;
diff --git a/resources/assets/vue/components/orders/elements/ParcelComponent.vue b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
index 7f50b346..f306502d 100644
--- a/resources/assets/vue/components/orders/elements/ParcelComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ParcelComponent.vue
@@ -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>
diff --git a/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
new file mode 100644
index 00000000..a56afe24
--- /dev/null
+++ b/resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue
@@ -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>
\ No newline at end of file
diff --git a/resources/views/pages/warehouse_list.blade.php b/resources/views/pages/warehouse_list.blade.php
index 3b58deab..b12f825a 100644
--- a/resources/views/pages/warehouse_list.blade.php
+++ b/resources/views/pages/warehouse_list.blade.php
@@ -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
\ No newline at end of file