redo dealer-fasten commission

app/Http/Controllers/DS/DealerController.php

@@ -631,6 +631,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,
@@ -643,14 +644,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
@@ -721,7 +727,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

@@ -542,10 +542,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' => '',
@@ -720,6 +726,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');
@@ -3728,67 +3740,7 @@ class MarketingController extends Controller
 		$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) {
@@ -3880,6 +3832,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,
@@ -3892,14 +3845,19 @@ class MarketingController 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
@@ -3950,7 +3908,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';
@@ -3958,7 +3916,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/claim_list.blade.php

@@ -262,10 +262,8 @@
 
 				else if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null')
 				{
-					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null/pdf';
 					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null' ).load();
-					$('#link1').show();
-					$('#link1').html('<li><a target="_blank" href="'+link+'" title=""><span class="icos-download"></span>Download PDF</a></li>');	
+					$('#link1').hide();
 				}
 
 				else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null')

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>

resources/views/pdf/agent-claim.blade.php

@@ -87,15 +87,28 @@
     <br/>
 
     <div class="invoice">
-        <h3>Invoice Number : {{$invoice_no}}</h3>
-        <h3>Invoice Claim: {{ $month }} / {{ $year}}</h3>
-        <h5>Issue Date: {{ date("d/m/Y H:i:s") }}</h5>
+        <table width="100%" style="font-size: 15px; font-weight:bold">
+            <tr>
+                <td style="border: none" >Invoice Number : {{$invoice_no}}</td>
+                <td style="border: none" align="right">Issue Date: {{ date("d/m/Y H:i:s") }}</td>
+            </tr>
+            <tr>
+                <td style="border: none">Invoice Claim: {{ $month }} / {{ $year}}</td>
+                <td style="border: none" align="right">Invoice Claim Date Range: 01/{{$month}}/{{$year}} - {{cal_days_in_month(CAL_GREGORIAN,$month,$year)}}/{{$month}}/{{$year}}</td>
+            </tr>
+            @if ($project_type!=null)
+            <tr >
+                <td colspan="2" style="border: none" >Project Type : {{$project_type}}</td>
+            </tr>
+            @endif
+        </table>
         <table width="100%" cellpadding="0" cellpadding="0">
             <thead>
                 <tr>
                     <th>#</th>
                     <th>Contract</th>
                     <th>W/O</th>
+                    <th>D/O</th>
                     <th>Activation</th>
                     <th>Name</th>
                     <th>Address</th>
@@ -114,6 +127,7 @@
                         <td>{{ $key+1 }}{{ $c['index'] }}</td>
                         <td>{{ $c['contract'] }}</td>
                         <td>{{ $c['wo'] }}</td>
+                        <td>{{ $c['do'] }}</td>
                         <td>{{ $c['activated_dt'] }}</td>
                         <td>{{ $c['name'] }}</td>
                         <td>{{ $c['address'] }}</td>
@@ -127,25 +141,49 @@
             </tbody>
             <tfoot>
                 <tr>
-                    <td colspan="9"></td>
+                    <td colspan="10"></td>
                     <td align="left">Additional Incentives</td>
                     <td align="left" class="gray">RM {{ $extra }}</td>
                 </tr>
                 <tr>
-                    <td colspan="9"></td>
+                    <td colspan="10"></td>
                     <td align="left">Incentives</td>
                     <td align="left" class="gray">RM {{ $basic_total }}</td>
                 </tr>
                 <tr>
-                    <td colspan="9"></td>
+                    <td colspan="10"></td>
                     <td align="left">Total</td>
                     <td align="left" class="gray">RM {{ $totals }}</td>
                 </tr>
+                <tr>
+                    <td colspan="12" style="border:none"> <p style="color: red" >This is system auto-generated. Payment will be processed within 45 days.</p> </td>
+                </tr>
             </tfoot>
         </table>
 
+        <table width="100%" style>
+            <tr>
+                <td width="50%">Business Registration Number : {{$com->reg_no}} </td>
+                <td width="50%">Contact Number : {{$com->contact_no}}</td>
+            </tr>
+            <tr>
+                <td colspan="2" style="font-weight: bold ; border:none">Bank Account Details</td>
+            </tr>
+            <tr>
+                <td width="50%">Bank Name : {{$com->bank_name}} </td>
+                <td width="50%">Account Number : {{$com->acc_no}}</td>
+            </tr>
+            <tr>
+                <td width="50%">Account Holder Name : {{$com->acc_holder_name}}</td>
+                <td width="50%">Finance Email Address : {{$com->fin_email}}</td>
+            </tr>
+        </table>
+
         <table width="100%" cellpadding="0" cellpadding="0" style="margin-top: 80px">
             <tr>
+                <th align="left" width="100%" colspan="3" >------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- <br> *For Internal Use </th>
+            </tr>
+            <tr>
                 <th width="33%">Submitted By</th>
                 <th width="33%">Verified By</th>
                 <th width="33%">Approved By</th>