cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard

Browse Source
This commit is contained in:
edmondlang
2024-04-02 11:53:43 +08:00
parent 3deba3468a dc61f23fa8
commit a4cb2b2066
49 changed files with 513 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/web.php
+83 -6
View File
@@ -139,16 +139,16 @@ Route::get('/transfer/{marking}/latest/{document_type}', function ($marking, $do
$lowercaseDocumentType = null;
switch ($document_type) {
case 'po':
case 'po':
$lowercaseDocumentType = DocumentType::PURCHASE_ORDER;
break;
case 'do':
case 'do':
$lowercaseDocumentType = DocumentType::DELIVER_ORDER;
break;
case 'sdo':
case 'sdo':
$lowercaseDocumentType = DocumentType::SUPPLIER_DELIVER_ORDER;
break;
default:
default:
$lowercaseDocumentType = DocumentType::INVOICE;
break;
}
@@ -879,8 +879,14 @@ Route::get('/vouchers', function () {
})->name('rewards');
Route::get('/customer/vouchers/{marking}', function ($marking) {
$id = \App\Models\Company::where('reference', '=', $marking)->first()->employees->first()->id;
return view('pages.customers.reward', ['id' => $id]);
$company = \App\Models\Company::where('reference', '=', $marking)->first();
if($company){
$id = $company->employees->first()->id;
return view('pages.customers.reward', ['id' => $id]);
}
else{
abort(404);
}
})->name('customer.reward');
Route::get('transaction/{id}/credit_note/download', 'Transactions\GenerateCreditNotePdfController@download')->name('transaction.credit_note.download');
@@ -961,3 +967,74 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
}
);
})->name('invoice.fix.byCustomerMarking');
Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', function ($from_date, $to_date) {
$approvedTransactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->where('owner_type', '!=', Wallet::class)->orderBy('status')->get();
echo '<h1>Pending Orders Payments</h1>';
echo '<table style="border-collapse: collapse;">';
echo '<thead>';
echo '<tr>';
echo '<th style="border: 1px solid black;">Booking</th>';
echo '<th style="border: 1px solid black;">Amount</th>';
echo '<th style="border: 1px solid black;">Payment Date</th>';
echo '<th style="border: 1px solid black;">Status</th>';
echo '</tr>';
echo '</thead>';
echo '<tbody>';
foreach ($approvedTransactions as $approvedTransaction) {
echo '<tr>';
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $approvedTransaction->owner->marking) . '" target="_blank">' . $approvedTransaction->owner->marking . '</a></td>';
echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</td>';
echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>';
echo '</tr>';
}
echo '</tbody>';
echo '</table>';
$startDate = Carbon::createFromFormat('d-m-Y', $from_date)->startOfDay();
$endDate = Carbon::createFromFormat('d-m-Y', $to_date)->endOfDay();
echo '<h1>Bills in the date range</h1>';
echo '<table style="border-collapse: collapse; width: 100%;">';
echo '<thead>';
echo '<tr>';
echo '<th style="border: 1px solid black;">Booking</th>';
echo '<th style="border: 1px solid black;">Amount</th>';
echo '<th style="border: 1px solid black;">Customer payment date</th>';
echo '<th style="border: 1px solid black;">White form date</th>';
echo '<th style="border: 1px solid black;">Supplier</th>';
echo '<th style="border: 1px solid black;">Upload bank slip Date</th>';
echo '<th style="border: 1px solid black;">PO submit date</th>';
echo '<th style="border: 1px solid black;">PO approve date</th>';
echo '</tr>';
echo '</thead>';
echo '<tbody>';
$bills = Transaction::where('type', TransactionType::BILL)->whereBetween('created_at', [$startDate, $endDate])->get();
foreach ($bills as $bill) {
echo '<tr>';
$payment = $bill->owner;
$po = $payment->owner->transactions()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first();
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $bill->owner->owner->marking) . '" target="_blank">' . $payment->owner->marking . '</a></td>';
echo '<td style="border: 1px solid black;">' . round($payment->amount, 2) . '</td>';
echo '<td style="border: 1px solid black;">' . $payment->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->issuerCompany->name . '</td>';
echo '<td style="border: 1px solid black; color: '.($bill->status === ApprovalStatus::APPROVED ? "green" : "red").';">' . ($bill->status === ApprovalStatus::APPROVED ? $bill->updated_at->format('d-m-Y h:i A') : 'Pending Upload') . '</td>';
echo '<td style="border: 1px solid black; color: '.($po ? "green" : "red").';">' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . '</td>';
echo '<td style="border: 1px solid black;">' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at->format('d-m-Y h:i A') : '' ) : '' ). '</td>';
echo '</tr>';
}
echo '</tbody>';
echo '</table>';
});