merdeka promotion

app/Http/Controllers/Auth/AdminController.php

 
 					if($user->roles_access == "Contractor"){
 						Auth::guard('contractor')->loginUsingId($user->_id, $rememberMe);
+						if (Carbon::now()->diffInDays($user->created_at) >= 90) {
+							return $this->expired($user->_id);
+						}
+						else{
 						return redirect('/contractor');
+						}
 					}
 					else if($user->roles_access == "Customer Service"){
 						Auth::guard('cs')->loginUsingId($user->_id, $rememberMe);
-						return redirect('/customer-service');
+						if (Carbon::now()->diffInDays($user->created_at) >= 90) {
+							return $this->expired($user->_id);
+						}else{
+							return redirect('/customer-service');
+						}
 					}else if($user->roles_access == "Developer"){
 						Auth::guard('cs')->loginUsingId($user->_id, $rememberMe);
-						return redirect('/customer-service');
+						if (Carbon::now()->diffInDays($user->created_at) >= 90) {
+							return $this->expired($user->_id);
+						}else{
+							return redirect('/customer-service');
+						}
 					}else if($user->roles_access == "Marketing"){
 						Auth::guard('ms')->loginUsingId($user->_id, $rememberMe);
-						return redirect('/marketing');
+						if (Carbon::now()->diffInDays($user->created_at) >= 90) {
+							return $this->expired($user->_id);
+						}else{
+							return redirect('/marketing');
+						}
 					}
 				}
 			}
 			Auth::guard($this->get_guard())->logout();
 			return redirect('/');
 		}
+	}
+	public function expired($_id)
+    {
+		$user = Staff::where('_id',$_id)->first();
+        return view('expiredPassword', compact ('user'));
+    }
+
+    public function postExpired(Request $request)
+    {
+		$user = Staff::where('_id',$request->_id)->first();
+		
+		$user->password = $this->encryptPassword('encrypt', $request->password);
+		$user->created_at = Carbon::now()->toDateTimeString();
+		$user->save();
+
+        if($user->roles_access == "Contractor"){
+			return redirect('/contractor');
+		}
+		else if($user->roles_access == "Customer Service"){
+			return redirect('/customer-service');
+		}else if($user->roles_access == "Developer"){
+			return redirect('/customer-service');
+		}else if($user->roles_access == "Marketing"){
+			return redirect('/marketing');
+		}
     }
+	
 }

app/Http/Controllers/Auth/StaffLoginController.php

 
 					if($user->roles_access == "Dealer"){
 						Auth::guard('ds')->loginUsingId($user->_id, $rememberMe);
-						return redirect('/dealer');
+						if (Carbon::now()->diffInDays($user->created_at) >= 90) {
+							return $this->expired($user->_id);
+						}else{
+							return redirect('/dealer');
+						}
 					}else if($user->roles_access == "Sales"){
 						Auth::guard('agent')->loginUsingId($user->_id, $rememberMe);
-						return redirect('/sales');
+						if (Carbon::now()->diffInDays($user->created_at) >= 90) {
+							return $this->expired($user->_id);
+						}else{
+							return redirect('/sales');
+						}
 					}
 
 				}
 		dd($output);
 	}
 
+	public function expired($_id)
+    {
+		$user = Staff::where('_id',$_id)->first();
+        return view('expiredPassword', compact ('user'));
+    }
+
+    public function postExpired(Request $request)
+    {
+		$user = Staff::where('_id',$request->_id)->first();
+		
+		$user->password = $this->encryptPassword('encrypt', $request->password);
+		$user->created_at = Carbon::now()->toDateTimeString();
+		$user->save();
+
+        if($user->roles_access == "Dealer"){
+			return redirect('/dealer');
+		}
+		else if($user->roles_access == "Sales"){
+			return redirect('/sales');
+		}
+    }
+	
 }

app/Http/Controllers/CustomerService/CustomerController.php

 						}
 
 						$nP = '';
