edit Setia Haruman

app/Http/Controllers/DS/MarketingController.php

@@ -3572,7 +3572,7 @@ class MarketingController extends Controller
 		$id = Auth::guard('ms')->id();
 		$user = Staff::with('StaffDetail')->find($id);
 
-		$count_cyberjaya = array(); $count_jasin = array(); 
+		$count_cyberjaya = array(); $count_jasin = array(); $count_ayerKeroh = array(); $count_alorGajah = array();
 		$extra = 0; $basic_total = 0; $totals = 0; 
 		
 		if($year!='null' && $month!='null' && $app=='null'){
@@ -3593,6 +3593,14 @@ class MarketingController extends Controller
 						if (strpos($d['address'], 'Jasin') !== false) {
 						    $count_jasin[] = $d;
 						}
+
+						if (strpos($d['address'], 'Ayer Keroh') !== false) {
+						    $count_ayerKeroh[] = $d;
+						}
+
+						if (strpos($d['address'], 'Alor Gajah') !== false) {
+						    $count_alorGajah[] = $d;
+						}
 					}
 				}
 			
@@ -3608,6 +3616,14 @@ class MarketingController extends Controller
 						if (strpos($d['address'], 'Jasin') !== false) {
 						    $count_jasin[] = $d;
 						}
+
+						if (strpos($d['address'], 'Ayer Keroh') !== false) {
+						    $count_ayerKeroh[] = $d;
+						}
+
+						if (strpos($d['address'], 'Alor Gajah') !== false) {
+						    $count_alorGajah[] = $d;
+						}
 					}
 				}
 
@@ -3644,6 +3660,14 @@ class MarketingController extends Controller
 							if (strpos($d['address'], 'Jasin') !== false) {
 							    $count_jasin[] = $d;
 							}
+
+							if (strpos($d['address'], 'Ayer Keroh') !== false) {
+							    $count_ayerKeroh[] = $d;
+							}
+
+							if (strpos($d['address'], 'Alor Gajah') !== false) {
+							    $count_alorGajah[] = $d;
+							}
 						}
 					}
 				
@@ -3659,6 +3683,14 @@ class MarketingController extends Controller
 							if (strpos($d['address'], 'Jasin') !== false) {
 							    $count_jasin[] = $d;
 							}
+
+							if (strpos($d['address'], 'Ayer Keroh') !== false) {
+							    $count_ayerKeroh[] = $d;
+							}
+
+							if (strpos($d['address'], 'Alor Gajah') !== false) {
+							    $count_alorGajah[] = $d;
+							}
 						}
 					}
 
@@ -3730,7 +3762,7 @@ class MarketingController extends Controller
 
 		$dataR = array(); $dataB = array(); $combineData = array();
 
-		$count_cyberjaya = array(); $count_jasin = array(); 
+		$count_cyberjaya = array(); $count_jasin = array(); $count_ayerKeroh = array(); $count_alorGajah = array();
 		$extra = 0; $basic_total = 0; $totals = 0; 
 
 		if($year!='null' && $month!='null' && $app=='null'){
@@ -3751,6 +3783,14 @@ class MarketingController extends Controller
 						if (strpos($d['address'], 'Jasin') !== false) {
 						    $count_jasin[] = $d;
 						}
+
+						if (strpos($d['address'], 'Ayer Keroh') !== false) {
+							$count_ayerKeroh[] = $d;
+						}
+
+						if (strpos($d['address'], 'Alor Gajah') !== false) {
+							$count_alorGajah[] = $d;
+						}
 					}
 				}
 			
@@ -3766,6 +3806,14 @@ class MarketingController extends Controller
 						if (strpos($d['address'], 'Jasin') !== false) {
 						    $count_jasin[] = $d;
 						}
+
+						if (strpos($d['address'], 'Ayer Keroh') !== false) {
+							$count_ayerKeroh[] = $d;
+						}
+
+						if (strpos($d['address'], 'Alor Gajah') !== false) {
+							$count_alorGajah[] = $d;
+						}
 					}
 				}
 
@@ -3790,6 +3838,13 @@ class MarketingController extends Controller
 							if (strpos($d['address'], 'Jasin') !== false) {
 							    $count_jasin[] = $d;
 							}
+							if (strpos($d['address'], 'Ayer Keroh') !== false) {
+							    $count_ayerKeroh[] = $d;
+							}
+
+							if (strpos($d['address'], 'Alor Gajah') !== false) {
+							    $count_alorGajah[] = $d;
+							}
 						}
 					}
 				
