diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index ef570aeb0fa9..a2ad553c95e9 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -640,8 +640,8 @@ class LoginController extends BaseController $parameters = ['response_type' => 'code', 'redirect_uri' => config('ninja.app_url') . "/auth/microsoft"]; } - if(request()->hasHeader('X-REACT')) - Cache::put("react_redir:".auth()->user()->account->key, 'true', 300); + if(request()->hasHeader('X-REACT') || request()->query('react')) + Cache::put("react_redir:".auth()->user()?->account->key, 'true', 300); if (request()->has('code')) { return $this->handleProviderCallback($provider); diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 34c4b3fae8ad..ef756cdbae2f 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -748,33 +748,12 @@ class InvoiceController extends BaseController break; case 'email': - //check query parameter for email_type and set the template else use calculateTemplate - - // if (request()->has('email_type') && in_array(request()->input('email_type'), ['reminder1', 'reminder2', 'reminder3', 'reminder_endless', 'custom1', 'custom2', 'custom3'])) { - if (request()->has('email_type') && property_exists($invoice->company->settings, request()->input('email_type'))) { - $this->reminder_template = $invoice->client->getSetting(request()->input('email_type')); - } else { - $this->reminder_template = $invoice->calculateTemplate('invoice'); - } - - BulkInvoiceJob::dispatch($invoice, $this->reminder_template); - - if (! $bulk) { - return response()->json(['message' => 'email sent'], 200); - } - break; - case 'send_email': //check query parameter for email_type and set the template else use calculateTemplate + $template = request()->has('email_type') ? request()->input('email_type') : $invoice->calculateTemplate('invoice'); - if (request()->has('email_type') && property_exists($invoice->company->settings, request()->input('email_type'))) { - $this->reminder_template = $invoice->client->getSetting(request()->input('email_type')); - } else { - $this->reminder_template = $invoice->calculateTemplate('invoice'); - } - - BulkInvoiceJob::dispatch($invoice, $this->reminder_template); + BulkInvoiceJob::dispatch($invoice, $template); if (! $bulk) { return response()->json(['message' => 'email sent'], 200); diff --git a/app/Http/Requests/Invoice/BulkInvoiceRequest.php b/app/Http/Requests/Invoice/BulkInvoiceRequest.php index dbccd463803e..738a8f7bd762 100644 --- a/app/Http/Requests/Invoice/BulkInvoiceRequest.php +++ b/app/Http/Requests/Invoice/BulkInvoiceRequest.php @@ -24,7 +24,8 @@ class BulkInvoiceRequest extends Request { return [ 'action' => 'required|string', - 'ids' => 'required' + 'ids' => 'required', + 'email_type' => 'sometimes|in:reminder1,reminder2,reminder3,reminder_endless,custom1,custom2,custom3,invoice,quote,credit,payment,payment_partial,statement,purchase_order' ]; } }