Add dealer detail

app/Http/Controllers/DS/DealerController.php

@@ -617,6 +617,7 @@ class DealerController extends Controller
 					'index' => $c->formT,
 					'contract' => $c->contract,
 					'wo' =>  $c->wo,
+					'do' => $c->docket,
 					'activated_dt' => $c->activated_dt,
 					'name' =>  $name,
 					'address' => $address,
@@ -629,14 +630,19 @@ class DealerController extends Controller
 				));
 			}
 
-
+			$project_type = '';
+			$invoice_no = '';
+			
 			foreach($dataClaim as $f){
 				$basic_total += $f->total_claim; 
 
-				$invoice_no = '';
 				if(!empty($f->invoice_no)){
 					$invoice_no = $f->invoice_no;
 				}
+
+				if(!empty($f->projectT)){
+					$project_type = $f->projectT;
+				}
 			}
 			
 			// Calculate extra incentves
@@ -708,7 +714,7 @@ class DealerController extends Controller
 
 			$totals = $basic_total + $extra;
 			
-			$pdf = PDF::loadView('pdf.agent-claim', compact('final', 'month', 'year','com','basic_total','extra','totals','invoice_no'));
+			$pdf = PDF::loadView('pdf.agent-claim', compact('final', 'month', 'year','com','basic_total','extra','totals','invoice_no','project_type'));
 			$pdf->setPaper('A4', 'landscape');
 			$pdfName = preg_replace('/\s+/', '-', $com->name).'-'.$month.'-'.$year.'.pdf';
 

app/Http/Controllers/DS/MarketingController.php

