diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 2eb06fb1e3ea..e93a9c3bef82 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -60,14 +60,14 @@ class Handler extends ExceptionHandler app('sentry')->configureScope(function (Scope $scope): void { - if(auth()->guard('contact')->user() && auth()->guard('contact')->user()->account->report_errors) { + if(auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) { $scope->setUser([ - 'id' => auth()->guard('contact')->user()->account->key, + 'id' => auth()->guard('contact')->user()->company->account->key, 'email' => "anonymous@example.com", 'name' => "Anonymous User", ]); - } - else if (auth()->user() && auth()->user()->account->report_errors) { + } + else if (auth()->guard('user')->user() && auth()->user()->company()->account->report_errors) { $scope->setUser([ 'id' => auth()->user()->account->key, 'email' => "anonymous@example.com", @@ -75,6 +75,7 @@ class Handler extends ExceptionHandler ]); } + }); app('sentry')->captureException($exception); diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 46d92e6f95b8..0a0ab5b1535b 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -172,9 +172,11 @@ class LoginController extends BaseController $user->setCompany($user->company_user->account->default_company); - $ct = CompanyUser::whereUserId($user->id)->with('company'); +// $ct = CompanyUser::whereUserId($user->id)->with('company'); + $ct = CompanyUser::whereUserId($user->id); return $this->listResponse($ct); + } else { $this->incrementLoginAttempts($request); diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 3894b9328f08..8a3551e09e0b 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -81,6 +81,8 @@ class BaseController extends Controller $include = implode(",", $this->forced_includes); } +\Log::error(print_r($include,1)); + $this->manager->parseIncludes($include); $this->serializer = request()->input('serializer') ?: EntityTransformer::API_SERIALIZER_ARRAY; @@ -256,10 +258,10 @@ class BaseController extends Controller 'company.company_gateways.gateway', 'company.clients.contacts', 'company.products', - 'company.invoices', + 'company.invoices.invitations.company', 'company.payments.paymentables', - 'company.quotes', - 'company.credits', + 'company.quotes.invitations.company', + 'company.credits.invitations.company', 'company.vendors.contacts', 'company.expenses', 'company.tasks', diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 3a190c827900..1f2d23a9eef1 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -123,7 +123,7 @@ class InvoiceController extends Controller $invoices->map(function ($invoice) { $invoice->balance = Number::formatMoney($invoice->balance, $invoice->client); - $invoice->due_date = $this->formatDate($invoice->due_date, $invoice->client->date_format()); + //$invoice->due_date = $this->formatDate($invoice->due_date, $invoice->client->date_format()); return $invoice; }); diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index f16632cdf624..0a64ae2c7c14 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -45,6 +45,11 @@ class SetupController extends Controller return back(); // This should never be reached. } + $mail_driver = $request->input('mail_driver'); + + if(!$this->failsafeMailCheck()) + $mail_driver = 'log'; + $_ENV['APP_KEY'] = config('app.key'); $_ENV['APP_URL'] = $request->input('url'); $_ENV['APP_DEBUG'] = $request->input('debug') ? 'true' : 'false'; @@ -54,7 +59,7 @@ class SetupController extends Controller $_ENV['DB_DATABASE1'] = $request->input('database'); $_ENV['DB_USERNAME1'] = $request->input('db_username'); $_ENV['DB_PASSWORD1'] = $request->input('db_password'); - $_ENV['MAIL_DRIVER'] = $request->input('mail_driver'); + $_ENV['MAIL_DRIVER'] = $mail_driver; $_ENV['MAIL_PORT'] = $request->input('mail_port'); $_ENV['MAIL_ENCRYPTION'] = $request->input('encryption'); $_ENV['MAIL_HOST'] = $request->input('mail_host'); @@ -154,4 +159,17 @@ class SetupController extends Controller return response()->json(['message' => $e->getMessage()], 400); } } + + private function failsafeMailCheck($request) + { + + $response_array = SystemHealth::testMailServer($request); + + if($response_array instanceof Response) + return true; + + + return false; + + } } diff --git a/app/Http/ViewComposers/TranslationComposer.php b/app/Http/ViewComposers/TranslationComposer.php deleted file mode 100644 index 6f56b5e8a690..000000000000 --- a/app/Http/ViewComposers/TranslationComposer.php +++ /dev/null @@ -1,45 +0,0 @@ -with('industries', TranslationHelper::getIndustries()); - - $view->with('countries', TranslationHelper::getCountries()); - - $view->with('payment_types', TranslationHelper::getPaymentTypes()); - - $view->with('languages', TranslationHelper::getLanguages()); - - $view->with('currencies', TranslationHelper::getCurrencies()); - - $view->with('payment_terms', TranslationHelper::getPaymentTerms()); - } -} diff --git a/app/Models/Client.php b/app/Models/Client.php index a26b32676987..f0f315533410 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -331,13 +331,17 @@ class Client extends BaseModel implements HasLocalePreference public function getCreditCardGateway() :?CompanyGateway { $company_gateways = $this->getSetting('company_gateway_ids'); - - if ($company_gateways) { + + info($company_gateways); +info($this->company->id); + if (strlen($company_gateways)>=1) { $gateways = $this->company->company_gateways->whereIn('id', $payment_gateways); } else { $gateways = $this->company->company_gateways; } +\Log::error($gateways); + foreach ($gateways as $gateway) { if (in_array(GatewayType::CREDIT_CARD, $gateway->driver($this)->gatewayTypes())) { return $gateway; diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 76bab0bfb70a..782e1c33192b 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -23,16 +23,6 @@ class ComposerServiceProvider extends ServiceProvider public function boot() { view()->composer('portal.*', 'App\Http\ViewComposers\PortalComposer'); - - //view()->composer('*', 'App\Http\ViewComposers\HeaderComposer'); -/* - view()->composer( - [ - 'client.edit', - ], - 'App\Http\ViewComposers\TranslationComposer' - ); - */ } /** diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index 9915fb265367..2a674d581541 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -49,7 +49,7 @@ trait Inviteable $entity_type = strtolower(class_basename($this->entityType())); //$this->with('company','contact',$this->entity_type); - $this->with('company'); + //$this->with('company'); $domain = isset($this->company->portal_domain) ?: $this->company->domain(); diff --git a/resources/views/portal/ninja2020/invoices/index.blade.php b/resources/views/portal/ninja2020/invoices/index.blade.php index 21539be06bf9..b02762a9e3ee 100644 --- a/resources/views/portal/ninja2020/invoices/index.blade.php +++ b/resources/views/portal/ninja2020/invoices/index.blade.php @@ -84,7 +84,7 @@ {{ $invoice->number }} - {{ $invoice->formatDate($invoice->date, $invoice->client->date_format()) }} + {{ $invoice->due_date }} {{ App\Utils\Number::formatMoney($invoice->balance, $invoice->client) }}