@@ -3805,6 +3860,14 @@ class MarketingController extends Controller
 							if (strpos($d['address'], 'Jasin') !== false) {
 							    $count_jasin[] = $d;
 							}
+
+							if (strpos($d['address'], 'Ayer Keroh') !== false) {
+							    $count_ayerKeroh[] = $d;
+							}
+
+							if (strpos($d['address'], 'Alor Gajah') !== false) {
+							    $count_alorGajah[] = $d;
+							}
 						}
 					}
 
@@ -3876,6 +3939,16 @@ class MarketingController extends Controller
 					$balance = count($count_jasin) - 10;
 					$extra += $balance * 50;
 				}
+
+				if(count($count_ayerKeroh) > 10){
+					$balance = count($count_ayerKeroh) - 10;
+					$extra += $balance * 50;
+				}
+
+				if(count($count_alorGajah) > 10){
+					$balance = count($count_alorGajah) - 10;
+					$extra += $balance * 50;
+				}
 			}else if($year == '2020' && ($month == '04' || $month == '05' || $month == '06' || $month == '07')){
 
 				if(count($count_cyberjaya) > 50){
@@ -3888,6 +3961,16 @@ class MarketingController extends Controller
 					$extra += $balance * 50;
 				}
 
+				if(count($count_ayerKeroh) > 20){
+					$balance = count($count_ayerKeroh) - 20;
+					$extra += $balance * 50;
+				}
+
+				if(count($count_alorGajah) > 20){
+					$balance = count($count_alorGajah) - 20;
+					$extra += $balance * 50;
+				}
+
 			}else {
 				$extra = 0;
 			}
@@ -3909,7 +3992,7 @@ class MarketingController extends Controller
 
 		$dataR = array(); $dataB = array(); $combineData = array();
 
-		$count_cyberjaya = array(); $count_jasin = array(); 
+		$count_cyberjaya = array(); $count_jasin = array(); $count_ayerKeroh = array(); $count_alorGajah = array();
 		$extra = 0; $basic_total = 0; $totals = 0; 
 
 		$dataDis = $this->returnDataR('5bb2bc66ee0dc2271c6fedf6','2019','12');

resources/views/email/track_wo.blade.php

@@ -159,7 +159,7 @@
 										</tr>
 										<tr>
 											<td style="font-family:Open Sans,Arial,sans-serif;font-size:11px;line-height:18px;color:#999999" valign="middle" align="center">
-												© 2017 Setia Haruman Technology Sdn Bhd
+												© 2017 Allo Technology Sdn Bhd
 											</td>
 										</tr>
 									</tbody>

resources/views/pdf/business-pdf.blade.php

@@ -533,11 +533,11 @@
 								</tr>
 								<tr><td height="10"></td></tr>
 								<tr>
-									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> I hereby declare that the above information, documents and any appendices attached are true and valid. I have read and undertood the consent of this form and agreed to be bound by TERMS & CONDITIONS as stated on the next page of this form which accompany the subscription of product(s) and/or service(s). Setia Haruman Technology Sdn Bhd reserve the rights to refuse any application at any given time should any of the information is incorrect.</td>
+									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> I hereby declare that the above information, documents and any appendices attached are true and valid. I have read and undertood the consent of this form and agreed to be bound by TERMS & CONDITIONS as stated on the next page of this form which accompany the subscription of product(s) and/or service(s). Allo Technology Sdn Bhd reserve the rights to refuse any application at any given time should any of the information is incorrect.</td>
 								</tr>
 								<tr><td height="10"></td></tr>
 								<tr>
-									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> By signing this document, I agree and accept TERMS & CONDITIONS stipulated herein. I declare that the information provided by me is true and valid. Setia Haruman Technology Sdn Bhd reserve the rights to refuse my application at any given time without any refund or whatever monies held by Setia Haruman Technology Sdn Bhd should any of the above informationis found to be incorrect. If the service is offered to me, I declare to be bound by the TERMS & CONDITIONS of the service herein</td>
+									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> By signing this document, I agree and accept TERMS & CONDITIONS stipulated herein. I declare that the information provided by me is true and valid. Allo Technology Sdn Bhd reserve the rights to refuse my application at any given time without any refund or whatever monies held by Allo Technology Sdn Bhd should any of the above informationis found to be incorrect. If the service is offered to me, I declare to be bound by the TERMS & CONDITIONS of the service herein</td>
 								</tr>
 							</table>
 						</td>