-						if($f->PackageDetail->voice_fee == 'Yes' || $f->PackageDetail->voice_fee == 'YES'){
-							$nP = 'Yes';
-						}else if($f->PackageDetail->voice_fee == 'No' || $f->PackageDetail->voice_fee == 'NO'){
-							$nP = 'No';
-						}else if($f->PackageDetail->voice_fee == ''){
-							$nP = '-';
-						}
+						
 						array_push($nested_data, array(
 							'formT' => $n1.$i.$f->type_application,
 							'type' => $f->type_service,
 		$ext3 = pathinfo(public_path().$form->visaF, PATHINFO_EXTENSION);
 		$ext4 = pathinfo(public_path().$form->visaB, PATHINFO_EXTENSION);
 
+		$ext5 = pathinfo(public_path().$form->paymentReceipt, PATHINFO_EXTENSION);
+		$ext6 = pathinfo(public_path().$form->soForm, PATHINFO_EXTENSION);
+
 		$documentPath = 'document/'.$subscriber_id;
 
 		$created = $form->Form->created_at->toDateString();
-
+	
 		$total = floatval($package->montly_fee) + floatval($package->deposit) + floatval($package->voice_fee) + floatval($package->upfront_payment);
 		// dd($total);
-		$pdf = PDF::loadView('pdf.residential-pdf', compact('form','package','product','ext1','ext2','ext3','ext4','created_at','created'));
+		$pdf = PDF::loadView('pdf.residential-pdf', compact('form','package','product','ext1','ext2','ext3','ext4','ext5','ext6','created_at','created'));
 		$pdf->setPaper('A4', 'potrait');
 
-		if(($ext1 == "jpeg" && $ext2 == "jpeg") || ($ext1 == "jpg" && $ext2 == "jpg")){
-			if(($ext3 == "jpeg" && $ext4 == "jpeg") || ($ext3 == "jpg" && $ext4 == "jpg")){
-				return $pdf->stream();
-			}else{
-				return $pdf->stream();
-			}
-		}else if($ext1 == "pdf" && $ext2 == "pdf" && $ext3 == "pdf" && $ext4 == "pdf"){
+		if($ext1 == "pdf" || $ext2 == "pdf" || $ext3 == "pdf" || $ext4 == "pdf" || $ext5 == "pdf" || $ext6 == "pdf" ){
 			$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
 			$merges = PDFMerger::init();
 			$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
+			if($ext1 == "pdf"){
 			$merges->addPDF(public_path().$form->front_ic,'all');
+			}
+			if($ext2 == "pdf"){
 			$merges->addPDF(public_path().$form->back_ic,'all');
+			}
+			if($ext3 == "pdf"){
 			$merges->addPDF(public_path().$form->visaF,'all');
+			}
+			if($ext4 == "pdf"){
 			$merges->addPDF(public_path().$form->visaB,'all');
+			}
+			if($ext5 == "pdf"){
+				$merges->addPDF(public_path().$form->paymentReceipt,'all');
+			}
+			if($ext6 == "pdf"){
+				$merges->addPDF(public_path().$form->soForm,'all');
+			}
 			$merges->merge();
 			$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-		}else if($ext1 == "pdf" && $ext2 == "pdf"){
-			$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-			$merges = PDFMerger::init();
-			$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-			$merges->addPDF(public_path().$form->front_ic,'all');
-			$merges->addPDF(public_path().$form->back_ic,'all');
-			$merges->merge();
-			$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
+
+		}else if(($ext1 == "jpeg" || $ext1 == "jpg" || $ext1 == "png" ) || ($ext2 == "jpeg" || $ext2 == "jpg" || $ext2 == "png" ) || 
+		($ext3 == "jpeg" || $ext3 == "jpg" || $ext3 == "png" ) ||($ext4 == "jpeg" || $ext4 == "jpg" || $ext4 == "png" ) ||
+		($ext5 == "jpeg" || $ext5 == "jpg" || $ext5 == "png" ) ||($ext6 == "jpeg" || $ext6 == "jpg" || $ext6 == "png" )){
+			return $pdf->stream();
 		}else{
 			return $pdf->stream();
 		}
 		$ext1 = pathinfo(public_path().$form->front_ic, PATHINFO_EXTENSION);
 		$ext2 = pathinfo(public_path().$form->back_ic, PATHINFO_EXTENSION);
 
-		$ext3 = pathinfo(public_path().$form->form24_49, PATHINFO_EXTENSION);
-		$ext4 = pathinfo(public_path().$form->form9_44, PATHINFO_EXTENSION);
+		$ext3 = pathinfo(public_path().$form->form9_44, PATHINFO_EXTENSION);
 
-		$ext5 = pathinfo(public_path().$form->visaF, PATHINFO_EXTENSION);
-		$ext6 = pathinfo(public_path().$form->visaB, PATHINFO_EXTENSION);
+		$ext4 = pathinfo(public_path().$form->paymentReceipt, PATHINFO_EXTENSION);
+		$ext5 = pathinfo(public_path().$form->soForm, PATHINFO_EXTENSION);
 
 		$documentPath = 'document/'.$subscriber_id;
 
 		// $pdf = PDF::loadView('pdf.business-pdf', compact('form','package','product','ext1','ext2','ext3','ext4','ext5','ext6','dateSubmittion'));
 		if(strtotime($form->created_at) >= 1580774399){
-			$pdf = PDF::loadView('pdf.newBusiness-pdf', compact('form','package','product','ext1','ext2','ext3','ext4','ext5','ext6','dateSubmittion'));
+			$pdf = PDF::loadView('pdf.newBusiness-pdf', compact('form','package','product','ext1','ext2','ext3','ext4','ext5','dateSubmittion'));
 		}else {
 			$pdf = PDF::loadView('pdf.oldBusiness-pdf', compact('form','package','product','ext1','ext2','ext3','ext4','ext5','ext6','dateSubmittion'));
 		}
 		
 		$pdf->setPaper('A4', 'potrait');
 
-		if(($ext1 == "jpeg" && $ext2 == "jpeg") || ($ext1 == "jpg" && $ext2 == "jpg") ||  ($ext1 == "JPG" && $ext2 == "JPG")){
-			if($ext3 == "pdf" && $ext4 == "pdf"){
-				if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG")){
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->form24_49,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else if($ext5 == "pdf" && $ext6 == "pdf"){
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->visaF,'all');
-					$merges->addPDF(public_path().$form->visaB,'all');
-					$merges->addPDF(public_path().$form->form24_49,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else{
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->form24_49,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}
-			}else if(($ext3 == "jpeg" && $ext4 == "jpeg") || ($ext3 == "jpg" && $ext4 == "jpg") || ($ext3 == "JPG" && $ext4 == "JPG")){
-				if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG")){
-					return $pdf->stream();
-				}else if($ext5 == "pdf" && $ext6 == "pdf"){
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->visaF,'all');
-					$merges->addPDF(public_path().$form->visaB,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else{
-					return $pdf->stream();
-				}
-			}else if($ext3 == "" && $ext4 == "pdf"){
-				if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG")){
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else if($ext5 == "pdf" && $ext6 == "pdf"){
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->visaF,'all');
-					$merges->addPDF(public_path().$form->visaB,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else{
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}
-			}else if($ext3 == "" && $ext4 == "jpg"){
-				return $pdf->stream();
+		
+		if($ext1 == "pdf" || $ext2 == "pdf" || $ext3 == "pdf" || $ext4 == "pdf" || $ext5 == "pdf" || $ext6 == "pdf" ){
+			$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
+			$merges = PDFMerger::init();
+			$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
+			if($ext1 == "pdf"){
+			$merges->addPDF(public_path().$form->front_ic,'all');
 			}
-		}else if($ext1 == "pdf" && $ext2 == "pdf"){
-			if($ext3 == "pdf" && $ext4 == "pdf"){
-				if($ext5 == "pdf" && $ext6 == "pdf"){
-					$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->front_ic,'all');
-					$merges->addPDF(public_path().$form->back_ic,'all');
-					$merges->addPDF(public_path().$form->visaF,'all');
-					$merges->addPDF(public_path().$form->visaB,'all');
-					$merges->addPDF(public_path().$form->form24_49,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG")){
-			        $pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->front_ic,'all');
-					$merges->addPDF(public_path().$form->back_ic,'all');
-					$merges->addPDF(public_path().$form->form24_49,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else{
-					$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->front_ic,'all');
-					$merges->addPDF(public_path().$form->back_ic,'all');
-					$merges->addPDF(public_path().$form->form24_49,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}
-			}else if(($ext3 == "jpeg" && $ext4 == "jpeg") || ($ext3 == "jpg" && $ext4 == "jpg") || ($ext3 == "JPG" && $ext4 == "JPG")){
-				if($ext5 == "pdf" && $ext6 == "pdf"){
-					$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->front_ic,'all');
-					$merges->addPDF(public_path().$form->back_ic,'all');
-					$merges->addPDF(public_path().$form->visaF,'all');
-					$merges->addPDF(public_path().$form->visaB,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG")){
-			        $pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->front_ic,'all');
-					$merges->addPDF(public_path().$form->back_ic,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else{
-					$pdf->save(public_path().'/'.$documentPath.'/application.pdf');
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->front_ic,'all');
-					$merges->addPDF(public_path().$form->back_ic,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}
-			}else if($ext3 == "" && $ext4 == "pdf"){
-				if($ext5 == "pdf" && $ext6 == "pdf"){
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->visaF,'all');
-					$merges->addPDF(public_path().$form->visaB,'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}else{
-					$pdf->save(public_path('/'.$documentPath.'/application.pdf'));
-					$merges = PDFMerger::init();
-					$merges->addPDF(public_path().'/'.$documentPath.'/application.pdf', 'all');
-					$merges->addPDF(public_path().$form->form9_44,'all');
-					$merges->merge();
-					$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
-				}
+			if($ext2 == "pdf"){
+			$merges->addPDF(public_path().$form->back_ic,'all');
 			}
-			
+			if($ext3 == "pdf"){
+			$merges->addPDF(public_path().$form->form9_44,'all');
+			}
+			if($ext4 == "pdf"){
+				$merges->addPDF(public_path().$form->paymentReceipt,'all');
+			}
+			if($ext5 == "pdf"){
+				$merges->addPDF(public_path().$form->soForm,'all');
+			}
+			$merges->merge();
+			$merges->save(public_path().'/'.$documentPath.'/'.$subscriber_id.'.pdf',"browser");
+
+		}else if(($ext1 == "jpeg" || $ext1 == "jpg" || $ext1 == "png" ) || ($ext2 == "jpeg" || $ext2 == "jpg" || $ext2 == "png" ) || 
+		($ext3 == "jpeg" || $ext3 == "jpg" || $ext3 == "png" ) ||($ext4 == "jpeg" || $ext4 == "jpg" || $ext4 == "png" ) ||
+		($ext5 == "jpeg" || $ext5 == "jpg" || $ext5 == "png" )){
+			return $pdf->stream();
 		}else {
 			return $pdf->stream();
 		}
-    }
+}
 
     public function viewSubscriber()
     {

app/Http/Controllers/Form/BusinessController.php

             $voice_price = 0;
         }
 
+        $ip_fee = 0; $ip_tax = 0;
+        if ($request->ip == "1 Fixed IP RM200/1P/Month") {
+            $ip_fee = 200 ;
+            $ip_tax = number_format((floatval($ip_fee) * 1.06),2); 
+        }elseif ($request->ip == "5 Fixed IP RM400/1P/Month") {
+            $ip_fee = 400;
+            $ip_tax = number_format((floatval($ip_fee) * 1.06),2); 
+        }
+
         if ($request->package != "1Gbps" && $request->subscription == '24'){
             $promo_price = number_format(floatval($product->retail_price) - 10);
             $promo_st = number_format(floatval($promo_price) * 1.06,2);
-            $total_monthly = number_format($promo_st + ($voice_price * 1.06), 2);
+            $total_monthly = number_format($promo_st + ($voice_price * 1.06) + $ip_tax, 2);
         }
         else if ($request->package == "1Gbps"){
+            if ($request->ip == "1 Fixed IP RM200/1P/Month") {
+                $gst = number_format(floatval($product->retail_price) * 1.06,2);
+                $total_monthly = 3920.94;
+            }elseif ($request->ip == "5 Fixed IP RM400/1P/Month") {
+                $gst = number_format(floatval($product->retail_price) * 1.06,2);
+                $total_monthly = 4132.94;
+            }else{
+                $gst = number_format(floatval($product->retail_price) * 1.06,2);
+                $total_monthly = $gst;
+            }
+        }else{
             $gst = number_format(floatval($product->retail_price) * 1.06,2);
-            $total_monthly = 3730.14;
-        }
-        else{
-            $gst = number_format(floatval($product->retail_price) * 1.06,2);
-            $total_monthly = number_format($gst + ($voice_price * 1.06), 2);
+            $total_monthly = number_format($gst + ($voice_price * 1.06) + $ip_tax, 2);
         }
         
 
         $otc_st = number_format(floatval($otc) * 1.06,2);
         $upfront_total = number_format(floatval($otc_st) + $deposit,2);
 
-        $IP = '';
-        if($request->ip == 'custom'){
-            $IP = $request->custom;
-        }else{
-            $IP = $request->ip;
-        }
-
-
-        $total = number_format((floatval($product->retail_price) * 1.06) + ($otc * 1.06) + $deposit, 2);
+        $total = number_format((floatval($product->retail_price) * 1.06) + ($otc * 1.06) + $deposit + $ip_tax, 2);
 
         array_push($data, array(
             'unit_no' => $request->unit_no,
             'subscription' => $request->subscription,
             'billing' => $request->billing,
             'voice' => $voice,
-            'ip' => $IP,
+            'ip' => $request->ip,
+            'ip_fee' => $ip_fee,
+            'ip_tax' => $ip_tax,
             'thedate' => $request->thedate,
         ));
 
 
     public function storeFormData(Request $request){
 
-        $su_id = ''; $pathIconF = ''; $pathIconB = ''; $pathForm9 = ''; $pathForm24 = '';
-        $pathVisaF = ''; $pathVisaB = '';
+        $su_id = ''; $pathIconF = ''; $pathIconB = ''; $pathForm9 = '';
 
         do {
             $su_id = strtoupper('CBB-'.$this->random_code(6).'B');
             File::makeDirectory(public_path().'/'.$destinationPath,0777,true);
         }
 
-
         if($request->hasfile('front_ic')){ 
 
             $icon = $request->file('front_ic');
             $pathForm9 = '/'.$destinationPath.'/formD.'.$icon->getClientOriginalExtension();
         }
 
-        if($request->hasfile('form_24')){ 
-
-            $icon = $request->file('form_24');
-            $icon->move($destinationPath,'formA_B.'.$icon->getClientOriginalExtension());
-            $pathForm24 = '/'.$destinationPath.'/formA_B.'.$icon->getClientOriginalExtension();
-        }
-
-        if($request->hasfile('visaF')){ 
-
-            $icon = $request->file('visaF');
-            $icon->move($destinationPath,'visaF.'.$icon->getClientOriginalExtension());
-            $pathVisaF = '/'.$destinationPath.'/visaF.'.$icon->getClientOriginalExtension();
-        }
-
-        if($request->hasfile('visaB')){ 
-
-            $icon = $request->file('visaB');
-            $icon->move($destinationPath,'visaB.'.$icon->getClientOriginalExtension());
-            $pathVisaB = '/'.$destinationPath.'/visaB.'.$icon->getClientOriginalExtension();
-        }
-
         if($pathForm9 != '' && $pathIconB != '' && $pathIconF != ''){
 
             $sl = Form::create([
             $sdl->state = $request->cstate;
             $sdl->front_ic = $pathIconF;
             $sdl->back_ic = $pathIconB;
-            $sdl->form24_49 = $pathForm24;
             $sdl->form9_44 = $pathForm9;
-            $sdl->visaF = $pathVisaF;
-            $sdl->visaB = $pathVisaB;         
                                             
             $packageD = new PackageDetail();
             $packageD->contract = $request->subscription;
             $packageD->ip = $request->ip;
             $packageD->deposit = $request->deposit;
             $packageD->upfront_payment = $request->otc;
+            $packageD->ip_tax = $request->ip_tax;
             $packageD->rfs = $request->rfs;
 
             $sl->subscriber()->save($sdl);
             $voice_price = 0;
         }
 
+        $ip_fee = 0; $ip_tax = 0;
+        if ($request->ip == "1 Fixed IP RM200/1P/Month") {
+            $ip_fee = 200 ;
+            $ip_tax = number_format((floatval($ip_fee) * 1.06),2); 
+        }elseif ($request->ip == "5 Fixed IP RM400/1P/Month") {
+            $ip_fee = 400;
+            $ip_tax = number_format((floatval($ip_fee) * 1.06),2); 
+        }
+
         if ($request->package != "1Gbps" && $request->subscription == '24'){
             $promo_price = number_format(floatval($product->retail_price) - 10);
             $promo_st = number_format(floatval($promo_price) * 1.06,2);
-            $total_monthly = number_format($promo_st + ($voice_price * 1.06), 2);
+            $total_monthly = number_format($promo_st + ($voice_price * 1.06) + $ip_tax, 2);
         }
         else if ($request->package == "1Gbps"){
-            $gst = number_format(floatval($product->retail_price) * 1.06,2);
-            $total_monthly = 3730.14;
+            if ($request->ip == "1 Fixed IP RM200/1P/Month") {
+                $gst = number_format(floatval($product->retail_price) * 1.06,2);
+                $total_monthly = 3920.94;
+            }elseif ($request->ip == "5 Fixed IP RM400/1P/Month") {
+                $gst = number_format(floatval($product->retail_price) * 1.06,2);
+                $total_monthly = 4132.94;
+            }else{
+                $gst = number_format(floatval($product->retail_price) * 1.06,2);
+                $total_monthly = $gst;
+            }
         }
         else{
             $gst = number_format(floatval($product->retail_price) * 1.06,2);
-            $total_monthly = number_format($gst + ($voice_price * 1.06), 2);
+            $total_monthly = number_format($gst + ($voice_price * 1.06) + $ip_tax, 2);
         }
         
 
         $otc_st = number_format(floatval($otc) * 1.06,2);
         $upfront_total = number_format(floatval($otc_st) + $deposit,2);
 
-        $IP = '';
-        if($request->ip == 'custom'){
-            $IP = $request->custom;
-        }else{
-            $IP = $request->ip;
-        }
+        $total = number_format((floatval($product->retail_price) * 1.06) + ($otc * 1.06) + $deposit + $ip_tax, 2);
 
         array_push($data, array(
             'unit_no' => $request->unit_no,
             'subscription' => $request->subscription,
             'billing' => $request->billing,
             'voice' => $voice,
-            'ip' => $IP,
+            'ip' => $request->ip,
+            'ip_fee' => $ip_fee,
+            'ip_tax' => $ip_tax,
             'thedate' => $request->thedate,
             'dealer_id' => $request->dealer_id,
         ));
 
     public function storeFormDataD(Request $request){
 
-        $su_id = ''; $pathIconF = ''; $pathIconB = ''; $pathForm9 = ''; $pathForm24 = '';
-        $pathVisaF = ''; $pathVisaB = '';
+        $su_id = ''; $pathIconF = ''; $pathIconB = ''; $pathForm9 = ''; $pathPaymentReceipt = ''; $pathSoForm = '';
 
         do {
             $su_id = strtoupper('CBB-'.$this->random_code(6).'B');
             $pathForm9 = '/'.$destinationPath.'/formD.'.$icon->getClientOriginalExtension();
         }
 
-        if($request->hasfile('form_24')){ 
-
-            $icon = $request->file('form_24');
-            $icon->move($destinationPath,'formA_B.'.$icon->getClientOriginalExtension());
-            $pathForm24 = '/'.$destinationPath.'/formA_B.'.$icon->getClientOriginalExtension();
-        }
-
-        if($request->hasfile('visaF')){ 
+        if($request->hasfile('paymentReceipt')){ 
 
-            $icon = $request->file('visaF');
-            $icon->move($destinationPath,'visaF.'.$icon->getClientOriginalExtension());
-            $pathVisaF = '/'.$destinationPath.'/visaF.'.$icon->getClientOriginalExtension();
+            $icon = $request->file('paymentReceipt');
+            $icon->move($destinationPath,'paymentReceipt.'.$icon->getClientOriginalExtension());
+            $pathPaymentReceipt = '/'.$destinationPath.'/paymentReceipt.'.$icon->getClientOriginalExtension();
         }
 
-        if($request->hasfile('visaB')){ 
+        if($request->hasfile('soForm')){ 
 
-            $icon = $request->file('visaB');
-            $icon->move($destinationPath,'visaB.'.$icon->getClientOriginalExtension());
-            $pathVisaB = '/'.$destinationPath.'/visaB.'.$icon->getClientOriginalExtension();
+            $icon = $request->file('soForm');
+            $icon->move($destinationPath,'soForm.'.$icon->getClientOriginalExtension());
+            $pathSoForm = '/'.$destinationPath.'/soForm.'.$icon->getClientOriginalExtension();
         }
 
         if($pathForm9 != '' && $pathIconB != '' && $pathIconF != ''){
                 $sdl->state = $request->cstate;
                 $sdl->front_ic = $pathIconF;
                 $sdl->back_ic = $pathIconB;
-                $sdl->form24_49 = $pathForm24;
                 $sdl->form9_44 = $pathForm9; 
-                $sdl->visaF = $pathVisaF;
-                $sdl->visaB = $pathVisaB;      
+                $sdl->paymentReceipt = $pathPaymentReceipt;
+                $sdl->soForm = $pathSoForm;
                                                 
                 $packageD = new PackageDetail();
                 $packageD->contract = $request->subscription;
                 }
                 $packageD->voice_fee = $request->voice;
                 $packageD->ip = $request->ip;
+                $packageD->ip_tax = $request->ip_tax;
                 $packageD->deposit = $request->deposit;
                 $packageD->upfront_payment = $request->otc;
                 $packageD->rfs = $request->rfs;

app/Http/Controllers/Form/ResidentialController.php

 
         if($request->citizenship != 'Malaysian' && $request->subscription == '12' && $voice == 'No'){
             $otc = 300;
-            $deposit = 300;
+            $deposit = 0;
         }else if($request->citizenship != 'Malaysian' && $request->subscription == '12' && $voice == 'Yes'){
             $otc = 300 + 100;
-            $deposit = 300;
-        }else if($request->citizenship != 'Malaysian' && $request->subscription == '24' && $voice == 'No'){
-            $otc = 0.0;
-            $deposit = 300;
-        }else if($request->citizenship != 'Malaysian' && $request->subscription == '24' && $voice == 'Yes') {
+            $deposit = 0;
+        }else if($request->citizenship != 'Malaysian' && $request->subscription == '24' &&  ($voice == 'No' || $voice == 'Yes')){
             $otc = 0.0;
             $deposit = 300;
-        }else if($request->citizenship == 'Malaysian' && $request->subscription == '24'){
+        }else if($request->citizenship == 'Malaysian' && $request->subscription == '24' && ($voice == 'No' || $voice == 'Yes')){
             $otc = 0.0;
             $deposit = $product->deposit;
-        }else if($request->citizenship == 'Malaysian' && $request->subscription == '12'){
+        }else if($request->citizenship == 'Malaysian' && $request->subscription == '12' && $voice == 'No'){
             $otc = 300;
             $deposit = $product->deposit;
+        }else if($request->citizenship == 'Malaysian' && $request->subscription == '12' && $voice == 'Yes'){
+            $otc = 300 + 100;
+            $deposit = $product->deposit;
         }
 
         $otc_st = number_format(floatval($otc) * 1.06,2);
 
         if($request->citizenship != 'Malaysian' && $request->subscription == '12' && $voice == 'No'){
             $otc = 300;
-            $deposit = 300;
+            $deposit = 0;
         }else if($request->citizenship != 'Malaysian' && $request->subscription == '12' && $voice == 'Yes'){
             $otc = 300 + 100;
-            $deposit = 300;
-        }else if($request->citizenship != 'Malaysian' && $request->subscription == '24' && $voice == 'No'){
+            $deposit = 0;
+        }else if($request->citizenship != 'Malaysian' && $request->subscription == '24' &&  ($voice == 'No' || $voice == 'Yes')){
             $otc = 0.0;
             $deposit = 300;
-        }else if($request->citizenship != 'Malaysian' && $request->subscription == '24' && $voice == 'Yes') {
-            $otc = 100;
-            $deposit = 300;
-        }else if($request->citizenship == 'Malaysian' && $request->subscription == '24'){
+        }else if($request->citizenship == 'Malaysian' && $request->subscription == '24' && ($voice == 'No' || $voice == 'Yes')){
             $otc = 0.0;
             $deposit = $product->deposit;
-        }else if($request->citizenship == 'Malaysian' && $request->subscription == '12'){
+        }else if($request->citizenship == 'Malaysian' && $request->subscription == '12' && $voice == 'No'){
             $otc = 300;
             $deposit = $product->deposit;
+        }else if($request->citizenship == 'Malaysian' && $request->subscription == '12' && $voice == 'Yes'){
+            $otc = 300 + 100;
+            $deposit = $product->deposit;
         }
 
         $otc_st = number_format(floatval($otc) * 1.06,2);
                 $pathPaymentReceipt = '/'.$destinationPath.'/payment_receipt.'.strtolower($icon->getClientOriginalExtension());
             }
 
+            if($request->hasfile('so_form')){ 
+
+                $icon = $request->file('so_form');
+                $icon->move($destinationPath,'so_form.'.strtolower($icon->getClientOriginalExtension()));
+                $pathSOForm = '/'.$destinationPath.'/so_form.'.strtolower($icon->getClientOriginalExtension());
+            }
+
             // staff
             $staff = Staff::with('StaffDetail')->where('_id',$request->dealer_id)->first();
             if(!empty($staff)){
                 $sdl->visaF = $pathVisaF;
                 $sdl->visaB = $pathVisaB;
                 $sdl->paymentReceipt = $pathPaymentReceipt;
+                $sdl->soForm = $pathSOForm;
                 $sdl->signature = '/'.$destinationPath.'/signature_form.jpg';
 
                 $packageD = new PackageDetail();
 
                 $sl->subscriber()->save($sdl);
                 $sl->packagedetail()->save($packageD);
-                
+
+
                 $f_id = $this->sendInvoice($su_id);
                 $stat = new FormStatus();
                 $stat->form_id = $f_id;
         $subscriber = Subscriber::where('subscriber_id',$subscriber_id)->first();
         if(!empty($subscriber)){
             $form = Form::where('_id',$subscriber->_id)->first();
-            $product = Product::where('formT','R')->where('package_name','50Mbps')->first();
+            $product = Product::where('speed',$form->PackageDetail->name)->where('formT',$form->type_application)->first();
         }
         return view('email.invoice', compact ('form', 'product'));
     }

resources/views/email/invoice.blade.php

 													<tbody>
 														<tr>
 															<td valign="top" align="center">
-																<h1 style="font-family:Signika,Helvetica,Arial,sans-serif;font-size:27px;font-style:normal;font-weight:normal;color:#333333">Thanks for your subscription</h1>
+																<h1 style="font-family:Signika,Helvetica,Arial,sans-serif;font-size:27px;font-style:normal;font-weight:normal;color:#333333">Thank you for your subscription!</h1>
 															</td>
 														</tr>
 														<tr style="font-family:Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif;font-size:14px;color:rgb(51,51,51)">
 															<td style="padding:0px 40px" valign="top" align="center">
 																<p><b style="color:#652d90">Hello</b> {{ $form->Subscriber->name }} </p>
-																<p>Have we got your details right? Check them below and let us know if we haven`t. After you are done, please click button <b>VERIFY</b> below to verify your <b>email address</b>
+																<p> Your world is about to get a little faster! We have received your application to upgrade your City Broadband Plan, and we are processing your request. Here are your new subscription details.
 																</p><p>Thank you.</p> 
 															</td>
 														</tr>
 																				<p>{{ $form->PackageDetail->contract}} Months</p>
 																			</td>
 																			<td style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
-																				<b>Checking and Evaluation, Date</b>
+																				<b>Preferred Installation Date</b>
 																				<p>{{ $form->PackageDetail->rfs }}</p>
 																			</td>
 																		</tr>
+																		@if ($form->PackageDetail->contract == '24' && $form->PackageDetail->name != '1')
+																		<tr>
+																			<td colspan="2" style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
+																				<b>Promotion</b>
+																				<p>RM10 off for 24 months</p>
+																			</td>
+																		</tr>
+																		@endif
 																		<tr>
 																			<td colspan="2" style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
 																				<b>Home Voice Plan</b>

resources/views/email/invoiceb.blade.php

 													<tbody>
 														<tr>
 															<td valign="top" align="center">
-																<h1 style="font-family:Signika,Helvetica,Arial,sans-serif;font-size:27px;font-style:normal;font-weight:normal;color:#333333">Thanks for your subscription</h1>
+																<h1 style="font-family:Signika,Helvetica,Arial,sans-serif;font-size:27px;font-style:normal;font-weight:normal;color:#333333">Thank you for your subscription!</h1>
 															</td>
 														</tr>
 														<tr style="font-family:Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif;font-size:14px;color:rgb(51,51,51)">
 															<td style="padding:0px 40px" valign="top" align="center">
 																<p><b style="color:#652d90">Hello</b> {{ $form->Subscriber->name }} </p>
-																<p>Have we got your details right? Check them below and let us know if we haven`t. After you are done, please click button <b>VERIFY</b> below to verify your <b>email address</b>
-																</p><p>Thank you.</p> 
+																<p>Your world is about to get a little faster! We have received your application to upgrade your City Broadband Plan, and we are processing your request. Here are your new subscription details.</p><p>Thank you.</p> 
 															</td>
 														</tr>
 													</tbody>
 																				<p>{{ $form->PackageDetail->contract}} Months</p>
 																			</td>
 																			<td style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
-																				<b>Checking and Evaluation, Date</b>
+																				<b>Preferred Installation Date</b>
 																				<p>{{ $form->PackageDetail->rfs }}</p>
 																			</td>
 																		</tr>
+																		@if ($form->PackageDetail->contract == '24' && $form->PackageDetail->name != '1')
 																		<tr>
 																			<td colspan="2" style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
+																				<b>Promotion</b>
+																				<p>RM10 off for 24 months</p>
+																			</td>
+																		</tr>
+																		@endif
+																		<tr>
+																			<td colspan="1" style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
 																				<b> Voice Plan</b>
-																				@if($form->PackageDetail->voice_fee == 'Yes')
-																				<p>Yes</p>
-																				@elseif($form->PackageDetail->voice_fee == 'No')
-																				<p>No</p>
-																				@endif
+																					@if($product->package_name != '50Mbps') 
+																						<p>Free</p>
+																					@else
+																						<p>{{$form->PackageDetail->voice_fee}}</p>
+																					@endif
+																			</td>
+																			<td colspan="1" style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
+																				<b> IP</b>
+																				<p>{{$form->PackageDetail->ip}}</p>
 																			</td>
 																		</tr>
 																		<tr>
 																		</tr>
 																		<tr>
 																			<td style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
-																				<b>Monthly Broadband Fee (incl. ST)</b>
-																				<p>RM {{  $form->PackageDetail->montly_fee  }}</p>
-																			</td>
-																			<td style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
-																				<b>Voice Fee (incl. ST</b>
+																				<b>Voice Fee (incl. ST)</b>
 																				@if($form->PackageDetail->voice_fee == 'Yes')
 																					<p>RM 21.20</p>
 																				@else
 																				<p>RM 0</p>
 																				@endif
 																			</td>
+																			<td style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
+																				<b>IP (incl. ST)</b>
+																					<p>RM {{$form->PackageDetail->ip_tax}}</p>
+																			</td>
+																		</tr>
+																		<tr>
+																			<td colspan='2' style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
+																				<b>Monthly Broadband Fee (incl. ST)</b>
+																				<p>RM {{  $form->PackageDetail->montly_fee  }}</p>
+																			</td>
 																		</tr>
 																	</tbody>
 																</table>

resources/views/expiredPassword.blade.php

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd') }}">
+<html xmlns="http://www.w3.org/1999/xhtml') }}">
+	<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+	<title>CBB Dashboard</title>
+	
+	<link rel="icon" href="{{ url('assets/favicon-2.png') }}" type="image/gif">
+	<link href="{{ url('css/styles.css') }}" rel="stylesheet" type="text/css" />
+	<link href="{{ url('css/login.css') }}" rel="stylesheet" type="text/css" />
+	<!--[if IE]> <link href="css/ie.css" rel="stylesheet" type="text/css') }}"> <![endif]-->
+
+	<!--<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js') }}"></script>-->
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/charts/excanvas.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/charts/jquery.flot.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/charts/jquery.flot.orderBars.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/charts/jquery.flot.pie.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/charts/jquery.flot.resize.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/charts/jquery.sparkline.min.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/tables/jquery.dataTables.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/tables/jquery.sortable.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/tables/jquery.resizable.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.autosize.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.uniform.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.inputlimiter.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.tagsinput.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.maskedinput.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.autotab.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.select2.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.dualListBox.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.cleditor.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.ibutton.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.validationEngine-en.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.validationEngine.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/uploader/plupload.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/uploader/plupload.html4.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/uploader/plupload.html5.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/uploader/jquery.plupload.queue.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/wizards/jquery.form.wizard.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/wizards/jquery.validate.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/wizards/jquery.form.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.collapsible.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.breadcrumbs.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.tipsy.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.progress.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.timeentry.min.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.colorpicker.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.jgrowl.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.fancybox.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.fileTree.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.sourcerer.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/others/jquery.fullcalendar.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/others/jquery.elfinder.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/plugins/forms/jquery.mousewheel.js') }}"></script>
+	<script type="text/javascript" src="{{ url('js/plugins/ui/jquery.easytabs.min.js') }}"></script>
+
+	<script type="text/javascript" src="{{ url('js/files/bootstrap.js') }}"></script>
+</head>
+
+<style type="text/css">
+	.loginWrapper input[type=email], .loginWrapper input[type=password] {
+	    font-size: 12px !important;
+	}
+</style>
+
+<body>
+	<!-- Top line begins -->
+	<div id="top">
+		<div class="wrapper">
+			<a title="" class="logo isDisabled"><img src="{{ url('assets/logo/logo-cbb3.png') }}" alt="" /></a>
+			
+			<!-- Right top nav -->
+			<div class="topNav">
+				<ul class="userNav') }}">
+					<li><a title="" class="screen isDisabled"></a></li>
+					<li><a title="" class="settings isDisabled"></a></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+	<!-- Top line ends -->
+	
+	<!-- Login wrapper begins -->
+	<div class="loginWrapper">
+	<div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="panel panel-default">
+                <div class="panel-heading">Reset Password</div>
+
+                <div class="panel-body">
+                    @if (session('status'))
+                        <div class="alert alert-success">
+                            {{ session('status') }}
+                        </div>
+                        <a href="/">Return to homepage</a>
+                    @else
+                    <div class="alert alert-info">
+                        Your password has expired, please change it.
+					</div>
+					
+                    <form class="form-horizontal" method="POST" action="{{ route('password.post_expired') }}">
+                        {{ csrf_field() }}
+						<input id="_id" type="hidden" class="form-control" name="_id" value="{{$user['_id']}}">
+                        <div class="form-group{{ $errors->has('current_password') ? ' has-error' : '' }}">
+                            <label for="current_password" class="col-md-4 control-label">Current Password</label>
+
+                            <div class="col-md-6">
+                                <input id="current_password" type="password" class="form-control" name="current_password" required="">
+
+                                @if ($errors->has('current_password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('current_password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+                            <label for="password" class="col-md-4 control-label">New Password</label>
+
+                            <div class="col-md-6">
+                                <input id="password" type="password" class="form-control" name="password" required="">
+
+                                @if ($errors->has('password'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
+                            <label for="password-confirm" class="col-md-4 control-label">Confirm New Password</label>
+                            <div class="col-md-6">
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required="">
+
+                                @if ($errors->has('password_confirmation'))
+                                    <span class="help-block">
+                                        <strong>{{ $errors->first('password_confirmation') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-6 col-md-offset-4">
+                                <button type="submit" class="btn btn-primary">
+                                    Reset Password
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+	</div>
+	<!-- Login wrapper ends -->
+</body>
+</html>

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

 <body>
 	<!-- Address -->
 	<table width="100%">
+		@if($package->name != '1' && $package->contract == '24' && date('d/m/Y', strtotime($form->created_at)) >= '11/08/2020')
+			<tr>
+				<td align="left" style="font-size: 10px">
+					<b style="color: red">PROMOTION (RM 10 off for 24 months)</b>
+				</td>
+				
+			</tr>
+		@endif
 		<tr>
 			<td align="right" class="fontStyle1">
 				<b>ALLO TECHNOLOGY SDN BHD</b>
 					<tr>
 						<td>
 							<table border="0" cellpadding="0" cellspacing="0">
-								@foreach($product as $p)
-									@if($p->speed != '10' && $p->speed != '30')
-									<tr>
-										<td width="13" height="13" style="border:1px solid black;">
-											<span>
-												@if( $package->name == $p->speed )
-												<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto">
-												@endif
-											</span>
-										</td>
-										<td width="5">&nbsp;</td>
-										<td style="font-size: 11px;"><b>{{ $p->package_name }}</b></td>
-										<td width="10">&nbsp;</td>
-										<td style="font-size: 11px;"><b>RM {{ $p->retail_price }}</b> ( RM {{ number_format(floatval(preg_replace("/\,/", "",$p->retail_price)) * 1.06, 2) }} )</td>
-										<td>&nbsp;</td>
-									</tr>
+								@if (date('d/m/Y', strtotime($form->created_at)) >= '11/08/2020')
+										@foreach($product as $p)
+										@if($p->speed != '10' && $p->speed != '30')
+										<tr>
+											<td width="13" height="13" style="border:1px solid black;">
+												<span>
+													@if( $package->name == $p->speed )
+													<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto">
+													@endif
+												</span>
+											</td>
+											<td width="5">&nbsp;</td>
+											<td style="font-size: 11px;"><b>{{ $p->package_name }}</b></td>
+											<td width="10">&nbsp;</td>
+											@if( $p->promotion_price  != '0' && $package->contract == "24")
+											<td style="font-size: 11px;">
+												<span style="text-decoration: line-through;">
+													<b>RM {{ $p->retail_price }}</b> ( RM {{ number_format(floatval($p->retail_price) * 1.06, 2) }} )
+												</span>
+												<b>RM {{ $p->promotion_price }}</b> ( RM {{ number_format(floatval($p->promotion_price) * 1.06, 2) }} )
+											</td>
+											@elseif($p->promotion_price  == '0' || $package->contract == "12" )
+												<td style="font-size: 11px;"><b>RM {{ $p->retail_price }}</b> ( RM {{ number_format(floatval($p->retail_price) * 1.06, 2) }} )</td>
+											@endif
+											<td>&nbsp;</td>
+										</tr>
+										@endif
+										@endforeach
+									@else
+										@foreach($product as $p)
+											@if($p->speed != '10' && $p->speed != '30')
+											<tr>
+												<td width="13" height="13" style="border:1px solid black;">
+													<span>
+														@if( $package->name == $p->speed )
+														<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto">
+														@endif
+													</span>
+												</td>
+												<td width="5">&nbsp;</td>
+												<td style="font-size: 11px;"><b>{{ $p->package_name }}</b></td>
+												<td width="10">&nbsp;</td>
+												<td style="font-size: 11px;"><b>RM {{ $p->retail_price }}</b> ( RM {{ number_format(floatval(preg_replace("/\,/", "",$p->retail_price)) * 1.06, 2) }} )</td>
+												<td>&nbsp;</td>
+											</tr>
+											@endif
+										@endforeach
 									@endif
-								@endforeach
 							</table>
 						</td>
 					</tr>
 					<tr><td height="4"></td></tr>
+					@if ($package->name != '1' && $package->contract == '24' && date('d/m/Y', strtotime($form->created_at)) >= '11/08/2020')
+						<tr>
+							<td style="font-size: 11px;">
+								<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"> RM 10 off for 24 months
+							</td>
+						</tr>
+					@endif
 					<tr>
-						<td style="font-size: 9px;font-style: italic">*All prices shown in the bracket include 6% Goods and Services Tax (SST)</td>
+						<td style="font-size: 9px;font-style: italic">*All prices shown in the bracket include 6%  Services Tax (SST)</td>
 					</tr>
 					<tr><td height="5"></td></tr>
 					<tr>
 					<tr>
 						<td>
 							<table border="0" cellpadding="0" cellspacing="0">
+							@if($package->name == '50') 
 								<tr>
 									<td width="13" height="13" style="border:1px solid black;">
 										<span>
 									<td width="5">&nbsp;</td>
 									<td style="font-size: 11px;"><b>No</b></td>
 								</tr>
+							@else
+								<tr>
+									<td width="13" height="13" style="border:1px solid black;">
+										<span>
+											<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto">
+										</span>
+									</td>
+									<td width="5">&nbsp;</td>
+									<td style="font-size: 11px;"><b>Free</b></td>
+								</tr>
+							@endif
 							</table>
 						</td>
 					</tr>
 									<td style="font-size: 11px;font-weight: bold;font-style: italic"><u>Advanced Payment</u></td>
 								</tr>
 								<tr>
-									<td style="font-size: 11px;">1 Month Fee : <b>RM {{ $package->montly_fee }}</b> (including GST)</td>
+									<td style="font-size: 11px;">1 Month Fee : <b>RM {{ $package->montly_fee }}</b> (including 6% ST)</td>
 								</tr>
 								<tr>
 									<td style="font-size: 11px;">Deposit Fee : <b>RM {{ $package->deposit }}</b></td>
 									@if($package->voice_fee == "no" || $package->voice_fee == "No" || $package->voice_fee == "NO")
 									<td style="font-size: 11px;">Voice Fee : <b>RM 0</b></td>
 									@elseif($package->voice_fee == "yes" || $package->voice_fee == "Yes" || $package->voice_fee == "YES")
-									<td style="font-size: 11px;">Voice Fee : <b>RM 20</b></td>
+									<td style="font-size: 11px;">Voice Fee : <b>RM 21.20</b> (including 6% ST)</td>
 									@endif
 								</tr>
 								<tr>
-									<td style="font-size: 11px;">OTC Fee : <b>RM {{ $package->upfront_payment }}</b></td>
+									<td style="font-size: 11px;">One Time Charge Fee : <b>RM {{ $package->upfront_payment }}</b> (including 6% ST)</td>
+								</tr>
+								<tr>
+									<td style="font-size: 11px;">IP Fee: <b>RM {{ $package->ip_tax }}</b> (including 6% ST)</td>
 								</tr>
 								<tr>
-									<td style="font-size: 11px;">Total : <b>RM {{ number_format(floatval($package->montly_fee) + floatval($package->deposit) + floatval($package->voice_fee) + floatval($package->upfront_payment), 2) }}</b></td>
+								@if ($package->name == "1")
+									@if ($package->ip == "1 Fixed IP RM200/1P/Month") 
+										@if ($package->contract == "12")
+										<td style="font-size: 11px;">Total : <b>RM 4238.94</b> </td>
+										@else
+										<td style="font-size: 11px;">Total : <b>RM 3920.94</b> </td>
+										@endif
+									@elseif ($package->ip == "5 Fixed IP RM400/1P/Month")
+										@if ($package->contract == "12")
+										<td style="font-size: 11px;">Total : <b>RM 4450.94</b> </td>
+										@else
+										<td style="font-size: 11px;">Total : <b>RM 4132.94</b> </td>
+										@endif
+									@else
+										@if ($package->contract == "12")
+										<td style="font-size: 11px;">Total : <b>RM 4026.94</b> </td>
+										@else
+										<td style="font-size: 11px;">Total : <b>RM 3708.94</b> </td>
+										@endif
+									@endif
+								@else
+									@if($package->voice_fee == "yes" || $package->voice_fee == "Yes" || $package->voice_fee == "YES")
+										<td style="font-size: 11px;">Total : <b>RM {{ number_format(floatval($package->montly_fee) + floatval($package->upfront_payment) + floatval($package->ip_tax) + 21.20 , 2) }}</b></td>
+									@else
+									<td style="font-size: 11px;">Total : <b>RM {{ number_format(floatval($package->montly_fee) + floatval($package->upfront_payment) + floatval($package->ip_tax) , 2) }}</b></td>						
+									@endif	
+								@endif
 								</tr>
 								<tr>
 									<td style="font-size: 9px;">*Installation fee will be woved for permises with available of required infrastructure</td>
 								<tr>
 									<td width="12" height="12" style="border:1px solid black"><span><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></span></td>
 									<td width="5">&nbsp;</td>
-									<td style="font-size: 11px;">Photocopy of NRIC (both sides) or passport (Non-Malaysian)</td>
+									<td style="font-size: 11px;">Photocopy of MyKad (both sides) or passport (Non-Malaysian)</td>
 								</tr>
 							</table>
 						</td>
 			</td>
 		</tr>
 	</table>
-	@if($form->back_ic != "" && $form->front_ic != "")
-		@if(($ext1 == "jpeg" && $ext2 == "jpeg") || ($ext1 == "jpg" && $ext2 == "jpg") ||  ($ext1 == "JPG" && $ext2 == "JPG"))
-			@if($ext3 == "pdf" && $ext4 == "pdf")
-				@if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG"))
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-								<tr><td height="10"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->front_ic) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->back_ic) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaF) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaB) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				@elseif($ext5 == "pdf" && $ext6 == "pdf")	
-				@else
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-								<tr><td height="10"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->front_ic) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->back_ic) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				@endif
-			@elseif(($ext3 == "jpeg" && $ext4 == "jpeg") || ($ext3 == "jpg" && $ext4 == "jpg") || ($ext3 == "JPG" && $ext4 == "JPG") || ($ext3 == "" && $ext4 == "jpg"))
-				@if(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG"))
+	<div class="page-break"></div>
 				<table border="0" cellpadding="0" cellspacing="0" width="100%">
 					<tr>
 						<td>
+						@if($form->back_ic != "" && $form->front_ic != "")
 							<table border="0" cellpadding="0" cellspacing="0" width="100%">
 								<tr>
 									<td align="center" style="font-size: 16; font-weight: bold;">
 									</td>
 								</tr>
 								<tr><td height="10"></td></tr>
+								@if ($ext1 != "pdf")
 								<tr>
 									<td style="font-size: 14; font-weight: bold;">
 										Identity Card (Front)
 										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->front_ic) }}">
 									</td>
 								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->back_ic) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaF) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaB) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								@if($form->form24_49 != '')
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 24_49
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form24_49) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
 								@endif
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 9_44
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form9_44) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				@elseif($ext5 == "pdf" && $ext6 == "pdf")
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-								<tr><td height="10"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->front_ic) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->back_ic) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								@if($form->form24_49 != '')
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 24_49
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form24_49) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								@endif
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 9_44
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form9_44) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				@else
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-								<tr><td height="10"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Identity Card (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->front_ic) }}">
-									</td>
-								</tr>
 								<tr><td height="5"></td></tr>
+								@if ($ext2 != "pdf")
 								<tr>
 									<td style="font-size: 14; font-weight: bold;">
 										Identity Card (Back)
 										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->back_ic) }}">
 									</td>
 								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								@if($form->form24_49 != '')
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 24_49
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form24_49) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
 								@endif
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 9_44
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form9_44) }}">
-									</td>
-								</tr>
 							</table>
 						</td>
 					</tr>
