diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index 52d7a03..51c819e 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -802,7 +802,7 @@ class AdminController extends Controller $new_front_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_front_visualize_filename, fopen($request->file('front_visualizer'), 'r+')); $data_front_visualizer = array( @@ -826,7 +826,7 @@ class AdminController extends Controller $new_back_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_back_visualize_filename, fopen($request->file('back_visualizer'), 'r+')); $data_back_visualizer = array( @@ -848,7 +848,7 @@ class AdminController extends Controller $new_right_visualize_filename = $this->generateFileName($orig_right_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_right_visualize_filename, fopen($request->file('right_visualizer'), 'r+')); $data_right_visualizer = array( @@ -870,7 +870,7 @@ class AdminController extends Controller $new_left_visualize_filename = $this->generateFileName($orig_left_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_left_visualize_filename, fopen($request->file('left_visualizer'), 'r+')); $data_left_visualizer = array( @@ -1013,7 +1013,7 @@ class AdminController extends Controller $new_visualizer_thumbnail_filename = $this->generateFileName($orig_visualizer_thumbnail_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_thumbnail_path . $new_visualizer_thumbnail_filename, fopen($request->file('visualizer_thumbnail'), 'r+')); $template_thumbnail = $template_thumbnail_path . $new_visualizer_thumbnail_filename; } else { @@ -1067,7 +1067,7 @@ class AdminController extends Controller $new_front_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_front_visualize_filename, fopen($request->file('front_visualizer'), 'r+')); $data_front_visualizer = array( @@ -1094,7 +1094,7 @@ class AdminController extends Controller $new_back_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_back_visualize_filename, fopen($request->file('back_visualizer'), 'r+')); $data_back_visualizer = array( @@ -1121,7 +1121,7 @@ class AdminController extends Controller $new_right_visualize_filename = $this->generateFileName($orig_right_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_right_visualize_filename, fopen($request->file('right_visualizer'), 'r+')); $data_right_visualizer = array( @@ -1148,7 +1148,7 @@ class AdminController extends Controller $new_left_visualize_filename = $this->generateFileName($orig_left_visualize_filename); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_left_visualize_filename, fopen($request->file('left_visualizer'), 'r+')); $data_left_visualizer = array( @@ -1226,7 +1226,7 @@ class AdminController extends Controller $rawName = $request->file('uploadPrintFiles')[$i]->getClientOriginalName(); $filesystem = Storage::disk('sftp'); - $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); + $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->put($template_path . $rawName, fopen($request->file('uploadPrintFiles')[$i], 'r+')); $data = array( @@ -1300,9 +1300,9 @@ class AdminController extends Controller $AdminModel = new AdminModel; $newStoreId = $newStore; $storeProducts = $AdminModel->selectTeamstoreProducts('TeamStoreId', $storeid); - - foreach($storeProducts as $product) { - + + foreach ($storeProducts as $product) { + $productId = $product->Id; unset($product->Id); unset($product->DateCreated); @@ -1317,13 +1317,28 @@ class AdminController extends Controller var_dump($response); $productThumbnails = $AdminModel->selectProductThumbnail($productId); - foreach($productThumbnails as $productThumbnail) { + foreach ($productThumbnails as $productThumbnail) { unset($productThumbnail->Id); unset($productThumbnail->DateCreated); $productThumbnail->ProductId = $response['lastId']; $AdminModel->insertProductThumbnails(json_decode(json_encode($productThumbnail), true)); var_dump($productThumbnail); - } + } } } + + + public function trackingIndex() + { + $AdminModel = new AdminModel; + // + $invoice = request()->get('invoiceNumber'); + $getTrackingStatus = []; + if ($invoice) { + // var_dump($invoice); + $getTrackingStatus = $AdminModel->getTrackingStatus($invoice); + // var_dump($getTrackingStatus); + } + return view('admin_pages.tracking_index')->with("tracking", $getTrackingStatus); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index fd73630..2efe5f0 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -89,6 +89,7 @@ Route::group(['middleware' => 'auth'], function () { // End Download Routes ///////////// Route::get('tax-settings', 'admin\AdminController@taxIndex'); + Route::get('tracking', 'admin\AdminController@trackingIndex'); Route::post('post/update-hibernate', 'admin\AdminController@updateHibernate'); diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index d160407..b9b45ff 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -533,4 +533,15 @@ class AdminModel extends Model return $i; } + + function getTrackingStatus($invoice) { + $i = DB::select("SELECT t.InvoiceNumber, ts.StepLabel, pu.Name, DATE_FORMAT(t.created_at, '%m/%d/%Y %h:%i:%s %p') AS DateCreated + FROM tracking AS t + INNER JOIN tracking_steps AS ts ON ts.Id = t.StepId + INNER JOIN production_user AS pu ON t.ScannedBy = pu.Id + WHERE t.InvoiceNumber = '$invoice'"); + + return $i; + } + } diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php index 23650d7..83de906 100644 --- a/resources/views/admin/sidebar.blade.php +++ b/resources/views/admin/sidebar.blade.php @@ -91,6 +91,11 @@ Tax Settings +
  • + + Tracking + +
    • @php $under_reports = array("/admin/reports", "/admin/commission") @endphp
  • Reports diff --git a/resources/views/admin_pages/tracking_index.blade.php b/resources/views/admin_pages/tracking_index.blade.php new file mode 100644 index 0000000..fdd4d79 --- /dev/null +++ b/resources/views/admin_pages/tracking_index.blade.php @@ -0,0 +1,115 @@ +@extends('admin.main') +@section('content') + +
    + +
    +

    + Tracking + +

    +
      +
    1. Dashboard
      2. +
    2. Tracking
      3. +
    +
    + + +
    +
    +
    +
    +
    +

    Tracking

    + {{-- --}} +
    +
    +
    + + {{--
    +
    + +
    +
    +
    --}} +
    +
    +
    + + {{-- --}} + + + + + +
    +
    +
    +
    + + + + + + + + + + + @if (count($tracking) > 0) + @foreach ($tracking as $track) + + + + + + + + @endforeach + @else + + + + @endif + + +
    Invoice NumberTracking StatusScanned ByDate Created
    {{ $track->InvoiceNumber }}{{ $track->StepLabel }}{{ $track->Name }}{{ $track->DateCreated }}
    No Record Found
    +
    +
    +
    +
    +
    +
    +
    + +
    + {{-- --}} +@endsection