| @@ -2259,7 +2259,7 @@ class DealerController extends Controller | |||
| if($year!='null' && $month!='null' && $app=='null'){ | |||
| $count_cyberjaya = array(); $count_jasin = array(); $count_ayerKeroh = array(); $count_alorGajah = array(); $count_menglembu = array(); $count_ipoh = array(); | |||
| $extra = 0; $basic_total = 0; $countAugust = array(); | |||
| $extra = 0; $basic_total = 0; $countAugust = array(); $finalprice = 0; | |||
| // if(($year == '2019' || $year == '2020') && ($month == '12' || $month == '01')){ | |||
| // $dataDis = $this->returnDataR($company,'2019','12'); | |||
| @@ -2794,7 +2794,14 @@ class DealerController extends Controller | |||
| )); | |||
| }else { | |||
| $total = number_format(floatval(str_replace("RM ", "" , $d['retail_price'])) * 2.5 + 50, 2); | |||
| if ($d['package']!= 1){ | |||
| $total = number_format(floatval((str_replace("RM ", "" , $d['retail_price']))- 10) * 2.5 + 50, 2); | |||
| $finalprice = number_format(floatval((str_replace("RM ", "" , $d['retail_price']))- 10), 2); | |||
| } | |||
| else{ | |||
| $total = number_format(floatval(str_replace("RM ", "" , $d['retail_price'])) * 2.5 + 50, 2); | |||
| $finalprice = number_format(floatval((str_replace("RM ", "" , $d['retail_price']))), 2); | |||
| } | |||
| array_push($combineData, array( | |||
| 'index' => $d['index'], | |||
| 'contract' => $d['contract'], | |||
| @@ -2803,7 +2810,7 @@ class DealerController extends Controller | |||
| 'name' => $d['name'], | |||
| 'address' => $d['address'], | |||
| 'package' => $d['package'], | |||
| 'retail_price' => $d['retail_price'], | |||
| 'retail_price' => 'RM '. $finalprice, | |||
| 'incentives1' => '250% + RM50', | |||
| 'incentives2' => $d['incentives2'], | |||
| 'total' => 'RM '.$total, | |||
| @@ -2829,7 +2836,14 @@ class DealerController extends Controller | |||
| 'claim' => $d['claim'], | |||
| )); | |||
| }else { | |||
| $total = number_format(floatval(str_replace("RM ", "" , $d['retail_price'])) * 2.5, 2); | |||
| if ($d['package']!= 1){ | |||
| $total = number_format(floatval((str_replace("RM ", "" , $d['retail_price']))- 10) * 2.5, 2); | |||
| $finalprice = number_format(floatval((str_replace("RM ", "" , $d['retail_price']))- 10), 2); | |||
| } | |||
| else{ | |||
| $total = number_format(floatval(str_replace("RM ", "" , $d['retail_price'])) * 2.5, 2); | |||
| $finalprice = number_format(floatval((str_replace("RM ", "" , $d['retail_price']))), 2); | |||
| } | |||
| array_push($combineData, array( | |||
| 'index' => $d['index'], | |||
| 'contract' => $d['contract'], | |||
| @@ -2838,7 +2852,7 @@ class DealerController extends Controller | |||
| 'name' => $d['name'], | |||
| 'address' => $d['address'], | |||
| 'package' => $d['package'], | |||
| 'retail_price' => $d['retail_price'], | |||
| 'retail_price' => 'RM '.$finalprice, | |||
| 'incentives1' => '250%', | |||
| 'incentives2' => $d['incentives2'], | |||
| 'total' => 'RM '.$total, | |||