-				</table>
 				@endif
-			@endif
-		@elseif($ext1 == "pdf" && $ext2 == "pdf")
-			@if($ext3 == "pdf" && $ext4 == "pdf")
-				@if($ext5 == "pdf" && $ext6 == "pdf")
-					
-				@elseif(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG"))
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaF) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaB) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				@else
-					
+					@if($form->form9_44 != "" && $ext3 != "pdf")
+				<tr>
+					<td>
+						<table border="0" cellpadding="0" cellspacing="0" width="100%">
+							<tr>
+								<td style="font-size: 14; font-weight: bold;">
+									Company Form
+								</td>
+							</tr>
+							<tr><td height="5"></td></tr>
+							<tr>
+								<td width="100%" style="text-align: center">
+									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->form9_44) }}">
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
 				@endif
-			@elseif(($ext3 == "jpeg" && $ext4 == "jpeg") || ($ext3 == "jpg" && $ext4 == "jpg") || ($ext3 == "JPG" && $ext4 == "JPG"))
-				@if($ext5 == "pdf" && $ext6 == "pdf")
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								@if($form->form24_49 != '')
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 24_49
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form24_49) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								@endif
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 9_44
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form9_44) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				@elseif(($ext5 == "jpeg" && $ext6 == "jpeg") || ($ext5 == "jpg" && $ext6 == "jpg") || ($ext5 == "JPG" && $ext6 == "JPG"))
-			    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Front)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaF) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Visa (Back)
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto"  src="{{ url($form->visaB) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								@if($form->form24_49 != '')
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 24_49
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form24_49) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								@endif
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 9_44
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form9_44) }}">
-									</td>
-								</tr>
+				@if($form->paymentReceipt != "" && $ext4 !="pdf")
+				<tr>
+					<td>
+						<table border="0" cellpadding="0" cellspacing="0" width="100%">
+							<tr>
+								<td style="font-size: 14; font-weight: bold;">
+									Upfront Payment Receipt
+								</td>
+							</tr>
+							<tr><td height="5"></td></tr>
+							<tr>
+								<td width="100%" style="text-align: center">
+									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->paymentReceipt) }}">
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				@endif
+				@if($form->soForm != "" && $ext5 !="pdf")
+				<tr>
+					<td>
+						<table border="0" cellpadding="0" cellspacing="0" width="100%">
+							<tr>
+								<td style="font-size: 14; font-weight: bold;">
+									Service Order Form
+								</td>
+							</tr>
+							<tr><td height="5"></td></tr>
+							<tr>
+								<td width="100%" style="text-align: center">
+									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->soForm) }}">
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				@endif
+			</table>	
 							</table>
