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

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

Browse Source
This commit is contained in:
edmondlang
2022-07-11 15:00:15 +08:00
parent 96fcfb241a 06015cea72
commit 1e634ddc44
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
+1 -1
View File
@@ -136,7 +136,7 @@ class FetchOrderListsFromYdPortalProcessor
public function execute(?Carbon $start = null, ?Carbon $end = null)
{
try {
$start = $start ? $start : Carbon::now()->subMonths(1);
$start = $start ? $start : Carbon::now()->subMonths(3);
$startLimit = Carbon::parse('01-12-2021');
app/Classes/ValueObjects/Constants/WarehouseReferences.php
+1 -1
View File
@@ -43,7 +43,7 @@ final class WarehouseReferences {
public const YD_DESTINATION_WAREHOUSE = self::YD_KLANG;
public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349];
public const YD_EXEMPT_LIST = [230, 294, 320, 652, 1248, 1726, 2349, 2574];
public const REPLICA_WHITE_LIST = [502];
routes/web.php
+3 -4
View File
@@ -288,8 +288,7 @@ Route::get('/settings', function () {
Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export');
Route::get('/customer/summary/monthly', function () {
$containers = Container::whereMonth('loading_date', '>', ((float)\Carbon\Carbon::now()->format('m') - 1))->whereYear('loading_date', \Carbon\Carbon::now()->format('Y'))->get();
// $containers = Container::whereIn('reference', ['cs-6062', 'eps-3926', 'sh-1122', 'sh-1121', 'eps-3925', 'cs-6060', 'eps-3927', 'cs-6066', 'cs-6069'])->get();
$containers = Container::whereMonth('loading_date', '>=', ((float)\Carbon\Carbon::now()->format('m') - 2))->whereYear('loading_date', (float)\Carbon\Carbon::now()->format('Y'))->get();
foreach ($containers as $container){
$packingLists = $container->packingLists()->get()->filter(function ($packingList) {
return $packingList->owner->company_module_id === 248;
@@ -297,7 +296,7 @@ Route::get('/customer/summary/monthly', function () {
if (!count($packingLists)) continue;
echo '<table>
echo '<table style="width: 100%; text-align: center;">
<tr>
<th>Date</th>
<th>Full Marking</th>
@@ -316,7 +315,7 @@ Route::get('/customer/summary/monthly', function () {
$packages = $packingList->packages;
foreach ($packages as $package){
echo '<tr>
<td>-</td>
<td>'.$container->loading_date->format('d-m-Y').'</td>
<td>MS/CIEF/769SMC/'.$packingList->owner->reference.'</td>
<td>'.$container->reference.'</td>
<td>'.$package->description.'</td>