Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cast matomo id to string

Browse Source
This commit is contained in:
David Bomba 2022-12-08 11:39:43 +11:00
parent 69a1419e9b
commit 482918e3f3
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -54,6 +54,8 @@ class UpdateCompanyRequest extends Request
$rules['size_id'] = 'integer|nullable'; $rules['size_id'] = 'integer|nullable';
$rules['country_id'] = 'integer|nullable'; $rules['country_id'] = 'integer|nullable';
$rules['work_email'] = 'email|nullable'; $rules['work_email'] = 'email|nullable';
$rules['matomo_id'] = 'nullable|integer';
// $rules['client_registration_fields'] = 'array'; // $rules['client_registration_fields'] = 'array';
if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) { if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {

2
app/Transformers/CompanyTransformer.php
View File

@ -150,7 +150,7 @@ class CompanyTransformer extends EntityTransformer
'google_analytics_url' => (string) $company->google_analytics_key, //@deprecate 1-2-2021 'google_analytics_url' => (string) $company->google_analytics_key, //@deprecate 1-2-2021
'google_analytics_key' => (string) $company->google_analytics_key, 'google_analytics_key' => (string) $company->google_analytics_key,
'matomo_url' => (string) $company->matomo_url, 'matomo_url' => (string) $company->matomo_url,
'matomo_id' => (int) $company->matomo_id, 'matomo_id' => (string) $company->matomo_id ?: '',
'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates, 'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates,
'client_can_register' => (bool) $company->client_can_register, 'client_can_register' => (bool) $company->client_can_register,
'is_large' => (bool) $company->is_large, 'is_large' => (bool) $company->is_large,

2
resources/views/portal/ninja2020/layout/clean_setup.blade.php
View File

@ -19,7 +19,7 @@
})(); })();
</script> </script>
<noscript><p><img src="{{ $company->matomo_url }}/matomo.php?idsite={{ $company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="{{ $company->matomo_url }}/matomo.php?idsite={{ $company->matomo_id }}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
@elif (config('services.analytics.tracking_id')) @elseif (config('services.analytics.tracking_id'))
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script> <script async src="https://www.googletagmanager.com/gtag/js?id=UA-122229484-1"></script>
<script> <script>
window.dataLayer = window.dataLayer || []; window.dataLayer = window.dataLayer || [];