-						</td>
-					</tr>
+			</table>	
 				</table>
-				@else
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td align="center" style="font-size: 16; font-weight: bold;">
-										Attachment
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<table border="0" cellpadding="0" cellspacing="0" width="100%">
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 24_49
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form24_49) }}">
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td style="font-size: 14; font-weight: bold;">
-										Form 9_44
-									</td>
-								</tr>
-								<tr><td height="5"></td></tr>
-								<tr>
-									<td width="100%">
-										<img style="display:block;max-width:670px;height:auto" src="{{ url($form->form9_44) }}">
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
+			</table>	
 				</table>
-				@endif
-			@endif
-		@endif
-	@endif
+			</table>	
 </body>
 </html>

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

 	<!-- Address -->
 	<table width="100%">
 		
-		@if((($package->montly_fee == '1 Month FREE' && $package->contract == '24') || ($package->name == '500' && $package->contract == '24')) && ($created >= '2019-12-12' && $created <= '2020-01-31'))
+		@if($package->name != '1' && $package->contract == '24' && date('d/m/Y', strtotime($created_at)) >= '11/08/2020')
 			<tr>
 				<td align="left" style="font-size: 10px">
-					<b style="color: red">PROMOTION (12.12)</b>
+					<b style="color: red">PROMOTION (RM 10 off for 24 months)</b>
 				</td>
 				
 			</tr>
 										@endif
 									</span></td>
 									<td width="5">&nbsp;</td>
