Merge pull request #8402 from turbo124/v5-develop

Configurable MailGun endpoint

VERSION.txt

@@ -1 +1 @@
-5.5.98
+5.5.99

app/DataMapper/CompanySettings.php

@@ -473,13 +473,10 @@ class CompanySettings extends BaseSettings
 
     public $client_initiated_payments_minimum = 0;
 
-    // public $client_initiated_payments_recurring = false;
-
     public $sync_invoice_quote_columns = true;
 
     public static $casts = [
         'mailgun_endpoint'                   => 'string',    
-        // 'client_initiated_payments_recurring'=> 'bool',
         'client_initiated_payments'          => 'bool',
         'client_initiated_payments_minimum'  => 'float',
         'sync_invoice_quote_columns'         => 'bool',

app/Http/Controllers/ClientPortal/PrePaymentController.php

@@ -44,7 +44,6 @@ class PrePaymentController extends Controller
 
         $data = [
             'title' => ctrans('texts.amount'). " " .$client->currency()->code." (".auth()->guard('contact')->user()->client->currency()->symbol . ")",
-            // 'allows_recurring' => auth()->guard('contact')->user()->client->getSetting('client_initiated_payments_recurring'),
             'allows_recurring' => true,
             'minimum' => $minimum,
             'minimum_amount' =>  $minimum_amount,

app/Jobs/Mail/NinjaMailerJob.php

@@ -128,13 +128,7 @@ class NinjaMailerJob implements ShouldQueue
             }
 
             if ($this->client_mailgun_secret) {
-
+                $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $this->nmo->settings->mailgun_endpoint);
-                $endpoint = 'api.mailgun.net';
-
-                if(strpos($this->client_mailgun_secret, 'key') !== false)
-                    $endpoint = 'api.eu.mailgun.net';
-
-                $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $endpoint);
             }
 
             $mailer

app/Services/Email/Email.php

@@ -58,6 +58,8 @@ class Email implements ShouldQueue
 
     protected ?string $client_mailgun_domain = null;
 
+    protected ?string $client_mailgun_endpoint = null;
+
     private string $mailer = 'default';
 
     public Mailable $mailable;
@@ -236,13 +238,7 @@ class Email implements ShouldQueue
 
         if ($this->client_mailgun_secret) {
 
-                $endpoint = 'api.mailgun.net';
+            $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $this->client_mailgun_endpoint);
-
-                if (strpos($this->client_mailgun_secret, 'key') !== false) {
-                    $endpoint = 'api.eu.mailgun.net';
-                }
-
-            $mailer->mailgun_config($this->client_mailgun_secret, $this->client_mailgun_domain, $endpoint);
         }
 
         /* Attempt the send! */
@@ -488,6 +484,8 @@ class Email implements ShouldQueue
 
         $this->client_mailgun_domain = null;
 
+        $this->client_mailgun_endpoint = null;
+
         //always dump the drivers to prevent reuse
         app('mail.manager')->forgetMailers();
     }
@@ -537,6 +535,8 @@ class Email implements ShouldQueue
         if (strlen($this->email_object->settings->mailgun_secret) > 2 && strlen($this->email_object->settings->mailgun_domain) > 2) {
             $this->client_mailgun_secret = $this->email_object->settings->mailgun_secret;
             $this->client_mailgun_domain = $this->email_object->settings->mailgun_domain;
+            $this->client_mailgun_endpoint = $this->email_object->settings->mailgun_endpoint;
+
         } else {
             $this->email_object->settings->email_sending_method = 'default';
             return $this->setMailDriver();

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.98',
+    'app_version' => '5.5.99',
-    'app_tag' => '5.5.98',
+    'app_tag' => '5.5.99',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\Company;
 use App\Libraries\MultiDB;
 use App\Models\CompanyUser;
 use Illuminate\Support\Facades\Schema;
@@ -41,34 +42,6 @@ return new class extends Migration
             $table->string('name', 191)->nullable()->change();
         });
                     
-
-        if (config('ninja.db.multi_db_enabled')) {
-            foreach (MultiDB::$dbs as $db) {
-                CompanyUser::on($db)->where('is_admin',0)->cursor()->each(function ($cu){
-
-                    $permissions = $cu->permissions;
-
-                    if (!$permissions || strlen($permissions) == 0) {
-                        $permissions = 'view_reports';
-                        $cu->permissions = $permissions;
-                        $cu->save();
-                    } else {
-                        $permissions_array = explode(',', $permissions);
-
-                        $permissions_array[] = 'view_reports';
-
-                        $modified_permissions_string = implode(",", $permissions_array);
-
-                        $cu->permissions = $modified_permissions_string;
-                        $cu->save();
-                    }
-
-
-                });
-            }
-        } else {
-            
-            
         CompanyUser::where('is_admin', 0)->cursor()->each(function ($cu) {
             $permissions = $cu->permissions;
 
@@ -88,11 +61,15 @@ return new class extends Migration
             }
         });
 
+        Company::query()
+            ->cursor()
+            ->each(function (Company $company) {
+                $settings = $company->settings;
 
-
+                if (!property_exists($settings, 'mailgun_endpoint')) {
+                    $company->saveSettings((array)$company->settings, $company);
                 }
-
+            });
-
         
     }