mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
fixes for recurring invoice request
This commit is contained in:
parent
f20183025b
commit
ce8d440ec5
@ -109,7 +109,7 @@ class RecurringInvoiceController extends BaseController
|
|||||||
public function store(StoreRecurringInvoiceRequest $request)
|
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);
|
return $this->itemResponse($recurring_invoice);
|
||||||
|
|
||||||
@ -156,7 +156,7 @@ class RecurringInvoiceController extends BaseController
|
|||||||
public function update(UpdateRecurringInvoiceRequest $request, RecurringInvoice $recurring_invoice)
|
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);
|
return $this->itemResponse($recurring_invoice);
|
||||||
|
|
||||||
|
@ -27,13 +27,12 @@ class RecurringInvoiceRepository extends BaseRepository
|
|||||||
return RecurringInvoice::class;
|
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->save();
|
||||||
|
|
||||||
|
|
||||||
$invoice_calc = new InvoiceCalc($invoice, $invoice->settings);
|
$invoice_calc = new InvoiceCalc($invoice, $invoice->settings);
|
||||||
|
|
||||||
$invoice = $invoice_calc->build()->getInvoice();
|
$invoice = $invoice_calc->build()->getInvoice();
|
||||||
|
@ -12,13 +12,19 @@
|
|||||||
namespace App\Utils\Traits;
|
namespace App\Utils\Traits;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class MakesDates
|
* Class Inviteable
|
||||||
* @package App\Utils\Traits
|
* @package App\Utils\Traits
|
||||||
*/
|
*/
|
||||||
trait Inviteable
|
trait Inviteable
|
||||||
{
|
{
|
||||||
|
|
||||||
public function getStatus()
|
|
||||||
|
/**
|
||||||
|
* Gets the status.
|
||||||
|
*
|
||||||
|
* @return string The status.
|
||||||
|
*/
|
||||||
|
public function getStatus() : string
|
||||||
{
|
{
|
||||||
$status = '';
|
$status = '';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user