diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 6f486c2ad9e7..20e479ebebc2 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -383,7 +383,7 @@ class CompanySettings extends BaseSettings public $page_layout = 'portrait'; - public $font_size = 7; //@implemented + public $font_size = 16; //@implemented public $primary_font = 'Roboto'; diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php index 4dc0889ad87c..73a12b03ebfd 100644 --- a/app/Http/Controllers/StripeConnectController.php +++ b/app/Http/Controllers/StripeConnectController.php @@ -70,14 +70,19 @@ class StripeConnectController extends BaseController { \Stripe\Stripe::setApiKey(config('ninja.ninja_stripe_key')); + if($request->has('error') && $request->error == 'access_denied'){ + return view('auth.connect.access_denied'); + } + try { $response = \Stripe\OAuth::token([ 'grant_type' => 'authorization_code', 'code' => $request->input('code'), ]); } catch (\Exception $e) { - nlog($e->getMessage()); - throw new SystemError($e->getMessage(), 500); + + return view('auth.connect.access_denied'); + } MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']); diff --git a/app/Http/Livewire/DocumentsTable.php b/app/Http/Livewire/DocumentsTable.php index a1a2566bc408..f808004d2e5b 100644 --- a/app/Http/Livewire/DocumentsTable.php +++ b/app/Http/Livewire/DocumentsTable.php @@ -50,7 +50,7 @@ class DocumentsTable extends Component { MultiDB::setDb($this->db); - $this->client = Client::with('company')->find($this->client_id); + $this->client = Client::withTrashed()->with('company')->find($this->client_id); $this->company = $this->client->company; diff --git a/app/Http/Livewire/PaymentMethodsTable.php b/app/Http/Livewire/PaymentMethodsTable.php index d0f85db911d3..ea6ad6d34e75 100644 --- a/app/Http/Livewire/PaymentMethodsTable.php +++ b/app/Http/Livewire/PaymentMethodsTable.php @@ -29,7 +29,7 @@ class PaymentMethodsTable extends Component { MultiDB::setDb($this->db); - $this->client = Client::with('company')->find($this->client_id); + $this->client = Client::withTrashed()->with('company')->find($this->client_id); $this->company = $this->client->company; } diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index 890027158d57..229cf262fd0f 100644 --- a/app/Models/ClientContact.php +++ b/app/Models/ClientContact.php @@ -240,7 +240,6 @@ class ClientContact extends Authenticatable implements HasLocalePreference { return $this ->withTrashed() - // ->company() ->where('id', $this->decodePrimaryKey($value))->firstOrFail(); } diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php index cb83d069aa80..db2bdf67247b 100644 --- a/app/Observers/QuoteObserver.php +++ b/app/Observers/QuoteObserver.php @@ -45,8 +45,8 @@ class QuoteObserver * @return void */ public function updated(Quote $quote) - {nlog("updated"); - + { + $event = Webhook::EVENT_UPDATE_QUOTE; if($quote->getOriginal('deleted_at') && !$quote->deleted_at) diff --git a/config/cache.php b/config/cache.php index f631b3d4f693..d35901c5bbc9 100644 --- a/config/cache.php +++ b/config/cache.php @@ -76,7 +76,7 @@ return [ 'redis' => [ 'driver' => 'redis', 'connection' => env('REDIS_CACHE_CONNECTION', 'cache'), - 'lock_connection' => 'default', + 'lock_connection' => env('REDIS_CACHE_CONNECTION', 'cache'), ], 'dynamodb' => [ diff --git a/resources/views/auth/connect/access_denied.blade.php b/resources/views/auth/connect/access_denied.blade.php new file mode 100644 index 000000000000..21a8bf9e58c1 --- /dev/null +++ b/resources/views/auth/connect/access_denied.blade.php @@ -0,0 +1,13 @@ +@extends('layouts.ninja') +@section('meta_title', ctrans('texts.success')) + +@section('body') +
+
+ +
+ +

We were unable to connect to Stripe as access was denied.

+ Click here to continue. +
+@endsection diff --git a/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php b/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php index 00f6e2311132..909e1e2de914 100644 --- a/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php @@ -56,7 +56,7 @@ type="checkbox" class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-500" /> - {{ ctrans('texts.terms')}} + {{ ctrans('texts.agree_to_terms', ['terms' => ctrans('texts.terms')]) }}