-									<td width="13%" style="font-size: 11px;"> 12 months</td>
+									<td width="15%" style="font-size: 11px;"> 12 months</td>
 									<td style="width: 20px;border:1px solid #000"><span>
 										@if( $package->contract == "24")
 										<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto">
 										@endif
 									</span></td>
 									<td width="5">&nbsp;</td>
-									<td style="font-size: 11px;"> 24 months</td>
+									<td width="40%" style="font-size: 11px;"> 24 months</td>
 								</tr>
 							</table>
 						</td>
 						<td>
 							<table border="0" cellpadding="0" cellspacing="0" width="100%">
 								<tr>
-									<td width="34%" style="font-size: 11px;">2. Required For Service : </td>
-									<td width="25%" height="16" style="font-size: 11px;border:1px solid #000"><span>{{ $package->rfs }}</span></td>
-									<td width="25%" style="font-size: 11px;text-align: right;padding-right: 5px;">Billing Cycle</td>
-									<td width="3%" style="font-size: 11px;border:1px solid #000"><span><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></span></td>
-									<td width="25%"></td>
+									<td width="35%" style="font-size: 11px;">2. Required For Service : </td>
+									<td width="65%" height="16" style="font-size: 11px;border:1px solid #000"><span>{{ $package->rfs }}</span></td>
 								</tr>
 							</table>
 						</td>
 									<td width="5">&nbsp;</td>
 									<td style="font-size: 11px;"><b>100Mbps</b></td>
 									<td width="10">&nbsp;</td>
-									@if(strpos($created_at, '10') !== false || strpos($created_at, '11') !== false || strpos($created_at, '12') !== false)
 									<td style="font-size: 11px;"><b>RM 109</b> ( RM 115.54 )</td>
-									@else
-									<td style="font-size: 11px;"><b>RM 129</b> ( RM 136.74 )</td>
-									@endif
 									<td>&nbsp;</td>
 								</tr>
 								<tr>
 										</span>
 									</td>
 									<td width="5">&nbsp;</td>
-									<td style="font-size: 11px;"><b>1Gbps</b></td>
+									<td style="font-size: 11px;"><b></b></td>
 									<td width="10">&nbsp;</td>
 									@if(strpos($created_at, '10') !== false || strpos($created_at, '11') !== false || strpos($created_at, '12') !== false)
 									<td style="font-size: 11px;"><b>RM 379</b> ( RM 401.74 )</td>
 											<td>&nbsp;</td>
 										</tr>
 										@endforeach
+									@elseif (date('d/m/Y', strtotime($created_at)) >= '11/08/2020')
+										@foreach($product as $p)
+										<tr>
+											<td width="13" height="13" style="border:1px solid black;">
+												<span>
+													@if( $package->name == $p->speed )
+													<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto">
+													@endif
+												</span>
+											</td>
+											<td width="5">&nbsp;</td>
+											<td style="font-size: 11px;"><b>{{ $p->package_name }}</b></td>
+											<td width="10">&nbsp;</td>
+											@if( $p->promotion_price  != '0' && $package->contract == "24")
+											<td style="font-size: 11px;">
+												<span style="text-decoration: line-through;">
+													<b>RM {{ $p->retail_price }}</b> ( RM {{ number_format(floatval($p->retail_price) * 1.06, 2) }} )
+												</span>
+												<b>RM {{ $p->promotion_price }}</b> ( RM {{ number_format(floatval($p->promotion_price) * 1.06, 2) }} )
+											</td>
+											@elseif($p->promotion_price  == '0' || $package->contract == "12" )
+												<td style="font-size: 11px;"><b>RM {{ $p->retail_price }}</b> ( RM {{ number_format(floatval($p->retail_price) * 1.06, 2) }} )</td>
+											@endif
+											<td>&nbsp;</td>
+										</tr>
+										@endforeach
 									@else
 										@foreach($product as $p)
 										<tr>
 						</td>
 					</tr>
 					<tr><td height="4"></td></tr>
+					@if ($package->name != '1' && $package->contract == '24' && date('d/m/Y', strtotime($created_at)) >= '11/08/2020')
+						<tr>
+							<td style="font-size: 11px;">
+								<img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"> RM 10 off for 24 months
+							</td>
+						</tr>
+					@endif
 					<tr>
-						<td style="font-size: 9px;font-style: italic">*All prices shown in the bracket include 6% Goods and Services Tax (SST)</td>
+						<td style="font-size: 9px;font-style: italic">*All prices shown in the bracket include 6% Services Tax (ST)</td>
 					</tr>
 					<tr><td height="5"></td></tr>
 					<tr>
 									</tr>
 								@else
 									<tr>
-										<td style="font-size: 11px;">1 Month Fee : <b>RM {{ $package->montly_fee }}</b> (including SST)</td>
+										<td style="font-size: 11px;">1 Month Fee : <b>RM {{ $package->montly_fee }}</b> (including 6% ST)</td>
 									</tr>
 								@endif
 								<tr>
 								</tr>
 								<tr>
 									@if($package->voice_fee == "no" || $package->voice_fee == "No" || $package->voice_fee == "NO")
-									<td style="font-size: 11px;">Voice Fee : <b>RM 0</b></td>
+									<td style="font-size: 11px;">Voice Fee : <b>RM 0.00</b></td>
 									@elseif($package->voice_fee == "yes" || $package->voice_fee == "Yes" || $package->voice_fee == "YES")
-									<td style="font-size: 11px;">Voice Fee : <b>RM 20</b></td>
+										@if(date('d/m/Y', strtotime($created_at)) >= '11/08/2020')
+										<td style="font-size: 11px;">Voice Fee : <b>RM 21.20</b>  (including 6% ST)</td>
+										@else
+										<td style="font-size: 11px;">Voice Fee : <b>RM 20</b></td>
+										@endif
 									@endif
 								</tr>
 								<tr>
-									<td style="font-size: 11px;">OTC Fee : <b>RM {{ (float)$package->upfront_payment * 1.06 }}</b> (including SST)</td>
+									<td style="font-size: 11px;">One Time Charge Fee : <b>RM {{ (float)$package->upfront_payment}}</b> (including 6% ST)</td>
 								</tr>
 								@if($package->montly_fee == '1 Month FREE' && $package->contract == '24')
 									<tr>
 									</tr>
 								@else
 									<tr>
-										<td style="font-size: 11px;">Total : <b>RM {{ number_format(floatval($package->montly_fee) + floatval($package->deposit) + floatval($package->voice_fee) + (float)$package->upfront_payment * 1.06, 2) }}</b></td>
+									@if($package->voice_fee == "yes" || $package->voice_fee == "Yes" || $package->voice_fee == "YES")
+										<td style="font-size: 11px;">Total : <b>RM {{ number_format(floatval($package->montly_fee) + floatval($package->deposit) + 21.20 + (float)$package->upfront_payment, 2) }}</b></td>
+									@else
+										<td style="font-size: 11px;">Total : <b>RM {{ number_format(floatval($package->montly_fee) + floatval($package->deposit) + (float)$package->upfront_payment, 2) }}</b></td>
+									@endif
 									</tr>
 								@endif
 								<tr>
 								<tr>
 									<td width="12" height="12" style="border:1px solid black"><span><img src="{{ url('/assets/tick.png') }}" style="width:14px; height:auto"></span></td>
 									<td width="5">&nbsp;</td>
-									<td style="font-size: 11px;">Photocopy of NRIC (both sides) or passport (Non-Malaysian)</td>
+									<td style="font-size: 11px;">Photocopy of MyKad (both sides) or passport (Non-Malaysian)</td>
 								</tr>
 							</table>
 						</td>
 	</table>
 	@if($form->back_ic != "" && $form->front_ic != "")
 		<!-- <div class="page-break"></div> -->
-		@if(($ext1 == "jpeg" && $ext2 == "jpeg") || ($ext1 == "jpg" && $ext2 == "jpg"))
-			@if(($ext3 == "jpeg" && $ext4 == "jpeg") || ($ext3 == "jpg" && $ext4 == "jpg"))
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td>
 								</td>
 							</tr>
 							<tr><td height="10"></td></tr>
+							@if($ext1 !="pdf")
 							<tr>
 								<td style="font-size: 14; font-weight: bold;">
 									Identity Card (Front)
 									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->front_ic) }}">
 								</td>
 							</tr>
+							@endif
 							<tr><td height="5"></td></tr>
+							@if($ext2 !="pdf")
 							<tr>
 								<td style="font-size: 14; font-weight: bold;">
 									Identity Card (Back)
 									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->back_ic) }}">
 								</td>
 							</tr>
+							@endif
 						</table>
 					</td>
 				</tr>
+				@if($form->visaF != "" && $form->visaB != "")
 				<tr>
 					<td>
 						<table border="0" cellpadding="0" cellspacing="0" width="100%">
+							@if($ext3 !="pdf")
 							<tr>
 								<td style="font-size: 14; font-weight: bold;">
 									Visa (Front)
 									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->visaF) }}">
 								</td>
 							</tr>
+							@endif
 							<tr><td height="5"></td></tr>
+							@if($ext4 !="pdf")
 							<tr>
 								<td style="font-size: 14; font-weight: bold;">
 									Visa (Back)
 									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->visaB) }}">
 								</td>
 							</tr>
+							@endif
 						</table>
 					</td>
 				</tr>
-			</table>
-			@else
-			<table border="0" cellpadding="0" cellspacing="0" width="100%">
+				@endif
+				@if($form->paymentReceipt != "" && $ext5 !="pdf")
 				<tr>
 					<td>
 						<table border="0" cellpadding="0" cellspacing="0" width="100%">
 							<tr>
-								<td align="center" style="font-size: 16; font-weight: bold;">
-									Attachment
-								</td>
-							</tr>
-							<tr><td height="10"></td></tr>
-							<tr>
 								<td style="font-size: 14; font-weight: bold;">
-									Identity Card (Front)
+									Upfront Payment Receipt
 								</td>
 							</tr>
 							<tr><td height="5"></td></tr>
 							<tr>
 								<td width="100%" style="text-align: center">
-									<img style="display:block;max-width:700px;height:auto" src="{{ url($form->front_ic) }}">
+									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->paymentReceipt) }}">
 								</td>
 							</tr>
-							<tr><td height="5"></td></tr>
+						</table>
+					</td>
+				</tr>
+				@endif
+				@if($form->soForm != "" && $ext6 !="pdf")
+				<tr>
+					<td>
+						<table border="0" cellpadding="0" cellspacing="0" width="100%">
 							<tr>
 								<td style="font-size: 14; font-weight: bold;">
-									Identity Card (Back)
+									Service Order Form
 								</td>
 							</tr>
 							<tr><td height="5"></td></tr>
 							<tr>
 								<td width="100%" style="text-align: center">
-									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->back_ic) }}">
+									<img style="display:block;max-width:700px;max-height:500px" src="{{ url($form->soForm) }}">
 								</td>
 							</tr>
 						</table>
 					</td>
 				</tr>
-			</table>
-			@endif
-		@endif
+				@endif
+			</table>	
 	@endif
 </body>
 </html>

resources/views/sales/form/business_application_information.blade.php

 																					<input type="radio" name="application" value="Upgrade">Upgrade
 																				</label>
 																				<label class="radio-inline">
-																					<input type="radio" name="application" value="Relocation">Relocation (Rm 150)
+																					<input type="radio" name="application" value="Relocation">Relocation (RM 150)
 																				</label>
 																			</div>
 																		</div>
 																	
 																		<div class="col-md-6">
 																			<div class="form-group">
-																				<label><b>NRIC / Passport</b> <small style="color: red">*</small></label>
+																				<label><b>MyKad / Passport</b> <small style="color: red">*</small></label>
 																				<input  name="nric_passport" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required />
 																			</div>
 																		</div>

resources/views/sales/form/business_package.blade.php

 
 																			<div>
 																				<label class="radio-inline">
-																					<input type="radio" id="subscription1" name="subscription" value="12">12 Months 
-																				</label>
+																					<input type="radio" id="subscription1" name="subscription" value="12">12 Months <br>
+																				<small id="OTC" style="color:red; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
+																				</label> 
 																				<label class="radio-inline">
 																					<input type="radio" id="subscription2" name="subscription" value="24" checked="">24 Months
 																				</label>
 																				@if ($pg != "1Gbps")
 																				<label class="radio-inline">
-																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off every month for 24 months</small>
+																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off for 24 months</small>
 																				</label>
 																				@endif
 																			</div>
-																			<small id="OTC" style="color:blue; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																		</div>
 																	</div>
 																</div>
 																	<div class="col-md-12">
 																		<div class="form-group">
 																			<div class="checkbox">
+																				@if ($pg == "50Mbps")
+																				<label>
+																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p style="margin-bottom: 0px !important">Add on Voice Plan and 1 Dect Phone at RM20/month ? <br><small id="otcVoice" style="color:red; display:none"> A deposit of RM100 is required for new voice activation tied to 12 months contract.</small></p>
+																				</label>
+																				@else
 																				<label>
-																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p style="margin-bottom: 0px !important">Add on Voice Plan and 1 Dect Phone at RM20/month ? <br><small style="color:red"> A deposit of RM100 is required for new voice activation tied to 12 months contract.</small></p>
+																					<input type="checkbox" name="voice" id="voice" value="No" checked> <p style="margin-bottom: 0px !important">Free Voice Plan and 1 Dect Phone </p>
 																				</label>
+																				@endif
 																			</div>
 																		</div>
 																	</div>
 																		<div class="form-group">
 																			<div class="checkbox">
 																				<label>
-																					<input type="checkbox" name="fixed_ip" id="fixed_ip" value="Yes"><p>Add on subscribtion for Fixed IP?</p>
+																					<p>Add on subscribtion for Fixed IP?</p>
 																				</label>
 																				<select name="ip" id="ip" class="form-control" onchange="yesnoCheck(this);">
