Updated invoice payment instructions

Author: andrewdrake

resources/lang/en/lang.php

@@ -512,4 +512,6 @@
     'lead_prefix' => 'lead prefix',
     'deal_prefix' => 'deal prefix',
     'create_and_add_another' => 'create & add another',
+    'invoice_payment_instructions' => 'invoice payment instructions',
+    'payment' => 'payment',
 ];

resources/views/invoices/pdf.blade.php

@@ -148,6 +148,18 @@
         </tr>
         </tfoot>
     </table>
+    @if($paymentInstructions)
+        <table class="table table-bordered table-sm table-items">
+            <tbody>
+            <tr>
+                <td>
+                    <h4>{{ ucfirst(__('laravel-crm::lang.payment')) }}</h4>
+                    {!! nl2br($paymentInstructions) !!}
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    @endif
     @if($invoice->terms)
         <table class="table table-bordered table-sm table-items">
             <tbody>

resources/views/portal/invoices/show.blade.php

@@ -227,12 +227,22 @@
                         </div>
                     </div>
                     <hr class="m-0" />
-                    <div class="row py-1">
-                        <div class="col px-5 py-4">
-                            <h5>{{ ucfirst(__('laravel-crm::lang.terms')) }}</h5>
-                            {!! nl2br($invoice->terms) !!}
+                    @if($paymentInstructions)
+                        <div class="row py-1">
+                            <div class="col px-5 py-4">
+                                <h5>{{ ucfirst(__('laravel-crm::lang.payment')) }}</h5>
+                                {!! nl2br($paymentInstructions) !!}
+                            </div>
                         </div>
-                    </div>
+                    @endif
+                    @if($invoice->terms)
+                        <div class="row py-1">
+                            <div class="col px-5 py-4">
+                                <h5>{{ ucfirst(__('laravel-crm::lang.terms')) }}</h5>
+                                {!! nl2br($invoice->terms) !!}
+                            </div>
+                        </div>
+                    @endif
                 </div>  
             </div>
         </div>

src/Http/Controllers/InvoiceController.php

@@ -298,6 +298,7 @@ public function download(Invoice $invoice)
             ->loadView('laravel-crm::invoices.pdf', [
                 'invoice' => $invoice,
                 'contactDetails' => $this->settingService->get('invoice_contact_details')->value ?? null,
+                'paymentInstructions' => $this->settingService->get('invoice_payment_instructions')->value ?? null,
                 'email' => $email ?? null,
                 'phone' => $phone ?? null,
                 'address' => $address ?? null,

src/Http/Controllers/Portal/InvoiceController.php

@@ -55,6 +55,7 @@ public function show(Request $request, Invoice $invoice)
         return view('laravel-crm::portal.invoices.show', [
             'invoice' => $invoice,
             'contactDetails' => $this->settingService->get('invoice_contact_details')->value ?? null,
+            'paymentInstructions' => $this->settingService->get('invoice_payment_instructions')->value ?? null,
             'email' => $email ?? null,
             'phone' => $phone ?? null,
             'address' => $address ?? null,

src/Http/Livewire/SendInvoice.php

@@ -78,6 +78,7 @@ public function send()
             ->loadView('laravel-crm::invoices.pdf', [
                 'invoice' => $this->invoice,
                 'contactDetails' => $this->settingService->get('invoice_contact_details')->value ?? null,
+                'paymentInstructions' => $this->settingService->get('invoice_payment_instructions')->value ?? null,
                 'email' => $email ?? null,
                 'phone' => $phone ?? null,
                 'address' => $address ?? null,