diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php index 3cd32aa..db81e26 100644 --- a/app/Http/Controllers/admin/AdminController.php +++ b/app/Http/Controllers/admin/AdminController.php @@ -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); } diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php index ab3a8cc..1df4072 100644 --- a/app/Models/admin/AdminModel.php +++ b/app/Models/admin/AdminModel.php @@ -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; diff --git a/resources/views/admin/main.blade.php b/resources/views/admin/main.blade.php index 55cbb8e..e4c9f68 100644 --- a/resources/views/admin/main.blade.php +++ b/resources/views/admin/main.blade.php @@ -276,6 +276,13 @@ desired effect // hash && $('ul.nav a[href="' + hash + '"]').tab('show'); // $.fn.dataTable.moment( 'DD/M/YYYY' ); + var date = new Date(); + var firstDay = new Date(date.getFullYear(), date.getMonth(), 1); + var lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0); + // console.log(firstDay.toString("MM/dd/yyyy"), lastDay) + $('#min').val(moment(firstDay).format('MM/DD/YYYY')) + $('#max').val(moment(lastDay).format('MM/DD/YYYY')) + // console.log(); callSpectrumApi(); $('#orders_table').DataTable({ columnDefs: [{ @@ -345,7 +352,7 @@ desired effect var startDate = new Date(data[5]); } - + if (min == null && max == null) { diff --git a/resources/views/admin_pages/reports.blade.php b/resources/views/admin_pages/reports.blade.php index bf481d0..f29c8c4 100644 --- a/resources/views/admin_pages/reports.blade.php +++ b/resources/views/admin_pages/reports.blade.php @@ -11,14 +11,14 @@
-

- Reports - -

-
    -
  1. Dashboard
    2. -
  2. Reports
    3. -
+

+ Reports + +

+
    +
  1. Dashboard
    2. +
  2. Reports
    3. +
@@ -27,22 +27,33 @@
-

Reports

+

Reports

-
-
- - +
+
+
+ + +
-
-
-
- - +
+
+ + +
-
+
+
+ +
+ +
+ +
+
+
@@ -50,7 +61,7 @@
- + @@ -80,32 +91,32 @@ @foreach($array_store_orders as $item_order) - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @endforeach
{{ $item_order->StoreName }}{{ $item_order->InvoiceNumber }}{{ $item_order->ProductName }}{{ $item_order->Name }}{{ $item_order->Number }}{{ $item_order->Size }}{{ $item_order->JerseySize }}{{ $item_order->ShortsSize }}{{ $item_order->Price . ' ' . $item_order->Currency }}{{ $item_order->Quantity }} {{ date('Y/m/d', strtotime($item_order->date_ordered)) }}{{ $item_order->Payer_Email }} {{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} {{ $item_order->recipient_name }} {{ $item_order->line1 }} {{ $item_order->line2 }} {{ $item_order->city }} {{ $item_order->state }} {{ $item_order->postal_code }} {{ $item_order->country_code }} {{ date('F j, Y g:i a', strtotime($item_order->date_ordered)) }} - View Details -
{{ $item_order->StoreName }}{{ $item_order->InvoiceNumber }}{{ $item_order->ProductName }}{{ $item_order->Name }}{{ $item_order->Number }}{{ $item_order->Size }}{{ $item_order->JerseySize }}{{ $item_order->ShortsSize }}{{ $item_order->Price . ' ' . $item_order->Currency }}{{ $item_order->Quantity }} {{ date('Y/m/d', strtotime($item_order->date_ordered)) }}{{ $item_order->Payer_Email }} {{ $item_order->Payer_Firstname . ' ' . $item_order->Payer_Lastname }} {{ $item_order->recipient_name }} {{ $item_order->line1 }} {{ $item_order->line2 }} {{ $item_order->city }} {{ $item_order->state }} {{ $item_order->postal_code }} {{ $item_order->country_code }} {{ date('F j, Y g:i a', strtotime($item_order->date_ordered)) }} + View Details +