|
|
@@ -2782,10 +2782,8 @@ class DealerController extends Controller |
|
|
|
$dataOctober = $this->returnDataR($company,'2020','10'); |
|
|
|
|
|
|
|
foreach ($dataAugustR as $key => $d) { |
|
|
|
if(date('m/Y', strtotime($d['submission'])) == $month.'/'.$year){ |
|
|
|
if(date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){ |
|
|
|
$countAugustR[] = $d; |
|
|
|
} |
|
|
|
if((date('m/Y', strtotime($d['submission'])) == $month.'/'.$year) && date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){ |
|
|
|
$countAugustR[] = $d; |
|
|
|
}else { |
|
|
|
if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){ |
|
|
|
$combineData[] = $d; |