added tracking module
This commit is contained in:
@@ -1326,4 +1326,19 @@ class AdminController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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');
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
115
resources/views/admin_pages/tracking_index.blade.php
Normal 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">×</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
|
||||||
Reference in New Issue
Block a user