Merge pull request #9298 from turbo124/v5-develop

Set default payment notifications for new companies

.github/workflows/react_release.yml

@@ -0,0 +1,76 @@
+on:
+  release:
+    types: [released]
+
+name: React Release
+
+jobs:
+  build:
+    name: Upload Release Asset
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: mysql, mysqlnd, sqlite3, bcmath, gd, curl, zip, openssl, mbstring, xml
+
+      - name: Checkout code
+        uses: actions/checkout@v1
+        with:
+          ref: v5-develop
+      
+      - name: Copy .env file
+        run: |
+          cp .env.example .env
+
+      - name: Install composer dependencies
+        run: |
+          composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer install --no-dev
+      
+      - name: Prepare Laravel Application
+        run: |
+          cp .env.example .env
+          php artisan key:generate --force
+          php artisan optimize
+          php artisan storage:link --force
+          sudo php artisan cache:clear
+          sudo find ./vendor/bin/ -type f -exec chmod +x {} \;
+          sudo find ./ -type d -exec chmod 755 {} \;
+          sudo rm -f public/main.*
+          sudo rm -f public/flutter*
+
+      - name: Prepare React FrontEnd
+        run: |
+          git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/ui.git
+          cd ui
+          git checkout develop
+          npm i
+          npm run build
+          cp -r dist/* ../public/
+
+      - name: Prepare JS/CSS assets
+        run: |
+          npm i
+          npm run production
+
+      - name: Cleanup Builds
+        run: |
+          sudo rm -rf bootstrap/cache/*
+          sudo rm -rf node_modules
+          sudo rm -rf .git
+          sudo rm .env
+
+      - name: Build project
+        run: |
+          shopt -s dotglob
+          tar --exclude='public/storage' --exclude='.htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/react-invoiceninja.tar *
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: |
+            /home/runner/work/invoiceninja/react-invoiceninja.tar

VERSION.txt

@@ -1 +1 @@
-5.8.24
+5.8.25

app/Console/Commands/CheckData.php

@@ -891,7 +891,7 @@ class CheckData extends Command
                 $this->logMessage("Fixing country for # {$client->id}");
             });
 
-            Client::query()->whereNull("settings->currency_id")->cursor()->each(function ($client){
+            Client::query()->whereNull("settings->currency_id")->cursor()->each(function ($client) {
                 $settings = $client->settings;
                 $settings->currency_id = (string)$client->company->settings->currency_id;
                 $client->settings = $settings;
@@ -901,7 +901,7 @@ class CheckData extends Command
 
             });
 
-            Payment::withTrashed()->where('exchange_rate', 0)->cursor()->each(function ($payment){
+            Payment::withTrashed()->where('exchange_rate', 0)->cursor()->each(function ($payment) {
                 $payment->exchange_rate = 1;
                 $payment->saveQuietly();
 
@@ -917,11 +917,11 @@ class CheckData extends Command
                 $p->currency_id = $p->client->settings->currency_id;
                 $p->saveQuietly();
 
-                
+
                 $this->logMessage("Fixing currency for # {$p->id}");
 
             });
-            
+
             Company::whereNull("subdomain")
             ->cursor()
             ->when(Ninja::isHosted())
@@ -942,7 +942,7 @@ class CheckData extends Command
                 $i->partial_due_date = null;
                 $i->saveQuietly();
 
-                
+
                 $this->logMessage("Fixing partial due date for # {$i->id}");
 
             });

app/Console/Commands/EncryptNinja.php

@@ -52,9 +52,10 @@ class EncryptNinja extends Command
      */
     public function handle()
     {
-        if($this->option('encrypt'))
+        if($this->option('encrypt')) {
             return $this->encryptFiles();
-            
+        }
+
         if($this->option('decrypt')) {
             return $this->decryptFiles();
         }
@@ -67,7 +68,7 @@ class EncryptNinja extends Command
             $contents = Storage::disk('base')->get($file);
             $encrypted = encrypt($contents);
             Storage::disk('base')->put($file.".enc", $encrypted);
-            Storage::disk('base')->delete($file);
+            // Storage::disk('base')->delete($file);
         }
     }
 
@@ -80,4 +81,4 @@ class EncryptNinja extends Command
             Storage::disk('base')->put($file, $decrypted);
         }
     }
-}
+}

app/Console/Commands/OpenApiYaml.php

@@ -79,7 +79,7 @@ class OpenApiYaml extends Command
         Storage::disk('base')->append('/openapi/api-docs.yaml', file_get_contents($path.'/components.yaml'));
 
         Storage::disk('base')->append('/openapi/api-docs.yaml', file_get_contents($path.'/components/examples.yaml'));
-        
+
         Storage::disk('base')->append('/openapi/api-docs.yaml', file_get_contents($path.'/components/responses.yaml'));
 
         $directory = new DirectoryIterator($path . '/components/responses/');

app/DataMapper/CompanySettings.php

@@ -494,7 +494,7 @@ class CompanySettings extends BaseSettings
     public $payment_email_all_contacts = false;
 
     public $show_pdfhtml_on_mobile = true;
-    
+
     public static $casts = [
         'show_pdfhtml_on_mobile'             => 'bool',
         'payment_email_all_contacts'         => 'bool',
@@ -878,7 +878,7 @@ class CompanySettings extends BaseSettings
     {
         $notification = new stdClass();
         $notification->email = [];
-        $notification->email = ['invoice_sent_all'];
+        $notification->email = ['invoice_sent_all','payment_success_all','payment_manual_all'];
 
         return $notification;
     }

app/DataProviders/Domains.php

@@ -59391,7 +59391,7 @@ class Domains
             'wireconnected.com'
         ];
 
-    public static function getDomains()
+    public static function getDomains(): array
     {
         return self::$verify_domains;
     }

app/Exceptions/Handler.php