-																					<option value="" >Please Select</option> 
-																					<option value="no">No</option>
+																					<option value="" >Please Select</option>
 																					<option value="1 Fixed IP RM200/1P/Month">1 Fixed IP RM200/1P/Month</option>
 																					<option value="5 Fixed IP RM400/1P/Month">5 Fixed IP RM400/1P/Month</option>
-																					<option value ="custom">Custom Fixed IP</option>
 																				</select>
 																			</div>
 																		</div>
-																		<div class="form-group">
-																			<input name="custom" id="custom" placeholder="Enter Custom Fixed IP" style="display: none;" class="form-control" type="text" required="" aria-required="true">
-																		</div>
 																	</div>
 																</div>
 
 			$('#subscription1').change(function(){
 				if(document.getElementById('subscription1').checked){
 					$('#OTC').show();
+					$('#otcVoice').show();
 					document.getElementById('10off').checked = false;
 					$('#10off').hide();
 					$('#10off1').hide();
 			$('#subscription2').change(function(){
 				if(document.getElementById('subscription2').checked){
 					$('#OTC').hide();
+					$('#otcVoice').show();
 					document.getElementById('10off').checked = true;
 					$('#10off').show();
 					$('#10off1').show();

resources/views/sales/form/business_preview.blade.php

 														<input type="hidden" name="subscription" value="{{$a['subscription']}}">
 														<input type="hidden" name="voice" value="{{$a['voice']}}">
 														<input type="hidden" name="ip" value="{{$a['ip']}}">
+														<input type="hidden" name="ip_tax" value="{{ $a['ip_tax'] }}">
 														<input type="hidden" name="rfs" value="{{$a['thedate']}}">
 														<input type="hidden" name="deposit" value="{{ $deposit }}">
 														<input type="hidden" name="otc" value="{{ $otc_st }}">
 														<input type="hidden" name="gst" value="{{ $gst }}">
 														<input type="hidden" name="promo_st" value="{{ $promo_st }}">
 														<input type="hidden" name="total_monthly" value="{{ $total_monthly }}">
-
+														
 														<div class="tracking-process"></div>
 													
 														<div>
 																			<hr><label><b>Add-On(s)</b></label>
 																			<table class="table table-sm table-bordered">
 																				<tbody>
-																					<tr><th width="50%">Voice Plan</th>
+																					<tr><th width="50%">Voice Plan and Dect Phone</th>
+																					@if($a['package'] != '50Mbps') 
+																						<td>Free</td>
+																					@else
 																						<td>{{$a['voice']}}</td>
+																					@endif
 																					</tr>
-																					<tr><th width="50%">IP</th>
+																					<tr><th width="50%">Fixed IP</th>
+																					@if($a['ip'] == '') 
+																						<td>No</td>
+																					@else
 																						<td>{{$a['ip']}}</td>
+																					@endif
 																					</tr>
 																				</tbody>
 																			</table>
 																					</tr>
 																				</tbody>
 																			</table>
-																			<hr><label><b>Montly Recurring Charges</b></label>
-																			@if($a['package']!='1Gbps' && $a['subscription']=='24')
-																				<br><small> Promotion: RM10 off for 24 months</small>
-																			@endif
+																			<hr><label><b>Monthly Recurring Charges</b></label>
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
 																					<tr><th>City Broadband Business - {{$a['package']}}</th>
 																					@if($a['package']!='1Gbps' && $a['subscription']=='24')
 																						</td>
 																					</tr>
 																					@endif
+																					@if($a['ip'] != '')
+																					<tr>
+																						<th>Fixed IP</th>
+																						<td>RM {{$a['ip_fee']}}</td>
+																						<td>RM {{$a['ip_tax']}}</td>
+																					</tr>
+																					@endif
 																					<tr><th colspan="2">Total Charges</th>
 																						<td><b>RM{{ $total_monthly }}</b></td>
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
+																			@if ($upfront_total != '0')
 																			<hr><label><b>Upfront Charges</b></label>
-																			
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
+																					@if ($otc_st != '0')
 																					<tr><th>One Time Charges</th>
-																						<td>RM{{ $otc }}</td>
-																						<td>RM{{ $otc_st }}</td>
+																						<td>RM {{ $otc }}</td>
+																						<td>RM {{ $otc_st }}</td>
 																					</tr>
+																					@endif
+																					@if ($deposit != '0')
 																					<tr><th colspan="2">Deposit</th></th>
-																						<td>RM{{ $deposit}}</td>
+																						<td>RM {{ $deposit}}</td>
 																					</tr>
+																					@endif
 																					<tr><th colspan="2">Total Charges</th>
 																						<td><b>RM{{ $upfront_total }}</b></td>
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
 																			<small>All upfront charges will need to be paid prior installation. You will receive an email once your application has been processed.</small>
+																			@endif
 																		</div>
 																	</div>
 																</div>
 																			</div>
 																			<div class="checkbox">
 																				<label>
-																					<input type="checkbox" name="formss" id="formss" value="24" required /> <p><small>Local Registered Company</small><br>Photocopy of Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)
-																					<br><small>Foreign Registered Company</small><br>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1)</p>
+																					<input type="checkbox" name="formss" id="formss" value="24" required /> <p>Local Registered Company<br>Photocopy of Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)
+																					<br>Foreign Registered Company<br>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1)</p>
 																				</label>
 																			</div>
 																			<div class="checkbox">
 																				<label>
 																					<input type="checkbox" name="consent" id="consent" value="24" required /> <p>I hereby consent to the collection, use,
-																						disclosure of my personal information in accordance with the <b><a href="https://www.citybroadband.my/privacy-policy-2/" > Privacy Policy</a></b> available one www.citybroadband.my.</p>
+																						disclosure of my personal information in accordance with the <b><a href="https://www.citybroadband.my/privacy-policy-2/" > Privacy Policy</a></b> available on www.citybroadband.my.</p>
 																				</label>
 																			</div>
 																			<div class="checkbox">
 																</div>
 
 																<h3>Upload Documents</h3>
-																<small><b>Acceptable formats: jpg , jpeg , pdf</b></small>
+																<small><b>Acceptable formats: jpg , jpeg , png, pdf</b></small>
 																<div class="row">
 
 																	<div class="col-md-6">
 																		<div class="form-group">
-																			<label><b>MyKad / Passport (Front)</b> <small style="color: red">*</small></label>
+																			<label>MyKad / Passport (Front) <small style="color: red">*</small></label>
 																			<input type="file" id="front_ic" name="front_ic" multiple onchange="validateImage1()" class="form-control" required />
 																		</div>
 																	</div>
 																	<div class="col-md-6">
 																		<div class="form-group">
-																			<label><b>MyKad/ Passport (Back)</b> <small style="color: red">*</small></label>
+																			<label>MyKad/ Passport (Back)<small style="color: red">*</small></label>
 																			<input type="file" id="back_ic" name="back_ic" multiple onchange="validateImage2()" class="form-control" required />
 																		</div>
 																	</div>
 
 																	<div class="col-md-12">
 																		<div class="form-group">
-																			<label><b>Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)</b> <small style="color: red">*Local Registered Company</small><br>
-																		<b>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1) </b ><small style="color: red">*Foreign Registered Company</small></label>
-																			<input type="file" id="form9" name="form9" multiple onchange="validateImage4()" class="form-control" required />
+																			<label>Local Registered Company<br>Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)<small style="color: red"> *</small><br>
+																			Foreign Registered Company<br>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1)<small style="color: red"> *</small></label>
+																			<input type="file" id="form9" name="form9" multiple onchange="validateImage3()" class="form-control" required />
 																		</div>
 																	</div>
 																</div>
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
+			if (t != "jpeg" && t != "jpg" && t != "pdf" && t != "png") {
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("front_ic").value = '';
 				return false;
 			}
 		
 		function validateImage2() {
 			var formData = new FormData();
-			 
 			var file = document.getElementById("back_ic").files[0];
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
+			if (t != "jpeg" && t != "jpg" && t != "pdf" && t != "png") {
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("back_ic").value = '';
 				return false;
 			}
 			return true;
 		}
-
-		function validateImage3() {
-			var formData = new FormData();
-			 
-			var file = document.getElementById("form_24").files[0];
-			 
-			formData.append("Filedata", file);
-			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
-				document.getElementById("form_24").value = '';
-				return false;
-			}
-			return true;
-		}
 		
-		function validateImage4() {
+		function validateImage3() {
 			var formData = new FormData();
 			 
 			var file = document.getElementById("form9").files[0];
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
+			if (t != "jpeg" && t != "jpg" && t != "pdf" && t != "png") {
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("form9").value = '';
 				return false;
 			}
 			return true;
 		}
 
-		function validateImage5() {
-			var formData = new FormData();
-			 
-			var file = document.getElementById("visaF").files[0];
-			 
-			formData.append("Filedata", file);
-			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
-				document.getElementById("visaF").value = '';
-				return false;
-			}
-			return true;
-		}
-		
-		function validateImage6() {
-			var formData = new FormData();
-			 
-			var file = document.getElementById("visaB").files[0];
-			 
-			formData.append("Filedata", file);
-			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
-				document.getElementById("visaB").value = '';
-				return false;
-			}
-			return true;
-		}
-
 	</script>
 
 </body>

resources/views/sales/form/dealer/business_application_information.blade.php

 																					<input type="radio" name="application" value="Upgrade">Upgrade
 																				</label>
 																				<label class="radio-inline">
-																					<input type="radio" name="application" value="Relocation">Relocation (Rm 150)
+																					<input type="radio" name="application" value="Relocation">Relocation (RM 150)
 																				</label>
 																			</div>
 																		</div>
 																	
 																		<div class="col-md-6">
 																			<div class="form-group">
-																				<label><b>NRIC / Passport</b> <small style="color: red">*</small></label>
+																				<label><b>MyKad / Passport</b> <small style="color: red">*</small></label>
 																				<input  name="nric_passport" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required />
 																			</div>
 																		</div>

resources/views/sales/form/dealer/business_package.blade.php

 														<input type="hidden" name="caddress" value="{{$a['caddress']}}">
 														<input type="hidden" name="ccity" value="{{$a['ccity']}}">
 														<input type="hidden" name="postcode" value="{{$a['postcode']}}">
-														<input type="hidden" name="ccity" value="{{$a['ccity']}}">
+														<input type="hidden" name="cstate" value="{{$a['cstate']}}">
 														<input type="hidden" name="package" value="{{ $a['package'] }}">
 														<input type="hidden" name="application" value="{{$a['application']}}">
 														<input type="hidden" name="company_name" value="{{$a['company_name']}}">
 
 																			<div>
 																				<label class="radio-inline">
-																					<input type="radio" id="subscription1" name="subscription" value="12">12 Months 
+																					<input type="radio" id="subscription1" name="subscription" value="12">12 Months <br>
+																				<small id="OTC" style="color:red; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																				</label>
 																				<label class="radio-inline">
 																					<input type="radio" id="subscription2" name="subscription" value="24" checked="">24 Months
 																				</label>
 																				@if ($pg != "1Gbps")
 																				<label class="radio-inline">
-																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off every month for 24 months</small>
+																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off for 24 months</small>
 																				</label>
 																				@endif
 																			</div>
-																			<small id="OTC" style="color:blue; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																		</div>
 																	</div>
 																</div>
 																	<div class="col-md-12">
 																		<div class="form-group">
 																			<div class="checkbox">
+																				@if ($pg == "50Mbps")
+																				<label>
+																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p style="margin-bottom: 0px !important">Add on Voice Plan and 1 Dect Phone at RM20/month ? <br><small id="otcVoice" style="color:red; display:none"> A deposit of RM100 is required for new voice activation tied to 12 months contract.</small></p>
+																				</label>
+																				@else
 																				<label>
-																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p style="margin-bottom: 0px !important">Add on Voice Plan and 1 Dect Phone at RM20/month ? <br><small style="color:red"> A deposit of RM100 is required for new voice activation tied to 12 months contract.</small></p>
+																					<input type="checkbox" name="voice" id="voice" value="No" checked> <p style="margin-bottom: 0px !important">Free Voice Plan and 1 Dect Phone </p>
 																				</label>
+																				@endif
 																			</div>
 																		</div>
 																	</div>
 																		<div class="form-group">
 																			<div class="checkbox">
 																				<label>
-																					<input type="checkbox" name="fixed_ip" id="fixed_ip" value="Yes"><p>Add on subscribtion for Fixed IP?</p>
+																					<p>Add on subscribtion for Fixed IP?</p>
 																				</label>
 																				<select name="ip" id="ip" class="form-control" onchange="yesnoCheck(this);">
-																					<option value="" >Please Select</option> 
-																					<option value="no">No</option>
+																					<option value="" >Please Select</option>
 																					<option value="1 Fixed IP RM200/1P/Month">1 Fixed IP RM200/1P/Month</option>
 																					<option value="5 Fixed IP RM400/1P/Month">5 Fixed IP RM400/1P/Month</option>
-																					<option value ="custom">Custom Fixed IP</option>
 																				</select>
 																			</div>
 																		</div>
-																		<div class="form-group">
-																			<input name="custom" id="custom" placeholder="Enter Custom Fixed IP" style="display: none;" class="form-control" type="text" required="" aria-required="true">
-																		</div>
 																	</div>
 																</div>
 
 			$('footer').removeClass('reached-bottom');   
 		}
 	});
