From 019073afc5cd5a5bed701a50486d3ce870d6b05a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 1 Oct 2021 21:25:02 +0800
Subject: [PATCH] customer report

---
 .../FetchLoadedContainersFromVTPortalProcessor.php           | 5 ++---
 routes/web.php                                               | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
index 306f0312..5df560d4 100644
--- a/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
+++ b/app/Classes/Modules/PackingLists/Processors/FetchLoadedContainersFromVTPortalProcessor.php
@@ -123,7 +123,7 @@ class FetchLoadedContainersFromVTPortalProcessor
      */
     public function execute(?Carbon $start = null, ?Carbon $end = null){
 
-//        DB::beginTransaction();
+        DB::beginTransaction();
         try {
             $start = $start ? $start : Carbon::now()->subDays(5);
 
@@ -216,7 +216,6 @@ class FetchLoadedContainersFromVTPortalProcessor
                     }
 
                 }
-                dd('inserted');
 
             }
         } catch (\Exception $exception){
@@ -224,7 +223,7 @@ class FetchLoadedContainersFromVTPortalProcessor
         }
 
 
-//        DB::commit();
+        DB::commit();
         return [];
 
     }
diff --git a/routes/web.php b/routes/web.php
index 93bf2cc7..c0023a55 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -130,7 +130,7 @@ Route::group(['prefix' => 'template', 'as' => 'template.'], function () {
 });
 
 Route::get('/report', function(){
-    $containers = Container::whereMonth('loading_date', '=', '09')->whereYear('loading_date', '=', '2021')->get();
+    $containers = Container::whereMonth('loading_date', '=', '09')->whereYear('loading_date', '=', '2021')->orderBy('loading_date')->get();
 
     $total = 0;
     $customers = collect();
@@ -140,7 +140,7 @@ Route::get('/report', function(){
                 return $packingList->packages->sum(function ($package){
                     return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;
                 });
-            }).'CBM <br><br>';
+            }).'CBM ('. $container->loading_date->format('d-m-Y') .')<br><br>';
         foreach($container->packingLists as $packingList){
             $cbm = $packingList->packages->sum(function ($package){
                 return (( (float) $package->width / 100) * ( (float) $package->length / 100) * ( (float) $package->height / 100)) * $package->quantity;