@@ -523,10 +523,16 @@ class MarketingController extends Controller
 	{
 		$companyData = [
 			'name' => $request->get('aname'),
+			'reg_no' => $request->get('biz_reg_no'),
+			'contact' => $request->get('contact_no'),
+			'fin_email' => $request->get('fin_email'),
 			'address' => $request->get('address'),
 			'city' => $request->get('city'),
 			'state' => $request->get('state'),
 			'postcode' => $request->get('postcode'),
+			'bank_name' => $request->get('bank_name'),
+			'acc_holder_name' => $request->get('acc_holder_name'),
+			'acc_no' => $request->get('acc_no'),
 			'color' => '',
 			'team' => 'Dealer',
 			'status' => '', 
@@ -706,6 +712,12 @@ class MarketingController extends Controller
 		$user = Company::where('_id', $request->get('company_id'))->first();
 
 		$user->name = $request->get('aname');
+		$user->reg_no = $request->get('biz_reg_no');
+		$user->contact = $request->get('contact_no');
+		$user->fin_email = $request->get('fin_email');
+		$user->bank_name = $request->get('bank_name');
+		$user->acc_holder_name = $request->get('acc_holder_name');
+		$user->acc_no = $request->get('acc_no');
 		$user->address = $request->get('address');
 		$user->city = $request->get('city');
 		$user->state = $request->get('state');
@@ -3738,67 +3750,7 @@ class MarketingController extends Controller
 		$count_cyberjaya = array(); $count_jasin = array(); $count_ayerKeroh = array(); $count_alorGajah = array();
 		$extra = 0; $basic_total = 0; $totals = 0; 
 
-		if($year!='null' && $month!='null' && $app!='null' && $ptype=='null'){
-
-			if($app == 'Residential'){
-				$dataClaim = DealerClaim::with(['Subscriber' => function($q) {
-					$q->with('Form');
-				}],'Staff')->where('formT', 'R')->where('dealer',$company)->where('activated_my',$month.'/'.$year)->orderBy('activated_dt','DESC')->get();
-				
-				if(($year == '2019' || $year == '2020') && ($month == '12' || $month == '01')){
-				
-					foreach ($dataClaim as $key => $d) {
-						if(date('d/m/Y', strtotime($d->activated_dt)) >= '12/12/2019' &&
-						date('d/m/Y', strtotime($d->activated_dt)) <= '31/01/2020'){
-							if (strpos($d['address'], 'Cyberjaya') !== false) {
-							    $count_cyberjaya[] = $d;
-							}
-
-							if (strpos($d['address'], 'Jasin') !== false) {
-							    $count_jasin[] = $d;
-							}
-							if (strpos($d['address'], 'Ayer Keroh') !== false) {
-							    $count_ayerKeroh[] = $d;
-							}
-
-							if (strpos($d['address'], 'Alor Gajah') !== false) {
-							    $count_alorGajah[] = $d;
-							}
-						}
-					}
-				
-				}else if($year == '2020' && ($month == '04' || $month == '05' || $month == '06' || $month == '07')){
-
-					foreach ($dataClaim as $key => $d) {
-						if(date('d/m/Y', strtotime($d->activated_dt)) >= '27/04/2020' &&
-						date('d/m/Y', strtotime($d->activated_dt)) <= '31/07/2020'){
-							if (strpos($d['address'], 'Cyberjaya') !== false) {
-							    $count_cyberjaya[] = $d;
-							}
-
-							if (strpos($d['address'], 'Jasin') !== false) {
-							    $count_jasin[] = $d;
-							}
-
-							if (strpos($d['address'], 'Ayer Keroh') !== false) {
-							    $count_ayerKeroh[] = $d;
-							}
-
-							if (strpos($d['address'], 'Alor Gajah') !== false) {
-							    $count_alorGajah[] = $d;
-							}
-						}
-					}
-
-				}
-
-			}else if($app == 'Business'){
-				$dataClaim = DealerClaim::with(['Subscriber' => function($q) {
-					$q->with('Form');
-				}],'Staff')->where('formT', 'B')->where('dealer',$company)->where('activated_my',$month.'/'.$year)->orderBy('activated_dt','DESC')->get();
-			}
-
-		} else if($year!='null' && $month!='null' && $app!='null' && $ptype!='null'){
+		if($year!='null' && $month!='null' && $app!='null' && $ptype!='null'){
 
 			if($app == 'Residential'){
 				$dataClaim = DealerClaim::with(['Subscriber' => function($q) {
@@ -3890,6 +3842,7 @@ class MarketingController extends Controller
 					'index' => $c->formT,
 					'contract' => $c->contract,
 					'wo' =>  $c->wo,
+					'do' => $c->docket,
 					'activated_dt' => $c->activated_dt,
 					'name' =>  $name,
 					'address' => $address,
@@ -3902,14 +3855,19 @@ class MarketingController extends Controller
 				));
 			}
 
+			$project_type = '';
+			$invoice_no = '';
 
-			foreach($dataClaim as $f){
-				$basic_total += $f->total_claim; 
+			foreach ($dataClaim as $f) {
+				$basic_total += $f->total_claim;
 
-				$invoice_no = '';
-				if(!empty($f->invoice_no)){
+				if (!empty($f->invoice_no)) {
 					$invoice_no = $f->invoice_no;
 				}
+
+				if (!empty($f->projectT)) {
+					$project_type = $f->projectT;
+				}
 			}
 			
 			// Calculate extra incentves
@@ -3961,7 +3919,7 @@ class MarketingController extends Controller
 
 			$totals = $basic_total + $extra;
 
-			$pdf = PDF::loadView('pdf.agent-claim', compact('final', 'month', 'year','com','basic_total','extra','totals', 'invoice_no'));
+			$pdf = PDF::loadView('pdf.agent-claim', compact('final', 'month', 'year','com','basic_total','extra','totals', 'invoice_no', 'project_type'));
 			$pdf->setPaper('A4', 'landscape');
 			if($ptype!=null){
 				$pdfName = preg_replace('/\s+/', '-', $com->name).'-'.$app.'-'.$ptype.'-'.$month.'-'.$year.'.pdf';
@@ -3969,7 +3927,7 @@ class MarketingController extends Controller
 				$pdfName = preg_replace('/\s+/', '-', $com->name).'-'.$app.'-'.$month.'-'.$year.'.pdf';
 			}
 
-			return $pdf->download( $pdfName );
+			return $pdf->stream( $pdfName );
 		}
 	}
 

resources/views/market/add_dealer.blade.php

@@ -49,6 +49,27 @@
 						<div class="grid2"><label><b>Dealer Name : </b></label></div>
                         <div class="grid6"><input type="text" name="aname" id="cname" value="" required /></div>
 						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Business Registration Number: </b></label></div>
+                        <div class="grid6"><input type="text" name="biz_reg_no" id="biz_reg_no" value="" required /></div>
+						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Contact Number : </b></label></div>
+                        <div class="grid6"><input type="text" name="contact_no" id="contact_no" value="" required /></div>
+						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Finance Email Address : </b></label></div>
+                        <div class="grid6"><input type="text" name="fin_email" id="fin_email" value="" required /></div>
+						<div class="grid2">&nbsp;</div>
                     </div>
 					
 					<div class="formRow">
@@ -77,8 +98,33 @@
 						<div class="grid2"><label><b>State : </b></label></div>
                         <div class="grid6"><input type="text" name="state" id="state" value="" required /></div>
 						<div class="grid2">&nbsp;</div>
+					</div>
+
+					<div class="formRow">
+					<h6>Bank Account Details</h6>
+					</div>
+
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Bank Name : </b></label></div>
+                        <div class="grid6"><input type="text" name="bank_name" id="bank_name" value="" required /></div>
+						<div class="grid2">&nbsp;</div>
                     </div>
 					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Account Holder Name : </b></label></div>
+                        <div class="grid6"><input type="text" name="acc_holder_name" id="acc_holder_name" value="" required /></div>
+						<div class="grid2">&nbsp;</div>
+                    </div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Account Number : </b></label></div>
+                        <div class="grid6"><input type="text" name="acc_no" id="acc_no" value="" required /></div>
+						<div class="grid2">&nbsp;</div>
+					</div>
+					
 					<div class="formRow noBorderB" id="sendForm"><input type="submit" value="Submit" class="buttonM bPurple formSubmit" name="submit" id="submit"></div>
 				</div>
 				<div class="widget grid2 widgetH"></div>

resources/views/market/edit_dealer.blade.php

@@ -51,6 +51,27 @@ Use App\Model\CompanyLaravel;
 						<div class="grid2"><label><b>Company Name : </b></label></div>
 						<div class="grid6"><input type="text" name="aname" id="cname" value="{{$a->name}}" required /></div>	
 						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Business Registration Number: </b></label></div>
+                        <div class="grid6"><input type="text" name="biz_reg_no" id="biz_reg_no" value="{{$a->reg_no}}" required /></div>
+						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Contact Number : </b></label></div>
+                        <div class="grid6"><input type="text" name="contact_no" id="contact_no" value="{{$a->contact}}" required /></div>
+						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Finance Email Address : </b></label></div>
+                        <div class="grid6"><input type="text" name="fin_email" id="fin_email" value="{{$a->fin_email}}" required /></div>
+						<div class="grid2">&nbsp;</div>
                     </div>
 					
 					<div class="formRow">
@@ -79,8 +100,33 @@ Use App\Model\CompanyLaravel;
 						<div class="grid2"><label><b>State : </b></label></div>
                         <div class="grid6"><input type="text" name="state" id="state" value="{{$a->state}}" required /></div>
 						<div class="grid2">&nbsp;</div>
+					</div>
+					
+					<div class="formRow">
+					<h6>Bank Account Details</h6>
+					</div>
+
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Bank Name : </b></label></div>
+                        <div class="grid6"><input type="text" name="bank_name" id="bank_name" value="{{$a->bank_name}}" required /></div>
+						<div class="grid2">&nbsp;</div>
                     </div>
 					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Account Holder Name : </b></label></div>
+                        <div class="grid6"><input type="text" name="acc_holder_name" id="acc_holder_name" value="{{$a->acc_holder_name}}" required /></div>
+						<div class="grid2">&nbsp;</div>
+                    </div>
+					
+					<div class="formRow">
+						<div class="grid2">&nbsp;</div>
+						<div class="grid2"><label><b>Account Number : </b></label></div>
+                        <div class="grid6"><input type="text" name="acc_no" id="acc_no" value="{{$a->acc_no}}" required /></div>
+						<div class="grid2">&nbsp;</div>
+					</div>
+					
 					<div class="formRow noBorderB" id="sendForm"><input type="submit" value="Update Detail" class="buttonM bPurple formSubmit" name="submit" id="submit"></div>
 				</div>
 				<div class="widget grid2 widgetH"></div>