added order status list
This commit is contained in:
@@ -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 = $('<select class="form-control"><option value=""></option></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( '<option value="'+d+'">'+d+'</option>' )
|
||||
} );
|
||||
} );
|
||||
},
|
||||
autoWidth: false,
|
||||
// scrollX: true,
|
||||
dom: 'Bfrtip',
|
||||
buttons: [
|
||||
{
|
||||
extend: 'csv',
|
||||
exportOptions: {
|
||||
columns: [ 0, 1, 2, 3, 4]
|
||||
},
|
||||
className : "btn btn-default",
|
||||
text: "<i class=\"fa fa-table\"></i> CSV",
|
||||
title : function() {
|
||||
return "ORDER STATUS REPORTS";
|
||||
}
|
||||
},
|
||||
{
|
||||
extend: 'excel',
|
||||
exportOptions: {
|
||||
columns: [ 0, 1, 2, 3, 4]
|
||||
},
|
||||
className : "btn btn-default",
|
||||
text: "<i class=\"fa fa-file-excel-o\"></i> 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();
|
||||
|
||||
@@ -1,116 +1,148 @@
|
||||
<aside class="main-sidebar">
|
||||
|
||||
<!-- sidebar: style can be found in sidebar.less -->
|
||||
<section class="sidebar">
|
||||
<!-- sidebar: style can be found in sidebar.less -->
|
||||
<section class="sidebar">
|
||||
|
||||
<!-- Sidebar user panel (optional) -->
|
||||
<div class="user-panel">
|
||||
<div class="pull-left image">
|
||||
<img src="{{ asset('/bower_components/admin-lte/dist/img/user-512.png') }}" class="img-circle" alt="User Image">
|
||||
</div>
|
||||
<div class="pull-left info">
|
||||
<p> {{ Auth::user()->name }} </p>
|
||||
<!-- Status -->
|
||||
<a href="#">Administrator</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@php $getrequest_url = Request::getPathInfo() . (Request::getQueryString() ? ('?' . Request::getQueryString()) : ''); @endphp
|
||||
<!-- Sidebar Menu -->
|
||||
<ul class="sidebar-menu" data-widget="tree">
|
||||
<li class="header">Navigation Menu</li>
|
||||
<!-- Optionally, you can add icons to the links -->
|
||||
<li class="{{ Request::is('admin') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin') }}">
|
||||
<i class="fa fa-dashboard"></i> <span>Dashboard</span>
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li class="{{ Request::is('admin/stores') ? 'active' : '' }}">
|
||||
<!-- Sidebar user panel (optional) -->
|
||||
<div class="user-panel">
|
||||
<div class="pull-left image">
|
||||
<img src="{{ asset('/bower_components/admin-lte/dist/img/user-512.png') }}" class="img-circle"
|
||||
alt="User Image">
|
||||
</div>
|
||||
<div class="pull-left info">
|
||||
<p> {{ Auth::user()->name }} </p>
|
||||
<!-- Status -->
|
||||
<a href="#">Administrator</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@php $getrequest_url = Request::getPathInfo() . (Request::getQueryString() ? ('?' . Request::getQueryString()) : ''); @endphp
|
||||
<!-- Sidebar Menu -->
|
||||
<ul class="sidebar-menu" data-widget="tree">
|
||||
<li class="header">Navigation Menu</li>
|
||||
<!-- Optionally, you can add icons to the links -->
|
||||
<li class="{{ Request::is('admin') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin') }}">
|
||||
<i class="fa fa-dashboard"></i> <span>Dashboard</span>
|
||||
</a>
|
||||
</li>
|
||||
<!-- <li class="{{ Request::is('admin/stores') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin/stores') }}">
|
||||
<i class="fa fa-list"></i> <span>Stores</span>
|
||||
</a>
|
||||
</li> -->
|
||||
@php $under_store_management = array("/admin/create-store", "/admin/stores-list") @endphp
|
||||
<li class="treeview {{ (in_array($getrequest_url, $under_store_management)) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-link"></i> <span>Store Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ ($getrequest_url == '/admin/create-store') ? 'class=active' : '' }}><a href="{{ url('/admin/create-store') }}"><i class="fa fa-plus"></i> Create New Store</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/stores-list') ? 'class=active' : '' }}><a href="{{ url('/admin/stores-list') }}"><i class="fa fa-list"></i> List of Stores</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
@php $under_clipart_management = array("/admin/cliparts", "/admin/overlay-pattern", "/admin/clipart-add", "/admin/clipart-categories") @endphp
|
||||
<li class="treeview {{ (in_array($getrequest_url, $under_clipart_management)) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-paint-brush"></i> <span>Clipart Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ ($getrequest_url == '/admin/cliparts') ? 'class=active' : '' }}><a href="{{ url('/admin/cliparts') }}"><i class="fa fa-circle-o"></i> Cliparts</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/clipart-add') ? 'class=active' : '' }}><a href="{{ url('/admin/clipart-add') }}"><i class="fa fa-circle-o"></i> Add Clipart</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/clipart-categories') ? 'class=active' : '' }}><a href="{{ url('/admin/clipart-categories') }}"><i class="fa fa-circle-o"></i> Clipart Categories</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/overlay-pattern') ? 'class=active' : '' }}><a href="{{ url('/admin/overlay-pattern') }}"><i class="fa fa-circle-o"></i> Overlay Pattern</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@php $under_visualizer_management = array("/admin/visualizer/add", "/admin/visualizer") @endphp
|
||||
<li class="treeview {{ (in_array($getrequest_url, $under_visualizer_management)) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-paint-brush"></i> <span> Visualizer Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ ($getrequest_url == '/admin/visualizer') ? 'class=active' : '' }}><a href="{{ url('/admin/visualizer') }}"><i class="fa fa-circle-o"></i> Visualizer</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/visualizer/add') ? 'class=active' : '' }}><a href="{{ url('/admin/visualizer/add') }}"><i class="fa fa-circle-o"></i> Add Visualizer</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@php $under_print_file = array("/admin/print-files", "/admin/upload-print-file") @endphp
|
||||
<li class="treeview {{ (in_array($getrequest_url, $under_print_file)) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-paint-brush"></i> <span>Print File Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ ($getrequest_url == '/admin/print-files') ? 'class=active' : '' }}><a href="{{ url('/admin/print-files') }}"><i class="fa fa-circle-o"></i> Print Files</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/upload-print-file') ? 'class=active' : '' }}><a href="{{ url('/admin/upload-print-file') }}"><i class="fa fa-circle-o"></i> Upload Print File</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="{{ Request::is('admin/orders') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin/orders') }}">
|
||||
<i class="fa fa-list-alt"></i> <span>Print Orders</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="{{ Request::is('admin/tax-settings') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin/tax-settings') }}">
|
||||
<i class="fa fa-money"></i> <span>Tax Settings</span>
|
||||
</a>
|
||||
</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
|
||||
<li class="treeview {{ (in_array($getrequest_url, $under_reports)) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-line-chart"></i> <span>Reports</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ ($getrequest_url == '/admin/reports') ? 'class=active' : '' }}><a href="{{ url('/admin/reports') }}"><i class="fa fa-circle-o"></i> Store Orders</a></li>
|
||||
<li {{ ($getrequest_url == '/admin/commission') ? 'class=active' : '' }}><a href="{{ url('/admin/commission') }}"><i class="fa fa-circle-o"></i> Commission</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@php $under_store_management = array("/admin/create-store", "/admin/stores-list") @endphp
|
||||
<li class="treeview {{ in_array($getrequest_url, $under_store_management) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-link"></i> <span>Store Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ $getrequest_url == '/admin/create-store' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/create-store') }}"><i class="fa fa-plus"></i> Create New
|
||||
Store</a></li>
|
||||
<li {{ $getrequest_url == '/admin/stores-list' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/stores-list') }}"><i class="fa fa-list"></i> List of
|
||||
Stores</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
<!-- /.sidebar-menu -->
|
||||
</section>
|
||||
<!-- /.sidebar -->
|
||||
</aside>
|
||||
@php $under_clipart_management = array("/admin/cliparts", "/admin/overlay-pattern", "/admin/clipart-add", "/admin/clipart-categories") @endphp
|
||||
<li class="treeview {{ in_array($getrequest_url, $under_clipart_management) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-paint-brush"></i> <span>Clipart Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ $getrequest_url == '/admin/cliparts' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/cliparts') }}"><i class="fa fa-circle-o"></i> Cliparts</a></li>
|
||||
<li {{ $getrequest_url == '/admin/clipart-add' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/clipart-add') }}"><i class="fa fa-circle-o"></i> Add Clipart</a>
|
||||
</li>
|
||||
<li {{ $getrequest_url == '/admin/clipart-categories' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/clipart-categories') }}"><i class="fa fa-circle-o"></i> Clipart
|
||||
Categories</a></li>
|
||||
<li {{ $getrequest_url == '/admin/overlay-pattern' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/overlay-pattern') }}"><i class="fa fa-circle-o"></i> Overlay
|
||||
Pattern</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@php $under_visualizer_management = array("/admin/visualizer/add", "/admin/visualizer") @endphp
|
||||
<li class="treeview {{ in_array($getrequest_url, $under_visualizer_management) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-paint-brush"></i> <span> Visualizer Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ $getrequest_url == '/admin/visualizer' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/visualizer') }}"><i class="fa fa-circle-o"></i> Visualizer</a>
|
||||
</li>
|
||||
<li {{ $getrequest_url == '/admin/visualizer/add' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/visualizer/add') }}"><i class="fa fa-circle-o"></i> Add
|
||||
Visualizer</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@php $under_print_file = array("/admin/print-files", "/admin/upload-print-file") @endphp
|
||||
<li class="treeview {{ in_array($getrequest_url, $under_print_file) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-paint-brush"></i> <span>Print File Management</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ $getrequest_url == '/admin/print-files' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/print-files') }}"><i class="fa fa-circle-o"></i> Print Files</a>
|
||||
</li>
|
||||
<li {{ $getrequest_url == '/admin/upload-print-file' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/upload-print-file') }}"><i class="fa fa-circle-o"></i> Upload
|
||||
Print File</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="{{ Request::is('admin/orders') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin/orders') }}">
|
||||
<i class="fa fa-list-alt"></i> <span>Print Orders</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="{{ Request::is('admin/tax-settings') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin/tax-settings') }}">
|
||||
<i class="fa fa-money"></i> <span>Tax Settings</span>
|
||||
</a>
|
||||
</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
|
||||
<li class="treeview {{ in_array($getrequest_url, $under_reports) ? 'active' : '' }}">
|
||||
<a href="#"><i class="fa fa-line-chart"></i> <span>Reports</span>
|
||||
<span class="pull-right-container">
|
||||
<i class="fa fa-angle-left pull-right"></i>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="treeview-menu">
|
||||
<li {{ $getrequest_url == '/admin/reports' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/reports') }}"><i class="fa fa-circle-o"></i> Store Orders</a></li>
|
||||
<li {{ $getrequest_url == '/admin/commission' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/commission') }}"><i class="fa fa-circle-o"></i> Commission</a>
|
||||
</li>
|
||||
<li {{ $getrequest_url == '/admin/order-status' ? 'class=active' : '' }}><a
|
||||
href="{{ url('/admin/order-status') }}"><i class="fa fa-circle-o"></i> Order Status</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="{{ Request::is('admin/home-carousel') ? 'active' : '' }}">
|
||||
<a href="{{ url('/admin/home-carousel') }}">
|
||||
<i class="fa fa-compass"></i> <span>Home Carousel</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
<!-- /.sidebar-menu -->
|
||||
</section>
|
||||
<!-- /.sidebar -->
|
||||
</aside>
|
||||
|
||||
Reference in New Issue
Block a user