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

Merge branch 'master' of https://github.com/franknstayn/crew_admin

Browse Source
This commit is contained in:
franknstayn
2020-02-29 13:14:41 +08:00
parent 349da702d4 2345120b33
commit a329ead2f6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/admin/AdminModel.php
View File

@@ -250,7 +250,7 @@ class AdminModel extends Model
} }
function selectStoreOrders(){ function selectStoreOrders(){
$i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'teamstores.*') $i = DB::table('orders')->select('orders.*', 'orders.Id as Order_Id', 'orders.DateCreated AS date_ordered', 'payment_details.InvoiceNumber', 'payment_details.Currency', 'payment_details.Payer_Email', 'payment_details.Payer_Firstname', 'payment_details.Payer_Lastname', 'shipping_addresses.*', 'teamstores.*')
->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey') ->leftjoin('payment_details', 'payment_details.CartKey','=','orders.CartKey')
->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id') ->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id','=','payment_details.Id')
->leftjoin('teamstores', 'teamstores.Id','=','orders.StoreId') ->leftjoin('teamstores', 'teamstores.Id','=','orders.StoreId')

4
resources/views/admin_pages/reports.blade.php
View File

@@ -91,7 +91,7 @@
<td>{{ $item_order->ShortsSize }}</td> <td>{{ $item_order->ShortsSize }}</td>
<td>{{ $item_order->Price . ' ' . $item_order->Currency }}</td> <td>{{ $item_order->Price . ' ' . $item_order->Currency }}</td>
<td>{{ $item_order->Quantity }} </td> <td>{{ $item_order->Quantity }} </td>
<td>{{ date('Y/m/d', strtotime($item_order->DateCreated)) }}</td> <td>{{ date('Y/m/d', strtotime($item_order->date_ordered)) }}</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>
<td>{{ $item_order->recipient_name }} </td> <td>{{ $item_order->recipient_name }} </td>
@@ -101,7 +101,7 @@
<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('F j, Y g:i a', strtotime($item_order->date_ordered)) }}</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>