From 9a0de9f64f92a96ad6e8b9ed533ff80ac60a5011 Mon Sep 17 00:00:00 2001 From: Mohit Panjwani Date: Thu, 3 Mar 2022 17:02:38 +0530 Subject: [PATCH] update message and formatting --- .../CompanyCurrencyCheckTransactionsController.php | 8 +------- .../V1/Admin/Settings/UpdateCompanySettingsController.php | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php b/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php index 3f7979d5..1c9da063 100644 --- a/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php +++ b/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php @@ -20,14 +20,8 @@ class CompanyCurrencyCheckTransactionsController extends Controller $this->authorize('manage company', $company); - if ($company->hasTransactions()) { - return response()->json([ - 'success' => false, - ]); - } - return response()->json([ - 'success' => true, + 'has_transactions' => $company->hasTransactions(), ]); } } diff --git a/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php b/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php index f2c879c6..128be75e 100644 --- a/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php +++ b/app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php @@ -26,7 +26,7 @@ class UpdateCompanySettingsController extends Controller if ($companyCurrency !== $data['currency'] && $company->hasTransactions()) { return response()->json([ 'success' => false, - 'message' => 'You cannot change currency once transaction is created.' + 'message' => 'Cannot update company currency after transactions are created.' ]); }