Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for setting default invoice terms/footers (#3439)

Browse Source
This commit is contained in:
David Bomba 2020-03-06 23:01:07 +11:00 committed by GitHub
parent 5bca8f8ad8
commit c57e6b0c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/InvoiceController.php
View File

@ -209,7 +209,7 @@ class InvoiceController extends BaseController {
$client = Client::find($request->input('client_id')); $client = Client::find($request->input('client_id'));
$invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company(), auth()->user()->id)); $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
$invoice = StoreInvoice::dispatchNow($invoice, $request->all(), $invoice->company);//todo potentially this may return mixed ie PDF/$invoice... need to revisit when we implement UI $invoice = StoreInvoice::dispatchNow($invoice, $request->all(), $invoice->company);//todo potentially this may return mixed ie PDF/$invoice... need to revisit when we implement UI

6
app/Models/Client.php
View File

@ -467,7 +467,7 @@ class Client extends BaseModel implements HasLocalePreference
} }
public function setInvoiceDefaults() :Invoice public function setInvoiceDefaults($invoice) :Invoice
{ {
$invoice->terms = $this->getSetting('invoice_terms'); $invoice->terms = $this->getSetting('invoice_terms');
$invoice->footer = $this->getSetting('invoice_footer'); $invoice->footer = $this->getSetting('invoice_footer');
@ -476,7 +476,7 @@ class Client extends BaseModel implements HasLocalePreference
return $invoice; return $invoice;
} }
public function setQuoteDefaults() :Quote public function setQuoteDefaults($quote) :Quote
{ {
$quote->terms = $this->getSetting('quote_terms'); $quote->terms = $this->getSetting('quote_terms');
$quote->footer = $this->getSetting('quote_footer'); $quote->footer = $this->getSetting('quote_footer');
@ -485,7 +485,7 @@ class Client extends BaseModel implements HasLocalePreference
return $quote; return $quote;
} }
public function setCreditDefaults() :Credit public function setCreditDefaults($credit) :Credit
{ {
$credit->terms = $this->getSetting('credit_terms'); $credit->terms = $this->getSetting('credit_terms');
$credit->footer = $this->getSetting('credit_footer'); $credit->footer = $this->getSetting('credit_footer');

2
app/Repositories/BaseRepository.php
View File

@ -197,7 +197,7 @@ class BaseRepository
//if new, set defaults! //if new, set defaults!
if(!$model->id) { if(!$model->id) {
$methodName = "set" . $resource . "Defaults"; $methodName = "set" . $resource . "Defaults";
$model = $client->{$methodName}(); $model = $client->{$methodName}($model);
} }