From db0a359e561ecf563c726dcd2b36638a4a126188 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Mon, 11 Nov 2019 18:37:06 +0800
Subject: [PATCH] added column in store order reports in store owner

---
 app/Http/Controllers/paypal/PaypalController.php     |  2 +-
 resources/views/sublayouts/cart.blade.php            |  2 +-
 resources/views/user-layouts/store-orders.blade.php  | 10 ++++++++++
 resources/views/user-layouts/user_template.blade.php |  8 ++++----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index 8e6fb61..3ca6789 100644
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -305,7 +305,7 @@ class PaypalController extends Controller {
 		$item_goup_array 		= $newUserModel->itemGroup($cartKey);
 		$item_thumbs 			= $newUserModel->selectDisplayItemThumb();
 		$array_payment_details 	= $newUserModel->selectPaymentDetails('CartKey', $cartKey);
-		$array_storename 	= $newUserModel->selectTeamStoreName($cartKey); // email subject
+		$array_storename 		= $newUserModel->selectTeamStoreName($cartKey); // email subject
 		
 		foreach($array_storename as $storname){
 			
diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php
index 770f7be..7e4c23b 100644
--- a/resources/views/sublayouts/cart.blade.php
+++ b/resources/views/sublayouts/cart.blade.php
@@ -88,7 +88,7 @@
     </div>
     <div class="col-md-8 col-md-pull-4">
         <div style="border: 1px solid #e2e2e2; padding: 10px;">
-            <h4><img height="30px" class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreLogo  }}"> {{ $store_array[0]->StoreName }}</h4>
+            <h4><img height="30px" class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo  }}"> {{ $store_array[0]->StoreName }}</h4>
         </div>
         @foreach($item_group as $item)
             @if($item->VoucherId == null)
diff --git a/resources/views/user-layouts/store-orders.blade.php b/resources/views/user-layouts/store-orders.blade.php
index e7b2192..d0ee64d 100644
--- a/resources/views/user-layouts/store-orders.blade.php
+++ b/resources/views/user-layouts/store-orders.blade.php
@@ -54,6 +54,11 @@
                                             <tr>
                                                 <th>Invoice No.</th>
                                                 <th>Product Name</th>
+                                                <th>Name</th>
+                                                <th>Number</th>
+                                                <th>Size</th>
+                                                <th>Jersey Size</th>
+                                                <th>Short Size</th>
                                                 <th>Price</th>
                                                 <th>Quantity</th>
                                                 <th>#</th>
@@ -75,6 +80,11 @@
                                                 <tr>
                                                     <td>{{ $item_order->InvoiceNumber . ' - ' . $item_order->Order_Id }}</td>
                                                     <td>{{ $item_order->ProductName }}</td>
+                                                    <td>{{ $item_order->Name }}</td>
+                                                    <td>{{ $item_order->Number }}</td>
+                                                    <td>{{ $item_order->Size }}</td>
+                                                    <td>{{ $item_order->JerseySize }}</td>
+                                                    <td>{{ $item_order->ShortsSize }}</td>
                                                     <td>{{ $item_order->Price . ' ' .  $item_order->Currency }}</td>
                                                     <td>{{ $item_order->Quantity }} </td>
                                                     <td>{{ date('Y/m/d', strtotime($item_order->DateCreated)) }}</td>
diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php
index 7ca5a91..6cec022 100644
--- a/resources/views/user-layouts/user_template.blade.php
+++ b/resources/views/user-layouts/user_template.blade.php
@@ -661,7 +661,7 @@
 						{
 							extend: 'csv',
 							exportOptions: {
-								columns: [ 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+								columns: [ 0, 1, 2, 3, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
 							},
 							className : "btn btn-default",
 							text: "<i class=\"fa fa-table\"></i> CSV",
@@ -672,7 +672,7 @@
 						{
 							extend: 'excel',
 							exportOptions: {
-								columns: [ 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 ]
+								columns: [ 0, 1, 2, 3, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
 							},
 							className : "btn btn-default",
 							text: "<i class=\"fa fa-file-excel-o\"></i> Excel",
@@ -710,8 +710,8 @@
 						// }
 					],
 					columnDefs: [
-						{ targets: 4, type: 'date', visible: false },
-						{ targets: 5, type: 'date' }
+						{ targets: 9, type: 'date', visible: false },
+						{ targets: 19, type: 'date' }
 					],
 					
 				});