diff --git a/resources/views/user-layouts/store-orders.blade.php b/resources/views/user-layouts/store-orders.blade.php
index d148dc2..9209e65 100755
--- a/resources/views/user-layouts/store-orders.blade.php
+++ b/resources/views/user-layouts/store-orders.blade.php
@@ -60,7 +60,9 @@
Jersey Size |
Short Size |
Price |
+
Currency |
Quantity |
+
Line Total |
# |
Payer Email |
Payer Fullname |
@@ -72,6 +74,7 @@
Postal Code |
Country Code |
Date Ordered |
+
Time Ordered |
Action |
@@ -86,8 +89,10 @@
{{ $item_order->Size }} |
{{ $item_order->JerseySize }} |
{{ $item_order->ShortsSize }} |
-
{{ $item_order->Price . ' ' . $item_order->Currency }} |
+
{{ $item_order->Price }} |
+
{{ $item_order->Currency }} |
{{ $item_order->Quantity }} |
+
{{ $item_order->Price * $item_order->Quantity }} |
{{ date('Y/m/d', strtotime($item_order->DateCreated)) }} |
{{ $item_order->Payer_Email }} |
{{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} |
@@ -98,7 +103,8 @@
{{ $item_order->state }} |
{{ $item_order->postal_code }} |
{{ $item_order->country_code }} |
-
{{ date('F j, Y g:i a', strtotime($item_order->DateCreated)) }} |
+
{{ date('m/d/Y', strtotime($item_order->DateCreated)) }} |
+
{{ date('g:i a', strtotime($item_order->DateCreated)) }} |
View Details
|
diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php
index 59f8a72..03bff89 100755
--- a/resources/views/user-layouts/user_template.blade.php
+++ b/resources/views/user-layouts/user_template.blade.php
@@ -704,7 +704,7 @@
var min = $('#min').datepicker("getDate");
var max = $('#max').datepicker("getDate");
- var startDate = new Date(data[10]);
+ var startDate = new Date(data[12]);
if (min == null && max == null) {
return true;
}
@@ -743,7 +743,7 @@
extend: 'csv',
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, 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",
text: "
CSV",
@@ -754,7 +754,7 @@
{
extend: 'excel',
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",
text: "
Excel",
@@ -793,12 +793,12 @@
// }
],
columnDefs: [{
- targets: 10,
+ targets: 12,
type: 'date',
visible: false
},
{
- targets: 10,
+ targets: 12,
type: 'date'
}
],