Merge pull request #5305 from turbo124/v5-develop

Payment mailer fixes

app/Console/Commands/SendRemindersCron.php

@@ -75,6 +75,10 @@ class SendRemindersCron extends Command
 
     }
 
+    private function webHookExpiredQuotes()
+    {
+        
+    }
 
     private function executeWebhooks()
     {

app/DataMapper/InvoiceItem.php

@@ -51,7 +51,7 @@ class InvoiceItem
 
     public $custom_value4 = '';
 
-    public $type_id = '1'; //1 = product, 2 = service, 3 unpaid gateway fee, 4 paid gateway fee, 5 late fee, 6 promo code
+    public $type_id = '1'; //1 = product, 2 = service, 3 unpaid gateway fee, 4 paid gateway fee, 5 late fee, 6 expense
 
     public static $casts = [
         'type_id' => 'string',

app/Jobs/Payment/EmailPayment.php

@@ -77,8 +77,13 @@ class EmailPayment implements ShouldQueue
 
             $email_builder = (new PaymentEmailEngine($this->payment, $this->contact))->build();
 
+            $invitation = null;
+
+            if($this->payment->invoices()->exists())
+                $invitation = $this->payment->invoices()->first()->invitations()->first();
+
             $nmo = new NinjaMailerObject;
-            $nmo->mailable = new TemplateEmail($email_builder, $this->contact);
+            $nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
             $nmo->to_user = $this->contact;
             $nmo->settings = $this->settings;
             $nmo->company = $this->company;

app/Listeners/Payment/PaymentNotification.php

@@ -59,7 +59,7 @@ class PaymentNotification implements ShouldQueue
         foreach ($payment->company->company_users as $company_user) {
             $user = $company_user->user;
 
-            $methods = $this->findUserEntityNotificationType($payment, $company_user, ['payment_success_all', 'all_notifications']);
+            $methods = $this->findUserEntityNotificationType($payment, $company_user, ['payment_success', 'payment_success_all', 'all_notifications']);
 
             if (($key = array_search('mail', $methods)) !== false) {
                 unset($methods[$key]);

app/Mail/Admin/AutoBillingFailureObject.php

@@ -12,6 +12,7 @@
 namespace App\Mail\Admin;
 
 use App\Models\Invoice;
+use App\Utils\HtmlEngine;
 use App\Utils\Number;
 use App\Utils\Traits\MakesHash;
 use stdClass;
@@ -84,6 +85,8 @@ class AutoBillingFailureObject
     private function getData()
     {
         $signature = $this->client->getSetting('email_signature');
+        $html_variables = (new HtmlEngine($this->invoices->first()->invitations->first()))->makeValues();
+        $signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
 
         $data = [
             'title' => ctrans(

app/Mail/Admin/ClientPaymentFailureObject.php

@@ -12,6 +12,7 @@
 namespace App\Mail\Admin;
 
 use App\Models\Invoice;
+use App\Utils\HtmlEngine;
 use App\Utils\Number;
 use App\Utils\Traits\MakesHash;
 use stdClass;
@@ -88,6 +89,8 @@ class ClientPaymentFailureObject
     private function getData()
     {
         $signature = $this->client->getSetting('email_signature');
+        $html_variables = (new HtmlEngine($this->invoices->first()->invitations->first()))->makeValues();
+        $signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
 
         $data = [
             'title' => ctrans(

app/Mail/Admin/EntityFailedSendObject.php

@@ -11,6 +11,7 @@
 
 namespace App\Mail\Admin;
 
+use App\Utils\HtmlEngine;
 use App\Utils\Number;
 use stdClass;
 
@@ -121,6 +122,10 @@ class EntityFailedSendObject
     private function getData()
     {
         $settings = $this->entity->client->getMergedSettings();
+        $signature = $settings->email_signature;
+
+        $html_variables = (new HtmlEngine($this->invitation)->makeValues();
+        $signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
 
         return [
             'title' => $this->getSubject(),
@@ -136,7 +141,7 @@ class EntityFailedSendObject
             ),
             'url' => $this->invitation->getAdminLink(),
             'button' => ctrans("texts.view_{$this->entity_type}"),
-            'signature' => $settings->email_signature,
+            'signature' => $signature,
             'logo' => $this->company->present()->logo(),
             'settings' => $settings,
             'whitelabel' => $this->company->account->isPaid() ? true : false,

app/Mail/Admin/EntityPaidObject.php

@@ -11,6 +11,7 @@
 
 namespace App\Mail\Admin;
 
+use App\Mail\Engine\PaymentEmailEngine;
 use App\Utils\Number;
 use stdClass;
 
@@ -62,6 +63,8 @@ class EntityPaidObject
     {
         $settings = $this->payment->client->getMergedSettings();
 
+        $signature = $this->generateSignature($settings);
+
         $amount = Number::formatMoney($this->payment->amount, $this->payment->client);
 
         $invoice_texts = ctrans('texts.invoice_number_short');
@@ -85,7 +88,6 @@ class EntityPaidObject
             ]
             ),
             'url' => config('ninja.app_url'),
-            // 'url' => config('ninja.app_url') . '/payments/' . $this->payment->hashed_id, //because we have no deep linking we cannot use this
             'button' => ctrans('texts.view_payment'),
             'signature' => $settings->email_signature,
             'logo' => $this->company->present()->logo(),
@@ -95,4 +97,13 @@ class EntityPaidObject
 
         return $data;
     }
+
+    private function generateSignature($settings)
+    {
+        $html_variables = (new PaymentEmailEngine($this->payment, $this->payment->client->primary_contact()->first()))->makeValues();
+
+        $signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
+        
+        return $signature;
+    }
 }

app/Mail/Engine/BaseEmailEngine.php

@@ -69,6 +69,7 @@ class BaseEmailEngine implements EngineInterface
     {
         if (! empty($this->variables)) {
             $body = str_replace(array_keys($this->variables), array_values($this->variables), $body);
+            $body = str_replace(array_keys($this->variables), array_values($this->variables), $body);
         }
 
         $this->body = $body;

app/Mail/Engine/PaymentEmailEngine.php

@@ -76,7 +76,7 @@ class PaymentEmailEngine extends BaseEmailEngine
     }
 
 
-    private function makePaymentVariables()
+    public function makePaymentVariables()
     {
         $data = [];
 
@@ -132,9 +132,9 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$client_balance'] = ['value' => Number::formatMoney($this->client->balance, $this->client), 'label' => ctrans('texts.account_balance')];
         $data['$paid_to_date'] = ['value' => Number::formatMoney($this->client->paid_to_date, $this->client), 'label' => ctrans('texts.paid_to_date')];
 
-        $data['$contact.full_name'] = ['value' => $this->contact->present()->name(), 'label' => ctrans('texts.name')];
+        $data['$contact.full_name'] = ['value' => isset($this->contact) ? $this->contact->present()->name() : '', 'label' => ctrans('texts.name')];
-        $data['$contact.email'] = ['value' => $this->contact->email, 'label' => ctrans('texts.email')];
+        $data['$contact.email'] = ['value' => isset($this->contact) ? $this->contact->email : '', 'label' => ctrans('texts.email')];
-        $data['$contact.phone'] = ['value' => $this->contact->phone, 'label' => ctrans('texts.phone')];
+        $data['$contact.phone'] = ['value' => isset($this->contact) ? $this->contact->phone: '', 'label' => ctrans('texts.phone')];
 
         $data['$contact.name'] = ['value' => isset($this->contact) ? $this->contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
         $data['$contact.first_name'] = ['value' => isset($this->contact) ? $this->contact->first_name : '', 'label' => ctrans('texts.first_name')];

app/Mail/TemplateEmail.php

@@ -53,9 +53,14 @@ class TemplateEmail extends Mailable
 
         $company = $this->client->company;
 
+        if($this->invitation)
+        {
             $html_variables = (new HtmlEngine($this->invitation))->makeValues();
+            $signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
+        }
+        else
+            $signature = $settings->email_signature;
         
-//str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature)
         $this->from(config('mail.from.address'), $this->company->present()->name());
         
         if (strlen($settings->bcc_email) > 1) 
@@ -75,7 +80,7 @@ class TemplateEmail extends Mailable
                 'view_link' => $this->build_email->getViewLink(),
                 'view_text' => $this->build_email->getViewText(),
                 'title' => '',
-                'signature' => str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature),
+                'signature' => $signature,
                 'settings' => $settings,
                 'company' => $company,
                 'whitelabel' => $this->client->user->account->isPaid() ? true : false,

app/Models/Subscription.php

@@ -29,7 +29,7 @@ class Subscription extends BaseModel
         'promo_discount',
         'is_amount_discount',
         'allow_cancellation',
-        'per_set_enabled',
+        'per_seat_enabled',
         'min_seats_limit',
         'max_seats_limit',
         'trial_enabled',

app/Transformers/SubscriptionTransformer.php

@@ -44,6 +44,7 @@ class SubscriptionTransformer extends EntityTransformer
             'assigned_user_id' => $this->encodePrimaryKey($subscription->assigned_user_id),
             'company_id' => $this->encodePrimaryKey($subscription->company_id),
             'price' => (float) $subscription->price,
+            'promo_price' => (float) $subscription->promo_price,
             'frequency_id' => (string)$subscription->frequency_id,
             'auto_bill' => (string)$subscription->auto_bill,
             'promo_code' => (string)$subscription->promo_code,

app/Utils/Traits/Notifications/UserNotifies.php

@@ -38,8 +38,6 @@ trait UserNotifies
             array_push($notifiable_methods, 'mail');
         }
 
-nlog($notifiable_methods);
-
         // if(count(array_intersect($required_permissions, $notifications->slack)) >=1)
         //     array_push($notifiable_methods, 'slack');
 
@@ -63,10 +61,11 @@ nlog($notifiable_methods);
             array_push($required_permissions, 'all_user_notifications');
         }
 
-        if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect($required_permissions, ['all_user_notifications'])) >= 1 || count(array_intersect($required_permissions, ['all_notifications'])) >= 1) {
+        if (count(array_intersect($required_permissions, $notifications->email)) >= 1 || count(array_intersect(['all_user_notifications'], $notifications->email)) >= 1 || count(array_intersect(['all_notifications'],$notifications->email)) >= 1) {
             array_push($notifiable_methods, 'mail');
         }
 
+
         return $notifiable_methods;
     }