diff --git a/app/Classes/General/Eloquent/Filters/IssuerNot.php b/app/Classes/General/Eloquent/Filters/IssuerNotIn.php similarity index 74% rename from app/Classes/General/Eloquent/Filters/IssuerNot.php rename to app/Classes/General/Eloquent/Filters/IssuerNotIn.php index 77423b5d..61ca4f4c 100644 --- a/app/Classes/General/Eloquent/Filters/IssuerNot.php +++ b/app/Classes/General/Eloquent/Filters/IssuerNotIn.php @@ -4,7 +4,7 @@ namespace App\Classes\General\Eloquent\Filters; use Illuminate\Database\Eloquent\Builder; -class IssuerNot implements Filter +class IssuerNotIn implements Filter { /** @@ -14,7 +14,7 @@ class IssuerNot implements Filter */ public static function apply(Builder $builder, $value) { - return $builder->where('issuer', '!=', $value); + return $builder->whereNotIn('issuer', $value); } } \ No newline at end of file diff --git a/resources/views/pages/bookings.blade.php b/resources/views/pages/bookings/index.blade.php similarity index 100% rename from resources/views/pages/bookings.blade.php rename to resources/views/pages/bookings/index.blade.php diff --git a/resources/views/pages/booking_merge.blade.php b/resources/views/pages/bookings/merge.blade.php similarity index 100% rename from resources/views/pages/booking_merge.blade.php rename to resources/views/pages/bookings/merge.blade.php diff --git a/resources/views/pages/booking_details.blade.php b/resources/views/pages/bookings/profile.blade.php similarity index 100% rename from resources/views/pages/booking_details.blade.php rename to resources/views/pages/bookings/profile.blade.php diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php new file mode 100644 index 00000000..df395982 --- /dev/null +++ b/resources/views/pages/currency_orders.blade.php @@ -0,0 +1,120 @@ +@extends('layouts.base_portal') +@section('inner_content') +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Payment Proof
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Verification
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
Complete
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/pages/dashboards/account_admin.blade.php b/resources/views/pages/dashboards/account_admin.blade.php index 51ce8ebe..3e6f0c87 100644 --- a/resources/views/pages/dashboards/account_admin.blade.php +++ b/resources/views/pages/dashboards/account_admin.blade.php @@ -2,7 +2,14 @@
- + + + +
+
+ diff --git a/routes/web.php b/routes/web.php index fbfed07c..b2b61059 100644 --- a/routes/web.php +++ b/routes/web.php @@ -55,8 +55,12 @@ Route::get('/payments', function () { return view('pages.payments'); })->name('payments'); +Route::get('/currency_orders', function () { + return view('pages.currency_orders'); +})->name('payments'); + Route::get('/bookings', function () { - return view('pages.bookings'); + return view('pages.bookings.index'); })->name('bookings'); Route::get('/bookings/urgent', function () { @@ -64,42 +68,12 @@ Route::get('/bookings/urgent', function () { })->name('bookings.urgent'); Route::get('/transfer/{marking}', function ($marking) { - return view('pages.booking_details', ['marking' => $marking]); + return view('pages.bookings.profile', ['marking' => $marking]); })->name('booking.details'); Route::get('/transfer/merge/{marking}', function ($marking) { - return view('pages.booking_merge', ['marking' => $marking]); + return view('pages.bookings.merge', ['marking' => $marking]); })->name('booking.merge'); -Route::get('/test', function(){ - - Auth::login(User::findOrFail(1)); - try { - $zip_file = 'cief_oct_to_nov_11_delivery_orders.zip'; // Name of our archive to download - $zip = new ZipArchive(); - if ($zip->open(storage_path().'/'.$zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE) === TRUE) { - - //whereMonth('created_at', 5)->whereYear('created_at', 2021)-> - $bookings = \App\Models\Booking::where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::COMPLETED)->where('updated_at', '>=', Carbon::parse('01-10-2021'))->get(); - - foreach ($bookings as $booking) { - $file = $booking->documents()->where('document_type', \App\Classes\ValueObjects\Constants\DocumentType::SUPPLIER_DELIVER_ORDER)->first()->files()->first(); - if (! $zip->addFile(Storage::disk('documents')->path($file->file->file_info->original->file), $booking->created_at->format('d_m_Y').'_'.$booking->marking.'.pdf')) { - echo 'Could not add file to ZIP: ' . $file; - } - } - - // Close ZipArchive - $zip->close(); - } else { - echo 'Could not open ZIP file.'; - } - } catch (Exception $exception) { - dd($exception); - } - - -}); - Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export'); Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');