resources/views/pdf/newBusiness-pdf.blade.php

@@ -484,11 +484,11 @@
 								</tr>
 								<tr><td height="10"></td></tr>
 								<tr>
-									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> I hereby declare that the above information, documents and any appendices attached are true and valid. I have read and undertood the consent of this form and agreed to be bound by TERMS & CONDITIONS as stated on the next page of this form which accompany the subscription of product(s) and/or service(s). Setia Haruman Technology Sdn Bhd reserve the rights to refuse any application at any given time should any of the information is incorrect.</td>
+									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> I hereby declare that the above information, documents and any appendices attached are true and valid. I have read and undertood the consent of this form and agreed to be bound by TERMS & CONDITIONS as stated on the next page of this form which accompany the subscription of product(s) and/or service(s). Allo Technology Sdn Bhd reserve the rights to refuse any application at any given time should any of the information is incorrect.</td>
 								</tr>
 								<tr><td height="10"></td></tr>
 								<tr>
-									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> By signing this document, I agree and accept TERMS & CONDITIONS stipulated herein. I declare that the information provided by me is true and valid. Setia Haruman Technology Sdn Bhd reserve the rights to refuse my application at any given time without any refund or whatever monies held by Setia Haruman Technology Sdn Bhd should any of the above informationis found to be incorrect. If the service is offered to me, I declare to be bound by the TERMS & CONDITIONS of the service herein</td>
+									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> By signing this document, I agree and accept TERMS & CONDITIONS stipulated herein. I declare that the information provided by me is true and valid. Allo Technology Sdn Bhd reserve the rights to refuse my application at any given time without any refund or whatever monies held by Allo Technology Sdn Bhd should any of the above informationis found to be incorrect. If the service is offered to me, I declare to be bound by the TERMS & CONDITIONS of the service herein</td>
 								</tr>
 							</table>
 						</td>

resources/views/pdf/oldBusiness-pdf.blade.php

@@ -498,11 +498,11 @@
 								</tr>
 								<tr><td height="10"></td></tr>
 								<tr>
-									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> I hereby declare that the above information, documents and any appendices attached are true and valid. I have read and undertood the consent of this form and agreed to be bound by TERMS & CONDITIONS as stated on the next page of this form which accompany the subscription of product(s) and/or service(s). Setia Haruman Technology Sdn Bhd reserve the rights to refuse any application at any given time should any of the information is incorrect.</td>
+									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> I hereby declare that the above information, documents and any appendices attached are true and valid. I have read and undertood the consent of this form and agreed to be bound by TERMS & CONDITIONS as stated on the next page of this form which accompany the subscription of product(s) and/or service(s). Allo Technology Sdn Bhd reserve the rights to refuse any application at any given time should any of the information is incorrect.</td>
 								</tr>
 								<tr><td height="10"></td></tr>
 								<tr>
-									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> By signing this document, I agree and accept TERMS & CONDITIONS stipulated herein. I declare that the information provided by me is true and valid. Setia Haruman Technology Sdn Bhd reserve the rights to refuse my application at any given time without any refund or whatever monies held by Setia Haruman Technology Sdn Bhd should any of the above informationis found to be incorrect. If the service is offered to me, I declare to be bound by the TERMS & CONDITIONS of the service herein</td>
+									<td style="font-size: 12px;text-align: justify"><div style="width:16px;height:16px;border:1px solid black;float:left;margin-right: 3px;"><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></div> By signing this document, I agree and accept TERMS & CONDITIONS stipulated herein. I declare that the information provided by me is true and valid. Allo Technology Sdn Bhd reserve the rights to refuse my application at any given time without any refund or whatever monies held by Allo Technology Sdn Bhd should any of the above informationis found to be incorrect. If the service is offered to me, I declare to be bound by the TERMS & CONDITIONS of the service herein</td>
 								</tr>
 							</table>
 						</td>

routes/web.php

@@ -14,7 +14,7 @@ Route::get('/', function () {
     return view('index');
 });
 
-Route::get('/convert-password', ['uses' => 'Auth\LoginController@hmmm']);
+Route::get('/convert-password/{action}/', ['uses' => 'Auth\AdminController@encryptPassword']);
 Route::get('/store-claim/pdf', ['uses' => 'DS\DealerController@exportDealerJson']);
 Route::get('/convert-total-claim-float', ['uses' => 'DS\DealerController@update_total_claim']);