Merge pull request #4096 from turbo124/v2

Improve email templates customizations

app/Http/Controllers/BaseController.php

@@ -71,6 +71,7 @@ class BaseController extends Controller
           'company.clients.gateway_tokens',
           'company.clients.documents',
           'company.products',
+          'company.products.documents',
           'company.recurring_invoices',
           'company.invoices.invitations.contact',
           'company.invoices.invitations.company',
@@ -92,6 +93,7 @@ class BaseController extends Controller
           'company.tasks',
           'company.projects',
           'company.designs',
+          'company.documents',
           'company.webhooks',
           'company.tokens_hashed',
         ];
@@ -202,7 +204,7 @@ class BaseController extends Controller
         $query->with(
           [
             'company' => function ($query) use ($updated_at) {
-                $query->whereNotNull('updated_at');
+                $query->whereNotNull('updated_at')->with('documents');
             },
             'company.clients' => function ($query) use ($updated_at) {
                 $query->where('clients.updated_at', '>=', $updated_at)->with('contacts', 'gateway_tokens','documents');
@@ -217,7 +219,7 @@ class BaseController extends Controller
                 $query->whereNotNull('updated_at');
             },
             'company.products' => function ($query) use ($updated_at) {
-                $query->where('updated_at', '>=', $updated_at);
+                $query->where('updated_at', '>=', $updated_at)->with('documents');
             },
             'company.recurring_invoices'=> function ($query) use ($updated_at) {
                 $query->where('updated_at', '>=', $updated_at)->with('company');

app/Http/Controllers/InvoiceController.php

@@ -700,7 +700,7 @@ class InvoiceController extends BaseController
                 }
                 break;
             case 'email':
-                //check query paramater for email_type and set the template else use calculateTemplate
+                //check query parameter for email_type and set the template else use calculateTemplate
                 if (request()->has('email_type') && property_exists($invoice->company->settings, request()->input('email_type'))) {
                     $this->reminder_template = $invoice->client->getSetting(request()->input('email_type'));
                 } else {

app/Jobs/User/UserEmailChanged.php

@@ -92,6 +92,7 @@ class UserEmailChanged extends BaseMailerJob implements ShouldQueue
             'button' => ctrans('texts.account_login'),
             'signature' => $this->company->owner()->signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->settings,
         ];
     }
 }

app/Jobs/Util/SendFailedEmails.php

@@ -56,7 +56,7 @@ class SendFailedEmails implements ShouldQueue
 
     private function processEmails()
     {
-        \Log::error('processing emails');
+        //\Log::error('processing emails');
         //info("process emails");
         //@todo check that the quota is available for the job
 

app/Mail/Admin/EntitySentObject.php

@@ -84,6 +84,8 @@ class EntitySentObject
             'button' => ctrans("texts.view_{$this->entity_type}"),
             'signature' => $settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $settings,
+
         ];
     }
 }

app/Mail/Admin/EntityViewedObject.php

@@ -84,6 +84,8 @@ class EntityViewedObject
             'button' => ctrans("texts.view_{$this->entity_type}"),
             'signature' => $settings->email_signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $settings,
+
         ];
 
         return $data;

app/Mail/Admin/PaymentFailureObject.php

@@ -76,6 +76,8 @@ class PaymentFailureObject
             ),
             'signature' => $signature,
             'logo' => $this->company->present()->logo(),
+            'settings' => $this->client->getMergedSettings(),
+
         ];
 
         return $data;

app/Notifications/Admin/EntitySentNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Admin;
 

app/Notifications/Admin/EntityViewedNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Admin;
 

app/Notifications/Admin/InvoiceSentNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Admin;
 

app/Notifications/Admin/InvoiceViewedNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Admin;
 

app/Notifications/Admin/NewPartialPaymentNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Admin;
 

app/Notifications/Admin/NewPaymentNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Admin;
 

app/Notifications/BaseNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications;
 
@@ -114,6 +123,7 @@ class BaseNotification extends Notification implements ShouldQueue
             'view_text' => ctrans('texts.view_'.$this->entity_string),
             'logo' => $this->entity->company->present()->logo(),
             'signature' => $this->settings->email_signature,
+            'settings' => $this->settings,
 
         ];
 

app/Notifications/ClientContactRequestCancellation.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications;
 

app/Notifications/ClientContactResetPassword.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications;
 

app/Notifications/GmailTestNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications;
 

app/Notifications/NewAccountCreated.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications;
 

app/Notifications/Ninja/NewAccountCreated.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Ninja;
 

app/Notifications/Ninja/VerifyUser.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications\Ninja;
 

app/Notifications/SendGenericNotification.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Notifications;
 

app/Providers/EventServiceProvider.php

@@ -225,6 +225,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         InvoiceWasPaid::class => [
            InvoicePaidActivity::class,
+           CreateInvoicePdf::class,
         ],
         InvoiceWasViewed::class => [
             InvoiceViewedActivity::class,
@@ -238,6 +239,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         InvoiceWasDeleted::class => [
             InvoiceDeletedActivity::class,
+            CreateInvoicePdf::class,
         ],
         InvoiceWasArchived::class => [
             InvoiceArchivedActivity::class,
@@ -247,6 +249,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         InvoiceWasReversed::class => [
             InvoiceReversedActivity::class,
+            CreateInvoicePdf::class,
         ],
         InvoiceWasCancelled::class => [
             InvoiceCancelledActivity::class,

app/Services/Invoice/InvoiceService.php

@@ -206,6 +206,9 @@ class InvoiceService
         if($this->invoice->balance == 0)
             $this->setStatus(Invoice::STATUS_PAID);
 
+        if($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount)
+            $this->setStatus(Invoice::STATUS_PARTIAL);
+        
         return $this;
     }
 

app/Services/Payment/UpdateInvoicePayment.php

@@ -73,6 +73,8 @@ class UpdateInvoicePayment
             $pivot_invoice->pivot->amount = $paid_amount;
             $pivot_invoice->pivot->save();
 
+            $this->payment->applied += $paid_amount;
+
             $invoice->service() //caution what if we amount paid was less than partial - we wipe it!
                 ->clearPartial()
                 ->updateBalance($paid_amount * -1)
@@ -82,6 +84,8 @@ class UpdateInvoicePayment
             event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars()));
 
         });
+        
+        $this->payment->save();
 
         return $this->payment;
     }

app/Utils/ClientPortal/CustomMessage/CustomMessage.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Utils\ClientPortal\CustomMessage;
 

app/Utils/ClientPortal/CustomMessage/CustomMessageFacade.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Utils\ClientPortal\CustomMessage;
 

resources/views/portal/ninja2020/gateways/stripe/credit_card.blade.php

@@ -31,6 +31,28 @@
                     </div>
                     <div>
                         <dl>
+                            
+                            <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                                <dt class="text-sm leading-5 font-medium text-gray-500">
+                                    {{ ctrans('texts.subtotal') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ App\Utils\Number::formatMoney($total['invoice_totals'], $client) }}
+                                </dd>
+                                <dt class="text-sm leading-5 font-medium text-gray-500">
+                                    {{ ctrans('texts.gateway_fees') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ App\Utils\Number::formatMoney($total['fee_total'], $client) }}
+                                </dd>
+                                <dt class="text-sm leading-5 font-medium text-gray-500">
+                                    {{ ctrans('texts.total') }}
+                                </dt>
+                                <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                    {{ App\Utils\Number::formatMoney($total['amount_with_fee'], $client) }}
+                                </dd>
+                            </div>
+
                             @if($token)
                                 <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex items-center">
                                     <dt class="text-sm leading-5 font-medium text-gray-500 mr-4">