+
+			$('#subscription1').change(function(){
+				if(document.getElementById('subscription1').checked){
+					$('#OTC').show();
+					$('#otcVoice').show();
+					document.getElementById('10off').checked = false;
+					$('#10off').hide();
+					$('#10off1').hide();
+				}
+			});
+			$('#subscription2').change(function(){
+				if(document.getElementById('subscription2').checked){
+					$('#OTC').hide();
+					$('#otcVoice').show();
+					document.getElementById('10off').checked = true;
+					$('#10off').show();
+					$('#10off1').show();
+				}
+			});
 </script>
 <style>
 	select {

resources/views/sales/form/dealer/business_preview.blade.php

 														<input type="hidden" name="subscription" value="{{$a['subscription']}}">
 														<input type="hidden" name="voice" value="{{$a['voice']}}">
 														<input type="hidden" name="ip" value="{{$a['ip']}}">
+														<input type="hidden" name="ip_tax" value="{{ $a['ip_tax'] }}">
 														<input type="hidden" name="rfs" value="{{$a['thedate']}}">
 														<input type="hidden" name="deposit" value="{{ $deposit }}">
 														<input type="hidden" name="otc" value="{{ $otc_st }}">
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr><th width="50%">Voice Plan</th>
-																						<td>{{$a['voice']}}</td>
+																					@if($a['package'] != '50Mbps') 
+																						<td>Free</td>
+																					@else
+																						<td>{{($a['voice'])}}</td>
+																					@endif
 																					</tr>
 																					<tr><th width="50%">IP</th>
+																					@if($a['ip'] == '') 
+																						<td>No</td>
+																					@else
 																						<td>{{$a['ip']}}</td>
+																					@endif
 																					</tr>
 																				</tbody>
 																			</table>
 																					</tr>
 																				</tbody>
 																			</table>
-																			<hr><label><b>Montly Recurring Charges</b></label>
-																			@if($a['package']!='1Gbps' && $a['subscription']=='24')
-																				<br><small> Promotion: RM10 off for 24 months</small>
-																			@endif
+																			<hr><label><b>Monthly Recurring Charges</b></label>
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
 																					<tr><th>City Broadband Business - {{$a['package']}}</th>
 																					@if($a['package']!='1Gbps' && $a['subscription']=='24')
 																						</td>
 																					</tr>
 																					@endif
+																					@if($a['ip'] != '')
+																					<tr>
+																						<th>IP</th>
+																						<td>RM {{$a['ip_fee']}}</td>
+																						<td>RM {{$a['ip_tax']}}</td>
+																					</tr>
+																					@endif
 																					<tr><th colspan="2">Total Charges</th>
 																						<td><b>RM{{ $total_monthly }}</b></td>
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
+																			@if ($upfront_total != '0')
 																			<hr><label><b>Upfront Charges</b></label>
-																			
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
+																					@if ($otc_st != '0')
 																					<tr><th>One Time Charges</th>
-																						<td>RM{{ $otc }}</td>
-																						<td>RM{{ $otc_st }}</td>
+																						<td>RM {{ $otc }}</td>
+																						<td>RM {{ $otc_st }}</td>
 																					</tr>
+																					@endif
+																					@if ($deposit != '0')
 																					<tr><th colspan="2">Deposit</th></th>
-																						<td>RM{{ $deposit}}</td>
+																						<td>RM {{ $deposit}}</td>
 																					</tr>
+																					@endif
 																					<tr><th colspan="2">Total Charges</th>
 																						<td><b>RM{{ $upfront_total }}</b></td>
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
 																			<small>All upfront charges will need to be paid prior installation. You will receive an email once your application has been processed.</small>
+																			@endif
 																		</div>
 																	</div>
 																</div>
 																			</div>
 																			<div class="checkbox">
 																				<label>
-																					<input type="checkbox" name="formss" id="formss" value="24" required /> <p><small>Local Registered Company</small><br>Photocopy of Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)
-																					<br><small>Foreign Registered Company</small><br>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1)</p>
+																					<input type="checkbox" name="formss" id="formss" value="24" required /> <p>Local Registered Company<br>Photocopy of Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)
+																					<br>Foreign Registered Company<br>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1)</p>
 																				</label>
 																			</div>
 																			<div class="checkbox">
 																				<label>
 																					<input type="checkbox" name="consent" id="consent" value="24" required /> <p>I hereby consent to the collection, use,
-																						disclosure of my personal information in accordance with the <b><a href="https://www.citybroadband.my/privacy-policy-2/" > Privacy Policy</a></b> available one www.citybroadband.my.</p>
+																						disclosure of my personal information in accordance with the <b><a href="https://www.citybroadband.my/privacy-policy-2/" > Privacy Policy</a></b> available on www.citybroadband.my.</p>
 																				</label>
 																			</div>
 																			<div class="checkbox">
 																</div>
 
 																<h3>Upload Documents</h3>
-																<small><b>Acceptable formats: jpg , jpeg , pdf</b></small>
+																<small><b>Acceptable formats: jpg , jpeg , png, pdf</b></small>
 																<div class="row">
 
 																	<div class="col-md-6">
 																		<div class="form-group">
-																			<label><b>MyKad / Passport (Front)</b> <small style="color: red">*</small></label>
+																			<label>MyKad / Passport (Front) <small style="color: red">*</small></label>
 																			<input type="file" id="front_ic" name="front_ic" multiple onchange="validateImage1()" class="form-control" required />
 																		</div>
 																	</div>
 																	<div class="col-md-6">
 																		<div class="form-group">
-																			<label><b>MyKad/ Passport (Back)</b> <small style="color: red">*</small></label>
+																			<label>MyKad/ Passport (Back)<small style="color: red">*</small></label>
 																			<input type="file" id="back_ic" name="back_ic" multiple onchange="validateImage2()" class="form-control" required />
 																		</div>
 																	</div>
 
 																	<div class="col-md-12">
 																		<div class="form-group">
-																			<label><b>Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)</b> <small style="color: red">*Local Registered Company</small><br>
-																		<b>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1) </b ><small style="color: red">*Foreign Registered Company</small></label>
-																			<input type="file" id="form9" name="form9" multiple onchange="validateImage4()" class="form-control" required />
+																			<label>Local Registered Company<br>Form 9/Form 13/Notice of Registration (Section 15)/Certificate of Incorporation (Section 17)/Section 28/Certificateof Practice issued by the relevant authority (NGO/Association /Cooperative)<small style="color: red"> *</small><br>
+																			Foreign Registered Company<br>Form 79/Form 80/Form 80a/Form 83/Form 83a/Section 562(1)<small style="color: red"> *</small></label>
+																			<input type="file" id="form9" name="form9" multiple onchange="validateImage3()" class="form-control" required />
 																		</div>
 																	</div>
 																	<div class="col-md-12">
 																		<div class="form-group">
 																			<label><b>Upfront Payment Receipt</b></label>
-																			<input type="file"  id="payment_receipt" accept="image/*" capture="camera" name="payment_receipt" multiple="" onchange="validateImage5()" class="form-control" aria-required="true">
+																			<input type="file"  id="payment_receipt" accept="image/*" capture="camera" name="payment_receipt" multiple="" onchange="validateImage4()" class="form-control" aria-required="true">
+																		</div>
+																	</div>
+																	<div class="col-md-12">
+																		<div class="form-group">
+																			<label><b>Service Order Form</b></label>
+																			<input type="file"  id="soForm" accept="image/*" capture="camera" name="soForm" multiple="" onchange="validateImage5()" class="form-control" aria-required="true">
 																		</div>
 																	</div>
 																</div>
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
+			if (t != "jpeg" && t != "jpg" && t != "pdf" && t != "png") {
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("front_ic").value = '';
 				return false;
 			}
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
+			if (t != "jpeg" && t != "jpg" && t != "pdf" && t != "png") {
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("back_ic").value = '';
 				return false;
 			}
 			return true;
 		}
-
-		function validateImage3() {
-			var formData = new FormData();
-			 
-			var file = document.getElementById("form_24").files[0];
-			 
-			formData.append("Filedata", file);
-			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
-				document.getElementById("form_24").value = '';
-				return false;
-			}
-			return true;
-		}
 		
