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

updated reports

Browse Source
This commit is contained in:
franknstayn
2022-03-12 20:17:57 +08:00
parent a94ef951a3
commit a24e016b85
4 changed files with 91 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ namespace App\Models\admin;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
use Carbon\Carbon;
class AdminModel extends Model
{
@@ -297,13 +298,13 @@ class AdminModel extends Model
return $i;
}
function selectStoreOrders()
{
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')
->leftjoin('shipping_addresses', 'shipping_addresses.PaymentDetail_Id', '=', 'payment_details.Id')
->leftjoin('teamstores', 'teamstores.Id', '=', 'orders.StoreId')
// ->where('orders.StoreId', $store_id)
->whereBetween('orders.DateCreated', [$start, $end])
->orderby('orders.DateCreated', 'DESC')
->get();
return $i;