Merge branch 'vapor/production' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into vapor/development

This commit is contained in:
edmondlang
2024-12-16 13:17:19 +08:00
2 changed files with 7 additions and 1 deletions
@@ -44,6 +44,7 @@ class ExportsSegmentCustomers implements WithHeadings, WithHeadingRow, WithMappi
'Company Marking',
'Is Credit Term Customers',
'Auto Release',
'Latest Order Creation Date',
];
}
@@ -64,11 +65,14 @@ class ExportsSegmentCustomers implements WithHeadings, WithHeadingRow, WithMappi
$isCreditTermCustomer = in_array('Credit Term Customer', $segments);
$autoRelease = in_array('Auto Release', $segments);
$lastestOrder = $companyModule->orders()->orderBy('id', 'desc')->first();
return [
$list->name,
$marking,
$isCreditTermCustomer ? 'TRUE' : 'FALSE',
$autoRelease ? 'TRUE' : 'FALSE',
$lastestOrder ? $lastestOrder->created_at : '',
];
}
}
@@ -60,7 +60,7 @@ class UpdateDoFromYDPortalProcessor
$remark = $remark ? $remark->content : 'URGENT!!! PLEASE CALL BEFORE ONE DAY DELIVERY.';
if(!$phone || !$reference) throw new MalformedRequestException('Can\'t release this packing list because it doesn\'t have the person in charge contact information');
$this->fetchesDataFRomYDPortal->clientRequest(
$res = $this->fetchesDataFRomYDPortal->clientRequest(
'http://www.yd-wl.com/api/UpdateOrderAddress.ashx',
'POST',
[
@@ -72,6 +72,8 @@ class UpdateDoFromYDPortalProcessor
]);
Log::info('UpdateDoFromYDPortalProcessor - $res' . json_encode($res));
} catch (\Exception $exception){
log::debug($exception);