tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes for recurring invoice request

Browse source
This commit is contained in:
David Bomba 2019-05-30 09:58:00 +10:00
parent f20183025b
commit ce8d440ec5
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/RecurringInvoiceController.php
View file

@ -109,7 +109,7 @@ class RecurringInvoiceController extends BaseController
public function store(StoreRecurringInvoiceRequest $request)
{
$recurring_invoice = $this->recurring_invoice_repo->save($request, RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
$recurring_invoice = $this->recurring_invoice_repo->save($request->all(), RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
return $this->itemResponse($recurring_invoice);
@ -156,7 +156,7 @@ class RecurringInvoiceController extends BaseController
public function update(UpdateRecurringInvoiceRequest $request, RecurringInvoice $recurring_invoice)
{
$recurring_invoice = $this->recurring_invoice_repo->save(request(), $recurring_invoice);
$recurring_invoice = $this->recurring_invoice_repo->save($request->all(), $recurring_invoice);
return $this->itemResponse($recurring_invoice);

5
app/Repositories/RecurringInvoiceRepository.php
View file

@ -27,13 +27,12 @@ class RecurringInvoiceRepository extends BaseRepository
return RecurringInvoice::class;
}
public function save(Request $request, RecurringInvoice $invoice) : ?RecurringInvoice
public function save($data, RecurringInvoice $invoice) : ?RecurringInvoice
{
$invoice->fill($request->input());
$invoice->fill($data);
$invoice->save();
$invoice_calc = new InvoiceCalc($invoice, $invoice->settings);
$invoice = $invoice_calc->build()->getInvoice();

10
app/Utils/Traits/Inviteable.php
View file

@ -12,13 +12,19 @@
namespace App\Utils\Traits;
/**
* Class MakesDates
* Class Inviteable
* @package App\Utils\Traits
*/
trait Inviteable
{
public function getStatus()
/**
* Gets the status.
*
* @return string The status.
*/
public function getStatus() : string
{
$status = '';