From 453683ca76d759273885f7ea2fcdc49e3df21ec3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 14:59:43 +0800 Subject: [PATCH 01/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 66934840..67f75fc9 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -40,16 +40,17 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->get(); - $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]); + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('transport', function ($query){ + return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); + })->get(); foreach($packingLists as $packingList){ - $packages = !$packingList->packingLists()->exists() || $exceptionUsers ? $packingList->packages : $packingList->packingLists->first()->packages; + $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; foreach ($packages as $package) { $returnArray->push($package); } } - + return $returnArray; } From f73094ca065482342cbef7e85423ba1b110ea6ff Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 15:01:35 +0800 Subject: [PATCH 02/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 67f75fc9..9232a053 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -40,7 +40,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('transport', function ($query){ + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->whereHas('transport', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); From 6713542dc941fecbc7c15428ea30fea5c85f2afc Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 15:02:06 +0800 Subject: [PATCH 03/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 9232a053..c4f8c379 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -40,7 +40,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->whereHas('transport', function ($query){ + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); From e369bc7f9ee22ada823691e8ef395b922be7788c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 15:42:33 +0800 Subject: [PATCH 04/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index c4f8c379..76accca7 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -3,6 +3,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Models\CompanyModule; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromCollection; @@ -64,10 +65,19 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingList = $package->packingList; $order = $packingList->owner; - $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); + if($order instanceof CompanyModule){ + $companyModule = $order; + $warehouse = $packingList->claimant_id; + } else { + $companyModule = $order->companyModule->first(); + $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->reference; + } + + + $connection = $companyModule->inviters()->withPivot('invitee_reference')->first(); $marking = $connection ? $connection->pivot->invitee_reference:''; - $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; + $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; @@ -76,7 +86,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, return [ $packingList->owner->reference, $marking, - $warehouse->reference, + $warehouse, $cbm, $package->description, $package->quantity, From aa1d1dccc5205d35a412828c681abc3acf430a3f Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 18:57:22 +0800 Subject: [PATCH 05/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 76accca7..921bd950 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -3,7 +3,6 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; -use App\Models\CompanyModule; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromCollection; @@ -56,8 +55,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, } /** - * @param ReturnArray $returnArray - * + * @param $package * @return array */ public function map($package): array @@ -65,19 +63,10 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingList = $package->packingList; $order = $packingList->owner; - if($order instanceof CompanyModule){ - $companyModule = $order; - $warehouse = $packingList->claimant_id; - } else { - $companyModule = $order->companyModule->first(); - $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->reference; - } - - - $connection = $companyModule->inviters()->withPivot('invitee_reference')->first(); + $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); $marking = $connection ? $connection->pivot->invitee_reference:''; - + $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; @@ -86,7 +75,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, return [ $packingList->owner->reference, $marking, - $warehouse, + $warehouse->reference, $cbm, $package->description, $package->quantity, From 0640e0de9b6aa68c873ad4cd4d107114ea7ca3ae Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:13:36 +0800 Subject: [PATCH 06/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 921bd950..6122a79c 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -3,6 +3,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Models\CompanyModule; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromCollection; @@ -40,7 +41,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->whereHas('transports', function ($query){ + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); From 3100d42bd764cc1326a139af7fb75d7896aa5fb9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:23:03 +0800 Subject: [PATCH 07/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 6122a79c..8b346c68 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -44,7 +44,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); - +dd($packingLists); foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; foreach ($packages as $package) { @@ -64,8 +64,8 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingList = $package->packingList; $order = $packingList->owner; - $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); - $marking = $connection ? $connection->pivot->invitee_reference:''; +// $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); +// $marking = $connection ? $connection->pivot->invitee_reference:''; $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; @@ -75,7 +75,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, return [ $packingList->owner->reference, - $marking, +// $marking, $warehouse->reference, $cbm, $package->description, From 9e060bccd30ef4c828260830582ed43eeb6f3b67 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:24:02 +0800 Subject: [PATCH 08/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 8b346c68..23651815 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -44,7 +44,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); -dd($packingLists); + foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; foreach ($packages as $package) { @@ -63,9 +63,9 @@ dd($packingLists); { $packingList = $package->packingList; $order = $packingList->owner; - -// $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); -// $marking = $connection ? $connection->pivot->invitee_reference:''; +dump($order); + $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); + $marking = $connection ? $connection->pivot->invitee_reference:''; $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; @@ -75,7 +75,7 @@ dd($packingLists); return [ $packingList->owner->reference, -// $marking, + $marking, $warehouse->reference, $cbm, $package->description, From 4fb284c85cd0d2b5ff54664cdaf83a9f06813ec2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:27:45 +0800 Subject: [PATCH 09/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 23651815..bd16dd9a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -47,12 +47,10 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; - foreach ($packages as $package) { - $returnArray->push($package); - } + $returnArray->push($packages); } - return $returnArray; + return $returnArray->flatten(); } /** From 78ce2084b91fc2ebff0e401944ceb2ef84bd6b98 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:31:04 +0800 Subject: [PATCH 10/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index bd16dd9a..9fcc9e94 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -61,7 +61,10 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $packingList = $package->packingList; $order = $packingList->owner; -dump($order); + + if($order instanceof PackingList){ + $order = $order->owner; + } $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); $marking = $connection ? $connection->pivot->invitee_reference:''; From 6094adadec3b0c7e113d9de5aab7c1f86c814981 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:35:16 +0800 Subject: [PATCH 11/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 9fcc9e94..72d057f4 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -44,7 +44,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); - +dd($packingLists); foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; $returnArray->push($packages); From fc6c36579250dc82f772fdf24f1dc2852745e8d7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:37:39 +0800 Subject: [PATCH 12/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 72d057f4..114a359e 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -63,7 +63,8 @@ dd($packingLists); $order = $packingList->owner; if($order instanceof PackingList){ - $order = $order->owner; + $packingList = $package->packingList->packingList; + $order = $packingList->owner; } $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); $marking = $connection ? $connection->pivot->invitee_reference:''; From 96eeb5a63e595009d0a51f956bc8d1d78dc81ae4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:37:49 +0800 Subject: [PATCH 13/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 114a359e..a0a2cd0f 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -44,7 +44,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); })->get(); -dd($packingLists); + foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; $returnArray->push($packages); From c299c60d38f999459728dcb97f646cfabe56c30b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:38:04 +0800 Subject: [PATCH 14/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index a0a2cd0f..1096fb9b 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -59,6 +59,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, */ public function map($package): array { + dd($package); $packingList = $package->packingList; $order = $packingList->owner; From f4a96fec786ebcedc123dcf73ff46c1b3f370266 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:41:35 +0800 Subject: [PATCH 15/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 1096fb9b..a0a2cd0f 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -59,7 +59,6 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, */ public function map($package): array { - dd($package); $packingList = $package->packingList; $order = $packingList->owner; From 9041d9623ba27105fbb06379c40c5b573a48538a Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:46:16 +0800 Subject: [PATCH 16/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index a0a2cd0f..e621a141 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -63,7 +63,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $order = $packingList->owner; if($order instanceof PackingList){ - $packingList = $package->packingList->packingList; + $packingList = $package->packingList->owner; $order = $packingList->owner; } $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); From d972e98732a967cca832ba8adb94f804c8620a45 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 19:50:19 +0800 Subject: [PATCH 17/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index e621a141..2d2ac386 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -41,9 +41,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ - return $query->whereMonth('drop_date', '>', 3)->whereYear('drop_date', 2022); - })->get(); + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->get(); foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; From 2e03ce370dd0e1fc8d6e0f54d3d05977f26b5686 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 13:42:26 +0800 Subject: [PATCH 18/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 2d2ac386..57a95c5b 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -41,7 +41,9 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->get(); + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ + return $query->whereYear('drop_date', 2022); + })->get(); foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; From 9b35f8c3740f51e0c0705c4280d9516112c17029 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 13:51:13 +0800 Subject: [PATCH 19/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 51 ++++++++----------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 57a95c5b..4d3235e4 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -6,7 +6,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Models\CompanyModule; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; -use Maatwebsite\Excel\Concerns\FromCollection; +use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithMapping; use Maatwebsite\Excel\Concerns\WithHeadings; @@ -15,7 +15,7 @@ use Carbon\Carbon; use App\Classes\ValueObjects\Constants\OrderRoleTypes; use App\Classes\ValueObjects\Constants\RoleTypes; -class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection +class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery { use Exportable; @@ -37,53 +37,42 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, /** * @return \Illuminate\Support\Collection|mixed */ - public function collection() + public function query() { - $returnArray = collect(); - - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ + return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereYear('drop_date', 2022); - })->get(); - - foreach($packingLists as $packingList){ - $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; - $returnArray->push($packages); - } - - return $returnArray->flatten(); + }); } /** - * @param $package + * @param $packingList * @return array */ - public function map($package): array + public function map($packingList): array { - $packingList = $package->packingList; $order = $packingList->owner; - if($order instanceof PackingList){ - $packingList = $package->packingList->owner; - $order = $packingList->owner; - } $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); $marking = $connection ? $connection->pivot->invitee_reference:''; $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; - $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; - $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y'); return [ - $packingList->owner->reference, - $marking, - $warehouse->reference, - $cbm, - $package->description, - $package->quantity, - $arrival_date, - '' + array_map(function ($package) use($order, $marking, $warehouse, $arrival_date) { + $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; + return [ + $order->reference, + $marking, + $warehouse->reference, + $cbm, + $package->description, + $package->quantity, + $arrival_date, + '' + ]; + }, $packingList->packages) ]; } } \ No newline at end of file From 764e7091354bfac2184adfa1edeade84204985a8 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 14:01:02 +0800 Subject: [PATCH 20/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 4d3235e4..10460ab7 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -50,6 +50,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, */ public function map($packingList): array { + dd($packingList->packages); $order = $packingList->owner; $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); From dad2f95eaaa47223f562e878cd72093a80acf8c6 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 14:03:52 +0800 Subject: [PATCH 21/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 10460ab7..246083ac 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -50,7 +50,6 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, */ public function map($packingList): array { - dd($packingList->packages); $order = $packingList->owner; $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); @@ -61,7 +60,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y'); return [ - array_map(function ($package) use($order, $marking, $warehouse, $arrival_date) { + $packingList->packages->map(function($package) use($order, $marking, $warehouse, $arrival_date) { $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; return [ $order->reference, @@ -73,7 +72,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $arrival_date, '' ]; - }, $packingList->packages) + }) ]; } } \ No newline at end of file From fe70c4b1116144d692166269fa95bcf22f4363b3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 11 May 2022 18:00:13 +0800 Subject: [PATCH 22/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 246083ac..1886b6bc 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -6,7 +6,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Models\CompanyModule; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; -use Maatwebsite\Excel\Concerns\FromQuery; +use Maatwebsite\Excel\Concerns\FromCollection; use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithMapping; use Maatwebsite\Excel\Concerns\WithHeadings; @@ -15,7 +15,7 @@ use Carbon\Carbon; use App\Classes\ValueObjects\Constants\OrderRoleTypes; use App\Classes\ValueObjects\Constants\RoleTypes; -class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery +class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection { use Exportable; @@ -37,19 +37,29 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, /** * @return \Illuminate\Support\Collection|mixed */ - public function query() + public function collection() { - return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ + $returnArray = collect(); + + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ return $query->whereYear('drop_date', 2022); - }); + })->get(); + + foreach($packingLists as $packingList){ + $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; + $returnArray->push($packages); + } + + return $returnArray->flatten(); } /** - * @param $packingList + * @param $package * @return array */ - public function map($packingList): array + public function map($package): array { + $packingList = $package->packingList; $order = $packingList->owner; $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); @@ -57,22 +67,19 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; + $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; + $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y'); return [ - $packingList->packages->map(function($package) use($order, $marking, $warehouse, $arrival_date) { - $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; - return [ - $order->reference, - $marking, - $warehouse->reference, - $cbm, - $package->description, - $package->quantity, - $arrival_date, - '' - ]; - }) + $packingList->owner->reference, + $marking, + $warehouse->reference, + $cbm, + $package->description, + $package->quantity, + $arrival_date, + '' ]; } } \ No newline at end of file From 3854884370b6aeaaa84e65926d46a3c984f75378 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 12 May 2022 12:14:29 +0800 Subject: [PATCH 23/27] fix export arrival list --- app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 1886b6bc..9aa933e7 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -4,6 +4,7 @@ namespace App\Classes\Modules\Exports\Services; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Models\CompanyModule; +use App\Models\Order; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromCollection; @@ -41,7 +42,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', '!=', CompanyModule::class)->whereHas('transports', function ($query){ + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transports', function ($query){ return $query->whereYear('drop_date', 2022); })->get(); From 5d504b51117eb1af3227f06f076b7e091ac69925 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 13 May 2022 12:44:19 +0800 Subject: [PATCH 24/27] fix export arrival list --- .../Modules/Exports/Services/ExportsArrivedParcel.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 9aa933e7..7c4a745d 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -42,10 +42,8 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, { $returnArray = collect(); - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->whereHas('transports', function ($query){ - return $query->whereYear('drop_date', 2022); - })->get(); - + $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->get(); +dd($packingLists); foreach($packingLists as $packingList){ $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; $returnArray->push($packages); From 4fef6f8e6f67edfca679ea091111c7b9d3e56ee5 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 13 May 2022 12:45:54 +0800 Subject: [PATCH 25/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 7c4a745d..98635a6a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -7,7 +7,7 @@ use App\Models\CompanyModule; use App\Models\Order; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; -use Maatwebsite\Excel\Concerns\FromCollection; +use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithMapping; use Maatwebsite\Excel\Concerns\WithHeadings; @@ -16,7 +16,7 @@ use Carbon\Carbon; use App\Classes\ValueObjects\Constants\OrderRoleTypes; use App\Classes\ValueObjects\Constants\RoleTypes; -class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection +class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery { use Exportable; @@ -38,26 +38,18 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, /** * @return \Illuminate\Support\Collection|mixed */ - public function collection() + public function query() { - $returnArray = collect(); - - $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->get(); -dd($packingLists); - foreach($packingLists as $packingList){ - $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages; - $returnArray->push($packages); - } - - return $returnArray->flatten(); + return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class); } /** * @param $package * @return array */ - public function map($package): array + public function map($packingList): array { + dd($packingList); $packingList = $package->packingList; $order = $packingList->owner; From faf4d353407d1a4c84f90d53f5473a38bad794c4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 13 May 2022 12:50:36 +0800 Subject: [PATCH 26/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 98635a6a..1a9c9b5b 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -44,13 +44,11 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, } /** - * @param $package + * @param $packingList * @return array */ public function map($packingList): array { - dd($packingList); - $packingList = $package->packingList; $order = $packingList->owner; $connection = $order->companyModule()->first()->inviters()->withPivot('invitee_reference')->first(); @@ -58,17 +56,28 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, $warehouse = $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee; - $cbm = (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; + $cbm = $packingList->packages->sum(function($package){ + return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity; + }); $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y'); - +dd([ + $packingList->owner->reference, + $marking, + $warehouse->reference, + $cbm, + $packingList->packages->implode('description', ', '), + $packingList->packages->sum('quantity'), + $arrival_date, + '' +]); return [ $packingList->owner->reference, $marking, $warehouse->reference, $cbm, - $package->description, - $package->quantity, + $packingList->packages->implode('description', ', '), + $packingList->packages->sum('quantity'), $arrival_date, '' ]; From 31e28c3dfa143a0b1ded2b6d97919be69be8a7a0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 13 May 2022 12:51:20 +0800 Subject: [PATCH 27/27] fix export arrival list --- .../Exports/Services/ExportsArrivedParcel.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php index 1a9c9b5b..72725cfb 100644 --- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php +++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php @@ -2,8 +2,6 @@ namespace App\Classes\Modules\Exports\Services; -use App\Classes\ValueObjects\Constants\ApprovalStatus; -use App\Models\CompanyModule; use App\Models\Order; use App\Models\PackingList; use Maatwebsite\Excel\Concerns\Exportable; @@ -12,9 +10,7 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithMapping; use Maatwebsite\Excel\Concerns\WithHeadings; use Maatwebsite\Excel\Concerns\ShouldAutoSize; -use Carbon\Carbon; use App\Classes\ValueObjects\Constants\OrderRoleTypes; -use App\Classes\ValueObjects\Constants\RoleTypes; class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery { @@ -61,16 +57,7 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, }); $arrival_date = $packingList->transports()->first()->drop_date->format('d-m-Y'); -dd([ - $packingList->owner->reference, - $marking, - $warehouse->reference, - $cbm, - $packingList->packages->implode('description', ', '), - $packingList->packages->sum('quantity'), - $arrival_date, - '' -]); + return [ $packingList->owner->reference, $marking,