Merge pull request invoiceninja#10527 from turbo124/v5-develop

v5.11.24

VERSION.txt

@@ -1 +1 @@
-5.11.23
+5.11.24

app/Helpers/SwissQr/SwissQrGenerator.php

@@ -172,6 +172,7 @@ public function run()
                 ->setPrintable(false)
                 ->getPaymentPart();
 
+                // return $html;
             return htmlspecialchars($html);
         } catch (\Exception $e) {
 

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -106,14 +106,14 @@ public function showBlob($hash)
                 break;
             }
 
-            usleep(200000);
+            usleep(300000);
 
         }
 
         $invitation = false;
 
         match($data['entity_type'] ?? 'invoice') {
-            'invoice' => $invitation = InvoiceInvitation::withTrashed()->find($data['invitation_id']),
+            'invoice' => $invitation = InvoiceInvitation::withTrashed()->find($data['invitation_id']), //@todo - sometimes this is false!!
             'quote' => $invitation = QuoteInvitation::withTrashed()->find($data['invitation_id']),
             'credit' => $invitation = CreditInvitation::withTrashed()->find($data['invitation_id']),
             'recurring_invoice' => $invitation = RecurringInvoiceInvitation::withTrashed()->find($data['invitation_id']),

app/Http/Requests/Company/UpdateCompanyRequest.php

@@ -195,7 +195,10 @@ private function filterSaveableSettings($settings)
 
         if (Ninja::isHosted()) {
             foreach ($this->protected_input as $protected_var) {
-                $settings[$protected_var] = str_replace("script", "", $settings[$protected_var]);
+
+                if(isset($settings[$protected_var])) {
+                    $settings[$protected_var] = str_replace("script", "", $settings[$protected_var]);
+                }
             }
         }
 

app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php

@@ -13,7 +13,6 @@
 
 use App\Http\Requests\Request;
 use App\Http\ValidationRules\Project\ValidProjectForClient;
-use App\Http\ValidationRules\Recurring\UniqueRecurringInvoiceNumberRule;
 use App\Models\Client;
 use App\Models\RecurringInvoice;
 use App\Utils\Traits\CleanLineItems;
@@ -68,7 +67,7 @@ public function rules()
 
         $rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
 
-        $rules['number'] = new UniqueRecurringInvoiceNumberRule($this->all());
+        $rules['number'] = ['bail', 'nullable', \Illuminate\Validation\Rule::unique('recurring_invoices')->where('company_id', $user->company()->id)];
 
         $rules['tax_rate1'] = 'bail|sometimes|numeric';
         $rules['tax_rate2'] = 'bail|sometimes|numeric';

app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php

@@ -12,7 +12,6 @@
 namespace App\Http\Requests\RecurringQuote;
 
 use App\Http\Requests\Request;
-use App\Http\ValidationRules\Recurring\UniqueRecurringQuoteNumberRule;
 use App\Models\Client;
 use App\Models\RecurringQuote;
 use App\Utils\Traits\CleanLineItems;
@@ -63,7 +62,7 @@ public function rules()
 
         $rules['frequency_id'] = 'required|integer|digits_between:1,12';
 
-        $rules['number'] = new UniqueRecurringQuoteNumberRule($this->all());
+        $rules['number'] = ['bail', 'nullable', \Illuminate\Validation\Rule::unique('recurring_quotes')->where('company_id', $user->company()->id)];
 
         return $rules;
     }

app/Jobs/Mail/NinjaMailerJob.php

@@ -515,7 +515,7 @@ private function cleanUpMailers(): void
     private function checkValidSendingUser($user)
     {
         /* Always ensure the user is set on the correct account */
-        if ($user->account_id != $this->company->account_id) {
+        if (!$user ||($user->account_id != $this->company->account_id)) {
             $this->nmo->settings->email_sending_method = 'default';
             return $this->setMailDriver();
         }

app/Livewire/Flow2/InvoicePay.php

@@ -141,6 +141,9 @@ public function paymentMethodSelected($company_gateway_id, $gateway_type_id, $am
 
         $company_gateway = CompanyGateway::query()->find($company_gateway_id);
 
+        if(!$company_gateway)
+            return $this->required_fields = false;
+
         $this->checkRequiredFields($company_gateway);
     }
 

app/PaymentDrivers/Authorize/AuthorizeTransaction.php

@@ -119,6 +119,10 @@ public function chargeCustomer(string $profile_id, array $data)
         $transactionRequestType->setOrder($order);
         $transactionRequestType->addToTransactionSettings($duplicateWindowSetting);
 
+        $solution = new \net\authorize\api\contract\v1\SolutionType();
+        $solution->setId($this->authorize->company_gateway->getConfigField('testMode') ? 'AAA100303' : 'AAA172036');
+        $transactionRequestType->setSolution($solution);
+
         $transactionRequestType->setPayment($paymentOne);
         $transactionRequestType->setCurrencyCode($this->authorize->client->currency()->code);
 

app/PaymentDrivers/Authorize/ChargePaymentProfile.php

@@ -92,6 +92,10 @@ public function chargeCustomerProfile($profile_id, $payment_profile_id, $amount)
         $transactionRequestType->setProfile($profileToCharge);
         $transactionRequestType->setCurrencyCode($this->authorize->client->currency()->code);
 
+        $solution = new \net\authorize\api\contract\v1\SolutionType();
+        $solution->setId($this->authorize->company_gateway->getConfigField('testMode') ? 'AAA100303' : 'AAA172036');
+        $transactionRequestType->setSolution($solution);
+
         $request = new CreateTransactionRequest();
         $request->setMerchantAuthentication($this->authorize->merchant_authentication);
         $request->setRefId($refId);

app/PaymentDrivers/Authorize/RefundTransaction.php

@@ -83,6 +83,10 @@ public function refundTransaction(Payment $payment, $amount)
         $transactionRequest->setPayment($paymentOne);
         $transactionRequest->setRefTransId($payment->transaction_reference);
 
+        $solution = new \net\authorize\api\contract\v1\SolutionType();
+        $solution->setId($this->authorize->company_gateway->getConfigField('testMode') ? 'AAA100303' : 'AAA172036');
+        $transactionRequest->setSolution($solution);
+
         $request = new CreateTransactionRequest();
         $request->setMerchantAuthentication($this->authorize->merchant_authentication);
         $request->setRefId($refId);

app/Services/Email/Email.php

@@ -691,7 +691,7 @@ private function cleanUpMailers(): void
     private function checkValidSendingUser($user)
     {
         /* Always ensure the user is set on the correct account */
-        if ($user->account_id != $this->company->account_id) {
+        if (!$user || ($user->account_id != $this->company->account_id)) {
             $this->email_object->settings->email_sending_method = 'default';
 
             return $this->setMailDriver();