From f2dd4d29377e87fc5c173a4fef6adb3def47100a Mon Sep 17 00:00:00 2001 From: franknstayn Date: Thu, 3 Feb 2022 20:18:00 +0800 Subject: [PATCH] added order status list --- .../Controllers/admin/AdminController.php | 88 ++++--- app/Http/routes.php | 6 +- app/Models/admin/AdminModel.php | 24 ++ resources/views/admin/main.blade.php | 62 ++++- resources/views/admin/sidebar.blade.php | 248 ++++++++++-------- .../views/admin_pages/home_carousel.blade.php | 119 +++++++++ .../views/admin_pages/order_status.blade.php | 118 +++++++++ 7 files changed, 517 insertions(+), 148 deletions(-) create mode 100644 resources/views/admin_pages/home_carousel.blade.php create mode 100644 resources/views/admin_pages/order_status.blade.php diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index 35cdff2..3cd32aa 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -12,7 +12,8 @@ use Illuminate\Support\Facades\Validator; // use Validator; use App\User; use Illuminate\Support\Facades\Session; -use Excel; +use Maatwebsite\Excel\Facades\Excel; +// use Maatwebsite\Excel\Excel; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\DB; use Carbon\Carbon; @@ -1349,52 +1350,65 @@ class AdminController extends Controller } - public function importExcel(Request $request){ + public function importExcel(Request $request) + { //validate the xls file $this->validate($request, array( - 'file' => 'required' + 'file' => 'required' )); - if($request->hasFile('file')){ - $extension = File::extension($request->file->getClientOriginalName()); - if ($extension == "xlsx" || $extension == "xls" || $extension == "csv") { + if ($request->hasFile('file')) { + $extension = File::extension($request->file->getClientOriginalName()); + if ($extension == "xlsx" || $extension == "xls" || $extension == "csv") { - $path = $request->file->getRealPath(); - $data = Excel::load($path, function($reader) { - })->get(); - if(!empty($data) && $data->count()){ + $path = $request->file->getRealPath(); + $data = Excel::load($path, function ($reader) { + })->get(); + if (!empty($data) && $data->count()) { - // var_dump($data); + // var_dump($data); - foreach ($data as $key => $value) { - $insert[] = [ - 'TrackingNumber' => $value->tracking_number, - 'InvoiceNumber' => $value->invoice_number, - 'Carrier' => $value->carrier, - 'StepId' => 10, - 'ScannedBy' => 1, - 'created_at'=> Carbon::now() - ]; - } + foreach ($data as $key => $value) { + $insert[] = [ + 'TrackingNumber' => $value->tracking_number, + 'InvoiceNumber' => $value->invoice_number, + 'Carrier' => $value->carrier, + 'StepId' => 10, + 'ScannedBy' => 1, + 'created_at' => Carbon::now() + ]; + } - if(!empty($insert)){ + if (!empty($insert)) { - $insertData = DB::table('tracking')->insert($insert); - if ($insertData) { - Session::flash('success', 'Your Data has successfully imported'); - }else { - Session::flash('error', 'Error inserting the data..'); - return back(); - } - } + $insertData = DB::table('tracking')->insert($insert); + if ($insertData) { + Session::flash('success', 'Your Data has successfully imported'); + } else { + Session::flash('error', 'Error inserting the data..'); + return back(); } - - return back(); - - }else { - Session::flash('error', 'File is a '.$extension.' file.!! Please upload a valid xls/csv file..!!'); - return back(); + } } + + return back(); + } else { + Session::flash('error', 'File is a ' . $extension . ' file.!! Please upload a valid xls/csv file..!!'); + return back(); + } } -} + } + + public function homeCarousel() + { + $AdminModel = new AdminModel; + $selectHomeCarousel = $AdminModel->selectHomeCarousel(); + return view('admin_pages.home_carousel')->with("carousels", $selectHomeCarousel); + } + + public function orderStatus() { + $AdminModel = new AdminModel; + $selectOrderStatus = $AdminModel->selectOrderStatus(); + return view('admin_pages.order_status')->with("order_status", $selectOrderStatus); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 1be0dff..f83117e 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -96,7 +96,11 @@ Route::group(['middleware' => 'auth'], function () { - Route::get('duplicate-store/{id}/{newstore_id}', 'admin\AdminController@duplicateStore' ); + Route::get('duplicate-store/{id}/{newstore_id}', 'admin\AdminController@duplicateStore'); + + + Route::get('home-carousel', 'admin\AdminController@homeCarousel'); + Route::get('order-status', 'admin\AdminController@orderStatus'); }); }); diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index 1e56d62..ab3a8cc 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -601,4 +601,28 @@ class AdminModel extends Model return $i; } + + function selectHomeCarousel() + { + $i = DB::table('home_carousel')->get(); + return $i; + } + + + function selectOrderStatus() + { + $i = DB::select("SELECT t.StoreName, pd.InvoiceNumber, o.ProductName, ( + SELECT ts.StepLabel + FROM tracking AS tr + LEFT JOIN tracking_steps AS ts ON tr.StepId = ts.Id + WHERE tr.InvoiceNumber = pd.InvoiceNumber + ORDER BY tr.StepId DESC + LIMIT 1 + ) AS OrderStatus, pd.DateCreated + FROM orders AS o + INNER JOIN teamstores AS t ON t.Id = o.StoreId + INNER JOIN payment_details AS pd ON pd.CartKey = o.CartKey"); + + return $i; + } } diff --git a/resources/views/admin/main.blade.php b/resources/views/admin/main.blade.php index 49021d0..cbc2be2 100644 --- a/resources/views/admin/main.blade.php +++ b/resources/views/admin/main.blade.php @@ -327,7 +327,7 @@ desired effect $.fn.dataTable.ext.search.push( function (settings, data, dataIndex) { - if (settings.nTable.id !=='tbl_store_orders') { + if (settings.nTable.id !=='tbl_store_orders' || settings.nTable.id !=='tbl_order_status') { return true; } var min = $('#min').datepicker("getDate"); @@ -342,7 +342,61 @@ desired effect }, ); - + + var tbl_order_status = $('#tbl_order_status').DataTable({ + initComplete: function () { + this.api().columns(0).every( function () { + var column = this; + var select = $('') + .appendTo( $('#tbl_order_status_filter').empty() ) + .on( 'change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); + + column + .search( val ? '^'+val+'$' : '', true, false ) + .draw(); + } ); + + column.data().unique().sort().each( function ( d, j ) { + select.append( '' ) + } ); + } ); + }, + autoWidth: false, + // scrollX: true, + dom: 'Bfrtip', + buttons: [ + { + extend: 'csv', + exportOptions: { + columns: [ 0, 1, 2, 3, 4] + }, + className : "btn btn-default", + text: " CSV", + title : function() { + return "ORDER STATUS REPORTS"; + } + }, + { + extend: 'excel', + exportOptions: { + columns: [ 0, 1, 2, 3, 4] + }, + className : "btn btn-default", + text: " Excel", + title : function() { + return "ORDER STATUS REPORTS"; + } + } + ], + columnDefs: [ + { targets: 4, type: 'date', visible: false }, + { targets: 4, type: 'date' } + ], + }); + var table = $('#tbl_store_orders').DataTable({ initComplete: function () { @@ -401,6 +455,10 @@ desired effect $("#min").datepicker({ onSelect: function () { table.draw(); }, changeMonth: true, changeYear: true }); $("#max").datepicker({ onSelect: function () { table.draw(); }, changeMonth: true, changeYear: true }); + + $("#min").datepicker({ onSelect: function () { tbl_order_status.draw(); }, changeMonth: true, changeYear: true }); + $("#max").datepicker({ onSelect: function () { tbl_order_status.draw(); }, changeMonth: true, changeYear: true }); + $(document).on('a click', '.btn-order-item-details', function(e){ e.preventDefault(); diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php index 83de906..44e3000 100644 --- a/resources/views/admin/sidebar.blade.php +++ b/resources/views/admin/sidebar.blade.php @@ -1,116 +1,148 @@ \ No newline at end of file + @php $under_clipart_management = array("/admin/cliparts", "/admin/overlay-pattern", "/admin/clipart-add", "/admin/clipart-categories") @endphp +
  • + Clipart Management + + + + + +
    • + @php $under_visualizer_management = array("/admin/visualizer/add", "/admin/visualizer") @endphp +
  • + Visualizer Management + + + + + +
    • + @php $under_print_file = array("/admin/print-files", "/admin/upload-print-file") @endphp +
  • + Print File Management + + + + + +
    • +
  • + + Print Orders + +
    • +
  • + + Tax Settings + +
    • +
  • + + Tracking + +
    • + + @php $under_reports = array("/admin/reports", "/admin/commission") @endphp +
  • + Reports + + + + + +
    • +
  • + + Home Carousel + +
    • + + + + + + diff --git a/resources/views/admin_pages/home_carousel.blade.php b/resources/views/admin_pages/home_carousel.blade.php new file mode 100644 index 0000000..c53a4e1 --- /dev/null +++ b/resources/views/admin_pages/home_carousel.blade.php @@ -0,0 +1,119 @@ +@extends('admin.main') +@section('content') + +
    + +
    +

    + Home Carousel + +

    +
      +
    1. Dashboard
      2. +
    2. Home Carousel
      3. +
    +
    + + +
    +
    +
    +
    +
    +

    Home Carousel

    + {{-- --}} +
    +
    +
    + + {{--
    +
    + +
    +
    +
    --}} +
    + + + + + + + + + + + + @if (count($carousels) > 0) + @foreach ($carousels as $carousel) + + + + + + + + @endforeach + @else + + + + @endif + + +
    ImageLinkIs ActiveDate CreatedActions
    {{ $carousel->Image }}{{ $carousel->Link }} + @if ($carousel->IsActive) + Yes + @else + No + @endif + + {{ $carousel->created_at }} + {{--
    + IsActive) checked @endif + id="store_hibernate" name="store_hibernate" + data-toggle="toggle" data-width="100px" + data-on=" Active" + data-off=" Deactivated" + data-size="small"> +
    --}} + + +
    No Record Found
    +
    +
    +
    +
    +
    +
    +
    + +
    + +@endsection diff --git a/resources/views/admin_pages/order_status.blade.php b/resources/views/admin_pages/order_status.blade.php new file mode 100644 index 0000000..e5b0b0d --- /dev/null +++ b/resources/views/admin_pages/order_status.blade.php @@ -0,0 +1,118 @@ +@extends('admin.main') +@section('content') + +
    + +
    +

    + Order Status + +

    +
      +
    1. Dashboard
      2. +
    2. Order Status
      3. +
    +
    + + +
    +
    +
    +
    +
    +

    Order Status

    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + @if (count($order_status) > 0) + @foreach ($order_status as $item) + + + + + + + + + @endforeach + @else + + + + @endif + + +
    TeamstoreInvoice No.Product NameOrder StatusDate Ordered
    {{ $item->StoreName }}{{ $item->InvoiceNumber }}{{ $item->ProductName }}{{ $item->OrderStatus }}{{ date("F j, Y g:i A", strtotime($item->DateCreated)) }}
    No Record Found
    +
    +
    +
    +
    +
    +
    +
    + +
    + +@endsection