diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 90d9d09..5084d2f 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/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 @@ Invoice No. Product Name + Name + Number + Size + Jersey Size + Short Size Price Quantity # @@ -75,6 +80,11 @@ {{ $item_order->InvoiceNumber . ' - ' . $item_order->Order_Id }} {{ $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)) }} 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: " 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: " 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' } ], });