diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index 28234b4..1f10317 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -853,5 +853,49 @@ class AdminController extends Controller return $final_filename; } - + public function visualizer(){ + $AdminModel = new AdminModel; + $sports_array = $AdminModel->selectSports(); + $pattern_array = $AdminModel->selectPattern(); + + $sport_name = request()->get('sport_name'); // Sprots Id + $sport_category = request()->get('sport_category'); + + if(isset($sport_name) && isset($sport_category)){ + $visualizer_array = $AdminModel->selectVisualizer($sport_name, $sport_category); + }else{ + $visualizer_array = array(); + } + + return view('admin_pages.visualizer') + ->with('sports_array', $sports_array) + ->with('visualizer_array', $visualizer_array); + + } + + function showStoreOrderDetails(Request $request){ + + $post = $request->all(); + // var_dump($post['pid']); + $AdminModel = new AdminModel; + $array_payment_details = $AdminModel->selectPaymentDetails('CartKey', $post['ck']); + $array_shipping_add = $AdminModel->selectShippingAddress('PaymentDetail_Id', $array_payment_details[0]->Id); + + $array_thumbnail_display = $AdminModel->selectDisplayItemThumbById($post['pid']); + $array_item = $AdminModel->selectOrder('Id', $post['id']); + $handle_order_detail_body = view('admin_pages.order-details-body') + ->with('array_payment_details', $array_payment_details) + ->with('array_shipping_add', $array_shipping_add) + ->with('array_thumbnail_display', $array_thumbnail_display) + ->with('array_item', $array_item) + ->render(); + + + return response()->json(array( + 'success' => true, + 'payment_details_response' => $handle_order_detail_body, + 'thumb' => $array_thumbnail_display, + 'item' => $array_item + )); + } } \ No newline at end of file diff --git a/app/Http/routes.php b/app/Http/routes.php index cc1e601..87ebd68 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -54,6 +54,7 @@ Route::group(['middleware' => 'auth'], function () { Route::post('clipart/update-clipart-category', 'admin\AdminController@updateClipartCategory'); Route::get('visualizer/add', 'admin\AdminController@visualizerAdd'); + Route::get('visualizer', 'admin\AdminController@visualizer'); Route::post('visualizer/request/get-sports-category', 'admin\AdminController@selectSportsCategory'); Route::get('/get-overlay-pattern', 'admin\AdminController@getOverlayPattern'); Route::post('/add-new-visualizer/save', 'admin\AdminController@saveNewVisualizer'); @@ -64,7 +65,7 @@ Route::group(['middleware' => 'auth'], function () { Route::post('post/remove-store-access', 'admin\AdminController@removeStoreAccess'); Route::post('post/save-new-store-owner', 'admin\AdminController@saveNewStoreOwner'); - + Route::post('post/show-store-order-details', 'admin\AdminController@showStoreOrderDetails'); // Download Routes ///////////////// Route::get('orders/download/tshirt/{ck}/{id}', 'admin\AdminController@downloadPrintFile_tshirt'); diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index 7d9b899..44d15d4 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -250,9 +250,10 @@ class AdminModel extends Model } function selectStoreOrders(){ - $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*') + $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'teamstores.*') ->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey') ->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id') + ->leftjoin('teamstores', 'teamstores.Id','=','orders.StoreId') // ->where('orders.StoreId', $store_id) ->orderby('orders.DateCreated', 'DESC') ->get(); @@ -292,5 +293,29 @@ class AdminModel extends Model $i = DB::table('template_paths')->insert($data); return $i; } + + function selectVisualizer($sports_id, $sports_category){ + $i = DB::table('templates') + ->where('SportsId', $sports_id) + ->where('Category', $sports_category) + ->orderBy('Id', 'DESC') + ->get(); + return $i; + } + + function selectDisplayItemThumbById($id){ + + $i = DB::table('teamstore_product_thumbnails') + ->where('ProductId', $id) + ->where('ImageClass', 'active') + ->get(); + return $i; + } + function selectOrder($field, $value){ + $i = DB::table('orders') + ->where($field, $value) + ->get(); + return $i; + } } diff --git a/resources/views/admin/main.blade.php b/resources/views/admin/main.blade.php index b7fa7e2..c159ef8 100644 --- a/resources/views/admin/main.blade.php +++ b/resources/views/admin/main.blade.php @@ -213,6 +213,13 @@ desired effect + + + + + + + @@ -246,13 +253,18 @@ desired effect // $.fn.dataTable.moment( 'DD/M/YYYY' ); - + $('#orders_table').DataTable({ + columnDefs: [{ + target: 6, + type: 'datetime-moment' + }] + }); $.fn.dataTable.ext.search.push( function (settings, data, dataIndex) { var min = $('#min').datepicker("getDate"); var max = $('#max').datepicker("getDate"); - var startDate = new Date(data[9]); + var startDate = new Date(data[10]); if (min == null && max == null) { return true; } if (min == null && startDate <= max) { return true;} if(max == null && startDate >= min) {return true;} @@ -263,7 +275,124 @@ desired effect $("#min").datepicker({ onSelect: function () { table.draw(); }, changeMonth: true, changeYear: true }); $("#max").datepicker({ onSelect: function () { table.draw(); }, changeMonth: true, changeYear: true }); - + + var table = $('#tbl_store_orders').DataTable({ + initComplete: function () { + this.api().columns(0).every( function () { + var column = this; + var select = $('') + .appendTo( $('#store_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( '' ) + } ); + } ); + }, + scrollX: true, + dom: 'Bfrtip', + buttons: [ + { + extend: 'csv', + exportOptions: { + columns: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 ] + }, + className : "btn btn-default", + text: " CSV", + title : function() { + return "ORDER REPORTS"; + } + }, + { + extend: 'excel', + exportOptions: { + columns: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 ] + }, + className : "btn btn-default", + text: " Excel", + title : function() { + return "ORDER REPORTS"; + } + } + + //, + // { + // extend: 'pdf', + // exportOptions: { + // columns: [ 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ] + // }, + // className : "btn btn-default", + // text: " PDF", + // orientation: 'landscape', + // pageSize: 'LEGAL', + // title : function() { + // return "ORDER REPORTS"; + // } + + // }, + // { + // extend: 'print', + // exportOptions: { + // columns: [ 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ] + // }, + // className : "btn btn-default", + // text : " Print", + // orientation: 'landscape', + // pageSize: 'LEGAL', + // title : function() { + // return "ORDER REPORTS"; + // } + // } + ], + columnDefs: [ + { targets: 9, type: 'date', visible: false }, + { targets: 9, type: 'date' } + ], + + }); + + + $(document).on('a click', '.btn-order-item-details', function(e){ + + e.preventDefault(); + var getCK = $(this).data('ck'); + var getPid = $(this).data('pid'); + var getId = $(this).data('id'); + $.ajax({ + data: { + ck: getCK, + pid: getPid, + id: getId + }, + type: 'POST', + url : "{{ url('admin/post/show-store-order-details') }}", + dataType: 'json', + beforeSend:function(xhr){ + + var token = $('meta[name="csrf_token"]').attr('content'); + + if (token) { + return xhr.setRequestHeader('X-CSRF-TOKEN', token); + } + xhr.setRequestHeader( 'X-Requested-With', 'XMLHttpRequest'); + }, + success:function(result) { + if(result.success){ + $('#modal_store_order_details_body_content').html(result.payment_details_response); + } + } + }); + $('#modal_store_order_details').modal('show'); + }); + try{ var canvas = new fabric.Canvas('canvas'); canvas.setWidth($('.canvas-container').width()); @@ -348,12 +477,7 @@ desired effect }); - $('#orders_table').DataTable({ - columnDefs: [{ - target: 5, - type: 'datetime-moment' - }] - }); + $('#store_owners_table').DataTable(); diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php index 285e269..473a0f4 100644 --- a/resources/views/admin/sidebar.blade.php +++ b/resources/views/admin/sidebar.blade.php @@ -57,7 +57,7 @@
  • Overlay Pattern
    • - @php $under_visualizer_management = array("/admin/visualizer/add") @endphp + @php $under_visualizer_management = array("/admin/visualizer/add", "/admin/visualizer") @endphp
  • Visualizer Management @@ -65,7 +65,7 @@
    • diff --git a/resources/views/admin_pages/add_visualizer.blade.php b/resources/views/admin_pages/add_visualizer.blade.php index b85975e..a301adf 100644 --- a/resources/views/admin_pages/add_visualizer.blade.php +++ b/resources/views/admin_pages/add_visualizer.blade.php @@ -230,12 +230,6 @@
    - {{--
    - -
    - -
    -
    --}}
    @@ -259,13 +253,6 @@
    - {{--
    - -
    - -
    -
    --}}
    diff --git a/resources/views/admin_pages/order-details-body.blade.php b/resources/views/admin_pages/order-details-body.blade.php new file mode 100644 index 0000000..84f4fdd --- /dev/null +++ b/resources/views/admin_pages/order-details-body.blade.php @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
    Payer InformationShipping Address
    Payer Name{{ $array_payment_details[0]->Payer_Firstname . ' ' . $array_payment_details[0]->Payer_Lastname }} + {{ $array_shipping_add[0]->recipient_name }}
    + {{ $array_shipping_add[0]->line1 . ' ' . $array_shipping_add[0]->line2 . ', ' }}
    + {{ $array_shipping_add[0]->city . ', ' . $array_shipping_add[0]->state . ' ' . $array_shipping_add[0]->postal_code }}
    + {{ $array_shipping_add[0]->country_code }} +
    Payer Email Address{{ $array_payment_details[0]->Payer_Email }}
    Payment Method{{ $array_payment_details[0]->PaymentMethod }}
    Transaction Information
    Invoice #{{ $array_payment_details[0]->InvoiceNumber }}
    +
    +
    +
    +
    + +
    +
    +
    + + @if($array_item[0]->FormUsed=="jersey-and-shorts-form") + + + + + + + + + @elseif($array_item[0]->FormUsed=="tshirt-form") + + + + + + + + + @elseif($array_item[0]->FormUsed=="quantity-form") + + + + + + + @elseif($array_item[0]->FormUsed=="name-number-form") + + + + + + + @elseif($array_item[0]->FormUsed=="name-number-size-form") + + + + + + + + @elseif($array_item[0]->FormUsed=="number-form") + + + + + + @else + + @endif + + @if($array_item[0]->FormUsed=="jersey-and-shorts-form") + + + + + + + + + + @elseif($array_item[0]->FormUsed=="tshirt-form") + + + + + + + + @elseif($array_item[0]->FormUsed=="quantity-form") + + + + + + @elseif($array_item[0]->FormUsed=="name-number-form") + + + + + + + + @elseif($array_item[0]->FormUsed=="name-number-size-form") + + + + + + + + @elseif($array_item[0]->FormUsed=="number-form") + + + + + + @else + + @endif +
    NameNumberJersey SizeShorts SizePriceQuantity
    SizePriceQuantity
    PriceQuantity
    NameNumberPriceQuantity
    NameNumberSizePriceQuantity
    NumberPriceQuantity
    @if($array_item[0]->Name != '') {{ $array_item[0]->Name }} @else -- @endif {{ $array_item[0]->Number }}{{ $array_item[0]->JerseySize }}{{ $array_item[0]->ShortsSize }}{{ $array_item[0]->Price }}{{ $array_item[0]->Quantity }}
    {{ $array_item[0]->Size }}{{ $array_item[0]->Price }}{{ $array_item[0]->Quantity }}
    {{ $array_item[0]->Price }}{{ $array_item[0]->Quantity }}
    {{ $array_item[0]->Name }}{{ $array_item[0]->Number }}{{ $array_item[0]->Price }}{{ $array_item[0]->Quantity }}
    {{ $array_item[0]->Name }}{{ $array_item[0]->Number }}{{ $array_item[0]->Size }}{{ $array_item[0]->Price }}{{ $array_item[0]->Quantity }}
    {{ $array_item[0]->Number }}{{ $array_item[0]->Price }}{{ $array_item[0]->Quantity }}
    +
    +
    +
    \ No newline at end of file diff --git a/resources/views/admin_pages/orders.blade.php b/resources/views/admin_pages/orders.blade.php index 9ee195d..e4e921f 100644 --- a/resources/views/admin_pages/orders.blade.php +++ b/resources/views/admin_pages/orders.blade.php @@ -23,7 +23,8 @@
    -
    + + {{--
    @@ -35,36 +36,38 @@
    -
    -
    - - - - - - - - - - - - - - - @foreach($array_payment_details as $pd_row) + --}} +
    +
    +
    StoreInvoice #CurrencyTaxSubtotalTotalDateAction
    + - - - - - - - - + + + + + + + + - @endforeach - -
    {{ $pd_row->StoreName }}{{ $pd_row->InvoiceNumber }}{{ $pd_row->Currency }}{{ $pd_row->Tax }}{{ $pd_row->SubTotal }}{{ $pd_row->Total }}{{ date("F j, Y g:i a", strtotime($pd_row->DateCreated)) }}View DetailsStoreInvoice #CurrencyTaxSubtotalTotalDateAction
    + + + @foreach($array_payment_details as $pd_row) + + {{ $pd_row->StoreName }} + {{ $pd_row->InvoiceNumber }} + {{ $pd_row->Currency }} + {{ $pd_row->Tax }} + {{ $pd_row->SubTotal }} + {{ $pd_row->Total }} + {{ date("F j, Y g:i a", strtotime($pd_row->DateCreated)) }} + View Details + + @endforeach + + +
    diff --git a/resources/views/admin_pages/reports.blade.php b/resources/views/admin_pages/reports.blade.php index 631e6ff..60e1956 100644 --- a/resources/views/admin_pages/reports.blade.php +++ b/resources/views/admin_pages/reports.blade.php @@ -1,5 +1,13 @@ @extends('admin.main') @section('content') +
    @@ -23,8 +31,84 @@
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach($array_store_orders as $item_order) + + + + + + + + + + + + + + + + + + + + + + + + + @endforeach + +
    TeamstoreInvoice No.Product NameNameNumberSizeJersey SizeShort SizePriceQuantity#Payer EmailPayer FullnameRecipient NameAddress Line 1Address Line 2CityStatePostal CodeCountry CodeDate OrderedAction
    {{ $item_order->StoreName }}{{ $item_order->InvoiceNumber }}{{ $item_order->ProductName }}{{ $item_order->Name }}{{ $item_order->Number }}{{ $item_order->Size }}{{ $item_order->JerseySize }}{{ $item_order->ShortsSize }}{{ $item_order->Price . ' ' . $item_order->Currency }}{{ $item_order->Quantity }} {{ date('Y/m/d', strtotime($item_order->DateCreated)) }}{{ $item_order->Payer_Email }} {{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} {{ $item_order->recipient_name }} {{ $item_order->line1 }} {{ $item_order->line2 }} {{ $item_order->city }} {{ $item_order->state }} {{ $item_order->postal_code }} {{ $item_order->country_code }} {{ date('F j, Y g:i a', strtotime($item_order->DateCreated)) }} + View Details +
    @@ -34,4 +118,24 @@
    + @endsection \ No newline at end of file diff --git a/resources/views/admin_pages/visualizer.blade.php b/resources/views/admin_pages/visualizer.blade.php new file mode 100644 index 0000000..35bda6e --- /dev/null +++ b/resources/views/admin_pages/visualizer.blade.php @@ -0,0 +1,146 @@ +@extends('admin.main') +@section('content') + + + +
    + +
    +

    + Visualizer + +

    +
      +
    1. Dashboard
      2. +
    2. Visualizer Management
      3. +
    3. Visualizer
      4. +
    +
    + + +
    +
    +
    +
    +
    +

    Visualizer

    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + @if(count($visualizer_array) > 0) + @foreach ($visualizer_array as $visualizer) +
    +
    + +
    +

    + {{ $visualizer->TemplateName }} +

    +

    + +

    +
    +
    + @if($visualizer->IsActive == "TRUE") +

    Public

    + @else +

    Private

    + @endif +
    +
    +
    +
    + View / Edit +
    +
    +
    +
    +
    + @endforeach + + @else +
    +

    No Record Found

    +
    + @endif +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +@endsection \ No newline at end of file