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

fix export arrival list

Browse Source
This commit is contained in:
omair saleh
2022-05-13 12:45:54 +08:00
parent 5d504b5111
commit 4fef6f8e6f
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
+6 -14
View File
@@ -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;