From c4bfb33dbf4396ed6f5fe5f7d8b37125f78aaf2e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Jan 2021 15:28:03 +1100 Subject: [PATCH] Add destroy() methods in all controllers --- app/Http/Controllers/ClientController.php | 7 ++- .../Controllers/CompanyGatewayController.php | 2 +- app/Http/Controllers/CreditController.php | 4 +- app/Http/Controllers/DesignController.php | 2 +- .../Controllers/GroupSettingController.php | 2 +- app/Http/Controllers/InvoiceController.php | 4 +- .../Controllers/PaymentTermController.php | 2 +- app/Http/Controllers/ProjectController.php | 2 +- app/Http/Controllers/QuoteController.php | 4 +- .../RecurringInvoiceController.php | 4 +- .../Controllers/RecurringQuoteController.php | 4 +- app/Http/Controllers/TaskController.php | 4 +- app/Http/Controllers/TaskStatusController.php | 2 +- app/Http/Controllers/VendorController.php | 2 +- app/Jobs/Util/WebhookHandler.php | 2 + ...31_change_custom_surcharge_column_type.php | 57 +++++++++++++++++++ 16 files changed, 82 insertions(+), 22 deletions(-) create mode 100644 database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 8753e475762a..c52d6267aa39 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -432,10 +432,11 @@ class ClientController extends BaseController */ public function destroy(DestroyClientRequest $request, Client $client) { - //may not need these destroy routes as we are using actions to 'archive/delete' - $client->delete(); - return response()->json([], 200); + $this->client_repo->delete($client); + + return $this->itemResponse($client->fresh()); + } /** diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php index c5572323bc12..3674f1aa4ed2 100644 --- a/app/Http/Controllers/CompanyGatewayController.php +++ b/app/Http/Controllers/CompanyGatewayController.php @@ -421,7 +421,7 @@ class CompanyGatewayController extends BaseController { $company_gateway->delete(); - return response()->json([], 200); + return $this->itemResponse($company_gateway->fresh()); } /** diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index 3cec7da3fb94..30019c4ed99c 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -420,9 +420,9 @@ class CreditController extends BaseController */ public function destroy(DestroyCreditRequest $request, Credit $credit) { - $credit->delete(); + $this->credit_repository->delete($credit); - return response()->json([], 200); + return $this->itemResponse($credit->fresh()); } /** diff --git a/app/Http/Controllers/DesignController.php b/app/Http/Controllers/DesignController.php index d306303f3f64..520783a9ad1e 100644 --- a/app/Http/Controllers/DesignController.php +++ b/app/Http/Controllers/DesignController.php @@ -415,7 +415,7 @@ class DesignController extends BaseController $design->delete(); $design->save(); - return response()->json([], 200); + return $this->itemResponse($design->fresh()); } /** diff --git a/app/Http/Controllers/GroupSettingController.php b/app/Http/Controllers/GroupSettingController.php index c56f9c0b584d..1f79f7838dc8 100644 --- a/app/Http/Controllers/GroupSettingController.php +++ b/app/Http/Controllers/GroupSettingController.php @@ -414,7 +414,7 @@ class GroupSettingController extends BaseController { $group_setting->delete(); - return response()->json([], 200); + return $this->itemResponse($group_setting->fresh()); } /** diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index a986afc1a28a..ba5f07d7cab3 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -451,9 +451,9 @@ class InvoiceController extends BaseController */ public function destroy(DestroyInvoiceRequest $request, Invoice $invoice) { - $invoice->delete(); + $this->invoice_repo->delete($invoice); - return response()->json([], 200); + return $this->itemResponse($invoice->fresh()); } /** diff --git a/app/Http/Controllers/PaymentTermController.php b/app/Http/Controllers/PaymentTermController.php index 8a0c114b9cbf..1f345cf6154c 100644 --- a/app/Http/Controllers/PaymentTermController.php +++ b/app/Http/Controllers/PaymentTermController.php @@ -397,7 +397,7 @@ class PaymentTermController extends BaseController { $payment_term->delete(); - return response()->json([], 200); + return $this->itemResponse($payment_term->fresh()); } /** diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 6de6394b1fc1..97086618f1ed 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -429,7 +429,7 @@ class ProjectController extends BaseController $project->delete(); $project->save(); - return response()->json([], 200); + return $this->itemResponse($project->fresh()); } /** diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index 23de4f7aeb06..0aca87c000d2 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -441,9 +441,9 @@ class QuoteController extends BaseController */ public function destroy(DestroyQuoteRequest $request, Quote $quote) { - $quote->delete(); + $this->quote_repo->delete($quote); - return response()->json([], 200); + return $this->itemResponse($quote->fresh()); } /** diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index 96d32cc3a698..aae11052205a 100644 --- a/app/Http/Controllers/RecurringInvoiceController.php +++ b/app/Http/Controllers/RecurringInvoiceController.php @@ -426,9 +426,9 @@ class RecurringInvoiceController extends BaseController */ public function destroy(DestroyRecurringInvoiceRequest $request, RecurringInvoice $recurring_invoice) { - $recurring_invoice->delete(); + $this->recurring_invoice_repo->delete($recurring_invoice); - return response()->json([], 200); + return $this->itemResponse($recurring_invoice->fresh()); } diff --git a/app/Http/Controllers/RecurringQuoteController.php b/app/Http/Controllers/RecurringQuoteController.php index 8370b2e26488..cd02e058f044 100644 --- a/app/Http/Controllers/RecurringQuoteController.php +++ b/app/Http/Controllers/RecurringQuoteController.php @@ -428,9 +428,9 @@ class RecurringQuoteController extends BaseController */ public function destroy(DestroyRecurringQuoteRequest $request, RecurringQuote $recurring_quote) { - $recurring_quote->delete(); + $this->recurring_quote_repo->delete($recurring_quote); - return response()->json([], 200); + return $this->itemResponse($recurring_quote->fresh()); } /** diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index fcdba38be96c..0b64615be59f 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -425,9 +425,9 @@ class TaskController extends BaseController public function destroy(DestroyTaskRequest $request, Task $task) { //may not need these destroy routes as we are using actions to 'archive/delete' - $task->delete(); + $this->task_repo->delete($task); - return response()->json([], 200); + return $this->itemResponse($task->fresh()); } /** diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php index 7bae5b0f4b18..4934e0b5fa90 100644 --- a/app/Http/Controllers/TaskStatusController.php +++ b/app/Http/Controllers/TaskStatusController.php @@ -400,7 +400,7 @@ class TaskStatusController extends BaseController { $task_status->delete(); - return response()->json([], 200); + return $this->itemResponse($task_status->fresh()); } /** diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php index a92986594abe..f9ce40c6cb92 100644 --- a/app/Http/Controllers/VendorController.php +++ b/app/Http/Controllers/VendorController.php @@ -432,7 +432,7 @@ class VendorController extends BaseController //may not need these destroy routes as we are using actions to 'archive/delete' $vendor->delete(); - return response()->json([], 200); + return $this->itemResponse($vendor->fresh()); } /** diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php index 60a5261b8a64..870cd298b778 100644 --- a/app/Jobs/Util/WebhookHandler.php +++ b/app/Jobs/Util/WebhookHandler.php @@ -112,6 +112,8 @@ class WebhookHandler implements ShouldQueue RequestOptions::JSON => $data, // or 'json' => [...] ]); + nlog($response); + if ($response->getStatusCode() == 410 || $response->getStatusCode() == 200) { $subscription->delete(); } diff --git a/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php b/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php new file mode 100644 index 000000000000..13ab32f111a8 --- /dev/null +++ b/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php @@ -0,0 +1,57 @@ +decimal('custom_surcharge1', 20,6)->change(); + $table->decimal('custom_surcharge2', 20,6)->change(); + $table->decimal('custom_surcharge3', 20,6)->change(); + $table->decimal('custom_surcharge4', 20,6)->change(); + }); + + Schema::table('recurring_invoices', function (Blueprint $table) { + $table->decimal('custom_surcharge1', 20,6)->change(); + $table->decimal('custom_surcharge2', 20,6)->change(); + $table->decimal('custom_surcharge3', 20,6)->change(); + $table->decimal('custom_surcharge4', 20,6)->change(); + }); + + + Schema::table('quotes', function (Blueprint $table) { + $table->decimal('custom_surcharge1', 20,6)->change(); + $table->decimal('custom_surcharge2', 20,6)->change(); + $table->decimal('custom_surcharge3', 20,6)->change(); + $table->decimal('custom_surcharge4', 20,6)->change(); + }); + + + Schema::table('credits', function (Blueprint $table) { + $table->decimal('custom_surcharge1', 20,6)->change(); + $table->decimal('custom_surcharge2', 20,6)->change(); + $table->decimal('custom_surcharge3', 20,6)->change(); + $table->decimal('custom_surcharge4', 20,6)->change(); + }); + + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}