cqpCow 1 rok pred
rodič
commit
8b74b00828

+ 4 - 3
app/Service/ProductActivityService.php

@@ -180,9 +180,10 @@ class ProductActivityService extends Service
             $model->where('crt_time','<=',$return[1]);
         }
         if(! empty($data['activity_time'][0]) && ! empty($data['activity_time'][1])) {
-            $return = $this->changeDateToTimeStampAboutRange($data['activity_time']);
-            $model->where('start_time','>=',$return[0]);
-            $model->where('end_time','<=',$return[1]);
+            $start_time = $this->changeDateToDateMin($data['activity_time'][0]);
+            $end_time = $this->changeDateToDateMin($data['activity_time'][1]);
+            $model->where('start_time','>=',$start_time);
+            $model->where('end_time','<=',$end_time);
         }
 
         $list = $this->limit($model,'',$data);

+ 4 - 3
app/Service/SportsBagService.php

@@ -187,9 +187,10 @@ class SportsBagService extends Service
             $model->where('crt_time','<=',$return[1]);
         }
         if(! empty($data['sports_bag_time'][0]) && ! empty($data['sports_bag_time'][1])) {
-            $return = $this->changeDateToTimeStampAboutRange($data['sports_bag_time']);
-            $model->where('start_time','>=',$return[0]);
-            $model->where('end_time','<=',$return[1]);
+            $start_time = $this->changeDateToDateMin($data['sports_bag_time'][0]);
+            $end_time = $this->changeDateToDateMin($data['sports_bag_time'][1]);
+            $model->where('start_time','>=',$start_time);
+            $model->where('end_time','<=',$end_time);
         }
 
         $list = $this->limit($model,'',$data);