Merge pull request #7259 from turbo124/v5-develop

v5.3.65

VERSION.txt

@@ -1 +1 @@
-5.3.64
+5.3.65

app/Console/Commands/BackupUpdate.php

@@ -77,17 +77,27 @@ class BackupUpdate extends Command
     {
         set_time_limit(0);
         
-        Backup::whereRaw('html_backup IS NOT NULL')->chunk(5000, function ($backups) {
+        Backup::whereHas('activity')->whereRaw('html_backup IS NOT NULL')->cursor()->each( function ($backup) {
-            foreach ($backups as $backup) {
 
-                if(strlen($backup->html_backup) > 1 && $backup->activity->client()->exists()){
                 
-                    $client = $backup->activity->client;
+                if(strlen($backup->html_backup) > 1 && $backup->activity->invoice->exists()){
+
+                    $client = $backup->activity->invoice->client;
+                    $backup->storeRemotely($backup->html_backup, $client);
+
+                }else if(strlen($backup->html_backup) > 1 && $backup->activity->quote->exists()){
+
+                    $client = $backup->activity->quote->client;
+                    $backup->storeRemotely($backup->html_backup, $client);
+
+                }else if(strlen($backup->html_backup) > 1 && $backup->activity->credit->exists()){
+
+                    $client = $backup->activity->credit->client;
                     $backup->storeRemotely($backup->html_backup, $client);
 
                 }
 
-            }
+            
         });
 
     }

app/Console/Commands/PostUpdate.php

@@ -12,6 +12,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\Util\VersionCheck;
+use App\Utils\Ninja;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 
@@ -59,7 +60,12 @@ class PostUpdate extends Command
         info("finished running composer install ");
 
         try {
+
+            if(Ninja::isHosted())
                 Artisan::call('optimize');
+            else
+                Artisan::call('config:clear');
+
         } catch (\Exception $e) {
             info("I wasn't able to optimize.");
         }

app/Http/Controllers/ClientPortal/RecurringInvoiceController.php

@@ -62,21 +62,46 @@ class RecurringInvoiceController extends Controller
 
     public function requestCancellation(RequestCancellationRequest $request, RecurringInvoice $recurring_invoice)
     {
-        if (is_null($recurring_invoice->subscription_id) || optional($recurring_invoice->subscription)->allow_cancellation) {
+        nlog("outside cancellation");
+
+        if (optional($recurring_invoice->subscription)->allow_cancellation) {
+
+            nlog("inside the cancellation");
+
             $nmo = new NinjaMailerObject;
             $nmo->mailable = (new NinjaMailer((new ClientContactRequestCancellationObject($recurring_invoice, auth()->user()))->build()));
             $nmo->company = $recurring_invoice->company;
             $nmo->settings = $recurring_invoice->company->settings;
 
-            $notifiable_users = $this->filterUsersByPermissions($recurring_invoice->company->company_users, $recurring_invoice, ['recurring_cancellation']);
+            // $notifiable_users = $this->filterUsersByPermissions($recurring_invoice->company->company_users, $recurring_invoice, ['recurring_cancellation']);
+
+            $recurring_invoice->company->company_users->each(function ($company_user) use ($nmo){
+
+
+                $methods = $this->findCompanyUserNotificationType($company_user, ['recurring_cancellation', 'all_notifications']);
+
+
+                //if mail is a method type -fire mail!!
+                if (($key = array_search('mail', $methods)) !== false) {
+                    unset($methods[$key]);
 
-            $notifiable_users->each(function ($company_user) use($nmo){
 
                     $nmo->to_user = $company_user->user;
                     NinjaMailerJob::dispatch($nmo);
 
+                }
+
+
+
             });
 
+            // $notifiable_users->each(function ($company_user) use($nmo){
+
+            //     $nmo->to_user = $company_user->user;
+            //     NinjaMailerJob::dispatch($nmo);
+
+            // });
+
             //$recurring_invoice->user->notify(new ClientContactRequestCancellation($recurring_invoice, auth()->user()));
 
             return $this->render('recurring_invoices.cancellation.index', [

app/Http/Controllers/SetupController.php

@@ -169,7 +169,8 @@ class SetupController extends Controller
 
             /* Run migrations */
             if (!config('ninja.disable_auto_update')) {
-                Artisan::call('optimize');
+                Artisan::call('config:clear');
+                // Artisan::call('optimize');
             }
 
             Artisan::call('migrate', ['--force' => true]);

app/Jobs/Invoice/ZipInvoices.php

@@ -111,7 +111,7 @@ class ZipInvoices implements ShouldQueue
 
         }
         catch(\PhpZip\Exception\ZipException $e){
-            // handle exception
+            nlog("could not make zip => ". $e->getMessage());
         }
         finally{
             $zipFile->close();

app/Jobs/Mail/NinjaMailer.php

@@ -41,12 +41,17 @@ class NinjaMailer extends Mailable
             $from_name = $this->mail_obj->from_name;
         }
 
-        return $this->from(config('mail.from.address'), $from_name)
+        $ninja_mailable =  $this->from(config('mail.from.address'), $from_name)
                     ->subject($this->mail_obj->subject)
                     ->view($this->mail_obj->markdown, $this->mail_obj->data)
                     ->withSwiftMessage(function ($message) {
                         $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
                     });
 
+        if(property_exists($this->mail_obj, 'text_view')){
+            $ninja_mailable->text($this->mail_obj->text_view, $this->mail_obj->data);
+        }
+
+        return $ninja_mailable;           
     }
 }

app/Jobs/User/UserEmailChanged.php

@@ -77,9 +77,6 @@ class UserEmailChanged implements ShouldQueue
 
         NinjaMailerJob::dispatch($nmo, true);
 
-        // $nmo->to_user = $this->new_user;
-        // NinjaMailerJob::dispatch($nmo);
-
         $this->new_user->service()->invite($this->company);
 
     }

app/Jobs/Util/UnlinkFile.php

@@ -39,6 +39,10 @@ class UnlinkFile implements ShouldQueue
      */
     public function handle()
     {
+        /* Do not delete files if we are on the sync queue*/
+        if(config('queue.default') == 'sync')
+            return;
+
         Storage::disk($this->disk)->delete($this->file_path);
     }
 }

app/Mail/Admin/VerifyUserObject.php

@@ -63,6 +63,7 @@ class VerifyUserObject
         $mail_obj->data = $data;
         $mail_obj->markdown = 'email.admin.generic';
         $mail_obj->tag = $this->company->company_key;
+        $mail_obj->text_view = 'email.admin.verify_user_text';
         
         return $mail_obj;
     }

app/Mail/ContactPasswordlessLogin.php

@@ -58,6 +58,7 @@ class ContactPasswordlessLogin extends Mailable
 
         return $this
             ->subject(ctrans('texts.account_passwordless_login'))
+            ->text('email.billing.passwordless-login_text')
             ->view('email.billing.passwordless-login', [
                 'logo' => $this->company->present()->logo(),
                 'settings' => $this->company->settings,

app/Mail/DownloadBackup.php

@@ -43,6 +43,9 @@ class DownloadBackup extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.download_backup_subject', ['company' => $company->present()->name()]))
+            ->text('email.admin.download_files_text',[
+               'url' => $this->file_path,
+            ])
             ->view('email.admin.download_files', [
                 'url' => $this->file_path,
                 'logo' => $company->present()->logo,

app/Mail/DownloadCredits.php

@@ -42,6 +42,9 @@ class DownloadCredits extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.download_files'))
+            ->text('email.admin.download_credits_text', [
+                'url' => $this->file_path,
+            ])
             ->view('email.admin.download_credits', [
                 'url' => $this->file_path,
                 'logo' => $this->company->present()->logo,

app/Mail/DownloadInvoices.php

@@ -42,6 +42,9 @@ class DownloadInvoices extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.download_files'))
+            ->text('email.admin.download_invoices_text', [
+                'url' => $this->file_path,
+            ])
             ->view('email.admin.download_invoices', [
                 'url' => $this->file_path,
                 'logo' => $this->company->present()->logo,

app/Mail/DownloadQuotes.php

@@ -42,6 +42,9 @@ class DownloadQuotes extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.download_files'))
+            ->text('email.admin.download_quotes_text', [
+                'url' => $this->file_path,
+            ])
             ->view('email.admin.download_quotes', [
                 'url' => $this->file_path,
                 'logo' => $this->company->present()->logo,

app/Mail/Engine/BaseEmailEngine.php

@@ -33,6 +33,10 @@ class BaseEmailEngine implements EngineInterface
 
     public $invitation;
     
+    public $text_body;
+
+    public $text_footer;
+
     public function setFooter($footer)
     {
         $this->footer = $footer;
@@ -105,6 +109,13 @@ class BaseEmailEngine implements EngineInterface
         return $this;
     }
     
+    public function setTextBody($text)
+    {
+        $this->text_body = $text;
+
+        return $this;
+    }
+
     public function getSubject()
     {
         return $this->subject;
@@ -148,11 +159,37 @@ class BaseEmailEngine implements EngineInterface
     public function setInvitation($invitation)
     {
         $this->invitation = $invitation;
+
+        return $this;
     }
 
     public function getInvitation()
     {
         return $this->invitation;
     }
+
+    public function getTextBody()
+    {
+        return $this->text_body;
+    }
+
+    private function replaceEntities($content)
+    {
+        $find = [
+            '<p>',
+            '</p>',
+            '<div class="center">',
+            '<\div>',
+        ];
+
+        $replace = [
+            '',
+            '\n\n',
+            '',
+            '\n\n',
+        ];
+
+        return str_replace($find, $replace, $content);
+    }
 }
 

app/Mail/Engine/CreditEmailEngine.php

@@ -93,6 +93,18 @@ class CreditEmailEngine extends BaseEmailEngine
             );
         }
 
+        $text_body = trans(
+                'texts.credit_message',
+                [
+                    'credit' => $this->credit->number,
+                    'company' => $this->credit->company->present()->name(),
+                    'amount' => Number::formatMoney($this->credit->balance, $this->client),
+                ],
+                null,
+                $this->client->locale()
+
+            ) . "\n\n" . $this->invitation->getLink();
+
         $this->setTemplate($this->client->getSetting('email_style'))
             ->setContact($this->contact)
             ->setVariables((new HtmlEngine($this->invitation))->makeValues())//move make values into the htmlengine
@@ -101,7 +113,8 @@ class CreditEmailEngine extends BaseEmailEngine
             ->setFooter("<a href='{$this->invitation->getLink()}'>".ctrans('texts.view_credit').'</a>')
             ->setViewLink($this->invitation->getLink())
             ->setViewText(ctrans('texts.view_credit'))
-            ->setInvitation($this->invitation);
+            ->setInvitation($this->invitation)
+            ->setTextBody($text_body);
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
 

app/Mail/Engine/EngineInterface.php

@@ -46,4 +46,7 @@ interface EngineInterface
     public function getViewText();
 
     public function build();
+
+    public function getTextBody();
+
 }

app/Mail/Engine/InvoiceEmailEngine.php

@@ -79,6 +79,17 @@ class InvoiceEmailEngine extends BaseEmailEngine
 
         }
 
+        $text_body = trans(
+                'texts.invoice_message',
+                [
+                    'invoice' => $this->invoice->number,
+                    'company' => $this->invoice->company->present()->name(),
+                    'amount' => Number::formatMoney($this->invoice->balance, $this->client),
+                ],
+                null,
+                $this->client->locale()
+            ) . "\n\n" . $this->invitation->getLink();
+
         if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
             nlog("subject = template data");
@@ -111,7 +122,8 @@ class InvoiceEmailEngine extends BaseEmailEngine
             ->setFooter("<a href='{$this->invitation->getLink()}'>".ctrans('texts.view_invoice').'</a>')
             ->setViewLink($this->invitation->getLink())
             ->setViewText(ctrans('texts.view_invoice'))
-            ->setInvitation($this->invitation);
+            ->setInvitation($this->invitation)
+            ->setTextBody($text_body);
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
 

app/Mail/Engine/QuoteEmailEngine.php

@@ -94,6 +94,18 @@ class QuoteEmailEngine extends BaseEmailEngine
             );
         }
 
+        $text_body = trans(
+                'texts.quote_message',
+                [
+                    'quote' => $this->quote->number,
+                    'company' => $this->quote->company->present()->name(),
+                    'amount' => Number::formatMoney($this->quote->amount, $this->client),
+                ],
+                null,
+                $this->client->locale()
+
+            ) . "\n\n" . $this->invitation->getLink();
+
         $this->setTemplate($this->client->getSetting('email_style'))
             ->setContact($this->contact)
             ->setVariables((new HtmlEngine($this->invitation))->makeValues())//move make values into the htmlengine
@@ -102,7 +114,8 @@ class QuoteEmailEngine extends BaseEmailEngine
             ->setFooter("<a href='{$this->invitation->getLink()}'>".ctrans('texts.view_quote').'</a>')
             ->setViewLink($this->invitation->getLink())
             ->setViewText(ctrans('texts.view_quote'))
-            ->setInvitation($this->invitation);
+            ->setInvitation($this->invitation)
+            ->setTextBody($text_body);
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
 

app/Mail/ExistingMigration.php

@@ -44,6 +44,7 @@ class ExistingMigration extends Mailable
 
         return $this
             ->from(config('mail.from.address'), config('mail.from.name'))
+            ->text('email.migration.existing_text')
             ->view('email.migration.existing');
     }
 }

app/Mail/Gateways/ACHVerificationNotification.php

@@ -54,6 +54,7 @@ class ACHVerificationNotification extends Mailable
 
         return $this
             ->subject(ctrans('texts.ach_verification_notification_label'))
+            ->text('email.gateways.ach-verification-notification_text')
             ->view('email.gateways.ach-verification-notification', [
                 'logo' => $this->company->present()->logo(),
                 'settings' => $this->company->settings,

app/Mail/Import/CompanyImportFailure.php

@@ -59,10 +59,9 @@ class CompanyImportFailure extends Mailable
         $this->title = ctrans('texts.company_import_failure_subject', ['company' => $this->company->present()->name()]);
         $this->whitelabel = $this->company->account->isPaid();
 
-        nlog($this->user_message);
-        
         return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->subject(ctrans('texts.company_import_failure_subject', ['company' => $this->company->present()->name()]))
+                    ->text('email.import.import_failure_text')
                     ->view('email.import.import_failure', ['user_message' => $this->user_message, 'title' => $this->title]);
     }
 }

app/Mail/MigrationCompleted.php

@@ -48,6 +48,7 @@ class MigrationCompleted extends Mailable
         $data['logo'] = $this->company->present()->logo();
         
         $result = $this->from(config('mail.from.address'), config('mail.from.name'))
+                    ->text('email.import.completed_text', $data)
                     ->view('email.import.completed', $data);
 
         return $result;

app/Mail/MigrationFailed.php

@@ -40,6 +40,7 @@ class MigrationFailed extends Mailable
         
         return $this
             ->from(config('mail.from.address'), config('mail.from.name'))
+            ->text('email.migration.failed_text')
             ->view('email.migration.failed', [
                 'logo' => $this->company->present()->logo(),
                 'settings' => $this->company->settings,

app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php

@@ -58,6 +58,7 @@ class ClientContactRequestCancellationObject
         $mail_obj->data = $data;
         $mail_obj->markdown = 'email.admin.generic';
         $mail_obj->tag = $this->company->company_key;
+        $mail_obj->text_view = 'email.admin.generic_text';
 
         return $mail_obj;
     }

app/Mail/TemplateEmail.php

@@ -92,12 +92,10 @@ class TemplateEmail extends Mailable
             $this->bcc(explode(",",str_replace(" ", "", $settings->bcc_email)));//remove whitespace if any has been inserted.
 
         $this->subject($this->build_email->getSubject())
-            ->text('email.template.plain', [
+            ->text('email.template.text', [
-                'body' => $this->build_email->getBody(),
+                'text_body' => $this->build_email->getTextBody(),
-                'footer' => $this->build_email->getFooter(),
                 'whitelabel' => $this->client->user->account->isPaid() ? true : false,
                 'settings' => $settings,
-                'unsubscribe_link' => $this->invitation ? $this->invitation->getUnsubscribeLink() : '',
             ])
             ->view($template_name, [
                 'greeting' => ctrans('texts.email_salutation', ['name' => $this->contact->present()->name()]),
@@ -111,7 +109,6 @@ class TemplateEmail extends Mailable
                 'company' => $company,
                 'whitelabel' => $this->client->user->account->isPaid() ? true : false,
                 'logo' => $this->company->present()->logo($settings),
-                'unsubscribe_link' => $this->invitation ? $this->invitation->getUnsubscribeLink() : '',
             ])
             ->withSwiftMessage(function ($message) use($company){
                 $message->getHeaders()->addTextHeader('Tag', $company->company_key);

app/Mail/User/UserAdded.php

@@ -50,6 +50,7 @@ class UserAdded extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.created_user'))
+            ->text('email.admin.user_added_text')
             ->view('email.admin.user_added')
             ->with([
                 'settings' => $this->company->settings,

app/Mail/User/UserLoggedIn.php

@@ -50,6 +50,10 @@ class UserLoggedIn extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.new_login_detected'))
+            ->text('email.admin.generic_text',[
+                'title' => ctrans('texts.new_login_detected'),
+                'body' => strip_tags(ctrans('texts.new_login_description', ['email' => $this->user->email, 'ip' => $this->ip, 'time' => now()]))
+            ])
             ->view('email.admin.notification')
             ->with([
                 'settings' => $this->company->settings,

app/Mail/User/UserNotificationMailer.php

@@ -37,6 +37,10 @@ class UserNotificationMailer extends Mailable
     {
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject($this->mail_obj->subject)
+            ->text('email.admin.generic_text',[
+                'title' => $this->mail_obj->data['title'],
+                'body' => $this->mail_obj->data['message'],
+            ])
             ->view($this->mail_obj->markdown, $this->mail_obj->data)
             ->withSwiftMessage(function ($message) {
                 $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);

app/Models/Activity.php

@@ -177,6 +177,11 @@ class Activity extends StaticModel
         return $this->belongsTo(Invoice::class)->withTrashed();
     }
 
+    public function credit()
+    {
+        return $this->belongsTo(Credit::class)->withTrashed();
+    }
+
     /**
      * @return mixed
      */

app/Models/PaymentHash.php

@@ -38,7 +38,7 @@ class PaymentHash extends Model
 
     public function fee_invoice()
     {
-        return $this->belongsTo(Invoice::class, 'fee_invoice_id', 'id');
+        return $this->belongsTo(Invoice::class, 'fee_invoice_id', 'id')->withTrashed();
     }
 
     public function withData(string $property, $value): self

app/PaymentDrivers/WePay/ACH.php

@@ -75,7 +75,6 @@ class ACH
 
             $message = [
                 'server_response' => $e->getMessage(),
-                'data' => $this->wepay_payment_driver->payment_hash->data,
             ];
 
             SystemLogger::dispatch(

app/Services/Credit/ApplyPayment.php

@@ -148,6 +148,7 @@ class ApplyPayment
 
         if ((int)$this->invoice->balance == 0) {
             $this->invoice->service()->deletePdf();
+            $this->invoice = $this->invoice->fresh();
             event(new InvoiceWasPaid($this->invoice, $this->payment, $this->payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
     }

app/Services/Invoice/AutoBillInvoice.php

@@ -47,7 +47,7 @@ class AutoBillInvoice extends AbstractService
 
         MultiDB::setDb($this->db);
 
-        $this->client = $this->invoice->client;
+        $this->client = $this->invoice->client->fresh();
 
         $is_partial = false;
 
@@ -181,7 +181,9 @@ class AutoBillInvoice extends AbstractService
             ->updatePaymentBalance($amount * -1)
             ->save();
 
-        $this->invoice->client->service()
+        $client = $this->invoice->client->fresh();
+
+        $client->service()
               ->updateBalance($amount * -1)
               ->updatePaidToDate($amount)
               ->adjustCreditBalance($amount * -1)

app/Services/Payment/UpdateInvoicePayment.php

@@ -41,6 +41,8 @@ class UpdateInvoicePayment
 
         collect($paid_invoices)->each(function ($paid_invoice) use ($invoices) {
 
+            $client = $this->payment->client->fresh();
+
             $invoice = $invoices->first(function ($inv) use ($paid_invoice) {
                 return $paid_invoice->invoice_id == $inv->hashed_id;
             });
@@ -70,8 +72,7 @@ class UpdateInvoicePayment
                  ->ledger()
                  ->updatePaymentBalance($paid_amount * -1);
 
-            $this->payment
+            $client
-                ->client
                 ->service()
                 ->updateBalance($paid_amount * -1)
                 ->updatePaidToDate($paid_amount)
@@ -95,10 +96,11 @@ class UpdateInvoicePayment
 
         $invoices->each(function ($invoice) {
             
+            $invoice = $invoice->fresh();
             event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         
         });
 
-        return $this->payment;
+        return $this->payment->fresh();
     }
 }

app/Services/Subscription/SubscriptionService.php

@@ -16,9 +16,13 @@ use App\Factory\CreditFactory;
 use App\Factory\InvoiceFactory;
 use App\Factory\InvoiceToRecurringInvoiceFactory;
 use App\Factory\RecurringInvoiceFactory;
+use App\Jobs\Mail\NinjaMailer;
+use App\Jobs\Mail\NinjaMailerJob;
+use App\Jobs\Mail\NinjaMailerObject;
 use App\Jobs\Util\SubscriptionWebhookHandler;
 use App\Jobs\Util\SystemLogger;
 use App\Libraries\MultiDB;
+use App\Mail\RecurringInvoice\ClientContactRequestCancellationObject;
 use App\Models\Client;
 use App\Models\ClientContact;
 use App\Models\Credit;
@@ -36,6 +40,7 @@ use App\Services\Subscription\ZeroCostProduct;
 use App\Utils\Ninja;
 use App\Utils\Traits\CleanLineItems;
 use App\Utils\Traits\MakesHash;
+use App\Utils\Traits\Notifications\UserNotifies;
 use App\Utils\Traits\SubscriptionHooker;
 use Carbon\Carbon;
 use GuzzleHttp\RequestOptions;
@@ -46,6 +51,7 @@ class SubscriptionService
     use MakesHash;
     use CleanLineItems;
     use SubscriptionHooker;
+    use UserNotifies;
 
     /** @var subscription */
     private $subscription;
@@ -102,7 +108,7 @@ class SubscriptionService
         }
         else
         {
-            $invoice = Invoice::find($payment_hash->fee_invoice_id);
+            $invoice = Invoice::withTrashed()->find($payment_hash->fee_invoice_id);
 
             $context = [
                 'context' => 'single_purchase',
@@ -934,6 +940,29 @@ class SubscriptionService
 
             $this->triggerWebhook($context);
 
+            $nmo = new NinjaMailerObject;
+            $nmo->mailable = (new NinjaMailer((new ClientContactRequestCancellationObject($recurring_invoice, auth()->guard('contact')->user()))->build()));
+            $nmo->company = $recurring_invoice->company;
+            $nmo->settings = $recurring_invoice->company->settings;
+            
+            $recurring_invoice->company->company_users->each(function ($company_user) use ($nmo){
+
+                $methods = $this->findCompanyUserNotificationType($company_user, ['recurring_cancellation', 'all_notifications']);
+
+                //if mail is a method type -fire mail!!
+                if (($key = array_search('mail', $methods)) !== false) {
+                    unset($methods[$key]);
+
+                    $nmo->to_user = $company_user->user;
+                    NinjaMailerJob::dispatch($nmo);
+
+                }
+
+
+            });
+
+
+
             return $this->handleRedirect('client/subscriptions');
 
     }

composer.json

@@ -26,12 +26,12 @@
     ],
     "type": "project",
     "require": {
-        "php": "^7.4|^8",
+        "php": "^7.4|^8.0",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-libxml": "*",
         "afosto/yaac": "^1.4",
-        "asm/php-ansible": "dev-main",
+        "asm/php-ansible": "^3",
         "authorizenet/authorizenet": "^2.0",
         "bacon/bacon-qr-code": "^2.0",
         "beganovich/snappdf": "^1.7",

config/ninja.php

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

resources/views/email/admin/download_credits.blade.php

@@ -0,0 +1,10 @@
+@component('email.template.admin', ['logo' => $logo, 'settings' => $settings])
+    <div class="center">
+        <h1>{{ ctrans('texts.credits_backup_subject') }}</h1>
+        <p>{{ ctrans('texts.download_timeframe') }}</p>
+
+        <a target="_blank" class="button" href="{{ $url }}">
+            {{ ctrans('texts.download') }}
+        </a>
+    </div>
+@endcomponent

resources/views/email/admin/download_credits_text.blade.php

@@ -0,0 +1,5 @@
+{!! ctrans('texts.credits_backup_subject') !!}
+
+{!! ctrans('texts.download_timeframe') !!}
+
+{!! $url !!}

resources/views/email/admin/download_files_text.blade.php

@@ -0,0 +1,5 @@
+{!! ctrans('texts.download_backup_subject') !!}
+
+{!! ctrans('texts.download_timeframe') !!}
+
+{!! $url !!}

resources/views/email/admin/download_invoices_text.blade.php

@@ -0,0 +1,5 @@
+{!! ctrans('texts.invoices_backup_subject') !!}
+
+{!! ctrans('texts.download_timeframe') !!}
+
+{!! $url !!}

resources/views/email/admin/download_quotes.blade.php

@@ -0,0 +1,10 @@
+@component('email.template.admin', ['logo' => $logo, 'settings' => $settings])
+    <div class="center">
+        <h1>{{ ctrans('texts.quotes_backup_subject') }}</h1>
+        <p>{{ ctrans('texts.download_timeframe') }}</p>
+
+        <a target="_blank" class="button" href="{{ $url }}">
+            {{ ctrans('texts.download') }}
+        </a>
+    </div>
+@endcomponent

resources/views/email/admin/download_quotes_text.blade.php

@@ -0,0 +1,5 @@
+{!! ctrans('texts.quotes_backup_subject') !!}
+
+{!! ctrans('texts.download_timeframe') !!}
+
+{!! $url !!}

resources/views/email/admin/generic_text.blade.php

@@ -0,0 +1,9 @@
+{!! $title !!}
+
+@isset($body)
+{!! $body !!}
+@endisset
+
+@isset($content)
+{!! $content !!}
+@endisset

resources/views/email/admin/user_added_text.blade.php

@@ -0,0 +1,3 @@
+{!! $title !!}
+
+{!! $body !!}

resources/views/email/admin/verify_user_text.blade.php

@@ -0,0 +1,5 @@
+{!! $title !!}
+
+{!! ctrans('texts.confirmation_message') !!}
+
+{!! $url !!}

resources/views/email/billing/passwordless-login_text.blade.php

@@ -0,0 +1,6 @@
+{!! ctrans('texts.login_link_requested_label') !!}
+
+{!! ctrans('texts.login_link_requested') !!}
+
+{!! $url !!}
+

resources/views/email/gateways/ach-verification-notification_text.blade.php

@@ -0,0 +1,5 @@
+{!! ctrans('texts.ach_verification_notification_label') !!}
+
+{!! ctrans('texts.ach_verification_notification') !!}
+
+{!! $url !!}

resources/views/email/import/completed_text.blade.php

@@ -0,0 +1,73 @@
+Hello, here is the output of your recent import job.
+
+If your logo imported correctly it will available display below. If it didn't import, you'll need to reupload your logo
+
+{!! $company->present()->logo() !!}
+
+@if(isset($company) && $company->clients->count() >=1)
+    {!! ctrans('texts.clients') !!}: {!! $company->clients->count() !!} 
+@endif
+
+@if(isset($company) && count($company->products) >=1)
+    {!! ctrans('texts.products') !!}: {!! count($company->products) !!} 
+@endif
+
+@if(isset($company) && count($company->invoices) >=1)
+    {!! ctrans('texts.invoices') !!}: {!! count($company->invoices) !!} 
+@endif
+
+@if(isset($company) && count($company->payments) >=1)
+    {!! ctrans('texts.payments') !!}: {!! count($company->payments) !!} 
+@endif
+
+@if(isset($company) && count($company->recurring_invoices) >=1)
+    {!! ctrans('texts.recurring_invoices') !!}: {!! count($company->recurring_invoices) !!} 
+@endif
+
+@if(isset($company) && count($company->quotes) >=1)
+    {!! ctrans('texts.quotes') !!}: {!! count($company->quotes) !!} 
+@endif
+
+@if(isset($company) && count($company->credits) >=1)
+    {!! ctrans('texts.credits') !!}: {!! count($company->credits) !!} 
+@endif
+
+@if(isset($company) && count($company->projects) >=1)
+    {!! ctrans('texts.projects') !!}: {!! count($company->projects) !!} 
+@endif
+
+@if(isset($company) && count($company->tasks) >=1)
+    {!! ctrans('texts.tasks') !!}: {!! count($company->tasks) !!} 
+@endif
+
+@if(isset($company) && count($company->vendors) >=1)
+    {!! ctrans('texts.vendors') !!}: {!! count($company->vendors) !!} 
+@endif
+
+@if(isset($company) && count($company->expenses) >=1)
+    {!! ctrans('texts.expenses') !!}: {!! count($company->expenses) !!} 
+@endif
+
+@if(isset($company) && count($company->company_gateways) >=1)
+    {!! ctrans('texts.gateways') !!}: {!! count($company->company_gateways) !!} 
+@endif
+
+@if(isset($company) && count($company->client_gateway_tokens) >=1)
+    {!! ctrans('texts.tokens') !!}: {!! count($company->client_gateway_tokens) !!} 
+@endif
+
+@if(isset($company) && count($company->tax_rates) >=1)
+    {!! ctrans('texts.tax_rates') !!}: {!! count($company->tax_rates) !!} 
+@endif
+
+@if(isset($company) && count($company->documents) >=1)
+    {!! ctrans('texts.documents') !!}: {!! count($company->documents) !!} 
+@endif
+
+{!! url('/') !!}
+
+{!! ctrans('texts.email_signature') !!}
+
+{!! ctrans('texts.email_from') !!}
+
+

resources/views/email/import/import_failure_text.blade.php

@@ -0,0 +1,7 @@
+{!! $title !!}
+
+{!! ctrans('texts.company_import_failure_body') !!}
+
+@if(isset($whitelabel) && !$whitelabel)
+{{ ctrans('texts.ninja_email_footer', ['site' => 'https://invoiceninja.com']) }}
+@endif

resources/views/email/migration/existing_text.blade.php

@@ -0,0 +1,3 @@
+{!! ctrans('texts.migration_already_completed') !!}
+
+{!! ctrans('texts.migration_already_completed_desc', ['company_name' => $company_name]) !!}

resources/views/email/migration/failed_text.blade

@@ -0,0 +1,11 @@
+{!! ctrans('texts.migration_failed_label') !!}
+
+{!! ctrans('texts.migration_failed') }} {{ $company->present()->name() !!}
+
+@if(\App\Utils\Ninja::isSelfHost() || $is_system)
+    {!! $exception->getMessage() !!}
+    {!! $content !!}
+@else
+    Please contact us at contact@invoiceninja.com for more information on this error.
+@endif
+

resources/views/email/template/client.blade.php

@@ -177,9 +177,6 @@
                                 </p>
                             @endif
                         </div>
-                        @if(isset($unsubscribe_link))
-                        <p><a href="{{$unsubscribe_link}}">{{ ctrans('texts.unsubscribe') }}</a></p>
-                        @endif
                     </td>
                 </tr>
             </table>

resources/views/email/template/text.blade.php

@@ -0,0 +1,7 @@
+{!! $text_body !!}
+@isset($whitelabel)
+@if(!$whitelabel)
+        
+{{ ctrans('texts.ninja_email_footer', ['site' => 'https://invoiceninja.com']) }}
+@endif
+@endisset