updated reports

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);
@@ -1406,7 +1422,8 @@ class AdminController extends Controller
 		return view('admin_pages.home_carousel')->with("carousels", $selectHomeCarousel);
 	}
 
-	public function orderStatus() {
+	public function orderStatus()
+	{
 		$AdminModel     = new AdminModel;
 		$selectOrderStatus = $AdminModel->selectOrderStatus();
 		return view('admin_pages.order_status')->with("order_status", $selectOrderStatus);

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;

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: [{

resources/views/admin_pages/reports.blade.php

@@ -31,18 +31,29 @@
                     </div>
                     <div class="box-body">
                         <div class="row">
+                            <form action="">
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <label class="control-label">Select Date From: <span class="required">*</span></label>
-                                    <input type="text" name="min" class="form-control datepicker-reports" id="min" placeholder="Select Date" required  autocomplete="off"/>
+                                        <input type="text" name="min" class="form-control datepicker-reports" id="min" placeholder="Select Date" required autocomplete="off" />
                                     </div>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <label class="control-label">Select Date To: <span class="required">*</span></label>
-                                    <input type="text" name="max" class="form-control datepicker-reports" id="max" placeholder="Select Date" required autocomplete="off"/>
+                                        <input type="text" name="max" class="form-control datepicker-reports" id="max" placeholder="Select Date" required autocomplete="off" />
                                     </div>
                                 </div>
+                                <div class="col-md-3 ml-0">
+                                    <div class="form-group">
+                                        <label class="control-label">&nbsp;</label>
+                                        <div>
+                                            <button class="btn btn-primary">Submit</button>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </form>
                             <div class="col-md-3">
                                 <div class="form-group">
                                     <label class="control-label">Filter By Store</label>