diff --git a/VERSION.txt b/VERSION.txt index 86df7a18a9..0d9a95ec67 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.12.17 \ No newline at end of file +5.12.18 \ No newline at end of file diff --git a/app/Models/Company.php b/app/Models/Company.php index e850664dfc..b302e71fd3 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -228,6 +228,7 @@ use Laracasts\Presenter\PresentableTrait; * @property-read int|null $users_count * @property-read \Illuminate\Database\Eloquent\Collection $vendors * @property-read int|null $vendors_count + * @property-read \Illuminate\Database\Eloquent\Collection $locations * @property-read \Illuminate\Database\Eloquent\Collection $webhooks * @method static \Illuminate\Database\Eloquent\Builder|Company where($query) * @method static \Illuminate\Database\Eloquent\Builder|Company find($query) diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 4a785e5a25..7de04e15db 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -226,7 +226,6 @@ class CompanyTransformer extends EntityTransformer 'has_quickbooks_token' => $company->quickbooks ? true : false, 'is_quickbooks_token_active' => $company->quickbooks?->accessTokenKey ?? false, 'legal_entity_id' => $company->legal_entity_id ?? null, - 'microsoft_client_id' => Ninja::isSelfHost() ? config('services.microsoft.client_id') : '', ]; } diff --git a/config/ninja.php b/config/ninja.php index c3c2a2df4c..74b805c04f 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.12.17'), - 'app_tag' => env('APP_TAG', '5.12.17'), + 'app_version' => env('APP_VERSION', '5.12.18'), + 'app_tag' => env('APP_TAG', '5.12.18'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), diff --git a/config/scout.php b/config/scout.php index ec1ec2464e..9c72bc0eca 100644 --- a/config/scout.php +++ b/config/scout.php @@ -44,7 +44,7 @@ return [ // 'queue' => env('SCOUT_QUEUE', true), 'queue' => [ - 'connection' => 'redis', + 'connection' => env('QUEUE_CONNECTION', 'sync'), 'queue' => 'scout' ], diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index b0dc8e5d5e..08116eb00e 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -1,5 +1,5 @@ - +