implement new way generate invoice_number

app/Http/Controllers/DS/DealerClaimController.php

@@ -80,7 +80,7 @@ class DealerClaimController extends Controller
 						'total_form_by_month' => '',
 						'agent' => $formD->dealer_id,
 						'dealer' => $formD->company_id,
-						'invoice_no' => $this->generateInvoiceNumber($formD->type_application, $formD->company_id, date('m', strtotime($docket->end_job)), date('Y', strtotime($docket->end_job))),
+						'invoice_no' => $this->generateInvoiceNumber($formD->project_type,$formD->type_application, $formD->company_id, date('m', strtotime($docket->end_job)), date('Y', strtotime($docket->end_job))),
 					];
 
 					DealerClaim::create($subsData);
@@ -302,9 +302,9 @@ class DealerClaimController extends Controller
 		dd($data_not_activated);
 	}
 
-	public function generateInvoiceNumber($formT, $dealer, $month, $year)
+	public function generateInvoiceNumber($projectT, $formT, $dealer, $month, $year)
 	{
-		$claim = DealerClaim::where('formT', $formT)->where('dealer', $dealer)->where('activated_my', $month . '/' . $year)->first();
+		$claim = DealerClaim::where('projectT',$projectT)->where('formT', $formT)->where('dealer', $dealer)->where('activated_my', $month . '/' . $year)->first();
 
 		if (!empty($claim->invoice_no)) {
 			return $claim->invoice_no;

app/Http/Controllers/DS/DealerController.php

@@ -655,10 +655,6 @@ class DealerController extends Controller
 
 			foreach ($dataClaim as $f) {
 				$basic_total += $f->total_claim;
-
-				if (!empty($f->invoice_no)) {
-					$invoice_no = $f->invoice_no;
-				}
 			}
 
 			// Calculate extra incentves

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

@@ -92,7 +92,9 @@
     <div class="invoice">
         <table width="100%" style="font-size: 15px; font-weight:bold">
             <tr>
+                @if ($invoice_no!=null)
                 <td style="border: none" >Invoice Number : {{$invoice_no}}</td>
+                @endif
                 <td style="border: none" align="right">Issue Date: {{ date("d/m/Y H:i:s") }}</td>
             </tr>
             <tr>