| @@ -2780,12 +2780,16 @@ class DealerController extends Controller | |||
| $dataAugustB = $this->returnDataB($company,'2020','8'); | |||
| $dataSeptember = $this->returnDataR($company,'2020','9'); | |||
| $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; | |||
| } | |||
| }else { | |||
| if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){ | |||
| $combineData[] = $d; | |||
| } | |||
| } | |||
| } | |||
| // Store to combineData New Incentive August | |||
| @@ -2897,6 +2901,10 @@ class DealerController extends Controller | |||
| $countAugustB[] = $d; | |||
| } | |||
| }else { | |||
| if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){ | |||
| $combineData[] = $d; | |||
| } | |||
| } | |||
| } | |||
| // Store to combineData New Incentive August | |||