-		function validateImage4() {
+		function validateImage3() {
 			var formData = new FormData();
 			 
 			var file = document.getElementById("form9").files[0];
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
+			if (t != "jpeg" && t != "jpg" && t != "pdf" && t != "png") {
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("form9").value = '';
 				return false;
 			}
 			return true;
 		}
 
-		function validateImage5() {
+		function validateImage4() {
 			var formData = new FormData();
 			 
 			var file = document.getElementById("payment_receipt").files[0];
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
 			if (t != "jpeg" && t != "jpg" && t !="png" && t != "pdf") {
-				alert('Accept jpg, jpeg, png and pdf only');
+				alert('Accept jpeg, jpg, pdf and png only.');
 				document.getElementById("payment_receipt").value = '';
 				return false;
 			}
 			return true;
 		}
-		
-		function validateImage6() {
+		function validateImage5() {
 			var formData = new FormData();
 			 
-			var file = document.getElementById("visaB").files[0];
+			var file = document.getElementById("soForm").files[0];
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t != "pdf") {
-				alert('Only Accept jpg / jpeg / PDF Only!!');
-				document.getElementById("visaB").value = '';
+			if (t != "jpeg" && t != "jpg" && t !="png" && t != "pdf") {
+				alert('Accept jpeg, jpg, pdf and png only.');
+				document.getElementById("soForm").value = '';
 				return false;
 			}
 			return true;

resources/views/sales/form/dealer/residential_address.blade.php

 
 																	<div class="col-md-12">
 																	<div class="form-group">
-																			<label><b>Street</b></label>
-																			<input type="text" name="street" placeholder="Enter your street" class="form-control">
+																			<label><b>Street</b> <small style="color: red;">*</small></label>
+																			<input type="text" name="street" placeholder="Enter your street" class="form-control"  required aria-required="true">
 																		</div>
 																	</div>
 

resources/views/sales/form/dealer/residential_application_information.blade.php

 																				<option value="female">Female</option>
 																			</select>
 																		</div>
-																		<small id="desc" style="color: red; display:none">A deposit of RM300 will be charge upfront prior installation.</small>
 																	</div>
 																	<div class="col-md-6">
 																		<div class="form-group">
 																						<option value="Zambia">Zambia</option>
 																						<option value="Zimbabwe">Zimbabwe</option>
 																					</select>
+																					<small id="desc" style="color: red; display:none">A deposit of RM300 will be charge upfront prior installation.</small>
 																		</div>
 																	</div>
 
 																		<div class="form-group">
 																			<label><b>MyKad / Passport</b> <small style="color: red">*</small></label>
 																			<input id="nric1" name="nric_passport1" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required="" aria-required="true" style="display:block">
-																			<textarea rows="3" id="nric2" name="nric_passport2" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required="" aria-required="true" style="display:none"></textarea>
+																			<textarea rows="6" id="nric2" name="nric_passport2" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required="" aria-required="true" style="display:none"></textarea>
 																		</div>
 																	</div>
 																	<div class="col-md-6">

resources/views/sales/form/dealer/residential_package.blade.php

 
 																			<div>
 																				<label class="radio-inline">
-																					<input id="subscription1" type="radio" name="subscription" value="12">12 Months
+																					<input id="subscription1" type="radio" name="subscription" value="12">12 Months <br> <small id="OTC" style="color:red; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																				</label>
 																				<label class="radio-inline">
-																					<input id="subscription2" type="radio" name="subscription" value="24" checked="">24 Months
+																					<input id="subscription2" type="radio" name="subscription" value="24" checked="">24 Months <br> 
 																				</label>
 																				@if ($a['package'] != "1Gbps")
 																				<label class="radio-inline">
-																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off every month for 24 months</small>
+																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off for 24 months</small>
 																				</label>
 																				@endif
 																			</div>
-																			<small id="OTC" style="color:blue; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																		</div>
 																	</div>
 																</div>
 																		<div class="form-group">
 																			<div class="checkbox">
 																				<label>
-																					@if($citizen != 'Malaysian')
-																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p>Add on Voice Home Plan at RM20/month<br><small style="color:red">A one-time-charge of RM100 is required for new voice activation tied to 12 months contract</small></p>
-																					@else
-																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p>Add on Voice Home Plan at RM20/month</p>
-																					@endif
+																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p>Add on Voice Home Plan at RM20/month<br><small id="otcVoice" style="color:red; display:none">A one-time-charge of RM100 is required for new voice activation tied to 12 months contract</small></p>
 																				</label>
 																			</div>
 																		</div>
 	$('#subscription1').change(function(){
 				if(document.getElementById('subscription1').checked){
 					$('#OTC').show();
+					$('#otcVoice').show();
 					document.getElementById('10off').checked = false;
 					$('#10off').hide();
 					$('#10off1').hide();
 			$('#subscription2').change(function(){
 				if(document.getElementById('subscription2').checked){
 					$('#OTC').hide();
+					$('#otcVoice').hide();
 					document.getElementById('10off').checked = true;
 					$('#10off').show();
 					$('#10off1').show();

resources/views/sales/form/dealer/residential_preview.blade.php

 																					</tr>
 																				</tbody>
 																			</table>
-																			<hr><label><b>Montly Recurring Charges</b></label>
-																			@if($a['package']!='1Gbps' && $a['subscription']=='24')
-																				<br><small> Promotion: RM10 off for 24 months</small>
-																			@endif
+																			<hr><label><b>Monthly Recurring Charges</b></label>
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
 																					<tr><th>City Broadband Residential - {{$a['package']}}</th>
 																					@if($a['package']!='1Gbps' && $a['subscription']=='24')
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
+																			@if ($upfront_total != 0)
 																			<hr><label><b>Upfront Charges</b></label>
-																			
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
+																					@if ($otc_st != 0)
 																					<tr><th>One Time Charges</th>
 																						<td>RM{{ $otc }}</td>
 																						<td>RM{{ $otc_st }}</td>
 																					</tr>
+																					@endif
+																					@if ($deposit != 0)
 																					<tr><th colspan="2">Deposit</th></th>
 																						<td>RM{{ $deposit}}</td>
 																					</tr>
+																					@endif
 																					<tr><th colspan="2">Total Charges</th>
 																						<td><b>RM{{ $upfront_total }}</b></td>
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
 																			<small>All upfront charges will need to be paid prior installation. You will receive an email once your application has been processed.</small>
+																			@endif
 																		</div>
 																	</div>
 																</div>
 																		<div class="form-group">
 																			<div class="checkbox">
 																				<label>
+																					<input type="checkbox" name="photocopy" id="photocopy" value="24" required="" aria-required="true"> <p>Photocopy of MyKad(both side) or passport minimum (12 months validity) and visa minimum 6 months validity)</p>
+																				</label>
+																			</div>
+																			<div class="checkbox">
+																				<label>
 																					<input type="checkbox" name="consent" id="consent" value="24" required="" aria-required="true"> <p>I hereby consent to the collection, use,
-																						disclosure of my personal information in accordance with the <b> <a href="https://www.citybroadband.my/privacy-policy-2/" >Privacy Policy</a> </b> available one www.citybroadband.my.</p>
+																						disclosure of my personal information in accordance with the <b> <a href="https://www.citybroadband.my/privacy-policy-2/" >Privacy Policy</a> </b> available on www.citybroadband.my.</p>
 																				</label>
 																			</div>
 																			<div class="checkbox">
 																</div>
 
 																<h3>Upload Documents</h3>
-																<small><b>Acceptable formats: jpg , jpeg , png </b></small>
+																<small><b>Acceptable formats: jpg , jpeg , png , pdf</b></small>
 																<div class="row">
 																	<div class="col-md-12">
 																		<div class="form-group">
 																	<div class="col-md-12">
 																		<div class="form-group">
 																			<label><b>Upfront Payment Receipt</b></label>
-																			<input type="file"  id="payment_receipt" accept="image/*" capture="camera" name="payment_receipt" multiple="" onchange="validateImage5()" class="form-control" aria-required="true">
+																			<input type="file"  id="payment_receipt" accept="image/*" capture="camera" name="payment_receipt" multiple="" onchange="validateImage5()" class="form-control">
+																		</div>
+																	</div>
+																	<div class="col-md-12">
+																		<div class="form-group">
+																			<label><b>Service Order Form</b></label>
+																			<input type="file"  id="so_form" accept="image/*" capture="camera" name="so_form" multiple="" onchange="validateImage6()" class="form-control">
 																		</div>
 																	</div>
 																</div>
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t !="png") {
+			if (t != "jpeg" && t != "jpg" && t !="png" && t != "pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("front_ic").value = '';
 				return false;
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t !="png") {
+			if (t != "jpeg" && t != "jpg" && t !="png" && t != "pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("back_ic").value = '';
 				return false;
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" &&  t !="png") {
+			if (t != "jpeg" && t != "jpg" &&  t !="png" && t != "pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("visaF").value = '';
 				return false;
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" &&t !="png") {
+			if (t != "jpeg" && t != "jpg" &&t !="png" && t != "pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("visaB").value = '';
 				return false;
 			return true;
 		}
 
+		function validateImage6() {
+			var formData = new FormData();
+			 
+			var file = document.getElementById("soorm").files[0];
+			 
+			formData.append("Filedata", file);
+			var t = file.type.split('/').pop().toLowerCase();
+			if (t != "jpeg" && t != "jpg" && t !="png" && t != "pdf") {
+				alert('Accept jpg, jpeg, png and pdf only');
+				document.getElementById("so_form").value = '';
+				return false;
+			}
+			return true;
+		}
+
 		$(document).ready(function(){
 
 			var needV = "{{ $a['citizenship'] }}";

resources/views/sales/form/residential_address.blade.php

 
 																	<div class="col-md-12">
 																	<div class="form-group">
-																			<label><b>Street</b></label>
-																			<input type="text" name="street" placeholder="Enter your street" class="form-control">
+																			<label><b>Street</b> <small style="color: red;">*</small></label>
+																			<input type="text" name="street" placeholder="Enter your street" class="form-control"  required aria-required="true">
 																		</div>
 																	</div>
 

resources/views/sales/form/residential_application_information.blade.php

 																				<option value="female">Female</option>
 																			</select>
 																		</div>
-																		<small id="desc" style="color: red; display:none">A deposit of RM300 will be charge upfront prior installation.</small>
 																	</div>
 																	<div class="col-md-6">
 																		<div class="form-group">
 																						<option value="Zambia">Zambia</option>
 																						<option value="Zimbabwe">Zimbabwe</option>
 																					</select>
+																					<small id="desc" style="color: red; display:none">A deposit of RM300 will be charge upfront prior installation.</small>	
 																		</div>
 																	</div>
-
 																	<div class="col-md-6">
 																		<div class="form-group">
 																			<label><b>MyKad / Passport</b> <small style="color: red">*</small></label>
 																			<input id="nric1" name="nric_passport1" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required="" aria-required="true" style="display:block">
-																			<textarea rows="3" id="nric2" name="nric_passport2" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required="" aria-required="true" style="display:none"></textarea>
+																			<textarea rows="6" id="nric2" name="nric_passport2" placeholder="Enter NRIC / Passport Number" class="form-control" type="text" required="" aria-required="true" style="display:none"></textarea>
 																		</div>
 																	</div>
 																	<div class="col-md-6">

resources/views/sales/form/residential_package.blade.php

 
 																			<div>
 																				<label class="radio-inline">
-																					<input id="subscription1" type="radio" name="subscription" value="12">12 Months
+																					<input id="subscription1" type="radio" name="subscription" value="12">12 Months <br> <small id="OTC" style="color:red; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																				</label>
 																				<label class="radio-inline">
 																					<input id="subscription2" type="radio" name="subscription" value="24" checked="">24 Months
 																				</label>
 																				@if ($a['package'] != "1Gbps")
 																				<label class="radio-inline">
-																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off every month for 24 months</small>
+																					<input type="checkbox" id="10off" checked="">   <small id="10off1">RM10 off for 24 months</small>
 																				</label>
 																				@endif
 																			</div>
-																			<small id="OTC" style="color:blue; display:none">A one-time charge of RM300 applies for 12 months subscription.</small>
 																		</div>
 																	</div>
 																</div>
 																		<div class="form-group">
 																			<div class="checkbox">
 																				<label>
-																					@if($citizen != 'Malaysian')
-																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p>Add on Voice Home Plan at RM20/month<br><small style="color:red">A one-time-charge of RM100 is required for new voice activation tied to 12 months contract</small></p>
-																					@else
-																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p>Add on Voice Home Plan at RM20/month</p>
-																					@endif
+																					<input type="checkbox" name="voice" id="voice" value="Yes"> <p>Add on Voice Home Plan at RM20/month<br><small id="otcVoice" style="color:red; display:none">A one-time-charge of RM100 is required for new voice activation tied to 12 months contract</small></p>
 																				</label>
 																			</div>
 																		</div>
 			$('#subscription1').change(function(){
 				if(document.getElementById('subscription1').checked){
 					$('#OTC').show();
+					$('#otcVoice').show();
 					document.getElementById('10off').checked = false;
 					$('#10off').hide();
 					$('#10off1').hide();
 			$('#subscription2').change(function(){
 				if(document.getElementById('subscription2').checked){
 					$('#OTC').hide();
+					$('#otcVoice').hide();
 					document.getElementById('10off').checked = true;
 					$('#10off').show();
 					$('#10off1').show();

resources/views/sales/form/residential_preview.blade.php

 																					</tr>
 																				</tbody>
 																			</table>
-																			<hr><label><b>Montly Recurring Charges</b></label>
-																			@if($a['package']!='1Gbps' && $a['subscription']=='24')
-																				<br><small> Promotion: RM10 off for 24 months</small>
-																			@endif
+																			<hr><label><b>Monthly Recurring Charges</b></label>
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
 																					<tr><th>City Broadband Residential - {{$a['package']}}</th>
 																					@if($a['package']!='1Gbps' && $a['subscription']=='24')
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
+																			@if ($upfront_total != 0)
 																			<hr><label><b>Upfront Charges</b></label>
-																			
 																			<table class="table table-sm table-bordered">
 																				<tbody>
 																					<tr>
 																						<th>Description</th>
 																						<th>Price exclude ST</th>
-																						<th>With ST 6%</th>
+																						<th>Total*</th>
 																					</tr>
+																					@if ($otc_st != 0)
 																					<tr><th>One Time Charges</th>
 																						<td>RM{{ $otc }}</td>
 																						<td>RM{{ $otc_st }}</td>
 																					</tr>
+																					@endif
+																					@if ($deposit != 0)
 																					<tr><th colspan="2">Deposit</th></th>
 																						<td>RM{{ $deposit}}</td>
 																					</tr>
+																					@endif
 																					<tr><th colspan="2">Total Charges</th>
 																						<td><b>RM{{ $upfront_total }}</b></td>
 																					</tr>
 																				</tbody>
 																			</table>
+																			<small>*Price subject to 6% Service Tax (if applicable).</small><br>
 																			<small>All upfront charges will need to be paid prior installation. You will receive an email once your application has been processed.</small>
+																			@endif
 																		</div>
 																	</div>
 																</div>
 																		<div class="form-group">
 																			<div class="checkbox">
 																				<label>
+																					<input type="checkbox" name="photocopy" id="photocopy" value="24" required="" aria-required="true"> <p>Photocopy of MyKad(both side) or passport minimum (12 months validity) and visa minimum 6 months validity)</p>
+																				</label>
+																			</div>
+																			<div class="checkbox">
+																				<label>
 																					<input type="checkbox" name="consent" id="consent" value="24" required="" aria-required="true"> <p>I hereby consent to the collection, use,
-																						disclosure of my personal information in accordance with the <b> <a href="https://www.citybroadband.my/privacy-policy-2/" >Privacy Policy</a> </b> available one www.citybroadband.my.</p>
+																						disclosure of my personal information in accordance with the <b> <a href="https://www.citybroadband.my/privacy-policy-2/" >Privacy Policy</a> </b> available on www.citybroadband.my.</p>
 																				</label>
 																			</div>
 																			<div class="checkbox">
 																</div>
 
 																<h3>Upload Documents</h3>
-																<small><b>Acceptable formats: jpg , jpeg , png </b></small>
+																<small><b>Acceptable formats: jpg , jpeg , png , pdf</b></small>
 																<div class="row">
 																	<div class="col-md-12">
 																		<div class="form-group">
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t !="png") {
+			if (t != "jpeg" && t != "jpg" && t !="png" && t !="pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("front_ic").value = '';
 				return false;
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" && t !="png") {
+			if (t != "jpeg" && t != "jpg" && t !="png" && t !="pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("back_ic").value = '';
 				return false;
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" &&  t !="png") {
+			if (t != "jpeg" && t != "jpg" &&  t !="png" && t !="pdf") {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("visaF").value = '';
 				return false;
 			 
 			formData.append("Filedata", file);
 			var t = file.type.split('/').pop().toLowerCase();
-			if (t != "jpeg" && t != "jpg" &&t !="png") {
+			if (t != "jpeg" && t != "jpg" &&t !="png" &&t !="pdf" ) {
 				alert('Accept jpg, jpeg, png and pdf only');
 				document.getElementById("visaB").value = '';
 				return false;

routes/web.php

 Route::post('/login-dashboard-staff', 'Auth\StaffLoginController@requestLoginStaff');
 Route::get('/dashboard/logout/staff', 'Auth\StaffLoginController@requestlogout');
 
+Route::post('password/post_expired', 'Auth\AdminController@postExpired')->name('password.post_expired');
+
+
 Route::get('/login/dashboard/admin', 'Auth\AdminController@showFormAdmin');
 Route::post('/login-dashboard-admin', 'Auth\AdminController@requestLoginAdmin');
 Route::get('/dashboard/logout/admin', 'Auth\AdminController@requestlogout');
 Route::post('/residential/application-form/store/{dealer_id}', 'Form\ResidentialController@storeFormDataD')->name('dstoreFormRD');
 
 Route::get('/check-template-email/{subscriber_id}','Form\ResidentialController@checkEmailTemplate');
+Route::get('/check-template-emailB/{subscriber_id}','Form\BusinessController@checkEmailTemplate');
 
 Route::get('/application-form/verify-email/{subscriber_id}', 'Form\ResidentialController@verifyEmail');
 Route::get('/residential/application-form/success-submit', 'Form\ResidentialController@successSubmit');
 /* Customer Service
 ***/
 Route::group(['middleware' => 'csAuth'], function () {
+
 	Route::get('/customer-service', ['uses' => 'CustomerService\CalendarController@index', 'as' => 'csHome']);
 	Route::post('/customer-service/get-all-calendar', ['uses' => 'CustomerService\CalendarController@getAllCalendar', 'as' => 'gALLCalendar']);
 	Route::post('/customer-service/get-company-color', ['uses' => 'CustomerService\CalendarController@getCompanyColor', 'as' => 'gCompanyColor']);
 	Route::post('/CustomerService/wo/delete-wo', 'DS\CustomerService\CustomerController@deleteCustomerWo')->name('deleteCustomerWo');
 
 	Route::get('/customer-service/get-data-claim','Api\ClaimedController@get_data_claim');
-    Route::get('/customer-service/get-data-form','Api\FormController@get_data_form');
+	Route::get('/customer-service/get-data-form','Api\FormController@get_data_form');
 });
 
 /** Access Authorized (Contractor) **/
 Route::group(['middleware' => 'contractorAuth'], function() {
+
 	Route::get('/contractor', ['uses' => 'Contractor\CalendarController@viewContractorDashboard','as'=>'conHome']);
 	Route::post('/contractor/get-all-calendar', ['uses' => 'Contractor\CalendarController@getAllCalendar', 'as' => 'gALLCalendar']);
 
 /** Access Auhtorized (Marketing - Admin) **/
 Route::group(['middleware' => 'marketAuth'], function () 
 {
-	//All route related to Dashboard	
+	//All route related to Dashboard
 	Route::get('/marketing', ['uses' => 'DS\MarketingController@dashboard', 'as' => 'dashboard']);
 
 	//All route related to Company(Dealer)
 
 /** Access Auhtorized (Dealer) **/
 Route::group(['middleware' => 'dsAuth'], function () {
+
 	Route::get('/dealer', ['uses' => 'DS\DealerController@viewList', 'as' => 'dHome']);
 	Route::get('/dealer/get-agent-list', ['uses' => 'DS\DealerController@gAgentList', 'as' => 'gAList']);