cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-31 10:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.2-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-05-15 03:51:46 +08:00
parent d376b8b2b9 ab4a83dc50
commit d69e348920
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Jobs/Commands/V2/TestExportExcelToS3BucketCommandJob.php
+9 -19
View File
@@ -15,6 +15,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\BusinessType;
use App\Models\Company;
use App\Models\Package;
use App\Models\Order;
class TestExportExcelToS3BucketCommandJob implements ShouldQueue
{
@@ -42,29 +43,18 @@ class TestExportExcelToS3BucketCommandJob implements ShouldQueue
Log::info('company 2: ' . json_encode($company));
$approvedCompanies = Company::where(function($query) {
$query->whereNull('debtor')
->orWhere('debtor', '');
})
->whereHas('companyModules', function($query) {
$company = Company::whereNull('debtor')
->orWhere('debtor', '')
->whereHas('companyModules', function ($query) {
$query->where('type', BusinessType::IMPORTER);
})
->where('status', ApprovalStatus::APPROVED)
->pluck('id');
$packages = Package::whereIn('company_id', $approvedCompanies)
->whereHas('packingList.owner.companyModule.company', function ($query) {
$query->where('type', BusinessType::IMPORTER);
})
->whereHas('packingList.owner', function ($query) {
$query->whereNotNull('owner_id');
})
->whereHas('packingList', function ($query) {
$query->whereNotNull('packing_list_id');
->whereHas('parcels', function ($query) {
$query->where('status', ApprovalStatus::APPROVED);
})
->with(['companyModules', 'parcels'])
->get();
Log::info('packages 1: ' . json_encode($packages));
Log::info('company 3: ' . json_encode($company));
$company = Company::where(function($query){
$query->whereNull('debtor')->orWhere('debtor', '');
@@ -72,7 +62,7 @@ class TestExportExcelToS3BucketCommandJob implements ShouldQueue
$query->where('type', BusinessType::IMPORTER);
})->whereHas('parcels')->where('status', ApprovalStatus::APPROVED)->get();
Log::info('company 3: ' . json_encode($company));
Log::info('company 4: ' . json_encode($company));
$export = new ExportsNullDebtors();
$filesystemDriver = Storage::getDefaultDriver();