diff --git a/routes/web.php b/routes/web.php index 15a092c2..4fe52d89 100644 --- a/routes/web.php +++ b/routes/web.php @@ -492,26 +492,6 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){ ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED]) ->first(); - if(!$invoice) { - echo '

'.$packingList->reference .' Warning: no billing

'; - continue; - } - - $payments = $invoice->transactions() - ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED]) - ->get(); - - $billed += 1; - $containerBilled += 1; - - $totalBilled += $invoice->amount; - $containerTotalBilled += $invoice->amount; - - $totalPaid += $payments->sum('amount'); - $containerTotalPaid += $payments->sum('amount'); - - echo ''.$packingList->reference.' | Amount: '.$invoice->amount.' | Paid: '.$payments->sum('amount').' | Invoice Date: '.$invoice->created_at->format('d-m-Y'). (($invoice->amount - $payments->sum('amount')) < 0.01 ? '' : '('.$invoice->created_at->diffForHumans().')').''; - echo '
'; $packing_list_drop_date = PackingList::where('reference', $packingList->reference)->where('type', 1)->first()->transports->first()->drop_date; $order = $packingList->owner; @@ -555,6 +535,27 @@ Route::get('/container/billing/{month}/{year}', function($month, $year){ echo 'supplier cost:'.$cost; echo '

'; + if(!$invoice) { + echo '

'.$packingList->reference .' Warning: no billing

'; + continue; + } + + $payments = $invoice->transactions() + ->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PAYMENT)->whereIn('status', [\App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED, \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED]) + ->get(); + + $billed += 1; + $containerBilled += 1; + + $totalBilled += $invoice->amount; + $containerTotalBilled += $invoice->amount; + + $totalPaid += $payments->sum('amount'); + $containerTotalPaid += $payments->sum('amount'); + + echo ''.$packingList->reference.' | Amount: '.$invoice->amount.' | Paid: '.$payments->sum('amount').' | Invoice Date: '.$invoice->created_at->format('d-m-Y'). (($invoice->amount - $payments->sum('amount')) < 0.01 ? '' : '('.$invoice->created_at->diffForHumans().')').''; + echo '
'; + } echo '

Container Invoices: '.$containerBilled.'/'.$containerTotalBillable.'

';