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

27
app/Http/Controllers/admin/AdminController.php
View File

@@ -17,7 +17,7 @@ use Maatwebsite\Excel\Facades\Excel;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\DB;
use Carbon\Carbon;
use Illuminate\Support\Facades\Input;
class AdminController extends Controller
@@ -446,7 +446,23 @@ class AdminController extends Controller
{
$AdminModel = new AdminModel;
$array_store_orders = $AdminModel->selectStoreOrders();
$start = Carbon::now()->startOfMonth()->startOfDay();
$end = Carbon::now()->endOfMonth()->endOfDay();
$min = Input::get('min');
$max = Input::get('max');
if ($min && $max) {
// var_dump(Carbon::parse($min)->format('Y-m-d'), $max);
$start = Carbon::parse($min)->format('Y-m-d');
$end = Carbon::parse($max)->format('Y-m-d');
}
//
$array_store_orders = $AdminModel->selectStoreOrders($start, $end);
// var_dump($array_store_orders);
return view('admin_pages.reports')
->with('array_store_orders', $array_store_orders);
@@ -1401,13 +1417,14 @@ class AdminController extends Controller
public function homeCarousel()
{
$AdminModel = new AdminModel;
$AdminModel = new AdminModel;
$selectHomeCarousel = $AdminModel->selectHomeCarousel();
return view('admin_pages.home_carousel')->with("carousels", $selectHomeCarousel);
}
public function orderStatus() {
$AdminModel = new AdminModel;
public function orderStatus()
{
$AdminModel = new AdminModel;
$selectOrderStatus = $AdminModel->selectOrderStatus();
return view('admin_pages.order_status')->with("order_status", $selectOrderStatus);
}