diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index e6a962651b6b..19c31d2aa453 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -136,7 +136,7 @@ class ActivityController extends BaseController $backup = $activity->backup; if (! $backup || ! $backup->html_backup) { - return response()->json(['message'=> 'No backup exists for this activity', 'errors' => new stdClass], 404); + return response()->json(['message'=> ctrans('texts.no_backup_exists'), 'errors' => new stdClass], 404); } $pdf = $this->makePdf(null, null, $backup->html_backup); diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 7ee03112f51e..00f3d6b750c3 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -150,7 +150,7 @@ class BaseController extends Controller */ public function notFound() { - return response()->json(['message' => '404 | Nothing to see here!'], 404) + return response()->json(['message' => ctrans('texts.api_404')], 404) ->header('X-API-VERSION', config('ninja.minimum_client_version')) ->header('X-APP-VERSION', config('ninja.app_version')); } @@ -198,7 +198,7 @@ class BaseController extends Controller $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0; if (auth()->user()->getCompany()->is_large && ! request()->has('updated_at')) { - return response()->json(['message' => 'Cannot load a large account without a updated_at parameter', 'errors' =>[]], 401); + return response()->json(['message' => ctrans('texts.large_account_update_parameter'), 'errors' =>[]], 401); } $updated_at = date('Y-m-d H:i:s', $updated_at); diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index e03599b1cf4b..0b437b32b2b7 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -501,6 +501,6 @@ class CompanyController extends BaseController } } - return response()->json(['message' => 'success'], 200); + return response()->json(['message' => ctrans('texts.success')], 200); } } diff --git a/app/Http/Controllers/CompanyUserController.php b/app/Http/Controllers/CompanyUserController.php index b13730a71658..be0a75a85a77 100644 --- a/app/Http/Controllers/CompanyUserController.php +++ b/app/Http/Controllers/CompanyUserController.php @@ -115,7 +115,7 @@ class CompanyUserController extends BaseController $company_user = CompanyUser::whereUserId($user->id)->whereCompanyId($company->id)->first(); if (! $company_user) { - throw new ModelNotFoundException('Company User record not found'); + throw new ModelNotFoundException(ctrans('texts.company_user_not_found')); return; } diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index 30019c4ed99c..346dda1ee391 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -484,7 +484,7 @@ class CreditController extends BaseController $credits = Credit::withTrashed()->whereIn('id', $this->transformKeys($ids)); if (! $credits) { - return response()->json(['message' => 'No Credits Found']); + return response()->json(['message' => ctrans('texts.no_credits_found')]); } $credits->each(function ($credit, $key) use ($action) { @@ -561,7 +561,7 @@ class CreditController extends BaseController break; default: - return response()->json(['message' => "The requested action `{$action}` is not available."], 400); + return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400); break; } } diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php index 6b0cd34feb58..0fd18e00289e 100644 --- a/app/Http/Controllers/DocumentController.php +++ b/app/Http/Controllers/DocumentController.php @@ -124,7 +124,7 @@ class DocumentController extends BaseController { $this->document_repo->delete($document); - return response()->json(['message'=>'success']); + return response()->json(['message'=> ctrans('texts.success')]); } public function bulk() @@ -136,7 +136,7 @@ class DocumentController extends BaseController $documents = Document::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get(); if (! $invoices) { - return response()->json(['message' => 'No Documents Found']); + return response()->json(['message' => ctrans('texts.no_documents_found')]); } /* diff --git a/app/Http/Controllers/GroupSettingController.php b/app/Http/Controllers/GroupSettingController.php index 8f7f828270e0..2c4815427f50 100644 --- a/app/Http/Controllers/GroupSettingController.php +++ b/app/Http/Controllers/GroupSettingController.php @@ -481,7 +481,7 @@ class GroupSettingController extends BaseController $group_settings = GroupSetting::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get(); if (! $group_settings) { - return response()->json(['message' => 'No Group Settings Found']); + return response()->json(['message' => ctrans('texts.no_group_settings_found')]); } /* diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index e11a88103003..aa23c649e5e2 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -95,7 +95,7 @@ class ImportController extends Controller { CSVImport::dispatch($request->all(), auth()->user()->company()); - return response()->json(['message' => 'Importing data, email will be sent on completion'], 200); + return response()->json(['message' => ctrans('texts.import_started')], 200); } private function getEntityMap($entity_type) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 9866f43133ae..bc2c5c138edc 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -387,7 +387,7 @@ class InvoiceController extends BaseController } if ($invoice->isLocked()) { - return response()->json(['message' => 'Invoice is locked, no modifications allowed']); + return response()->json(['message' => ctrans('texts.locked_invoice')]); } $invoice = $this->invoice_repo->save($request->all(), $invoice); @@ -526,13 +526,13 @@ class InvoiceController extends BaseController if ($action == 'download' && $invoices->count() > 1) { $invoices->each(function ($invoice) { if (auth()->user()->cannot('view', $invoice)) { - return response()->json(['message' => 'Insufficient privileges to access invoice '.$invoice->number]); + return response()->json(['message' => ctrans('text.access_denied')]); } }); ZipInvoices::dispatch($invoices, $invoices->first()->company, auth()->user()->email); - return response()->json(['message' => 'Email Sent!'], 200); + return response()->json(['message' => ctrans('texts.sent_message')], 200); } /* @@ -649,7 +649,7 @@ class InvoiceController extends BaseController break; case 'mark_paid': if ($invoice->balance < 0 || $invoice->status_id == Invoice::STATUS_PAID || $invoice->is_deleted === true) { - return $this->errorResponse(['message' => 'Invoice cannot be marked as paid'], 400); + return $this->errorResponse(['message' => ctrans('texts.invoice_cannot_be_marked_paid')], 400); } $invoice = $invoice->service()->markPaid(); @@ -686,9 +686,7 @@ class InvoiceController extends BaseController } break; case 'delete': - //need to make sure the invoice is cancelled first!! - //$invoice->service()->handleCancellation()s->save(); -nlog("inside delete"); + $this->invoice_repo->delete($invoice); if (! $bulk) { @@ -735,7 +733,7 @@ nlog("inside delete"); break; default: - return response()->json(['message' => "The requested action `{$action}` is not available."], 400); + return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400); break; } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 961242f56aa5..065694498879 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3408,6 +3408,16 @@ return [ 'attempted_refund_failed' => 'Attempting to refund :amount only :refundable_amount available for refund', 'user_not_associated_with_this_account' => 'This user is unable to be attached to this company. Perhaps they have already registered a user on another account?', 'migration_completed' => 'Migration completed', - 'migration_completed_description' => 'Your migration has completed, please review your data after logging in.' + 'migration_completed_description' => 'Your migration has completed, please review your data after logging in.', + 'api_404' => '404 | Nothing to see here!', + 'large_account_update_parameter' => 'Cannot load a large account without a updated_at parameter', + 'no_backup_exists' => 'No backup exists for this activity', + 'company_user_not_found' => 'Company User record not found', + 'no_credits_found' => 'No credits found.', + 'action_unavailable' => 'The requested action :action is not available.', + 'no_documents_found' => 'No Documents Found', + 'no_group_settings_found' => 'No group settings found', + 'access_denied' => 'Insufficient privileges to access/modify this resource', + 'invoice_cannot_be_marked_paid' => 'Invoice cannot be marked as paid', ];