From b7a5c055a89ae98a963d27dfba00cfc62a29e012 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 18 Aug 2022 14:08:50 +1000 Subject: [PATCH] Fixes for single route actions --- app/Http/Controllers/CreditController.php | 6 +++--- app/Http/Controllers/InvoiceController.php | 6 +++--- app/Http/Controllers/PurchaseOrderController.php | 8 ++++---- app/Http/Controllers/QuoteController.php | 6 +++--- .../Controllers/RecurringExpenseController.php | 6 +++--- .../Controllers/RecurringInvoiceController.php | 6 +++--- tests/Feature/InvoiceTest.php | 14 ++++++++++++++ 7 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index e0c72b90d598..55a1d03aad8e 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -587,21 +587,21 @@ class CreditController extends BaseController $this->credit_repository->archive($credit); if (! $bulk) { - return $this->listResponse($credit); + return $this->itemResponse($credit); } break; case 'restore': $this->credit_repository->restore($credit); if (! $bulk) { - return $this->listResponse($credit); + return $this->itemResponse($credit); } break; case 'delete': $this->credit_repository->delete($credit); if (! $bulk) { - return $this->listResponse($credit); + return $this->itemResponse($credit); } break; case 'email': diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index dd91e5e6b5d4..051b6d2c5fff 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -722,14 +722,14 @@ class InvoiceController extends BaseController $this->invoice_repo->restore($invoice); if (! $bulk) { - return $this->listResponse($invoice); + return $this->itemResponse($invoice); } break; case 'archive': $this->invoice_repo->archive($invoice); if (! $bulk) { - return $this->listResponse($invoice); + return $this->itemResponse($invoice); } break; case 'delete': @@ -737,7 +737,7 @@ class InvoiceController extends BaseController $this->invoice_repo->delete($invoice); if (! $bulk) { - return $this->listResponse($invoice); + return $this->itemResponse($invoice); } break; case 'cancel': diff --git a/app/Http/Controllers/PurchaseOrderController.php b/app/Http/Controllers/PurchaseOrderController.php index 8fc56b8fc7cb..83d8c9cd55cb 100644 --- a/app/Http/Controllers/PurchaseOrderController.php +++ b/app/Http/Controllers/PurchaseOrderController.php @@ -623,14 +623,14 @@ class PurchaseOrderController extends BaseController $this->purchase_order_repository->restore($purchase_order); if (! $bulk) { - return $this->listResponse($purchase_order); + return $this->itemResponse($purchase_order); } break; case 'archive': $this->purchase_order_repository->archive($purchase_order); if (! $bulk) { - return $this->listResponse($purchase_order); + return $this->itemResponse($purchase_order); } break; case 'delete': @@ -638,7 +638,7 @@ class PurchaseOrderController extends BaseController $this->purchase_order_repository->delete($purchase_order); if (! $bulk) { - return $this->listResponse($purchase_order); + return $this->itemResponse($purchase_order); } break; @@ -684,7 +684,7 @@ class PurchaseOrderController extends BaseController } if (! $bulk) { - return $this->listResponse($purchase_order); + return $this->itemResponse($purchase_order); } break; diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index de549bdccccc..a42c9c09c8e3 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -728,7 +728,7 @@ class QuoteController extends BaseController $this->quote_repo->restore($quote); if (! $bulk) { - return $this->listResponse($quote); + return $this->itemResponse($quote); } break; @@ -736,7 +736,7 @@ class QuoteController extends BaseController $this->quote_repo->archive($quote); if (! $bulk) { - return $this->listResponse($quote); + return $this->itemResponse($quote); } break; @@ -744,7 +744,7 @@ class QuoteController extends BaseController $this->quote_repo->delete($quote); if (! $bulk) { - return $this->listResponse($quote); + return $this->itemResponse($quote); } break; diff --git a/app/Http/Controllers/RecurringExpenseController.php b/app/Http/Controllers/RecurringExpenseController.php index 46d3ba315b62..98524be5ffa3 100644 --- a/app/Http/Controllers/RecurringExpenseController.php +++ b/app/Http/Controllers/RecurringExpenseController.php @@ -511,21 +511,21 @@ class RecurringExpenseController extends BaseController $this->recurring_expense_repo->archive($recurring_expense); if (! $bulk) { - return $this->listResponse($recurring_expense); + return $this->itemResponse($recurring_expense); } break; case 'restore': $this->recurring_expense_repo->restore($recurring_expense); if (! $bulk) { - return $this->listResponse($recurring_expense); + return $this->itemResponse($recurring_expense); } break; case 'delete': $this->recurring_expense_repo->delete($recurring_expense); if (! $bulk) { - return $this->listResponse($recurring_expense); + return $this->itemResponse($recurring_expense); } break; case 'email': diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index ec3ebe1c6556..6eb6d12d200d 100644 --- a/app/Http/Controllers/RecurringInvoiceController.php +++ b/app/Http/Controllers/RecurringInvoiceController.php @@ -662,21 +662,21 @@ class RecurringInvoiceController extends BaseController $this->recurring_invoice_repo->archive($recurring_invoice); if (! $bulk) { - return $this->listResponse($recurring_invoice); + return $this->itemResponse($recurring_invoice); } break; case 'restore': $this->recurring_invoice_repo->restore($recurring_invoice); if (! $bulk) { - return $this->listResponse($recurring_invoice); + return $this->itemResponse($recurring_invoice); } break; case 'delete': $this->recurring_invoice_repo->delete($recurring_invoice); if (! $bulk) { - return $this->listResponse($recurring_invoice); + return $this->itemResponse($recurring_invoice); } break; case 'email': diff --git a/tests/Feature/InvoiceTest.php b/tests/Feature/InvoiceTest.php index 5e582bf5ce1e..18a36185103b 100644 --- a/tests/Feature/InvoiceTest.php +++ b/tests/Feature/InvoiceTest.php @@ -46,6 +46,18 @@ class InvoiceTest extends TestCase $this->makeTestData(); } + + public function testInvoiceArchiveAction() + { + + $response = $this->withHeaders([ + 'X-API-SECRET' => config('ninja.api_secret'), + 'X-API-TOKEN' => $this->token, + ])->get('/api/v1/invoices/'.$this->invoice->hashed_id.'/archive',) + ->assertStatus(200); + } + + public function testMarkingDeletedInvoiceAsSent() { Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id])->each(function ($c) { @@ -290,4 +302,6 @@ class InvoiceTest extends TestCase ])->post('/api/v1/invoices/', $data) ->assertStatus(200); } + + }