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

updated report

Browse Source
This commit is contained in:
franknstayn
2021-10-16 17:20:58 +08:00
parent a663b8e899
commit 6c3679b55a
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/user-layouts/order-details-body.blade.php
View File

@@ -33,7 +33,7 @@
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<div class="text-center"> <div class="text-center">
<img class="previewImage" id="active_thumbnail" src="{{ config('site_config.images_url') . '/images/' . $array_thumbnail_display[0]->Image }}"> <img class="previewImage" id="active_thumbnail" src="{{ config('site_config.images_url') . '/' . $array_thumbnail_display[0]->Image }}">
</div> </div>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">

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

@@ -60,7 +60,9 @@
<th>Jersey Size</th> <th>Jersey Size</th>
<th>Short Size</th> <th>Short Size</th>
<th>Price</th> <th>Price</th>
<th>Currency</th>
<th>Quantity</th> <th>Quantity</th>
<th>Line Total</th>
<th>#</th> <th>#</th>
<th>Payer Email</th> <th>Payer Email</th>
<th>Payer Fullname</th> <th>Payer Fullname</th>
@@ -72,6 +74,7 @@
<th>Postal Code</th> <th>Postal Code</th>
<th>Country Code</th> <th>Country Code</th>
<th>Date Ordered</th> <th>Date Ordered</th>
<th>Time Ordered</th>
<th class="text-center">Action</th> <th class="text-center">Action</th>
</tr> </tr>
</thead> </thead>
@@ -86,8 +89,10 @@
<td>{{ $item_order->Size }}</td> <td>{{ $item_order->Size }}</td>
<td>{{ $item_order->JerseySize }}</td> <td>{{ $item_order->JerseySize }}</td>
<td>{{ $item_order->ShortsSize }}</td> <td>{{ $item_order->ShortsSize }}</td>
<td>{{ $item_order->Price . ' ' . $item_order->Currency }}</td> <td>{{ $item_order->Price }}</td>
<td>{{ $item_order->Currency }}</td>
<td>{{ $item_order->Quantity }} </td> <td>{{ $item_order->Quantity }} </td>
<td>{{ $item_order->Price * $item_order->Quantity }} </td>
<td>{{ date('Y/m/d', strtotime($item_order->DateCreated)) }}</td> <td>{{ date('Y/m/d', strtotime($item_order->DateCreated)) }}</td>
<td>{{ $item_order->Payer_Email }} </td> <td>{{ $item_order->Payer_Email }} </td>
<td>{{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} </td> <td>{{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} </td>
@@ -98,7 +103,8 @@
<td>{{ $item_order->state }} </td> <td>{{ $item_order->state }} </td>
<td>{{ $item_order->postal_code }} </td> <td>{{ $item_order->postal_code }} </td>
<td>{{ $item_order->country_code }} </td> <td>{{ $item_order->country_code }} </td>
<td>{{ date('F j, Y g:i a', strtotime($item_order->DateCreated)) }}</td> <td>{{ date('m/d/Y', strtotime($item_order->DateCreated)) }}</td>
<td>{{ date('g:i a', strtotime($item_order->DateCreated)) }}</td>
<td class="text-center"> <td class="text-center">
<a href="#" data-pid="{{ $item_order->ProductId }}" data-id="{{ $item_order->Order_Id }}" data-ck="{{ $item_order->CartKey }}" class="btn btn-default btn-xs btn-order-item-details">View Details</a> <a href="#" data-pid="{{ $item_order->ProductId }}" data-id="{{ $item_order->Order_Id }}" data-ck="{{ $item_order->CartKey }}" class="btn btn-default btn-xs btn-order-item-details">View Details</a>
</td> </td>

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

@@ -704,7 +704,7 @@
var min = $('#min').datepicker("getDate"); var min = $('#min').datepicker("getDate");
var max = $('#max').datepicker("getDate"); var max = $('#max').datepicker("getDate");
var startDate = new Date(data[10]); var startDate = new Date(data[12]);
if (min == null && max == null) { if (min == null && max == null) {
return true; return true;
} }
@@ -743,7 +743,7 @@
extend: 'csv', extend: 'csv',
exportOptions: { exportOptions: {
// columns: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ] // columns: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20] columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
}, },
className: "btn btn-default", className: "btn btn-default",
text: "<i class=\"fa fa-table\"></i> CSV", text: "<i class=\"fa fa-table\"></i> CSV",
@@ -754,7 +754,7 @@
{ {
extend: 'excel', extend: 'excel',
exportOptions: { exportOptions: {
columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20] columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
}, },
className: "btn btn-default", className: "btn btn-default",
text: "<i class=\"fa fa-file-excel-o\"></i> Excel", text: "<i class=\"fa fa-file-excel-o\"></i> Excel",
@@ -793,12 +793,12 @@
// } // }
], ],
columnDefs: [{ columnDefs: [{
targets: 10, targets: 12,
type: 'date', type: 'date',
visible: false visible: false
}, },
{ {
targets: 10, targets: 12,
type: 'date' type: 'date'
} }
], ],