webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from franknstayn/local_dev

Browse Source 
added column in store order reports in store owner
This commit is contained in:
franknstayn
2019-11-11 18:42:11 +08:00
committed by GitHub
parent 3698312664 db0a359e56
commit 1d4c9a5445
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -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){

10
resources/views/user-layouts/store-orders.blade.php
View File

@@ -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>

8
resources/views/user-layouts/user_template.blade.php
View File

@@ -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' }
],
});