From ae73e414e921f1bd7606df8436bf405e59ad5176 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 2 Dec 2022 09:45:38 +1100 Subject: [PATCH] updates for cookie consent --- app/Filters/InvoiceFilters.php | 2 +- resources/views/layouts/ninja.blade.php | 6 +++--- resources/views/portal/ninja2020/layout/app.blade.php | 6 +++--- resources/views/portal/ninja2020/layout/clean.blade.php | 6 +++--- .../views/portal/ninja2020/layout/clean_setup.blade.php | 6 +++--- .../views/portal/ninja2020/layout/vendor_app.blade.php | 6 +++--- resources/views/themes/ninja2020/clean.blade.php | 6 +++--- routes/api.php | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php index f599511ee13d..46a63b0be388 100644 --- a/app/Filters/InvoiceFilters.php +++ b/app/Filters/InvoiceFilters.php @@ -167,7 +167,7 @@ class InvoiceFilters extends QueryFilters ->orderBy('due_date', 'ASC'); } - public function payable(string $client_id) + public function payable(string $client_id = '') { if (strlen($client_id) == 0) { return $this->builder; diff --git a/resources/views/layouts/ninja.blade.php b/resources/views/layouts/ninja.blade.php index d18aa27e8bcb..8a4d1802b386 100644 --- a/resources/views/layouts/ninja.blade.php +++ b/resources/views/layouts/ninja.blade.php @@ -108,9 +108,9 @@ }, "content": { "href": "{{ config('ninja.privacy_policy_url.hosted') }}", - "message": "This website uses cookies to ensure you get the best experience on our website.", - "dismiss": "Got it!", - "link": "Learn more", + "message": "{{ ctrans('texts.cookie_message')}}", + "dismiss": "{{ ctrans('texts.got_it')}}", + "link": "{{ ctrans('texts.learn_more')}}", } })} ); diff --git a/resources/views/portal/ninja2020/layout/app.blade.php b/resources/views/portal/ninja2020/layout/app.blade.php index a68a47b90b41..2ded1173c3fb 100644 --- a/resources/views/portal/ninja2020/layout/app.blade.php +++ b/resources/views/portal/ninja2020/layout/app.blade.php @@ -125,9 +125,9 @@ }, "content": { "href": "{{ config('ninja.privacy_policy_url.hosted') }}", - "message": "This website uses cookies to ensure you get the best experience on our website.", - "dismiss": "Got it!", - "link": "Learn more", + "message": "{{ ctrans('texts.cookie_message')}}", + "dismiss": "{{ ctrans('texts.got_it')}}", + "link": "{{ ctrans('texts.learn_more')}}", } })} ); diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php index 0302bdb23fac..d9efdd3a6c57 100644 --- a/resources/views/portal/ninja2020/layout/clean.blade.php +++ b/resources/views/portal/ninja2020/layout/clean.blade.php @@ -110,9 +110,9 @@ }, "content": { "href": "{{ config('ninja.privacy_policy_url.hosted') }}", - "message": "This website uses cookies to ensure you get the best experience on our website.", - "dismiss": "Got it!", - "link": "Learn more", + "message": "{{ ctrans('texts.cookie_message')}}", + "dismiss": "{{ ctrans('texts.got_it')}}", + "link": "{{ ctrans('texts.learn_more')}}", } })} ); diff --git a/resources/views/portal/ninja2020/layout/clean_setup.blade.php b/resources/views/portal/ninja2020/layout/clean_setup.blade.php index 3eaf8875c7ff..8e46175b6569 100644 --- a/resources/views/portal/ninja2020/layout/clean_setup.blade.php +++ b/resources/views/portal/ninja2020/layout/clean_setup.blade.php @@ -119,9 +119,9 @@ }, "content": { "href": "{{ config('ninja.privacy_policy_url.hosted') }}", - "message": "This website uses cookies to ensure you get the best experience on our website.", - "dismiss": "Got it!", - "link": "Learn more", + "message": "{{ ctrans('texts.cookie_message')}}", + "dismiss": "{{ ctrans('texts.got_it')}}", + "link": "{{ ctrans('texts.learn_more')}}", } })} ); diff --git a/resources/views/portal/ninja2020/layout/vendor_app.blade.php b/resources/views/portal/ninja2020/layout/vendor_app.blade.php index baf55d4945d4..ef18dcede0e8 100644 --- a/resources/views/portal/ninja2020/layout/vendor_app.blade.php +++ b/resources/views/portal/ninja2020/layout/vendor_app.blade.php @@ -126,9 +126,9 @@ }, "content": { "href": "{{ config('ninja.privacy_policy_url.hosted') }}", - "message": "This website uses cookies to ensure you get the best experience on our website.", - "dismiss": "Got it!", - "link": "Learn more", + "message": "{{ ctrans('texts.cookie_message')}}", + "dismiss": "{{ ctrans('texts.got_it')}}", + "link": "{{ ctrans('texts.learn_more')}}", } })} ); diff --git a/resources/views/themes/ninja2020/clean.blade.php b/resources/views/themes/ninja2020/clean.blade.php index b1ecd0e05b8a..f8422e9d3a38 100644 --- a/resources/views/themes/ninja2020/clean.blade.php +++ b/resources/views/themes/ninja2020/clean.blade.php @@ -108,9 +108,9 @@ }, "content": { "href": "{{ config('ninja.privacy_policy_url.hosted') }}", - "message": "This website uses cookies to ensure you get the best experience on our website.", - "dismiss": "Got it!", - "link": "Learn more", + "message": "{{ ctrans('texts.cookie_message')}}", + "dismiss": "{{ ctrans('texts.got_it')}}", + "link": "{{ ctrans('texts.learn_more')}}", } })} ); diff --git a/routes/api.php b/routes/api.php index d7d0632a73d1..e20d1315f290 100644 --- a/routes/api.php +++ b/routes/api.php @@ -186,7 +186,7 @@ Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale Route::put('expenses/{expense}/upload', [ExpenseController::class, 'upload']); Route::post('expenses/bulk', [ExpenseController::class, 'bulk'])->name('expenses.bulk'); - Route::post('export', [ExportController::class, 'index'])->middleware('throttle:2,1')->name('export.index'); + Route::post('export', [ExportController::class, 'index'])->name('export.index'); Route::resource('expense_categories', ExpenseCategoryController::class); // name = (expense_categories. index / create / show / update / destroy / edit Route::post('expense_categories/bulk', [ExpenseCategoryController::class, 'bulk'])->name('expense_categories.bulk'); @@ -196,7 +196,7 @@ Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale Route::put('group_settings/{group_setting}/upload', [GroupSettingController::class, 'upload'])->name('group_settings.upload'); Route::post('import', [ImportController::class, 'import'])->name('import.import'); - Route::post('import_json', [ImportJsonController::class, 'import'])->middleware('throttle:2,1')->name('import.import_json'); + Route::post('import_json', [ImportJsonController::class, 'import'])->name('import.import_json'); Route::post('preimport', [ImportController::class, 'preimport'])->name('import.preimport'); Route::resource('invoices', InvoiceController::class); // name = (invoices. index / create / show / update / destroy / edit