Default quote & invoice terms setting

Author: andrewdrake

resources/lang/en/lang.php

@@ -382,5 +382,5 @@
     'delivery' => 'delivery',
     'delivered' => 'delivered',
     'quote_terms' => 'quote terms',
-    'invoice_terms' => 'invoice terms'
+    'invoice_terms' => 'invoice terms',
 ];

resources/views/invoices/partials/fields.blade.php

@@ -94,7 +94,7 @@
              'name' => 'terms',
              'label' => ucfirst(__('laravel-crm::lang.terms')),
              'rows' => 5,
-             'value' => old('terms', $invoice->terms ?? null)
+             'value' => old('terms', $invoice->terms ?? $invoiceTerms->value ??  null)
         ])
         {{--@include('laravel-crm::partials.form.multiselect',[
             'name' => 'labels',

resources/views/quotes/partials/fields.blade.php

@@ -95,7 +95,7 @@
              'name' => 'terms',
              'label' => ucfirst(__('laravel-crm::lang.terms')),
              'rows' => 5,
-             'value' => old('terms', $quote->terms ?? null) 
+             'value' => old('terms', $quote->terms ?? $quoteTerms->value ?? null) 
         ])
 
         @include('laravel-crm::partials.form.multiselect',[

src/Http/Controllers/InvoiceController.php

@@ -91,12 +91,15 @@ public function create(Request $request)
                 break;
         }
 
+        $invoiceTerms = $this->settingService->get('invoice_terms');
+
         return view('laravel-crm::invoices.create', [
             'person' => $person ?? null,
             'organisation' => $organisation ?? null,
             'order' => $order ?? null,
             'prefix' => $this->settingService->get('invoice_prefix'),
             'number' => (Invoice::latest()->first()->number ?? 1000) + 1,
+            'invoiceTerms' => $invoiceTerms,
         ]);
     }
 

src/Http/Controllers/QuoteController.php

@@ -95,9 +95,12 @@ public function create(Request $request)
                 break;
         }
 
+        $quoteTerms = $this->settingService->get('quote_terms');
+
         return view('laravel-crm::quotes.create', [
             'person' => $person ?? null,
             'organisation' => $organisation ?? null,
+            'quoteTerms' => $quoteTerms,
         ]);
     }