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

update hoodie downloader

Browse Source
This commit is contained in:
franknstayn
2022-04-01 20:19:08 +08:00
parent 13c6135a66
commit 4ecd282462
5 changed files with 980 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,15 @@ class AdminModel extends Model
function selectOrderItem($field, $ck)
{
// $i = DB::table('orders')
// ->where($field, $ck)
// ->get();
$i = DB::table('orders')
->where($field, $ck)
->leftjoin('client_designs', 'client_designs.DesignCode', '=', 'orders.DesignCode')
->leftjoin('print_pattern_list', 'print_pattern_list.TemplateCode', '=', 'client_designs.TemplateCode')
->select('orders.*', 'client_designs.TemplateCode', 'print_pattern_list.Type')
->orderby('clipart_categories.Ordering', 'ASC')
->get();
return $i;
}
@@ -298,7 +305,8 @@ class AdminModel extends Model
return $i;
}
function selectStoreOrders($start, $end) {
function selectStoreOrders($start, $end)
{
$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')