@@ -105,8 +105,8 @@ class Handler extends ExceptionHandler
         if (Ninja::isHosted()) {
 
             // if($exception instanceof ThrottleRequestsException && class_exists(\Modules\Admin\Events\ThrottledExceptionRaised::class)) {
-                // $uri = urldecode(request()->getRequestUri());
+            // $uri = urldecode(request()->getRequestUri());
-                // event(new \Modules\Admin\Events\ThrottledExceptionRaised(auth()->user()?->account?->key, $uri, request()->ip()));
+            // event(new \Modules\Admin\Events\ThrottledExceptionRaised(auth()->user()?->account?->key, $uri, request()->ip()));
             // }
 
             Integration::configureScope(function (Scope $scope): void {

app/Export/CSV/BaseExport.php

@@ -451,17 +451,19 @@ class BaseExport
     {
         if (isset($this->input['client_id']) && $this->input['client_id'] != 'all') {
 
-            if(!is_int($this->input['client_id'])) 
+            if(!is_int($this->input['client_id'])) {
                 $this->input['client_id'] = $this->decodePrimaryKey($this->input['client_id']);
+            }
 
             $client = Client::withTrashed()->find($this->input['client_id']);
 
-            if(!$client)
+            if(!$client) {
                 return $query;
+            }
 
             $this->client_description = $client->present()->name;
             return $query->where('client_id', $this->input['client_id']);
-            
+
         } elseif(isset($this->input['clients']) && count($this->input['clients']) > 0) {
 
             $this->client_description = 'Multiple Clients';
@@ -844,64 +846,69 @@ class BaseExport
     }
 
     protected function addClientFilter($query, $clients): Builder
-    {   
+    {
-        if(is_string($clients))
+        if(is_string($clients)) {
-           $clients =  explode(',', $clients);
+            $clients =  explode(',', $clients);
+        }
 
         $transformed_clients = $this->transformKeys($clients);
 
         nlog($clients);
         nlog($transformed_clients);
 
-        if(count($transformed_clients) > 0)
+        if(count($transformed_clients) > 0) {
             $query->whereIn('client_id', $transformed_clients);
-        
+        }
+
         return $query;
     }
 
     protected function addVendorFilter($query, $vendors): Builder
-    {   
+    {
-        
+
         if(is_string($vendors)) {
             $vendors =  explode(',', $vendors);
         }
-        
+
         $transformed_vendors = $this->transformKeys($vendors);
 
-        if(count($transformed_vendors) > 0)
+        if(count($transformed_vendors) > 0) {
             $query->whereIn('vendor_id', $transformed_vendors);
-        
+        }
+
         return $query;
     }
 
     protected function addProjectFilter($query, $projects): Builder
-    {   
+    {
-        
+
         if(is_string($projects)) {
             $projects =  explode(',', $projects);
         }
 
         $transformed_projects = $this->transformKeys($projects);
-        
+
-        if(count($transformed_projects) > 0)
+        if(count($transformed_projects) > 0) {
             $query->whereIn('project_id', $transformed_projects);
-        
+        }
+
         return $query;
     }
 
     protected function addCategoryFilter($query, $expense_categories): Builder
-    {   
+    {
-        
+
         if(is_string($expense_categories)) {
             $expense_categories =  explode(',', $expense_categories);
         }
 
         $transformed_expense_categories = $this->transformKeys($expense_categories);
-        
 
-        if(count($transformed_expense_categories) > 0)
+
+        if(count($transformed_expense_categories) > 0) {
             $query->whereIn('category_id', $transformed_expense_categories);
-        
+        }
+
         return $query;
     }
 
@@ -1299,12 +1306,12 @@ class BaseExport
     public function queueDocuments(Builder $query)
     {
         nlog("queue docs pls");
-        if($query->getModel() instanceof Document)
+        if($query->getModel() instanceof Document) {
             $documents = $query->pluck('id')->toArray();
-        else{
+        } else {
             $documents = $query->cursor()
-                               ->map(function ($entity){
+                               ->map(function ($entity) {
-                                      return $entity->documents()->pluck('id')->toArray();
+                                   return $entity->documents()->pluck('id')->toArray();
                                })->flatten()
                                ->toArray();
         }
@@ -1315,11 +1322,13 @@ class BaseExport
 
             $user = $this->company->owner();
 
-            if(auth()->user() && auth()->user()->account_id == $this->company->account_id)
+            if(auth()->user() && auth()->user()->account_id == $this->company->account_id) {
                 $user = auth()->user();
+            }
 
-            if($this->input['user_id'] ?? false)
+            if($this->input['user_id'] ?? false) {
                 $user = User::where('id', $this->input['user_id'])->where('account_id', $this->company->account_id)->first();
+            }
 
             ZipDocuments::dispatch($documents, $this->company, $user);
         }

app/Export/CSV/CreditExport.php

@@ -106,7 +106,7 @@ class CreditExport extends BaseExport
                         ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Export/CSV/DocumentExport.php

@@ -77,7 +77,7 @@ class DocumentExport extends BaseExport
         $query = Document::query()->where('company_id', $this->company->id);
 
         $query = $this->addDateRange($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Export/CSV/ExpenseExport.php

@@ -23,7 +23,6 @@ use League\Csv\Writer;
 
 class ExpenseExport extends BaseExport
 {
-
     private $expense_transformer;
 
     private Decorator $decorator;
@@ -103,7 +102,7 @@ class ExpenseExport extends BaseExport
         if(isset($this->input['categories'])) {
             $query = $this->addCategoryFilter($query, $this->input['categories']);
         }
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }
@@ -206,23 +205,21 @@ class ExpenseExport extends BaseExport
 
         if($expense->calculate_tax_by_amount) {
             $total_tax_amount = round($expense->tax_amount1 + $expense->tax_amount2 + $expense->tax_amount3, $precision);
-        }
+        } else {
-        else {
+
-            
+            if($expense->uses_inclusive_taxes) {
-            if($expense->uses_inclusive_taxes){
+                $total_tax_amount = ($this->calcInclusiveLineTax($expense->tax_rate1 ?? 0, $expense->amount, $precision)) + ($this->calcInclusiveLineTax($expense->tax_rate2 ?? 0, $expense->amount, $precision)) + ($this->calcInclusiveLineTax($expense->tax_rate3 ?? 0, $expense->amount, $precision));
-                $total_tax_amount = ($this->calcInclusiveLineTax($expense->tax_rate1 ?? 0, $expense->amount,$precision)) + ($this->calcInclusiveLineTax($expense->tax_rate2 ?? 0, $expense->amount,$precision)) + ($this->calcInclusiveLineTax($expense->tax_rate3 ?? 0, $expense->amount,$precision));
                 $entity['expense.net_amount'] = round(($expense->amount - round($total_tax_amount, $precision)), $precision);
-            }
+            } else {
-            else{
+                $total_tax_amount = ($expense->amount * (($expense->tax_rate1 ?? 0) / 100)) + ($expense->amount * (($expense->tax_rate2 ?? 0) / 100)) + ($expense->amount * (($expense->tax_rate3 ?? 0) / 100));
-                $total_tax_amount = ($expense->amount * (($expense->tax_rate1 ?? 0)/100)) + ($expense->amount * (($expense->tax_rate2 ?? 0)/100)) + ($expense->amount * (($expense->tax_rate3 ?? 0)/100));
                 $entity['expense.net_amount'] = round(($expense->amount + round($total_tax_amount, $precision)), $precision);
             }
         }
 
         $entity['expense.tax_amount'] = round($total_tax_amount, $precision);
-        
+
         return $entity;
-        
+
     }
 
     private function calcInclusiveLineTax($tax_rate, $amount, $precision): float

app/Export/CSV/InvoiceItemExport.php

@@ -76,7 +76,7 @@ class InvoiceItemExport extends BaseExport
         $query = $this->addDateRange($query);
 
         $query = $this->applyFilters($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Export/CSV/PaymentExport.php

@@ -60,7 +60,7 @@ class PaymentExport extends BaseExport
                             ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Export/CSV/ProductExport.php

@@ -77,7 +77,7 @@ class ProductExport extends BaseExport
                         ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Export/CSV/PurchaseOrderExport.php

@@ -107,7 +107,7 @@ class PurchaseOrderExport extends BaseExport
                         ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Export/CSV/QuoteItemExport.php

@@ -69,7 +69,7 @@ class QuoteItemExport extends BaseExport
                             ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
-        
+
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
         }

app/Filters/ClientFilters.php

@@ -165,8 +165,7 @@ class ClientFilters extends QueryFilters
 
         $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
 
-        if($sort_col[0] == 'number')
+        if($sort_col[0] == 'number') {
-        {
             return $this->builder->orderByRaw('ABS(number) ' . $dir);
         }
 

app/Filters/InvoiceFilters.php

@@ -318,13 +318,12 @@ class InvoiceFilters extends QueryFilters
 
         if ($sort_col[0] == 'client_id') {
 
-            return $this->builder->orderBy(\App\Models\Client::select       ('name')
+            return $this->builder->orderBy(\App\Models\Client::select('name')
                              ->whereColumn('clients.id', 'invoices.client_id'), $dir);
 
         }
 
-        if($sort_col[0] == 'number')
+        if($sort_col[0] == 'number') {
-        {
             return $this->builder->orderByRaw('ABS(number) ' . $dir);
         }
 

app/Filters/ProjectFilters.php

@@ -59,7 +59,7 @@ class ProjectFilters extends QueryFilters
     public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
-        
+
         if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
         }

app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php

@@ -70,8 +70,9 @@ class TransactionTransformer implements BankRevenueInterface
     {
         $data = [];
 
-        if (!array_key_exists('transactions', $transactionResponse) || !array_key_exists('booked', $transactionResponse["transactions"]))
+        if (!array_key_exists('transactions', $transactionResponse) || !array_key_exists('booked', $transactionResponse["transactions"])) {
             throw new \Exception('invalid dataset');
+        }
 
         foreach ($transactionResponse["transactions"]["booked"] as $transaction) {
             $data[] = $this->transformTransaction($transaction);
@@ -83,11 +84,11 @@ class TransactionTransformer implements BankRevenueInterface
     {
         // depending on institution, the result can be different, so we load the first available unique id
         $transactionId = '';
-        if (array_key_exists('transactionId', $transaction))
+        if (array_key_exists('transactionId', $transaction)) {
             $transactionId = $transaction["transactionId"];
-        else if (array_key_exists('internalTransactionId', $transaction))
+        } elseif (array_key_exists('internalTransactionId', $transaction)) {
             $transactionId = $transaction["internalTransactionId"];
-        else {
+        } else {
             nlog(`Invalid Input for nordigen transaction transformer: ` . $transaction);
             throw new \Exception('invalid dataset: missing transactionId - Please report this error to the developer');
         }
@@ -96,23 +97,25 @@ class TransactionTransformer implements BankRevenueInterface
 
         // description could be in varios places
         $description = '';
-        if (array_key_exists('remittanceInformationStructured', $transaction))
+        if (array_key_exists('remittanceInformationStructured', $transaction)) {
             $description = $transaction["remittanceInformationStructured"];
-        else if (array_key_exists('remittanceInformationStructuredArray', $transaction))
+        } elseif (array_key_exists('remittanceInformationStructuredArray', $transaction)) {
             $description = implode('\n', $transaction["remittanceInformationStructuredArray"]);
-        else if (array_key_exists('remittanceInformationUnstructured', $transaction))
+        } elseif (array_key_exists('remittanceInformationUnstructured', $transaction)) {
             $description = $transaction["remittanceInformationUnstructured"];
-        else if (array_key_exists('remittanceInformationUnstructuredArray', $transaction))
+        } elseif (array_key_exists('remittanceInformationUnstructuredArray', $transaction)) {
             $description = implode('\n', $transaction["remittanceInformationUnstructuredArray"]);
-        else
+        } else {
             Log::warning("Missing description for the following transaction: " . json_encode($transaction));
+        }
 
         // enrich description with currencyExchange informations
-        if (array_key_exists('currencyExchange', $transaction))
+        if (isset($transaction['currencyExchange'])) {
             foreach ($transaction["currencyExchange"] as $exchangeRate) {
-                $targetAmount = round($amount * (float) $exchangeRate["exchangeRate"], 2);
+                $targetAmount = round($amount * (float) ($exchangeRate["exchangeRate"] ?? 1) , 2);
-                $description .= '\nexchangeRate: ' . $amount . " " . $exchangeRate["sourceCurrency"] . " = " . $targetAmount . " " . $exchangeRate["targetCurrency"] . " (" . $exchangeRate["quotationDate"] . ")";
+                $description .= '\nexchangeRate: ' . $amount . " " . ($exchangeRate["sourceCurrency"] ?? '?') . " = " . $targetAmount . " " . ($exchangeRate["targetCurrency"] ?? '?') . " (" . ($exchangeRate["quotationDate"] ?? '?') . ")";
             }
+        }
 
         // participant data
         $participant = array_key_exists('debtorAccount', $transaction) && array_key_exists('iban', $transaction["debtorAccount"]) ?
@@ -153,8 +156,9 @@ class TransactionTransformer implements BankRevenueInterface
             return $item->code == $code;
         })->first();
 
-        if ($currency)
+        if ($currency) {
             return $currency->id;
+        }
 
         return 1;
 

app/Http/Controllers/ActivityController.php

@@ -62,7 +62,7 @@ class ActivityController extends BaseController
             $system = ctrans('texts.system');
 
             $data = $activities->cursor()->map(function ($activity) {
-                
+
                 /** @var \App\Models\Activity $activity */
                 return $activity->activity_string();
 

app/Http/Controllers/BankTransactionController.php

@@ -112,8 +112,9 @@ class BankTransactionController extends BaseController
             $this->bank_transaction_repo->convert_matched($bank_transactions);
         } else {
             $bank_transactions->each(function ($bank_transaction, $key) use ($action, $user) {
-                if($user->can('edit', $bank_transaction))
+                if($user->can('edit', $bank_transaction)) {
                     $this->bank_transaction_repo->{$action}($bank_transaction);
+                }
             });
         }
 

app/Http/Controllers/ClientController.php

@@ -412,19 +412,19 @@ class ClientController extends BaseController
 
     }
 
-    public function documents(ClientDocumentsRequest $request, Client $client) 
+    public function documents(ClientDocumentsRequest $request, Client $client)
     {
-     
+
         $this->entity_type = Document::class;
 
         $this->entity_transformer = DocumentTransformer::class;
-        
+
         $documents = Document::query()
             ->company()
-            ->whereHasMorph('documentable', [Invoice::class, Quote::class, Credit::class, Expense::class, Payment::class, Task::class], function ($query) use($client) {
+            ->whereHasMorph('documentable', [Invoice::class, Quote::class, Credit::class, Expense::class, Payment::class, Task::class], function ($query) use ($client) {
                 $query->where('client_id', $client->id);
             })
-            ->orWhereHasMorph('documentable', [Client::class], function ($query) use ($client){
+            ->orWhereHasMorph('documentable', [Client::class], function ($query) use ($client) {
                 $query->where('id', $client->id);
             });
 

app/Http/Controllers/ClientGatewayTokenController.php

@@ -353,7 +353,7 @@ class ClientGatewayTokenController extends BaseController
      */
     public function store(StoreClientGatewayTokenRequest $request)
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Controllers/ClientPortal/DocumentController.php

@@ -73,12 +73,13 @@ class DocumentController extends Controller
     {
 
         $hash = Cache::pull($hash);
-        
+
-        if(!$hash)
+        if(!$hash) {
             abort(404);
+        }
 
         MultiDB::setDb($hash['db']);
-        
+
         /** @var \App\Models\Document $document **/
         $document = Document::where('hash', $hash['doc_hash'])->firstOrFail();
 

app/Http/Controllers/ClientPortal/EmailPreferencesController.php

@@ -58,4 +58,3 @@ class EmailPreferencesController extends Controller
         return back()->with('message', ctrans('texts.updated_settings'));
     }
 }
-

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -70,7 +70,7 @@ class InvoiceController extends Controller
         }
 
         $variables = ($invitation && auth()->guard('contact')->user()->client->getSetting('show_accept_invoice_terms')) ? (new HtmlEngine($invitation))->generateLabelsAndValues() : false;
-        
+
         $data = [
             'invoice' => $invoice,
             'invitation' => $invitation ?: $invoice->invitations->first(),
@@ -224,8 +224,9 @@ class InvoiceController extends Controller
         $settings = auth()->guard('contact')->user()->client->getMergedSettings();
         $variables = false;
 
-        if(($invitation = $invoices->first()->invitations()->first() ?? false) && $settings->show_accept_invoice_terms)
+        if(($invitation = $invoices->first()->invitations()->first() ?? false) && $settings->show_accept_invoice_terms) {
             $variables = (new HtmlEngine($invitation))->generateLabelsAndValues();
+        }
 
         $data = [
             'settings' => $settings,

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -12,24 +12,25 @@
 
 namespace App\Http\Controllers\ClientPortal;
 
-use App\Factory\PaymentFactory;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
-use App\Models\CompanyGateway;
-use App\Models\GatewayType;
 use App\Models\Invoice;
 use App\Models\Payment;
+use App\Utils\HtmlEngine;
+use Illuminate\View\View;
+use App\Models\GatewayType;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
+use Illuminate\Http\Request;
+use App\Models\CompanyGateway;
+use App\Factory\PaymentFactory;
+use App\Utils\Traits\MakesHash;
+use App\Utils\Traits\MakesDates;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Contracts\View\Factory;
 use App\PaymentDrivers\Stripe\BankTransfer;
 use App\Services\ClientPortal\InstantPayment;
 use App\Services\Subscription\SubscriptionService;
-use App\Utils\Traits\MakesDates;
+use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
-use App\Utils\Traits\MakesHash;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\View\View;
 
 /**
  * Class PaymentController.
@@ -125,10 +126,16 @@ class PaymentController extends Controller
 
         // 09-07-2022 catch duplicate responses for invoices that already paid here.
         if ($invoice && $invoice->status_id == Invoice::STATUS_PAID) {
+
+            $invitation = $invoice->invitations->first();
+
+            $variables = ($invitation && auth()->guard('contact')->user()->client->getSetting('show_accept_invoice_terms')) ? (new HtmlEngine($invitation))->generateLabelsAndValues() : false;
+
             $data = [
                 'invoice' => $invoice,
                 'key' => false,
-                'invitation' => $invoice->invitations->first()
+                'invitation' => $invitation,
+                'variables' => $variables,
             ];
 
             if ($request->query('mode') === 'fullscreen') {

app/Http/Controllers/ClientPortal/PaymentMethodController.php

@@ -147,7 +147,7 @@ class PaymentMethodController extends Controller
             $payment_method->is_deleted = true;
             $payment_method->delete();
             $payment_method->save();
-            
+
         } catch (Exception $e) {
             nlog($e->getMessage());
 

app/Http/Controllers/ClientPortal/QuoteController.php

@@ -215,7 +215,7 @@ class QuoteController extends Controller
                 ->withSuccess('Quote(s) approved successfully.');
         }
 
-        
+
         $variables = false;
 
         if($invitation = $quotes->first()->invitations()->first() ?? false) {

app/Http/Controllers/CompanyGatewayController.php

@@ -149,7 +149,7 @@ class CompanyGatewayController extends BaseController
      */
     public function create(CreateCompanyGatewayRequest $request)
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Controllers/CompanyLedgerController.php

@@ -64,7 +64,7 @@ class CompanyLedgerController extends BaseController
      */
     public function index(ShowCompanyLedgerRequest $request)
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Controllers/ConnectedAccountController.php

@@ -121,7 +121,7 @@ class ConnectedAccountController extends BaseController
                 'email_verified_at' => now()
             ];
 
-            
+
             /** @var \App\Models\User $user */
             $user = auth()->user();
 

app/Http/Controllers/ExpenseCategoryController.php

@@ -128,7 +128,7 @@ class ExpenseCategoryController extends BaseController
      */
     public function create(CreateExpenseCategoryRequest $request)
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Controllers/HostedMigrationController.php

@@ -21,7 +21,7 @@ class HostedMigrationController extends Controller
 {
     public function checkStatus(Request $request)
     {
-        
+
         if ($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret')) {
             return;
         }
@@ -29,19 +29,20 @@ class HostedMigrationController extends Controller
         MultiDB::findAndSetDbByCompanyKey($request->company_key);
         $c = Company::where('company_key', $request->company_key)->first();
 
-        if(!$c || $c->is_disabled)
+        if(!$c || $c->is_disabled) {
             return response()->json(['message' => 'ok'], 200);
+        }
 
         // if(\App\Models\Invoice::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2))->first())
         //     return response()->json(['message' => 'New data exists, are you sure? Please log in here https://app.invoicing.co and delete the company if you really need to migrate again.'], 400);
-    
+
-        // if(\App\Models\Client::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2))->first()) 
+        // if(\App\Models\Client::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2))->first())
-        //     return response()->json(['message' => 'New data exists, are you sure? Please log in here https://app.invoicing.co and delete the company if you really need to migrate again.'], 400);
-        
-        // if(\App\Models\Quote::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2))) 
         //     return response()->json(['message' => 'New data exists, are you sure? Please log in here https://app.invoicing.co and delete the company if you really need to migrate again.'], 400);
 
-        // if(\App\Models\RecurringInvoice::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2))) 
+        // if(\App\Models\Quote::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2)))
+        //     return response()->json(['message' => 'New data exists, are you sure? Please log in here https://app.invoicing.co and delete the company if you really need to migrate again.'], 400);
+
+        // if(\App\Models\RecurringInvoice::query()->where('company_id', $c->id)->where('created_at', '>', now()->subMonths(2)))
         //     return response()->json(['message' => 'New data exists, are you sure? Please log in here https://app.invoicing.co and delete the company if you really need to migrate again.'], 400);
 
         return response()->json(['message' => 'You have already activated this company on v5!!!!!! This migration may be a BAD idea. Contact us contact@invoiceninja.com to confirm this action.'], 400);

app/Http/Controllers/MailgunWebhookController.php

@@ -22,18 +22,22 @@ class MailgunWebhookController extends BaseController
 {
     private $invitation;
 
-    public function __construct() {}
+    public function __construct()
+    {
+    }
 
     public function webhook(Request $request)
     {
 
         $input = $request->all();
 
-        if (\abs(\time() - $request['signature']['timestamp']) > 15) 
+        if (\abs(\time() - $request['signature']['timestamp']) > 15) {
             return response()->json(['message' => 'Success'], 200);
+        }
 
-        if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature']))
+        if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) {
             ProcessMailgunWebhook::dispatch($request->all())->delay(10);
+        }
 
         return response()->json(['message' => 'Success.'], 200);
     }

app/Http/Controllers/PaymentController.php

@@ -520,7 +520,7 @@ class PaymentController extends BaseController
         if($action == 'template' && $user->can('view', $payments->first())) {
 
             $hash_or_response = request()->boolean('send_email') ? 'email sent' : \Illuminate\Support\Str::uuid();
-           
+
             TemplateAction::dispatch(
                 $payments->pluck('hashed_id')->toArray(),
                 $request->template_id,

app/Http/Controllers/PreviewPurchaseOrderController.php

@@ -316,8 +316,8 @@ class PreviewPurchaseOrderController extends BaseController
             return;
         }
 
-            /** @var \App\Models\User $user */
+        /** @var \App\Models\User $user */
-            $user = auth()->user();
+        $user = auth()->user();
 
         //if phantom js...... inject here..
         if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {

app/Http/Controllers/ProductController.php

@@ -181,7 +181,7 @@ class ProductController extends BaseController
      */
     public function store(StoreProductRequest $request)
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Controllers/QuoteController.php

@@ -399,7 +399,7 @@ class QuoteController extends BaseController
 
         $quote->service()
               ->triggeredActions($request);
-        
+
         event(new QuoteWasUpdated($quote, $quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($quote);

app/Http/Controllers/StripeConnectController.php

@@ -86,7 +86,7 @@ class StripeConnectController extends BaseController
             ]);
 
             nlog($response);
-            
+
         } catch (\Exception $e) {
             return view('auth.connect.access_denied');
         }

app/Http/Controllers/TwoFactorController.php

@@ -84,7 +84,7 @@ class TwoFactorController extends BaseController
 
     public function disableTwoFactor()
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Controllers/VendorController.php

@@ -499,7 +499,7 @@ class VendorController extends BaseController
 
         $ids = request()->input('ids');
         $vendors = Vendor::withTrashed()->find($this->transformKeys($ids));
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Middleware/TokenAuth.php

@@ -67,7 +67,7 @@ class TokenAuth
             $truth->setUser($company_token->user);
             $truth->setCompany($company_token->company);
             $truth->setCompanyToken($company_token);
-
+            $truth->setPremiumHosted($company_token->account->isPremium());
             /*
             | This method binds the db to the jobs created using this
             | session

app/Http/Requests/ClientPortal/PaymentMethod/CreatePaymentMethodRequest.php

@@ -27,7 +27,7 @@ class CreatePaymentMethodRequest extends FormRequest
             ->filter(function ($method) use (&$available_methods) {
                 $available_methods[] = $method['gateway_type_id'];
             });
-            
+
         if (in_array($this->query('method'), $available_methods)) {
             return true;
         }

app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php

@@ -32,7 +32,7 @@ class StoreExpenseCategoryRequest extends Request
 
     public function rules()
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php

@@ -26,7 +26,7 @@ class UpdateExpenseCategoryRequest extends Request
      */
     public function authorize(): bool
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
@@ -35,7 +35,7 @@ class UpdateExpenseCategoryRequest extends Request
 
     public function rules()
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/Requests/Request.php

@@ -198,18 +198,22 @@ class Request extends FormRequest
             }
         }
 
-        if(isset($input['public_notes']))
+        if(isset($input['public_notes'])) {
-            $input['public_notes'] = str_replace("</sc","<-", $input['public_notes']);
+            $input['public_notes'] = str_replace("</sc", "<-", $input['public_notes']);
+        }
 
-        if(isset($input['footer'])) 
+        if(isset($input['footer'])) {
             $input['footer'] = str_replace("</sc", "<-", $input['footer']);
-        
+        }
-        if(isset($input['terms'])) 
+
+        if(isset($input['terms'])) {
             $input['terms'] = str_replace("</sc", "<-", $input['terms']);
-        
+        }
-        if(isset($input['private_notes'])) 
+
+        if(isset($input['private_notes'])) {
             $input['private_notes'] = str_replace("</sc", "<-", $input['private_notes']);
-        
+        }
+
         return $input;
     }
 

app/Http/ValidationRules/Ninja/CanAddUserRule.php

@@ -39,11 +39,11 @@ class CanAddUserRule implements Rule
             return true;
         }
 
-        /* 
+        /*
-        Check that we have sufficient quota to allow this to happen 
+        Check that we have sufficient quota to allow this to happen
 
         @ 31-01-2024 - changed query to use email instead of user_id
-        
+
         $count = CompanyUser::query()
                           ->where('company_user.account_id', $user->account_id)
                           ->join('users', 'users.id', '=', 'company_user.user_id')
@@ -69,7 +69,7 @@ class CanAddUserRule implements Rule
      */
     public function message()
     {
-        
+
         /** @var \App\Models\User $user */
         $user = auth()->user();
 

app/Http/ValidationRules/PaymentAppliedValidAmount.php

@@ -88,10 +88,9 @@ class PaymentAppliedValidAmount implements Rule
                 nlog($inv->amount);
                 nlog($invoice['amount']);
 
-                if($inv->status_id == Invoice::STATUS_DRAFT && $inv->amount >= $invoice['amount']){
+                if($inv->status_id == Invoice::STATUS_DRAFT && $inv->amount >= $invoice['amount']) {
 
-                }
+                } elseif ($inv->balance < $invoice['amount']) {
-                elseif ($inv->balance < $invoice['amount']) {
                     $this->message = 'Amount cannot be greater than invoice balance';
 
                     return false;

app/Import/Providers/BaseImport.php

@@ -152,7 +152,7 @@ class BaseImport
             }
 
         }
-        
+
         return $bestDelimiter ?? ',';
     }
 

app/Import/Providers/Wave.php

@@ -117,10 +117,8 @@ class Wave extends BaseImport implements ImportInterface
 
         $this->transformer = new InvoiceTransformer($this->company);
 
-        foreach($data as $key => $invoice)
+        foreach($data as $key => $invoice) {
-        {
+            if(!isset($invoice['Invoice Number']) || empty($invoice['Invoice Number'])) {
-            if(!isset($invoice['Invoice Number']) || empty($invoice['Invoice Number']))
-            {
                 unset($data[$key]);
             }
         }

app/Jobs/Company/CompanyExport.php

@@ -72,13 +72,13 @@ class CompanyExport implements ShouldQueue
 
         $this->file_name = date('Y-m-d') . '_' . str_replace([" ", "/"], ["_",""], $this->company->present()->name() . '_' . $this->company->company_key . '.json');
 
-$this->writer = new File($this->file_name);
+        $this->writer = new File($this->file_name);
 
         set_time_limit(0);
 
-$this->writer->value('app_version', config('ninja.app_version'));
+        $this->writer->value('app_version', config('ninja.app_version'));
-$this->writer->value('storage_url', Storage::url(''));
+        $this->writer->value('storage_url', Storage::url(''));
-        
+
         $this->export_data['activities'] = $this->company->all_activities->map(function ($activity) {
             $activity = $this->transformArrayOfKeys($activity, [
                 'user_id',
@@ -104,9 +104,9 @@ $this->writer->value('storage_url', Storage::url(''));
         })->makeHidden(['id'])->all();
 
 
-$x = $this->writer->collection('activities');
+        $x = $this->writer->collection('activities');
-$x->addItems($this->export_data['activities']);
+        $x->addItems($this->export_data['activities']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['users'] = $this->company->users()->withTrashed()->cursor()->map(function ($user) {
@@ -116,9 +116,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('users');
+        $x = $this->writer->collection('users');
-$x->addItems($this->export_data['users']);
+        $x->addItems($this->export_data['users']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['client_contacts'] = $this->company->client_contacts->map(function ($client_contact) {
@@ -140,9 +140,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('client_contacts');
+        $x = $this->writer->collection('client_contacts');
-$x->addItems($this->export_data['client_contacts']);
+        $x->addItems($this->export_data['client_contacts']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['client_gateway_tokens'] = $this->company->client_gateway_tokens->map(function ($client_gateway_token) {
             $client_gateway_token = $this->transformArrayOfKeys($client_gateway_token, ['company_id', 'client_id', 'company_gateway_id']);
@@ -151,9 +151,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('client_gateway_tokens');
+        $x = $this->writer->collection('client_gateway_tokens');
-$x->addItems($this->export_data['client_gateway_tokens']);
+        $x->addItems($this->export_data['client_gateway_tokens']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['clients'] = $this->company->clients()->orderBy('number', 'DESC')->cursor()->map(function ($client) {
             $client = $this->transformArrayOfKeys($client, ['company_id', 'user_id', 'assigned_user_id', 'group_settings_id']);
@@ -162,18 +162,18 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('clients');
+        $x = $this->writer->collection('clients');
-$x->addItems($this->export_data['clients']);
+        $x->addItems($this->export_data['clients']);
-$this->export_data = null;
+        $this->export_data = null;
 
         // $this->export_data['company'] = $this->company->toArray();
         // $this->export_data['company']['company_key'] = $this->createHash();
 
-$this->writer->value('company', $this->company->toJson(), encode: false);
+        $this->writer->value('company', $this->company->toJson(), encode: false);
-     
+
-// $x = $this->writer->collection('company');
+        // $x = $this->writer->collection('company');
-// $x->addItems($this->export_data['company']);
+        // $x->addItems($this->export_data['company']);
-// $this->export_data = null;
+        // $this->export_data = null;
 
 
         $this->export_data['company_gateways'] = $this->company->company_gateways()->withTrashed()->cursor()->map(function ($company_gateway) {
@@ -184,11 +184,11 @@ $this->writer->value('company', $this->company->toJson(), encode: false);
         })->all();
 
 
-$x = $this->writer->collection('company_gateways');
+        $x = $this->writer->collection('company_gateways');
-$x->addItems($this->export_data['company_gateways']);
+        $x->addItems($this->export_data['company_gateways']);
-$this->export_data = null;
+        $this->export_data = null;
+
 
-        
 
 
         $this->export_data['company_tokens'] = $this->company->tokens->map(function ($token) {
@@ -198,9 +198,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('company_tokens');
+        $x = $this->writer->collection('company_tokens');
-$x->addItems($this->export_data['company_tokens']);
+        $x->addItems($this->export_data['company_tokens']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['company_ledger'] = $this->company->ledger->map(function ($ledger) {
@@ -210,20 +210,20 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('company_ledger');
+        $x = $this->writer->collection('company_ledger');
-$x->addItems($this->export_data['company_ledger']);
+        $x->addItems($this->export_data['company_ledger']);
-$this->export_data = null;
+        $this->export_data = null;
+
 
-        
         $this->export_data['company_users'] = $this->company->company_users()->without(['user','account'])->cursor()->map(function ($company_user) {
             $company_user = $this->transformArrayOfKeys($company_user, ['company_id', 'account_id', 'user_id']);
             return $company_user;
         })->all();
 
 
-$x = $this->writer->collection('company_users');
+        $x = $this->writer->collection('company_users');
-$x->addItems($this->export_data['company_users']);
+        $x->addItems($this->export_data['company_users']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['credits'] = $this->company->credits()->orderBy('number', 'DESC')->cursor()->map(function ($credit) {
@@ -233,9 +233,9 @@ $this->export_data = null;
             return $credit->makeVisible(['id']);
         })->all();
 
-$x = $this->writer->collection('credits');
+        $x = $this->writer->collection('credits');
-$x->addItems($this->export_data['credits']);
+        $x->addItems($this->export_data['credits']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['credit_invitations'] = CreditInvitation::query()->where('company_id', $this->company->id)->withTrashed()->cursor()->map(function ($credit) {
@@ -244,18 +244,18 @@ $this->export_data = null;
             return $credit->makeVisible(['id']);
         })->all();
 
-        
+
-$x = $this->writer->collection('credit_invitations');
+        $x = $this->writer->collection('credit_invitations');
-$x->addItems($this->export_data['credit_invitations']);
+        $x->addItems($this->export_data['credit_invitations']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['designs'] = $this->company->user_designs->makeHidden(['id'])->all();
 
-        
+
-$x = $this->writer->collection('designs');
+        $x = $this->writer->collection('designs');
-$x->addItems($this->export_data['designs']);
+        $x->addItems($this->export_data['designs']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['documents'] = $this->company->all_documents->map(function ($document) {
@@ -265,9 +265,9 @@ $this->export_data = null;
             return $document->makeVisible(['id']);
         })->all();
 
-$x = $this->writer->collection('documents');
+        $x = $this->writer->collection('documents');
-$x->addItems($this->export_data['documents']);
+        $x->addItems($this->export_data['documents']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['expense_categories'] = $this->company->expense_categories()->cursor()->map(function ($expense_category) {
             $expense_category = $this->transformArrayOfKeys($expense_category, ['user_id', 'company_id']);
@@ -275,9 +275,9 @@ $this->export_data = null;
             return $expense_category->makeVisible(['id']);
         })->all();
 
-$x = $this->writer->collection('expense_categories');
+        $x = $this->writer->collection('expense_categories');
-$x->addItems($this->export_data['expense_categories']);
+        $x->addItems($this->export_data['expense_categories']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['expenses'] = $this->company->expenses()->orderBy('number', 'DESC')->cursor()->map(function ($expense) {
@@ -288,9 +288,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('expenses');
+        $x = $this->writer->collection('expenses');
-$x->addItems($this->export_data['expenses']);
+        $x->addItems($this->export_data['expenses']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['group_settings'] = $this->company->group_settings->map(function ($gs) {
@@ -299,10 +299,10 @@ $this->export_data = null;
             return $gs->makeVisible(['id']);
         })->all();
 
-        
+
-$x = $this->writer->collection('group_settings');
+        $x = $this->writer->collection('group_settings');
-$x->addItems($this->export_data['group_settings']);
+        $x->addItems($this->export_data['group_settings']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['invoices'] = $this->company->invoices()->orderBy('number', 'DESC')->cursor()->map(function ($invoice) {
@@ -318,9 +318,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('invoices');
+        $x = $this->writer->collection('invoices');
-$x->addItems($this->export_data['invoices']);
+        $x->addItems($this->export_data['invoices']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['invoice_invitations'] = InvoiceInvitation::query()->where('company_id', $this->company->id)->withTrashed()->cursor()->map(function ($invoice) {
             $invoice = $this->transformArrayOfKeys($invoice, ['company_id', 'user_id', 'client_contact_id', 'invoice_id']);
@@ -329,9 +329,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('invoice_invitations');
+        $x = $this->writer->collection('invoice_invitations');
-$x->addItems($this->export_data['invoice_invitations']);
+        $x->addItems($this->export_data['invoice_invitations']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['payment_terms'] = $this->company->user_payment_terms->map(function ($term) {
@@ -340,10 +340,10 @@ $this->export_data = null;
             return $term;
         })->makeHidden(['id'])->all();
 
-        
+
-$x = $this->writer->collection('payment_terms');
+        $x = $this->writer->collection('payment_terms');
-$x->addItems($this->export_data['payment_terms']);
+        $x->addItems($this->export_data['payment_terms']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['payments'] = $this->company->payments()->orderBy('number', 'DESC')->cursor()->map(function ($payment) {
@@ -357,9 +357,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('payments');
+        $x = $this->writer->collection('payments');
-$x->addItems($this->export_data['payments']);
+        $x->addItems($this->export_data['payments']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['products'] = $this->company->products->map(function ($product) {
@@ -370,9 +370,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('products');
+        $x = $this->writer->collection('products');
-$x->addItems($this->export_data['products']);
+        $x->addItems($this->export_data['products']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['projects'] = $this->company->projects()->orderBy('number', 'DESC')->cursor()->map(function ($project) {
@@ -383,9 +383,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('projects');
+        $x = $this->writer->collection('projects');
-$x->addItems($this->export_data['projects']);
+        $x->addItems($this->export_data['projects']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['quotes'] = $this->company->quotes()->orderBy('number', 'DESC')->cursor()->map(function ($quote) {
@@ -395,10 +395,10 @@ $this->export_data = null;
             return $quote->makeVisible(['id']);
         })->all();
 
-        
+
-$x = $this->writer->collection('quotes');
+        $x = $this->writer->collection('quotes');
-$x->addItems($this->export_data['quotes']);
+        $x->addItems($this->export_data['quotes']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['quote_invitations'] = QuoteInvitation::query()->where('company_id', $this->company->id)->withTrashed()->cursor()->map(function ($quote) {
@@ -408,9 +408,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('quote_invitations');
+        $x = $this->writer->collection('quote_invitations');
-$x->addItems($this->export_data['quote_invitations']);
+        $x->addItems($this->export_data['quote_invitations']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['recurring_expenses'] = $this->company->recurring_expenses()->orderBy('number', 'DESC')->cursor()->map(function ($expense) {
@@ -422,9 +422,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('recurring_expenses');
+        $x = $this->writer->collection('recurring_expenses');
-$x->addItems($this->export_data['recurring_expenses']);
+        $x->addItems($this->export_data['recurring_expenses']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['recurring_invoices'] = $this->company->recurring_invoices()->orderBy('number', 'DESC')->cursor()->map(function ($ri) {
@@ -434,10 +434,10 @@ $this->export_data = null;
             return $ri->makeVisible(['id']);
         })->all();
 
-        
+
-$x = $this->writer->collection('recurring_invoices');
+        $x = $this->writer->collection('recurring_invoices');
-$x->addItems($this->export_data['recurring_invoices']);
+        $x->addItems($this->export_data['recurring_invoices']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['recurring_invoice_invitations'] = RecurringInvoiceInvitation::query()->where('company_id', $this->company->id)->withTrashed()->cursor()->map(function ($ri) {
@@ -447,9 +447,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('recurring_invoice_invitations');
+        $x = $this->writer->collection('recurring_invoice_invitations');
-$x->addItems($this->export_data['recurring_invoice_invitations']);
+        $x->addItems($this->export_data['recurring_invoice_invitations']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
 
@@ -467,9 +467,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('subscriptions');
+        $x = $this->writer->collection('subscriptions');
-$x->addItems($this->export_data['subscriptions']);
+        $x->addItems($this->export_data['subscriptions']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['system_logs'] = $this->company->system_logs->map(function ($log) {
             $log->client_id = $this->encodePrimaryKey($log->client_id);
@@ -479,9 +479,9 @@ $this->export_data = null;
         })->makeHidden(['id'])->all();
 
 
-$x = $this->writer->collection('system_logs');
+        $x = $this->writer->collection('system_logs');
-$x->addItems($this->export_data['system_logs']);
+        $x->addItems($this->export_data['system_logs']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['tasks'] = $this->company->tasks()->orderBy('number', 'DESC')->cursor()->map(function ($task) {
@@ -493,9 +493,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('tasks');
+        $x = $this->writer->collection('tasks');
-$x->addItems($this->export_data['tasks']);
+        $x->addItems($this->export_data['tasks']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['task_statuses'] = $this->company->task_statuses->map(function ($status) {
@@ -508,9 +508,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('task_statuses');
+        $x = $this->writer->collection('task_statuses');
-$x->addItems($this->export_data['task_statuses']);
+        $x->addItems($this->export_data['task_statuses']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['tax_rates'] = $this->company->tax_rates->map(function ($rate) {
@@ -522,9 +522,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('tax_rates');
+        $x = $this->writer->collection('tax_rates');
-$x->addItems($this->export_data['tax_rates']);
+        $x->addItems($this->export_data['tax_rates']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['vendors'] = $this->company->vendors()->orderBy('number', 'DESC')->cursor()->map(function ($vendor) {
@@ -532,10 +532,10 @@ $this->export_data = null;
         })->all();
 
 
-        
+
-$x = $this->writer->collection('vendors');
+        $x = $this->writer->collection('vendors');
-$x->addItems($this->export_data['vendors']);
+        $x->addItems($this->export_data['vendors']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['vendor_contacts'] = VendorContact::where('company_id', $this->company->id)->withTrashed()->cursor()->map(function ($vendor) {
@@ -547,9 +547,9 @@ $this->export_data = null;
 
 
 
-$x = $this->writer->collection('vendor_contacts');
+        $x = $this->writer->collection('vendor_contacts');
-$x->addItems($this->export_data['vendor_contacts']);
+        $x->addItems($this->export_data['vendor_contacts']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['webhooks'] = $this->company->webhooks->map(function ($hook) {
@@ -560,9 +560,9 @@ $this->export_data = null;
         })->makeHidden(['id'])->all();
 
 
-$x = $this->writer->collection('webhooks');
+        $x = $this->writer->collection('webhooks');
-$x->addItems($this->export_data['webhooks']);
+        $x->addItems($this->export_data['webhooks']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
         $this->export_data['purchase_orders'] = $this->company->purchase_orders()->orderBy('number', 'DESC')->cursor()->map(function ($purchase_order) {
@@ -578,9 +578,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('purchase_orders');
+        $x = $this->writer->collection('purchase_orders');
-$x->addItems($this->export_data['purchase_orders']);
+        $x->addItems($this->export_data['purchase_orders']);
-$this->export_data = null;
+        $this->export_data = null;
 
 
 
@@ -591,9 +591,9 @@ $this->export_data = null;
         })->all();
 
 
-$x = $this->writer->collection('purchase_order_invitations');
+        $x = $this->writer->collection('purchase_order_invitations');
-$x->addItems($this->export_data['purchase_order_invitations']);
+        $x->addItems($this->export_data['purchase_order_invitations']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['bank_integrations'] = $this->company->bank_integrations()->withTrashed()->orderBy('id', 'ASC')->cursor()->map(function ($bank_integration) {
             $bank_integration = $this->transformArrayOfKeys($bank_integration, ['account_id','company_id', 'user_id']);
@@ -601,9 +601,9 @@ $this->export_data = null;
             return $bank_integration->makeVisible(['id','user_id','company_id','account_id','hashed_id']);
         })->all();
 
-$x = $this->writer->collection('bank_integrations');
+        $x = $this->writer->collection('bank_integrations');
-$x->addItems($this->export_data['bank_integrations']);
+        $x->addItems($this->export_data['bank_integrations']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['bank_transactions'] = $this->company->bank_transactions()->withTrashed()->orderBy('id', 'ASC')->cursor()->map(function ($bank_transaction) {
             $bank_transaction = $this->transformArrayOfKeys($bank_transaction, ['company_id', 'user_id','bank_integration_id','expense_id','ninja_category_id','vendor_id']);
@@ -611,9 +611,9 @@ $this->export_data = null;
             return $bank_transaction->makeVisible(['id','user_id','company_id']);
         })->all();
 
-$x = $this->writer->collection('bank_transactions');
+        $x = $this->writer->collection('bank_transactions');
-$x->addItems($this->export_data['bank_transactions']);
+        $x->addItems($this->export_data['bank_transactions']);
-$this->export_data = null;
+        $this->export_data = null;
 
         $this->export_data['schedulers'] = $this->company->schedulers()->withTrashed()->orderBy('id', 'ASC')->cursor()->map(function ($scheduler) {
             $scheduler = $this->transformArrayOfKeys($scheduler, ['company_id', 'user_id']);
@@ -621,14 +621,14 @@ $this->export_data = null;
             return $scheduler->makeVisible(['id','user_id','company_id']);
         })->all();
 
-$x = $this->writer->collection('schedulers');
+        $x = $this->writer->collection('schedulers');
-$x->addItems($this->export_data['schedulers']);
+        $x->addItems($this->export_data['schedulers']);
-$this->export_data = null;
+        $this->export_data = null;
 
         //write to tmp and email to owner();
 
 
-$this->writer->end();
+        $this->writer->end();
 
 
         $this->zipAndSend();
@@ -680,20 +680,20 @@ $this->writer->end();
 
         $zip->close();
 
-        Storage::disk(config('filesystems.default'))->put('backups/'.str_replace(".json", ".zip",$this->file_name), file_get_contents($zip_path));
+        Storage::disk(config('filesystems.default'))->put('backups/'.str_replace(".json", ".zip", $this->file_name), file_get_contents($zip_path));
 
         if(file_exists($zip_path)) {
             unlink($zip_path);
         }
 
-        if(file_exists($this->file_name)){
+        if(file_exists($this->file_name)) {
             unlink($this->file_name);
         }
 
         if(Ninja::isSelfHost()) {
-            $storage_path = 'backups/'.str_replace(".json", ".zip",$this->file_name);
+            $storage_path = 'backups/'.str_replace(".json", ".zip", $this->file_name);
         } else {
-            $storage_path = Storage::disk(config('filesystems.default'))->path('backups/'.str_replace(".json", ".zip",$this->file_name));
+            $storage_path = Storage::disk(config('filesystems.default'))->path('backups/'.str_replace(".json", ".zip", $this->file_name));
         }
 
         $url = Cache::get($this->hash);

app/Jobs/Company/CompanyImport.php

@@ -338,7 +338,7 @@ class CompanyImport implements ShouldQueue
     private function unzipFile()
     {
         $path = TempFile::filePath(Storage::disk(config('filesystems.default'))->get($this->file_location), basename($this->file_location));
-        
+
         $zip = new ZipArchive();
         $res = $zip->open($path);
         $file_path = sys_get_temp_dir().'/'.sha1(microtime());
@@ -357,7 +357,7 @@ class CompanyImport implements ShouldQueue
         }
 
         $file_path = "{$file_path}/backup.json";
-        
+
         nlog($file_path);
 
         if (! file_exists($file_path)) {

app/Jobs/Cron/CompanyRecurringCron.php

@@ -1,65 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Jobs\Cron;
-
-use App\Libraries\MultiDB;
-use App\Models\Company;
-use App\Models\RecurringInvoice;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-/*@not used*/
-
-class CompanyRecurringCron
-{
-    use Dispatchable;
-
-    public $tries = 1;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        //multiDB environment, need to
-        foreach (MultiDB::$dbs as $db) {
-            MultiDB::setDB($db);
-
-            Company::where('is_disabled', 0)
-                   ->whereHas('recurring_invoices', function ($query) {
-                       $query->where('next_send_date', '<=', now()->toDateTimeString())
-                             ->whereNotNull('next_send_date')
-                             ->whereNull('deleted_at')
-                             ->where('is_deleted', false)
-                             ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
-                             ->where('remaining_cycles', '!=', '0')
-                             ->whereHas('client', function ($query) {
-                                 $query->where('is_deleted', 0)
-                                       ->where('deleted_at', null);
-                             });
-                   })
-                    ->cursor()->each(function ($company) {
-                        SendCompanyRecurring::dispatch($company->id, $company->db);
-                    });
-        }
-    }
-}

app/Jobs/Cron/RecurringExpensesCron.php

@@ -51,7 +51,7 @@ class RecurringExpensesCron
         Auth::logout();
 
         if (! config('ninja.db.multi_db_enabled')) {
-            $recurring_expenses = RecurringExpense::where('next_send_date', '<=', now()->toDateTimeString())
+            $recurring_expenses = RecurringExpense::query()->where('next_send_date', '<=', now()->toDateTimeString())
                                                         ->whereNotNull('next_send_date')
                                                         ->whereNull('deleted_at')
                                                         ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
@@ -76,7 +76,7 @@ class RecurringExpensesCron
             foreach (MultiDB::$dbs as $db) {
                 MultiDB::setDB($db);
 
-                $recurring_expenses = RecurringExpense::where('next_send_date', '<=', now()->toDateTimeString())
+                $recurring_expenses = RecurringExpense::query()->where('next_send_date', '<=', now()->toDateTimeString())
                                                             ->whereNotNull('next_send_date')
                                                             ->whereNull('deleted_at')
                                                             ->where('status_id', RecurringInvoice::STATUS_ACTIVE)

app/Jobs/Cron/RecurringInvoicesCron.php

@@ -48,7 +48,7 @@ class RecurringInvoicesCron
         Auth::logout();
 
         if (! config('ninja.db.multi_db_enabled')) {
-            $recurring_invoices = RecurringInvoice::where('status_id', RecurringInvoice::STATUS_ACTIVE)
+            $recurring_invoices = RecurringInvoice::query()->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                         ->where('is_deleted', false)
                                                         ->where('remaining_cycles', '!=', '0')
                                                         ->whereNotNull('next_send_date')
@@ -87,7 +87,7 @@ class RecurringInvoicesCron
             foreach (MultiDB::$dbs as $db) {
                 MultiDB::setDB($db);
 
-                $recurring_invoices = RecurringInvoice::where('status_id', RecurringInvoice::STATUS_ACTIVE)
+                $recurring_invoices = RecurringInvoice::query()->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                         ->where('is_deleted', false)
                                                         ->where('remaining_cycles', '!=', '0')
                                                         ->whereNull('deleted_at')

app/Jobs/Cron/SendCompanyRecurring.php

@@ -1,74 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Jobs\Cron;
-
-use App\Jobs\RecurringInvoice\SendRecurring;
-use App\Libraries\MultiDB;
-use App\Models\Company;
-use App\Models\RecurringInvoice;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-/*@not used*/
-
-class SendCompanyRecurring
-{
-    use Dispatchable;
-
-    public $tries = 1;
-
-    /** @var \App\Models\Company $company */
-    public $company;
-
-    public function __construct(private int $company_id, private string $db)
-    {
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        MultiDB::setDB($this->db);
-
-        $recurring_invoices = Company::where('id', $this->company_id)
-                                     ->where('is_disabled', 0)
-                                     ->whereHas('recurring_invoices', function ($query) {
-                                         $query->where('next_send_date', '<=', now()->toDateTimeString())
-                                               ->whereNotNull('next_send_date')
-                                               ->whereNull('deleted_at')
-                                               ->where('is_deleted', false)
-                                               ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
-                                               ->where('remaining_cycles', '!=', '0')
-                                               ->whereHas('client', function ($query) {
-                                                   $query->where('is_deleted', 0)
-                                                         ->where('deleted_at', null);
-                                               });
-                                     })
-                                      ->cursor()->each(function ($recurring_invoice) {
-                                          nlog("Trying to send {$recurring_invoice->number}");
-
-                                          if ($recurring_invoice->company->stop_on_unpaid_recurring) {
-                                              if ($recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
-                                                  return;
-                                              }
-                                          }
-
-                                          try {
-                                              (new SendRecurring($recurring_invoice, $recurring_invoice->company->db))->handle();
-                                          } catch (\Exception $e) {
-                                              nlog("Unable to sending recurring invoice {$recurring_invoice->id} ".$e->getMessage());
-                                          }
-                                      });
-    }
-}

app/Jobs/Cron/SubscriptionCron.php

@@ -52,7 +52,7 @@ class SubscriptionCron
                               ->whereNotNull('subscription_id')
                               ->cursor();
 
-            $invoices->each(function ($invoice) {
+            $invoices->each(function (Invoice $invoice) {
                 $subscription = $invoice->subscription;
 
                 $body = [
@@ -80,7 +80,7 @@ class SubscriptionCron
                                   ->whereNotNull('subscription_id')
                                   ->cursor();
 
-                $invoices->each(function ($invoice) {
+                $invoices->each(function (Invoice $invoice) {
                     $subscription = $invoice->subscription;
 
                     $body = [

app/Jobs/Mail/NinjaMailerJob.php

@@ -99,10 +99,9 @@ class NinjaMailerJob implements ShouldQueue
             }
 
             $this->nmo->mailable->replyTo($this->nmo->settings->reply_to_email, $reply_to_name);
-        }elseif(isset($this->nmo->invitation->user)){
+        } elseif(isset($this->nmo->invitation->user)) {
             $this->nmo->mailable->replyTo($this->nmo->invitation->user->email, $this->nmo->invitation->user->present()->name());
-        } 
+        } else {
-        else {
             $this->nmo->mailable->replyTo($this->company->owner()->email, $this->company->owner()->present()->name());
         }
 
@@ -135,7 +134,7 @@ class NinjaMailerJob implements ShouldQueue
             }
 
             $mailable = $this->nmo->mailable;
-            
+
             /** May need to re-build it here */
             if(Ninja::isHosted() && method_exists($mailable, 'build')) {
                 $mailable->build();
@@ -269,14 +268,14 @@ class NinjaMailerJob implements ShouldQueue
 
         if(Ninja::isHosted() && $this->company->account->isPaid() && $this->nmo->settings->email_sending_method == 'default') {
             //check if outlook.
-            
+
-            try{
+            try {
                 $email = $this->nmo->to_user->email;
                 $domain = explode("@", $email)[1] ?? "";
                 $dns = dns_get_record($domain, DNS_MX);
                 $server = $dns[0]["target"];
-                if(stripos($server, "outlook.com") !== false){                  
+                if(stripos($server, "outlook.com") !== false) {
-                    
+
                     $this->mailer = 'postmark';
                     $this->client_postmark_secret = config('services.postmark-outlook.token');
 
@@ -286,8 +285,7 @@ class NinjaMailerJob implements ShouldQueue
 
                     return $this;
                 }
-            }
+            } catch(\Exception $e) {
-            catch(\Exception $e){
                 nlog($e->getMessage());
             }
         }
@@ -409,7 +407,7 @@ class NinjaMailerJob implements ShouldQueue
 
     private function setHostedMailgunMailer()
     {
-        
+
         if (property_exists($this->nmo->settings, 'email_from_name') && strlen($this->nmo->settings->email_from_name) > 1) {
             $email_from_name = $this->nmo->settings->email_from_name;
         } else {

app/Jobs/Mail/NinjaMailerObject.php

@@ -16,7 +16,6 @@ namespace App\Jobs\Mail;
  */
 class NinjaMailerObject
 {
-    
     /* @var Illuminate\Mail\Mailable */
     public $mailable;
 

app/Jobs/Mailgun/ProcessMailgunWebhook.php

@@ -34,7 +34,10 @@ use App\Notifications\Ninja\EmailBounceNotification;
 
 class ProcessMailgunWebhook implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     public $tries = 1;
 
@@ -89,8 +92,9 @@ class ProcessMailgunWebhook implements ShouldQueue
     {
         nlog($this->request);
 
-        if(!$this->request['event-data']['tags'][0])
+        if(!$this->request['event-data']['tags'][0]) {
             return;
+        }
 
         MultiDB::findAndSetDbByCompanyKey($this->request['event-data']['tags'][0]);
         $company = Company::where('company_key', $this->request['event-data']['tags'][0])->first();
@@ -112,7 +116,7 @@ class ProcessMailgunWebhook implements ShouldQueue
         if (isset($this->request['event-details']['delivery-status']['message'])) {
             $this->invitation->email_error = $this->request['event-details']['delivery-status']['message'];
         }
-        
+
         switch ($this->request['event-data']['event']) {
             case 'delivered':
                 return $this->processDelivery();
@@ -128,50 +132,50 @@ class ProcessMailgunWebhook implements ShouldQueue
         }
     }
 
-/*
+    /*
-{
+    {
-  "signature": {
+      "signature": {
-    "token": "7f388cf8096aa0bca1477aee9d91e156c61f8fa8282c7f1c0c",
+        "token": "7f388cf8096aa0bca1477aee9d91e156c61f8fa8282c7f1c0c",
-    "timestamp": "1705376308",
+        "timestamp": "1705376308",
-    "signature": "a22b7c3dd4861e27a1664cef3611a1954c0665cfcaca9b8f35ee216243a4ce3f"
+        "signature": "a22b7c3dd4861e27a1664cef3611a1954c0665cfcaca9b8f35ee216243a4ce3f"
-  },
+      },
-  "event-data": {
+      "event-data": {
-    "id": "Ase7i2zsRYeDXztHGENqRA",
+        "id": "Ase7i2zsRYeDXztHGENqRA",
-    "timestamp": 1521243339.873676,
+        "timestamp": 1521243339.873676,
-    "log-level": "info",
+        "log-level": "info",
-    "event": "opened",
+        "event": "opened",
-    "message": {
+        "message": {
-      "headers": {
+          "headers": {
-        "message-id": "20130503182626.18666.16540@mail.invoicing.co"
+            "message-id": "20130503182626.18666.16540@mail.invoicing.co"
+          }
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "ip": "50.56.129.169",
+        "geolocation": {
+          "country": "US",
+          "region": "CA",
+          "city": "San Francisco"
+        },
+        "client-info": {
+          "client-os": "Linux",
+          "device-type": "desktop",
+          "client-name": "Chrome",
+          "client-type": "browser",
+          "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31"
+        },
+        "campaigns": [],
+        "tags": [
+          "my_tag_1",
+          "my_tag_2"
+        ],
+        "user-variables": {
+          "my_var_1": "Mailgun Variable #1",
+          "my-var-2": "awesome"
+        }
       }
-    },
-    "recipient": "alice@example.com",
-    "recipient-domain": "example.com",
-    "ip": "50.56.129.169",
-    "geolocation": {
-      "country": "US",
-      "region": "CA",
-      "city": "San Francisco"
-    },
-    "client-info": {
-      "client-os": "Linux",
-      "device-type": "desktop",
-      "client-name": "Chrome",
-      "client-type": "browser",
-      "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31"
-    },
-    "campaigns": [],
-    "tags": [
-      "my_tag_1",
-      "my_tag_2"
-    ],
-    "user-variables": {
-      "my_var_1": "Mailgun Variable #1",
-      "my-var-2": "awesome"
     }
-  }
+    */
-}
-*/
     private function processOpen()
     {
         $this->invitation->opened_date = now();
@@ -180,8 +184,9 @@ class ProcessMailgunWebhook implements ShouldQueue
         $sl = $this->getSystemLog($this->request['MessageID']);
 
         /** Prevents Gmail tracking from firing inappropriately */
-        if($this->request['signature']['timestamp'] < $sl->log['signature']['timestamp'] + 3)
+        if($this->request['signature']['timestamp'] < $sl->log['signature']['timestamp'] + 3) {
             return;
+        }
 
         $event = [
             'bounce_id' => '',
@@ -201,74 +206,74 @@ class ProcessMailgunWebhook implements ShouldQueue
 
     }
 
-/*
+    /*
-{
+    {
-  "signature": {
+      "signature": {
-    "token": "70b91a64ed0f1bdf90fb9c6ea7e3c31d5792a3d0945ffc20fe",
+        "token": "70b91a64ed0f1bdf90fb9c6ea7e3c31d5792a3d0945ffc20fe",
-    "timestamp": "1705376276",
+        "timestamp": "1705376276",
-    "signature": "ba96f841fc236e1bf5840b02fad512d0bd15b0731b5e6b154764c7a05f7ee999"
+        "signature": "ba96f841fc236e1bf5840b02fad512d0bd15b0731b5e6b154764c7a05f7ee999"
-  },
-  "event-data": {
-    "id": "CPgfbmQMTCKtHW6uIWtuVe",
-    "timestamp": 1521472262.908181,
-    "log-level": "info",
-    "event": "delivered",
-    "delivery-status": {
-      "tls": true,
-      "mx-host": "smtp-in.example.com",
-      "code": 250,
-      "description": "",
-      "session-seconds": 0.4331989288330078,
-      "utf8": true,
-      "attempt-no": 1,
-      "message": "OK",
-      "certificate-verified": true
-    },
-    "flags": {
-      "is-routed": false,
-      "is-authenticated": true,
-      "is-system-test": false,
-      "is-test-mode": false
-    },
-    "envelope": {
-      "transport": "smtp",
-      "sender": "bob@mail.invoicing.co",
-      "sending-ip": "209.61.154.250",
-      "targets": "alice@example.com"
-    },
-    "message": {
-      "headers": {
-        "to": "Alice <alice@example.com>",
-        "message-id": "20130503182626.18666.16540@mail.invoicing.co",
-        "from": "Bob <bob@mail.invoicing.co>",
-        "subject": "Test delivered webhook"
       },
-      "attachments": [],
+      "event-data": {
-      "size": 111
+        "id": "CPgfbmQMTCKtHW6uIWtuVe",
-    },
+        "timestamp": 1521472262.908181,
-    "recipient": "alice@example.com",
+        "log-level": "info",
-    "recipient-domain": "example.com",
+        "event": "delivered",
-    "storage": {
+        "delivery-status": {
-      "url": "https://se.api.mailgun.net/v3/domains/mail.invoicing.co/messages/message_key",
+          "tls": true,
-      "key": "message_key"
+          "mx-host": "smtp-in.example.com",
-    },
+          "code": 250,
-    "campaigns": [],
+          "description": "",
-    "tags": [
+          "session-seconds": 0.4331989288330078,
-      "my_tag_1",
+          "utf8": true,
-      "my_tag_2"
+          "attempt-no": 1,
-    ],
+          "message": "OK",
-    "user-variables": {
+          "certificate-verified": true
-      "my_var_1": "Mailgun Variable #1",
+        },
-      "my-var-2": "awesome"
+        "flags": {
+          "is-routed": false,
+          "is-authenticated": true,
+          "is-system-test": false,
+          "is-test-mode": false
+        },
+        "envelope": {
+          "transport": "smtp",
+          "sender": "bob@mail.invoicing.co",
+          "sending-ip": "209.61.154.250",
+          "targets": "alice@example.com"
+        },
+        "message": {
+          "headers": {
+            "to": "Alice <alice@example.com>",
+            "message-id": "20130503182626.18666.16540@mail.invoicing.co",
+            "from": "Bob <bob@mail.invoicing.co>",
+            "subject": "Test delivered webhook"
+          },
+          "attachments": [],
+          "size": 111
+        },
+        "recipient": "alice@example.com",
+        "recipient-domain": "example.com",
+        "storage": {
+          "url": "https://se.api.mailgun.net/v3/domains/mail.invoicing.co/messages/message_key",
+          "key": "message_key"
+        },
+        "campaigns": [],
+        "tags": [
+          "my_tag_1",
+          "my_tag_2"
+        ],
+        "user-variables": {
+          "my_var_1": "Mailgun Variable #1",
+          "my-var-2": "awesome"
+        }
+      }
     }
-  }
+    */
-}
-*/
     private function processDelivery()
     {
         $this->invitation->email_status = 'delivered';
         $this->invitation->save();
-        
+
         $sl = $this->getSystemLog($this->request['MessageID']);
 
         if($sl) {
@@ -384,47 +389,47 @@ class ProcessMailgunWebhook implements ShouldQueue
 
     }
 
-/*
+    /*
-{
+    {
-  "signature": {
+      "signature": {
-    "token": "d7be371deef49c8b187119df295e3eb17fd1974d513a4be2cb",
+        "token": "d7be371deef49c8b187119df295e3eb17fd1974d513a4be2cb",
-    "timestamp": "1705376380",
+        "timestamp": "1705376380",
-    "signature": "52f31c75b492d67be906423279e0effe563e28790ee65ba23a1b30006df649df"
+        "signature": "52f31c75b492d67be906423279e0effe563e28790ee65ba23a1b30006df649df"
-  },
-  "event-data": {
-    "id": "-Agny091SquKnsrW2NEKUA",
-    "timestamp": 1521233123.501324,
-    "log-level": "warn",
-    "event": "complained",
-    "envelope": {
-      "sending-ip": "173.193.210.33"
-    },
-    "flags": {
-      "is-test-mode": false
-    },
-    "message": {
-      "headers": {
-        "to": "Alice <alice@example.com>",
-        "message-id": "20110215055645.25246.63817@mail.invoicing.co",
-        "from": "Bob <bob@mail.invoicing.co>",
-        "subject": "Test complained webhook"
       },
-      "attachments": [],
+      "event-data": {
-      "size": 111
+        "id": "-Agny091SquKnsrW2NEKUA",
-    },
+        "timestamp": 1521233123.501324,
-    "recipient": "alice@example.com",
+        "log-level": "warn",
-    "campaigns": [],
+        "event": "complained",
-    "tags": [
+        "envelope": {
-      "my_tag_1",
+          "sending-ip": "173.193.210.33"
-      "my_tag_2"
+        },
-    ],
+        "flags": {
-    "user-variables": {
+          "is-test-mode": false
-      "my_var_1": "Mailgun Variable #1",
+        },
-      "my-var-2": "awesome"
+        "message": {
+          "headers": {
+            "to": "Alice <alice@example.com>",
+            "message-id": "20110215055645.25246.63817@mail.invoicing.co",
+            "from": "Bob <bob@mail.invoicing.co>",
+            "subject": "Test complained webhook"
+          },
+          "attachments": [],
+          "size": 111
+        },
+        "recipient": "alice@example.com",
+        "campaigns": [],
+        "tags": [
+          "my_tag_1",
+          "my_tag_2"
+        ],
+        "user-variables": {
+          "my_var_1": "Mailgun Variable #1",
+          "my-var-2": "awesome"
+        }
+      }
     }
-  }
+    */
-}
-*/
     private function processSpamComplaint()
     {
         $this->invitation->email_status = 'spam';

app/Jobs/Ninja/TaskScheduler.php

@@ -56,7 +56,7 @@ class TaskScheduler implements ShouldQueue
                 ->where('next_run', '<=', now())
                 ->cursor()
                 ->each(function ($scheduler) {
-                
+
                     nlog("Doing job {$scheduler->name}");
 
                     try {
@@ -81,7 +81,7 @@ class TaskScheduler implements ShouldQueue
                 ->where('next_run', '<=', now())
                 ->cursor()
                 ->each(function ($scheduler) {
-                    
+
                     nlog("Doing job {$scheduler->name}");
 
                     try {

app/Jobs/Payment/EmailPayment.php

@@ -106,7 +106,7 @@ class EmailPayment implements ShouldQueue
         (new NinjaMailerJob($nmo))->handle();
 
         event(new PaymentWasEmailed($this->payment, $this->payment->company, $this->contact, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-    
+
     }
 
     private function emailAllContacts($email_builder): void

app/Jobs/User/UserEmailChanged.php

@@ -94,6 +94,7 @@ class UserEmailChanged implements ShouldQueue
             'logo' => $this->company->present()->logo(),
             'settings' => $this->settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
     }
 }

app/Jobs/Util/Import.php

@@ -233,7 +233,6 @@ class Import implements ShouldQueue
             ['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 2],
             ['name' => ctrans('texts.in_progress'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 3],
             ['name' => ctrans('texts.done'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 4],
-
         ];
 
         TaskStatus::insert($task_statuses);
@@ -1144,7 +1143,7 @@ class Import implements ShouldQueue
             );
 
             $key = "invoices_{$resource['id']}";
-            
+
             nlog($invoice->id);
 
             $this->ids['invoices'][$key] = [
@@ -1409,7 +1408,7 @@ class Import implements ShouldQueue
             }
 
             nlog($payment->id);
-            
+
             $old_user_key = array_key_exists('user_id', $resource) ?? $this->user->id;
 
             $this->ids['payments'] = [
@@ -1528,8 +1527,8 @@ class Import implements ShouldQueue
                     }
                 }
 
-                
+
-                    // throw new Exception("Resource invoice/quote document not available.");
+                // throw new Exception("Resource invoice/quote document not available.");
             }
 
             if (array_key_exists('expense_id', $resource) && $resource['expense_id'] && array_key_exists('expenses', $this->ids)) {
@@ -2078,7 +2077,7 @@ class Import implements ShouldQueue
         nlog(print_r($exception->getMessage(), 1));
 
         // if (Ninja::isHosted()) {
-            app('sentry')->captureException($exception);
+        app('sentry')->captureException($exception);
         // }
     }
 

app/Jobs/Util/ReminderJob.php

@@ -38,7 +38,7 @@ class ReminderJob implements ShouldQueue
     use SerializesModels;
     use MakesReminders;
     use MakesDates;
-    
+
     public $tries = 1;
 
     public function __construct()

app/Jobs/Util/VersionCheck.php

@@ -94,7 +94,7 @@ class VersionCheck implements ShouldQueue
 
             Client::doesntHave('contacts')
                             ->cursor()
-                            ->each(function ($client) {
+                            ->each(function (Client $client) {
 
                                 $new_contact = ClientContactFactory::create($client->company_id, $client->user_id);
                                 $new_contact->client_id = $client->id;
@@ -107,7 +107,7 @@ class VersionCheck implements ShouldQueue
 
             Vendor::doesntHave('contacts')
                             ->cursor()
-                            ->each(function ($vendor) {
+                            ->each(function (Vendor $vendor) {
 
                                 $new_contact = VendorContactFactory::create($vendor->company_id, $vendor->user_id);
                                 $new_contact->vendor_id = $vendor->id;

app/Listeners/Invoice/InvoiceEmailFailedActivity.php

@@ -59,7 +59,7 @@ class InvoiceEmailFailedActivity implements ShouldQueue
         $fields->company_id = $event->invitation->invoice->company_id;
         $fields->activity_type_id = Activity::EMAIL_INVOICE_FAILED;
         $fields->notes = $event->message ?? '';
-        
+
         $this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars);
     }
 }

app/Listeners/Invoice/InvoiceFailedEmailNotification.php

@@ -37,8 +37,9 @@ class InvoiceFailedEmailNotification
     {
         MultiDB::setDb($event->company->db);
 
-        if(Cache::has("invoice_failed_email_notification_{$event->invitation->key}"))
+        if(Cache::has("invoice_failed_email_notification_{$event->invitation->key}")) {
             return;
+        }
 
         $invoice = $event->invitation->invoice;
 

app/Livewire/BillingPortalPurchase.php

@@ -326,7 +326,7 @@ class BillingPortalPurchase extends Component
         $this->contact = $contact;
 
         if ($contact->showRff()) {
-            return $this->rff(); 
+            return $this->rff();
         }
 
         Auth::guard('contact')->loginUsingId($contact->id, true);

app/Livewire/PdfSlot.php

@@ -131,7 +131,7 @@ class PdfSlot extends Component
 
         $this->settings = $this->entity->client ? $this->entity->client->getMergedSettings() : $this->entity->company->settings;
         $this->html_entity_option = $this->entity->client ? $this->entity->client->getSetting('show_pdfhtml_on_mobile') : $this->entity->company->getSetting('show_pdfhtml_on_mobile');
-        
+
         $this->show_cost = in_array('$product.unit_cost', $this->settings->pdf_variables->product_columns);
         $this->show_line_total = in_array('$product.line_total', $this->settings->pdf_variables->product_columns);
         $this->show_quantity = in_array('$product.quantity', $this->settings->pdf_variables->product_columns);

app/Mail/Admin/ClientUnsubscribedObject.php

@@ -44,6 +44,7 @@ class ClientUnsubscribedObject
             'settings' => $this->company->settings,
             'logo' => $this->company->present()->logo(),
             'text_body' => "\n\n".ctrans('texts.client_unsubscribed_help', ['client' => $this->contact->present()->name()])."\n\n",
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         $mail_obj = new \stdClass();

app/Mail/Admin/EntityCreatedObject.php

@@ -76,13 +76,13 @@ class EntityCreatedObject
             $mail_obj->text_view = 'email.template.text';
 
             $content = ctrans(
-                                    $this->template_body,
+                $this->template_body,
-                                    [
+                [
                                         'amount' => $mail_obj->amount,
                                         'vendor' => $this->entity->vendor->present()->name(),
                                         'purchase_order' => $this->entity->number,
                                     ]
-                                    );
+            );
 
             $mail_obj->data = [
                                 'title' => $mail_obj->subject,
@@ -94,7 +94,8 @@ class EntityCreatedObject
                                 'settings' => $this->company->settings,
                                 'whitelabel' => $this->company->account->isPaid() ? true : false,
                                 'text_body' => str_replace(['$view_button','$viewButton','$viewLink','$view_url'], '$view_url', $content),
-                            ];
+                                'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
+                ];
         } else {
             $this->entity->load('client.country', 'client.company');
             $this->client = $this->entity->client;
@@ -181,6 +182,7 @@ class EntityCreatedObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => str_replace(['$view_button','$viewButton','$view_link','$view_button'], '$view_url', $content),
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
     }
 }

app/Mail/Admin/EntityFailedSendObject.php

@@ -132,15 +132,15 @@ class EntityFailedSendObject
         $html_variables = (new HtmlEngine($this->invitation))->makeValues();
         $signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
         $content = ctrans(
-                $this->template_body,
+            $this->template_body,
-                [
+            [
                     'amount' => $this->getAmount(),
                     'client' => $this->contact->present()->name(),
                     'invoice' => $this->entity->number,
                     'error' => $this->message_content ?? '',
                     'contact' => $this->contact->present()->name(),
                 ]
-                );
+        );
 
         $data = [
             "title" => $this->getSubject(),
@@ -152,6 +152,7 @@ class EntityFailedSendObject
             "settings" => $settings,
             "whitelabel" => $this->company->account->isPaid() ? true : false,
             "text_body" => str_replace("<br>", "\n", $content),
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/EntityNotificationMailer.php

@@ -12,6 +12,7 @@
 namespace App\Mail\Admin;
 
 use Illuminate\Mail\Mailable;
+
 //@deprecated?
 class EntityNotificationMailer extends Mailable
 {

app/Mail/Admin/EntityPaidObject.php

@@ -85,8 +85,8 @@ class EntityPaidObject
 
         $invoice_texts = substr($invoice_texts, 0, -1);
         $content = ctrans(
-                'texts.notification_payment_paid',
+            'texts.notification_payment_paid',
-                ['amount' => $amount,
+            ['amount' => $amount,
                     'client' => $this->payment->client->present()->name(),
                     'invoice' => $invoice_texts,
                 ]
@@ -105,6 +105,7 @@ class EntityPaidObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/EntitySentObject.php

@@ -87,6 +87,8 @@ class EntitySentObject
                 'logo' => $this->company->present()->logo(),
                 'settings' => $this->company->settings,
                 'whitelabel' => $this->company->account->isPaid() ? true : false,
+                'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
+
             ];
             $mail_obj->markdown = 'email.admin.generic';
             $mail_obj->tag = $this->company->company_key;
@@ -98,7 +100,7 @@ class EntitySentObject
             $mail_obj->markdown = 'email.admin.generic';
             $mail_obj->tag = $this->company->company_key;
         }
-        
+
         $mail_obj->text_view = 'email.template.text';
 
         return $mail_obj;
@@ -186,7 +188,7 @@ class EntitySentObject
     {
         $settings = $this->entity->client->getMergedSettings();
         $content = $this->getMessage();
-        
+
         return [
             'title' => $this->getSubject(),
             'content' => $content,
@@ -197,6 +199,8 @@ class EntitySentObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
+            
         ];
     }
 }

app/Mail/Admin/EntityViewedObject.php

@@ -98,13 +98,13 @@ class EntityViewedObject
         }
 
         $content = ctrans(
-                "texts.notification_{$this->entity_type}_viewed",
+            "texts.notification_{$this->entity_type}_viewed",
-                [
+            [
                     'amount' => $this->getAmount(),
                     'client' => $this->contact->present()->name(),
                     'invoice' => $this->entity->number,
                 ]
-                );
+        );
 
         $data = [
             'title' => $this->getSubject(),
@@ -116,6 +116,7 @@ class EntityViewedObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/InventoryNotificationObject.php

@@ -60,12 +60,12 @@ class InventoryNotificationObject
     private function getData()
     {
         $content = ctrans(
-                'texts.inventory_notification_body',
+            'texts.inventory_notification_body',
-                ['amount' => $this->getAmount(),
+            ['amount' => $this->getAmount(),
                     'product' => $this->product->product_key.': '.$this->product->notes,
                 ]
         );
-        
+
         $data = [
             'title' => $this->getSubject(),
             'content' => $content,
@@ -76,6 +76,7 @@ class InventoryNotificationObject
             'settings' => $this->product->company->settings,
             'whitelabel' => $this->product->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->product->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/PaymentFailureObject.php

@@ -75,14 +75,14 @@ class PaymentFailureObject
     {
         $signature = $this->client->getSetting('email_signature');
         $content = ctrans(
-                'texts.notification_invoice_payment_failed',
+            'texts.notification_invoice_payment_failed',
-                [
+            [
                     'client' => $this->client->present()->name(),
                     'invoice' => $this->getDescription(),
                     'amount' => Number::formatMoney($this->amount, $this->client),
                 ]
-                );
+        );
-                
+
         $data = [
             'title' => ctrans(
                 'texts.payment_failed_subject',
@@ -99,6 +99,7 @@ class PaymentFailureObject
             'button' => $this->use_react_url ? ctrans('texts.view_client') : ctrans('texts.login'),
             'additional_info' => $this->error,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/PurchaseOrderAcceptedObject.php

@@ -74,14 +74,14 @@ class PurchaseOrderAcceptedObject
         $settings = $this->company->settings;
 
         $content = ctrans(
-                'texts.notification_purchase_order_accepted',
+            'texts.notification_purchase_order_accepted',
-                [
+            [
                     'amount' => $this->getAmount(),
                     'vendor' => $this->purchase_order->vendor->present()->name(),
                     'purchase_order' => $this->purchase_order->number,
                 ]
         );
-        
+
         $data = [
             'title' => $this->getSubject(),
             'content' => $content,
@@ -92,6 +92,7 @@ class PurchaseOrderAcceptedObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/QuoteApprovedObject.php

@@ -73,13 +73,13 @@ class QuoteApprovedObject
     {
         $settings = $this->quote->client->getMergedSettings();
         $content = ctrans(
-                'texts.notification_quote_approved',
+            'texts.notification_quote_approved',
-                [
+            [
                     'amount' => $this->getAmount(),
                     'client' => $this->quote->client->present()->name(),
                     'invoice' => $this->quote->number,
                 ]
-                );
+        );
 
         $data = [
             'title' => $this->getSubject(),
@@ -91,6 +91,7 @@ class QuoteApprovedObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         return $data;

app/Mail/Admin/QuoteExpiredObject.php

@@ -73,13 +73,13 @@ class QuoteExpiredObject
     {
         $settings = $this->quote->client->getMergedSettings();
         $content = ctrans(
-                'texts.notification_quote_expired',
+            'texts.notification_quote_expired',
-                [
+            [
                     'amount' => $this->getAmount(),
                     'client' => $this->quote->client->present()->name(),
                     'invoice' => $this->quote->number,
                 ]
-                );
+        );
 
         $data = [
             'title' => $this->getSubject(),
@@ -91,6 +91,8 @@ class QuoteExpiredObject
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'text_body' => $content,
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
+
         ];
 
         return $data;

app/Mail/Admin/ResetPasswordObject.php

@@ -41,6 +41,7 @@ class ResetPasswordObject
             'settings' => $this->company->settings,
             'logo' => $this->company->present()->logo(),
             'text_body' => ctrans('texts.reset_password'),
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         $mail_obj = new \stdClass();

app/Mail/Admin/VerifyUserObject.php

@@ -53,6 +53,7 @@ class VerifyUserObject
             'logo' => $this->company->present()->logo(),
             'signature' => $this->company->settings->email_signature,
             'text_body' => ctrans('texts.confirmation_message'),
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         $mail_obj = new \stdClass();

app/Mail/Client/ClientStatement.php

@@ -52,7 +52,7 @@ class ClientStatement extends Mailable
     public function content()
     {
         return new Content(
-            view: 'email.template.client',
+            view: $this->data['company']->account->isPremium() ? 'email.template.client_premium' : 'email.template.client',
             text: 'email.template.text',
             with: [
                 'text_body' => $this->data['body'],

app/Mail/Engine/BaseEmailEngine.php

@@ -125,7 +125,7 @@ class BaseEmailEngine implements EngineInterface
     {
 
         if (! empty($this->variables)) {
-            
+
             $text = str_replace(['$paymentLink', '$viewButton', '$view_button', '$viewLink', '$view_link'], '$view_url', $text);
             $text = str_replace(array_keys($this->variables), array_values($this->variables), $text);
             $text = str_replace(array_keys($this->variables), array_values($this->variables), $text);

app/Mail/Engine/InvoiceEmailEngine.php

@@ -134,9 +134,9 @@ class InvoiceEmailEngine extends BaseEmailEngine
             $this->setAttachments([['file' => base64_encode($pdf), 'name' => $this->invoice->numberFormatter().'.pdf']]);
         }
 
-// $hash = Str::uuid();
+        // $hash = Str::uuid();
-// $url = \Illuminate\Support\Facades\URL::temporarySignedRoute('protected_download', now()->addHour(), ['hash' => $hash]);
+        // $url = \Illuminate\Support\Facades\URL::temporarySignedRoute('protected_download', now()->addHour(), ['hash' => $hash]);
-// Cache::put($hash, $url, now()->addHour());
+        // Cache::put($hash, $url, now()->addHour());
 
         //attach third party documents
         if ($this->client->getSetting('document_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
@@ -155,7 +155,7 @@ class InvoiceEmailEngine extends BaseEmailEngine
             // Storage::url
             $this->invoice->documents()->where('is_public', true)->cursor()->each(function ($document) {
                 if ($document->size > $this->max_attachment_size) {
-                    
+
                     $hash = Str::random(64);
                     Cache::put($hash, ['db' => $this->invoice->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
 
@@ -193,9 +193,9 @@ class InvoiceEmailEngine extends BaseEmailEngine
                                        ->each(function ($expense) {
                                            $expense->documents()->where('is_public', true)->cursor()->each(function ($document) {
                                                if ($document->size > $this->max_attachment_size) {
-                                                
+
-                                                    $hash = Str::random(64);
+                                                   $hash = Str::random(64);
-                                                    Cache::put($hash, ['db' => $this->invoice->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
+                                                   Cache::put($hash, ['db' => $this->invoice->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
 
                                                    $this->setAttachmentLinks(["<a class='doc_links' href='" . URL::signedRoute('documents.hashed_download', ['hash' => $hash]) ."'>". $document->name ."</a>"]);
                                                } else {
@@ -217,9 +217,9 @@ class InvoiceEmailEngine extends BaseEmailEngine
                                        ->each(function ($task) {
                                            $task->documents()->where('is_public', true)->cursor()->each(function ($document) {
                                                if ($document->size > $this->max_attachment_size) {
-                                                
+
-                                                    $hash = Str::random(64);
+                                                   $hash = Str::random(64);
-                                                    Cache::put($hash, ['db' => $this->invoice->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
+                                                   Cache::put($hash, ['db' => $this->invoice->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
 
                                                    $this->setAttachmentLinks(["<a class='doc_links' href='" . URL::signedRoute('documents.hashed_download', ['hash' => $hash]) ."'>". $document->name ."</a>"]);
                                                } else {

app/Mail/Engine/QuoteEmailEngine.php

@@ -125,7 +125,7 @@ class QuoteEmailEngine extends BaseEmailEngine
             // Storage::url
             $this->quote->documents()->where('is_public', true)->cursor()->each(function ($document) {
                 if ($document->size > $this->max_attachment_size) {
-                    
+
                     $hash = Str::random(64);
                     Cache::put($hash, ['db' => $this->quote->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
 
@@ -137,7 +137,7 @@ class QuoteEmailEngine extends BaseEmailEngine
 
             $this->quote->company->documents()->where('is_public', true)->cursor()->each(function ($document) {
                 if ($document->size > $this->max_attachment_size) {
-                    
+
                     $hash = Str::random(64);
                     Cache::put($hash, ['db' => $this->quote->company->db, 'doc_hash' => $document->hash], now()->addDays(7));
 

app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php

@@ -48,6 +48,7 @@ class ClientContactRequestCancellationObject
             'signature' => $this->company->settings->email_signature,
             'settings' => $this->company->settings,
             'logo' => $this->company->present()->logo(),
+            'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
         ];
 
         $mail_obj = new \stdClass();

app/Mail/Subscription/OtpCode.php

@@ -58,6 +58,7 @@ class OtpCode extends Mailable
                 'title' => ctrans('texts.otp_code_subject'),
                 'content' => ctrans('texts.otp_code_body', ['code' => $this->code]),
                 'whitelabel' => $this->company->account->isPaid(),
+                'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
             ]);
     }
 }

app/Mail/TemplateEmail.php

@@ -75,7 +75,7 @@ class TemplateEmail extends Mailable
         $template_name = 'email.template.'.$this->build_email->getTemplate();
 
         if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
-            $template_name = 'email.template.client';
+            $template_name = $this->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client';
         }
 
         if ($this->build_email->getTemplate() == 'custom') {

app/Mail/User/UserLoggedIn.php

@@ -19,7 +19,6 @@ use Illuminate\Support\Facades\App;
 
 class UserLoggedIn extends Mailable
 {
-
     /**
      * Create a new message instance.
      *

app/Mail/VendorTemplateEmail.php

@@ -72,7 +72,7 @@ class VendorTemplateEmail extends Mailable
         $template_name = 'email.template.'.$this->build_email->getTemplate();
 
         if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
-            $template_name = 'email.template.client';
+            $template_name = $this->company->account->isPremium() ? 'email.template.client_premium' : 'email.template.client';
         }
 
         if ($this->build_email->getTemplate() == 'custom') {

app/Models/Account.php

@@ -296,6 +296,7 @@ class Account extends BaseModel
 
     public function isPremium(): bool
     {
+        // return true;
         return Ninja::isHosted() && $this->isPaidHostedClient() && !$this->isTrial() && Carbon::createFromTimestamp($this->created_at)->diffInMonths() > 2;
     }
 

app/Models/BaseModel.php

@@ -316,7 +316,7 @@ class BaseModel extends Model
         return "data:application/pdf;base64,".base64_encode((new CreateRawPdf($invitation))->handle());
 
     }
-    
+
     /**
      * Takes a entity prop as first argument
      * along with an array of variables and performs
@@ -328,9 +328,10 @@ class BaseModel extends Model
      */
     public function parseHtmlVariables(string $field, array $variables): string
     {
-        if(!$this->{$field})
+        if(!$this->{$field}) {
             return '';
-        
+        }
+
         $section = strtr($this->{$field}, $variables['labels']);
 
         return strtr($section, $variables['values']);

app/Models/ClientContact.php

@@ -254,7 +254,7 @@ class ClientContact extends Authenticatable implements HasLocalePreference
     {
         return $this->hasMany(CreditInvitation::class);
     }
- 
+
     public function sendPasswordResetNotification($token)
     {
         $this->token = $token;

app/Models/CompanyUser.php

@@ -201,7 +201,8 @@ class CompanyUser extends Pivot
      * @return bool
      */
     public function portalType(): bool
-    { nlog(isset($this->react_settings->react_notification_link) && $this->react_settings->react_notification_link);
+    {
+        nlog(isset($this->react_settings->react_notification_link) && $this->react_settings->react_notification_link);
         return isset($this->react_settings->react_notification_link) && $this->react_settings->react_notification_link;
     }