Merge branch 'v5-develop' into design_changes

VERSION.txt

@@ -1 +1 @@
-5.5.71
+5.5.72

app/Http/Controllers/SetupController.php

@@ -23,7 +23,6 @@ use App\Utils\CurlUtils;
 use App\Utils\Ninja;
 use App\Utils\SystemHealth;
 use App\Utils\Traits\AppSetup;
-use Beganovich\Snappdf\Snappdf;
 use Exception;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Routing\ResponseFactory;
@@ -209,30 +208,9 @@ class SetupController extends Controller
     public function checkPdf(Request $request)
     {
         try {
-            // if (config('ninja.pdf_generator') == 'phantom') {
-            //     return $this->testPhantom();
-            // }
 
-            // $pdf = new Snappdf();
-
-            // if (config('ninja.snappdf_chromium_path')) {
-            //     $pdf->setChromiumPath(config('ninja.snappdf_chromium_path'));
-            // }
-
-            // if (config('ninja.snappdf_chromium_arguments')) {
-            //     $pdf->clearChromiumArguments();
-            //     $pdf->addChromiumArguments(config('ninja.snappdf_chromium_arguments'));
-            // }
-
-            // $pdf = $pdf
-            //     ->setHtml('GENERATING PDFs WORKS! Thank you for using Invoice Ninja!')
-            //     ->generate();
-
-            // Storage::disk(config('filesystems.default'))->put('test.pdf', $pdf);
-            // Storage::disk('local')->put('test.pdf', $pdf);
             return response(['url' => ''], 200);
 
-            // return response(['url' => Storage::disk('local')->url('test.pdf')], 200);
         } catch (Exception $e) {
             nlog($e->getMessage());
 

app/Mail/TestMailServer.php

@@ -39,6 +39,7 @@ class TestMailServer extends Mailable
         $settings = new \stdClass;
         $settings->primary_color = '#4caf50';
         $settings->email_style = 'dark';
+        $settings->email_alignment = 'left';
         
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.email'))

app/PaymentDrivers/Mollie/CreditCard.php

@@ -72,7 +72,7 @@ class CreditCard
                     'sequenceType' => 'recurring',
                     'description' => $description,
                     'webhookUrl'  => $this->mollie->company_gateway->webhookUrl(),
-                    'idempotencyKey' => uniqid("st", true),
+                    // 'idempotencyKey' => uniqid("st", true),
                     'metadata' => [
                         'client_id' => $this->mollie->client->hashed_id,
                         'hash' => $this->mollie->payment_hash->hash,
@@ -111,7 +111,7 @@ class CreditCard
                     'value' => $amount,
                 ],
                 'description' => $description,
-                'idempotencyKey' => uniqid("st", true),
+                // 'idempotencyKey' => uniqid("st", true),
                 'redirectUrl' => route('mollie.3ds_redirect', [
                     'company_key' => $this->mollie->client->company->company_key,
                     'company_gateway_id' => $this->mollie->company_gateway->hashed_id,

app/PaymentDrivers/MolliePaymentDriver.php

@@ -218,6 +218,7 @@ class MolliePaymentDriver extends BaseDriver
                 'customerId' => $cgt->gateway_customer_reference,
                 'sequenceType' => 'recurring',
                 'description' => $description,
+                'idempotencyKey' => uniqid("st", true),
                 'webhookUrl'  => $this->company_gateway->webhookUrl(),
             ]);
 

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.71',
-    'app_tag' => '5.5.71',
+    'app_version' => '5.5.72',
+    'app_tag' => '5.5.72',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),