From 8af6a5cca66942dbf5f755ce9b2e8da34217aec1 Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Thu, 21 Mar 2019 11:02:19 +0800
Subject: [PATCH] Dashboard report

---
 .../Modules/ControllersLogic/Dashboard/CbmReportLogic.php  | 7 +++++--
 .../ControllersLogic/Dashboard/OrdersReportLogic.php       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/ControllersLogic/Dashboard/CbmReportLogic.php b/app/Classes/Modules/ControllersLogic/Dashboard/CbmReportLogic.php
index 2b890a5..5e1da04 100644
--- a/app/Classes/Modules/ControllersLogic/Dashboard/CbmReportLogic.php
+++ b/app/Classes/Modules/ControllersLogic/Dashboard/CbmReportLogic.php
@@ -3,6 +3,8 @@
 namespace App\Classes\Modules\ControllersLogic\Dashboard;
 
 use App\Models\Package;
+use App\Models\Order;
+use App\Models\PackingList;
 use Carbon\Carbon;
 
 class CbmReportLogic
@@ -20,8 +22,9 @@ class CbmReportLogic
     }
 
     public function execute() {
-
-        $cbm = $this->repository->selectRaw('created_at, ((((width/100) * (length/100) * (height/100))) * quantity) as cbm')->whereYear('created_at', '=', Carbon::now()->year)->whereMonth('created_at', '=', Carbon::now()->month)->orderBy('created_at')->get();
+        $excludedOrders = Order::where('company_id', 349)->pluck('id')->toArray();
+        $excludedPackingLists = PackingList::whereIn('order_id', $excludedOrders)->pluck('id')->toArray();
+        $cbm = $this->repository->selectRaw('created_at, ((((width/100) * (length/100) * (height/100))) * quantity) as cbm')->whereYear('created_at', '=', Carbon::now()->year)->whereMonth('created_at', '=', Carbon::now()->month)->whereNotIn('list_id', $excludedPackingLists)->orderBy('created_at')->get();
 
         $cbmGroup = $cbm->groupBy(function ($item) {
             return Carbon::parse($item->created_at)->format('j');
diff --git a/app/Classes/Modules/ControllersLogic/Dashboard/OrdersReportLogic.php b/app/Classes/Modules/ControllersLogic/Dashboard/OrdersReportLogic.php
index 8f1c128..4b2d531 100644
--- a/app/Classes/Modules/ControllersLogic/Dashboard/OrdersReportLogic.php
+++ b/app/Classes/Modules/ControllersLogic/Dashboard/OrdersReportLogic.php
@@ -22,7 +22,7 @@ class OrdersReportLogic
     public function execute() {
 
         $Orders= $this->repository->whereYear('created_at', '=', Carbon::now()->year)
-            ->whereMonth('created_at', '=', Carbon::now()->month)->orderBy('created_at')->get();
+            ->whereMonth('created_at', '=', Carbon::now()->month)->where('company_id', '!=', 349)->orderBy('created_at')->get();
 
         $group = $Orders->groupBy(function($item) {
             return Carbon::parse($item->created_at)->format('j');