diff --git a/app/Factory/RecurringInvoiceFactory.php b/app/Factory/RecurringInvoiceFactory.php index b656eda9af03..7e6d2b7b7952 100644 --- a/app/Factory/RecurringInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceFactory.php @@ -11,7 +11,7 @@ class RecurringInvoiceFactory public static function create(int $company_id, int $user_id) :RecurringInvoice { $invoice = new RecurringInvoice(); - $invoice->status_id = RecurringInvoice::STATUS_PENDING; + $invoice->status_id = RecurringInvoice::STATUS_DRAFT; $invoice->discount = 0; $invoice->is_amount_discount = true; $invoice->po_number = ''; diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index 8fc7c273c525..9cd0543af6c6 100644 --- a/app/Http/Controllers/RecurringInvoiceController.php +++ b/app/Http/Controllers/RecurringInvoiceController.php @@ -100,7 +100,7 @@ class RecurringInvoiceController extends BaseController public function store(StoreRecurringInvoiceRequest $request) { - $recurring_invoice = $this->RecurringInvoice_repo->save($request, RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id)); + $recurring_invoice = $this->recurring_invoice_repo->save($request, RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id)); return $this->itemResponse($recurring_invoice); @@ -147,7 +147,7 @@ class RecurringInvoiceController extends BaseController public function update(UpdateRecurringInvoiceRequest $request, RecurringInvoice $recurring_invoice) { - $recurring_invoice = $this->RecurringInvoice_repo->save(request(), $recurring_invoice); + $recurring_invoice = $this->recurring_invoice_repo->save(request(), $recurring_invoice); return $this->itemResponse($recurring_invoice); @@ -187,7 +187,7 @@ class RecurringInvoiceController extends BaseController $recurring_invoices->each(function ($recurring_invoice, $key) use($action){ if(auth()->user()->can('edit', $recurring_invoice)) - $this->RecurringInvoice_repo->{$action}($recurring_invoice); + $this->recurring_invoice_repo->{$action}($recurring_invoice); }); diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index cb2ad71021f7..f06cbf996ae2 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -19,10 +19,12 @@ class RecurringInvoice extends BaseModel /** * Invoice Statuses */ - const STATUS_PENDING = 1; - const STATUS_ACTIVE = 2; - const STATUS_COMPLETED = 3; - const STATUS_CANCELLED = 4; + const STATUS_DRAFT = 2; + const STATUS_ACTIVE = 3; + const STATUS_PENDING = -1; + const STATUS_COMPLETED = -2; + const STATUS_CANCELLED = -3; + /** * Recurring intervals diff --git a/tests/Feature/RecurringInvoiceTest.php b/tests/Feature/RecurringInvoiceTest.php index 8a3778e2383d..abc4eb0e51c2 100644 --- a/tests/Feature/RecurringInvoiceTest.php +++ b/tests/Feature/RecurringInvoiceTest.php @@ -177,7 +177,7 @@ class RecurringInvoiceTest extends TestCase $response->assertStatus(200); $RecurringInvoice_update = [ - 'status_id' => RecurringInvoice::STATUS_PAID + 'status_id' => RecurringInvoice::STATUS_DRAFT ]; $this->assertNotNull($RecurringInvoice);