webmaster/merchbay_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added tracking module

Browse Source
This commit is contained in:
franknstayn
2022-01-14 17:52:14 +08:00
parent 54b03986cf
commit e54f9e7db6
5 changed files with 162 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Http/Controllers/admin/AdminController.php
View File

@@ -802,7 +802,7 @@ class AdminController extends Controller
$new_front_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $new_front_visualize_filename = $this->generateFileName($orig_front_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_front_visualize_filename, fopen($request->file('front_visualizer'), 'r+'));
$data_front_visualizer = array( $data_front_visualizer = array(
@@ -826,7 +826,7 @@ class AdminController extends Controller
$new_back_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $new_back_visualize_filename = $this->generateFileName($orig_front_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_back_visualize_filename, fopen($request->file('back_visualizer'), 'r+'));
$data_back_visualizer = array( $data_back_visualizer = array(
@@ -848,7 +848,7 @@ class AdminController extends Controller
$new_right_visualize_filename = $this->generateFileName($orig_right_visualize_filename); $new_right_visualize_filename = $this->generateFileName($orig_right_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_right_visualize_filename, fopen($request->file('right_visualizer'), 'r+'));
$data_right_visualizer = array( $data_right_visualizer = array(
@@ -870,7 +870,7 @@ class AdminController extends Controller
$new_left_visualize_filename = $this->generateFileName($orig_left_visualize_filename); $new_left_visualize_filename = $this->generateFileName($orig_left_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_left_visualize_filename, fopen($request->file('left_visualizer'), 'r+'));
$data_left_visualizer = array( $data_left_visualizer = array(
@@ -1013,7 +1013,7 @@ class AdminController extends Controller
$new_visualizer_thumbnail_filename = $this->generateFileName($orig_visualizer_thumbnail_filename); $new_visualizer_thumbnail_filename = $this->generateFileName($orig_visualizer_thumbnail_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_thumbnail_path . $new_visualizer_thumbnail_filename, fopen($request->file('visualizer_thumbnail'), 'r+'));
$template_thumbnail = $template_thumbnail_path . $new_visualizer_thumbnail_filename; $template_thumbnail = $template_thumbnail_path . $new_visualizer_thumbnail_filename;
} else { } else {
@@ -1067,7 +1067,7 @@ class AdminController extends Controller
$new_front_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $new_front_visualize_filename = $this->generateFileName($orig_front_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_front_visualize_filename, fopen($request->file('front_visualizer'), 'r+'));
$data_front_visualizer = array( $data_front_visualizer = array(
@@ -1094,7 +1094,7 @@ class AdminController extends Controller
$new_back_visualize_filename = $this->generateFileName($orig_front_visualize_filename); $new_back_visualize_filename = $this->generateFileName($orig_front_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_back_visualize_filename, fopen($request->file('back_visualizer'), 'r+'));
$data_back_visualizer = array( $data_back_visualizer = array(
@@ -1121,7 +1121,7 @@ class AdminController extends Controller
$new_right_visualize_filename = $this->generateFileName($orig_right_visualize_filename); $new_right_visualize_filename = $this->generateFileName($orig_right_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_right_visualize_filename, fopen($request->file('right_visualizer'), 'r+'));
$data_right_visualizer = array( $data_right_visualizer = array(
@@ -1148,7 +1148,7 @@ class AdminController extends Controller
$new_left_visualize_filename = $this->generateFileName($orig_left_visualize_filename); $new_left_visualize_filename = $this->generateFileName($orig_left_visualize_filename);
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $templateCode . '/DISPLAY/' . $new_left_visualize_filename, fopen($request->file('left_visualizer'), 'r+'));
$data_left_visualizer = array( $data_left_visualizer = array(
@@ -1226,7 +1226,7 @@ class AdminController extends Controller
$rawName = $request->file('uploadPrintFiles')[$i]->getClientOriginalName(); $rawName = $request->file('uploadPrintFiles')[$i]->getClientOriginalName();
$filesystem = Storage::disk('sftp'); $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+')); $filesystem->put($template_path . $rawName, fopen($request->file('uploadPrintFiles')[$i], 'r+'));
$data = array( $data = array(
@@ -1300,9 +1300,9 @@ class AdminController extends Controller
$AdminModel = new AdminModel; $AdminModel = new AdminModel;
$newStoreId = $newStore; $newStoreId = $newStore;
$storeProducts = $AdminModel->selectTeamstoreProducts('TeamStoreId', $storeid); $storeProducts = $AdminModel->selectTeamstoreProducts('TeamStoreId', $storeid);
foreach($storeProducts as $product) { foreach ($storeProducts as $product) {
$productId = $product->Id; $productId = $product->Id;
unset($product->Id); unset($product->Id);
unset($product->DateCreated); unset($product->DateCreated);
@@ -1317,13 +1317,28 @@ class AdminController extends Controller
var_dump($response); var_dump($response);
$productThumbnails = $AdminModel->selectProductThumbnail($productId); $productThumbnails = $AdminModel->selectProductThumbnail($productId);
foreach($productThumbnails as $productThumbnail) { foreach ($productThumbnails as $productThumbnail) {
unset($productThumbnail->Id); unset($productThumbnail->Id);
unset($productThumbnail->DateCreated); unset($productThumbnail->DateCreated);
$productThumbnail->ProductId = $response['lastId']; $productThumbnail->ProductId = $response['lastId'];
$AdminModel->insertProductThumbnails(json_decode(json_encode($productThumbnail), true)); $AdminModel->insertProductThumbnails(json_decode(json_encode($productThumbnail), true));
var_dump($productThumbnail); 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);
}
} }

1
app/Http/routes.php
View File

@@ -89,6 +89,7 @@ Route::group(['middleware' => 'auth'], function () {
// End Download Routes ///////////// // End Download Routes /////////////
Route::get('tax-settings', 'admin\AdminController@taxIndex'); Route::get('tax-settings', 'admin\AdminController@taxIndex');
Route::get('tracking', 'admin\AdminController@trackingIndex');
Route::post('post/update-hibernate', 'admin\AdminController@updateHibernate'); Route::post('post/update-hibernate', 'admin\AdminController@updateHibernate');

11
app/Models/admin/AdminModel.php
View File

@@ -533,4 +533,15 @@ class AdminModel extends Model
return $i; 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;
}
} }

5
resources/views/admin/sidebar.blade.php
View File

@@ -91,6 +91,11 @@
<i class="fa fa-money"></i> <span>Tax Settings</span> <i class="fa fa-money"></i> <span>Tax Settings</span>
</a> </a>
</li> </li>
<li class="{{ Request::is('admin/tracking') ? 'active' : '' }}">
<a href="{{ url('/admin/tracking') }}">
<i class="fa fa-compass"></i> <span>Tracking</span>
</a>
</li>
@php $under_reports = array("/admin/reports", "/admin/commission") @endphp @php $under_reports = array("/admin/reports", "/admin/commission") @endphp
<li class="treeview {{ (in_array($getrequest_url, $under_reports)) ? 'active' : '' }}"> <li class="treeview {{ (in_array($getrequest_url, $under_reports)) ? 'active' : '' }}">
<a href="#"><i class="fa fa-line-chart"></i> <span>Reports</span> <a href="#"><i class="fa fa-line-chart"></i> <span>Reports</span>

115
resources/views/admin_pages/tracking_index.blade.php Normal file
View File

@@ -0,0 +1,115 @@
@extends('admin.main')
@section('content')
<style>
.previewImage {
height: 150px;
width: 95%;
overflow: hidden;
object-fit: contain;
}
</style>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
Tracking
<!-- <small>Optional description</small> -->
</h1>
<ol class="breadcrumb">
<li><a href="{{ url('admin') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active"> Tracking</li>
</ol>
</section>
<!-- Main content -->
<section class="content container-fluid">
<div class="row">
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<h4 class="box-title">Tracking</h4>
{{-- <button class="btn btn-primary pull-right" data-toggle="modal" data-target="#modal_show_stores"> <i class="fa fa-plus"></i> Add</button> --}}
</div>
<div class="box-body">
<div class="row">
{{-- <div class="col-md-3">
<div class="form-group">
<label class="control-label">Filter By Store</label>
<div id="store_filter"></div>
</div>
</div> --}}
<div class="col-md-12" style="margin-bottom: 20px">
<form action="{{ url('admin/tracking') }}">
<div class="input-group">
{{-- <input type="hidden" class="form-control" name="invoiceNumber"> --}}
<input type="text" class="form-control"
value="{{ Request::get('invoiceNumber') }}" name="invoiceNumber"
placeholder="Enter Invoice Number" required>
<span class="input-group-btn">
<button class="btn btn-default" type="submit">Submit</button>
</span>
</div><!-- /input-group -->
</form>
</div>
<div class="col-md-12">
<table class="table table-bordered table-condensed">
<thead>
<tr>
<th>Invoice Number</th>
<th>Tracking Status</th>
<th>Scanned By</th>
<th>Date Created</th>
</tr>
</thead>
<tbody>
@if (count($tracking) > 0)
@foreach ($tracking as $track)
<tr>
<td>{{ $track->InvoiceNumber }}</td>
<td>{{ $track->StepLabel }}</td>
<td>{{ $track->Name }}</td>
<td>{{ $track->DateCreated }}</td>
</tr>
@endforeach
@else
<tr>
<td colspan="4" colspan="text-center">No Record Found</td>
</tr>
@endif
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<!-- /.content -->
</div>
{{-- <div class="modal fade" id="modal_show_stores" role="dialog">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">List of Teamstore</h4>
</div>
<div class="modal-body">
<div id="modal_store_order_details_body_content">
<p> Loading content <i class="fa fa-spinner fa-spin"></i> </p>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div> --}}
@endsection