Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Console/Commands/MobileLocalization.php

@@ -61,7 +61,7 @@ class MobileLocalization extends Command
 
     private function laravelResources()
     {
-        $resources = $this->getResources();
+        $resources =(array)$this->getResources();
 
         if(is_iterable($resources)){
             foreach ($resources as $key => $val) {

app/Export/CSV/BaseExport.php

@@ -628,11 +628,11 @@ class BaseExport
         }
         
         if(in_array($column, ['client.user_id', 'user_id'])) {
-            return $entity->client->user->present()->name();
+            return $entity->client->user ? $entity->client->user->present()->name() : '';
         }
 
         if(in_array($column, ['client.assigned_user_id', 'assigned_user_id'])) {
-            return $entity->client->assigned_user->present()->name();
+            return $entity->client->assigned_user ? $entity->client->assigned_user->present()->name() : '';
         }
 
         if(in_array($column, ['client.country_id', 'country_id'])) {
@@ -760,7 +760,7 @@ class BaseExport
                 return $transformed_payment[$column];
             } elseif (array_key_exists(str_replace("payment.", "", $column), $transformed_payment)) {
                 return $transformed_payment[$column];
-            }
+            } 
 
             // nlog("export: Could not resolve payment key: {$column}");
 

app/Export/CSV/CreditExport.php

@@ -177,6 +177,14 @@ class CreditExport extends BaseExport
             $entity['credit.status'] = $credit->stringStatus($credit->status_id);
         }
 
+        if (in_array('credit.assigned_user_id', $this->input['report_keys'])) {
+            $entity['credit.assigned_user_id'] = $credit->assigned_user ? $credit->assigned_user->present()->name(): '';
+        }
+                            
+        if (in_array('credit.user_id', $this->input['report_keys'])) {
+            $entity['credit.user_id'] = $credit->user ? $credit->user->present()->name(): '';
+        }
+
         return $entity;
     }
 }

app/Export/CSV/InvoiceExport.php

@@ -151,7 +151,15 @@ class InvoiceExport extends BaseExport
             $entity['invoice.auto_bill_enabled'] = $invoice->auto_bill_enabled ? ctrans('texts.yes') : ctrans('texts.no');
         }
 
-        
+        if (in_array('invoice.assigned_user_id', $this->input['report_keys'])) {
+            $entity['invoice.assigned_user_id'] = $invoice->assigned_user ? $invoice->assigned_user->present()->name(): '';
+        }
+       
+        if (in_array('invoice.user_id', $this->input['report_keys'])) {
+            $entity['invoice.user_id'] = $invoice->user ? $invoice->user->present()->name(): '';
+        }
+
+
         return $entity;
     }
 }

app/Export/CSV/InvoiceItemExport.php

@@ -227,6 +227,13 @@ class InvoiceItemExport extends BaseExport
             $entity['invoice.recurring_id'] = $invoice->recurring_invoice->number ?? '';
         }
 
+        if (in_array('invoice.assigned_user_id', $this->input['report_keys'])) {
+            $entity['invoice.assigned_user_id'] = $invoice->assigned_user ? $invoice->assigned_user->present()->name(): '';
+        }
+            
+        if (in_array('invoice.user_id', $this->input['report_keys'])) {
+            $entity['invoice.user_id'] = $invoice->user ? $invoice->user->present()->name(): '';
+        }
 
         return $entity;
     }

app/Export/CSV/PaymentExport.php

@@ -167,6 +167,14 @@ class PaymentExport extends BaseExport
             $entity['gateway'] = $payment->gateway_type ? $payment->gateway_type->name : 'Unknown Type';
         }
 
+        if (in_array('payment.assigned_user_id', $this->input['report_keys'])) {
+            $entity['payment.assigned_user_id'] = $payment->assigned_user ? $payment->assigned_user->present()->name() : '';
+        }
+
+        if (in_array('payment.user_id', $this->input['report_keys'])) {
+            $entity['payment.user_id'] = $payment->user ? $payment->user->present()->name() : '';
+        }
+
         // $entity['invoices'] = $payment->invoices()->exists() ? $payment->invoices->pluck('number')->implode(',') : '';
 
         return $entity;

app/Export/CSV/QuoteExport.php

@@ -149,6 +149,15 @@ class QuoteExport extends BaseExport
             $entity['quote.invoice'] = $quote->invoice ? $quote->invoice->number : '';
         }
 
+        if (in_array('quote.assigned_user_id', $this->input['report_keys'])) {
+            $entity['quote.assigned_user_id'] = $quote->assigned_user ? $quote->assigned_user->present()->name(): '';
+        }
+            
+        if (in_array('quote.user_id', $this->input['report_keys'])) {
+            $entity['quote.user_id'] = $quote->user ? $quote->user->present()->name(): '';
+        }
+
+
         return $entity;
     }
 }

app/Export/CSV/QuoteItemExport.php

@@ -198,6 +198,16 @@ class QuoteItemExport extends BaseExport
         if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $quote->stringStatus($quote->status_id);
         }
+        
+        if (in_array('quote.assigned_user_id', $this->input['report_keys'])) {
+            $entity['quote.assigned_user_id'] = $quote->assigned_user ? $quote->assigned_user->present()->name(): '';
+        }
+                    
+        if (in_array('quote.user_id', $this->input['report_keys'])) {
+            $entity['quote.user_id'] = $quote->user ? $quote->user->present()->name(): '';
+        }
+
+
 
         return $entity;
     }

app/Export/CSV/RecurringInvoiceExport.php

@@ -157,6 +157,15 @@ class RecurringInvoiceExport extends BaseExport
             $entity['recurring_invoice.auto_bill_enabled'] = $invoice->auto_bill_enabled ? ctrans('texts.yes') : ctrans('texts.no');
         }
 
+        if (in_array('recurring_invoice.assigned_user_id', $this->input['report_keys'])) {
+            $entity['recurring_invoice.assigned_user_id'] = $invoice->assigned_user ? $invoice->assigned_user->present()->name() : '';
+        }
+
+        if (in_array('recurring_invoice.user_id', $this->input['report_keys'])) {
+            $entity['recurring_invoice.user_id'] = $invoice->user ? $invoice->user->present()->name() : '';
+        }
+
+
         return $entity;
     }
 }

app/Export/Decorators/ClientDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class ClientDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/CreditDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class CreditDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/Decorator.php

@@ -0,0 +1,51 @@
+<?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\Export\Decorators;
+
+
+use App\Models\Task;
+use App\Models\Quote;
+use App\Models\Client;
+use App\Models\Credit;
+use App\Models\Vendor;
+use App\Models\Expense;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Product;
+use App\Models\Project;
+use App\Models\PurchaseOrder;
+use App\Models\RecurringInvoice;
+
+class Decorator {
+
+    public function __invoke(mixed $entity, string $key)
+    {
+        return match($entity){
+            ($entity instanceof Client) => $value = (new ClientDecorator($entity, $key))->transform(),
+            ($entity instanceof Payment) => $value = (new PaymentDecorator($entity, $key))->transform(),
+            ($entity instanceof Invoice) => $value = (new InvoiceDecorator($entity, $key))->transform(),
+            ($entity instanceof RecurringInvoice) => $value = (new RecurringInvoiceDecorator($entity, $key))->transform(),
+            ($entity instanceof Credit) => $value = (new CreditDecorator($entity, $key))->transform(),
+            ($entity instanceof Quote) => $value = (new QuoteDecorator($entity, $key))->transform(),
+            ($entity instanceof Task) => $value = (new TaskDecorator($entity, $key))->transform(),
+            ($entity instanceof Expense) => $value = (new ExpenseDecorator($entity, $key))->transform(),
+            ($entity instanceof Project) => $value = (new ProjectDecorator($entity, $key))->transform(),
+            ($entity instanceof Product) => $value = (new ProductDecorator($entity, $key))->transform(),
+            ($entity instanceof Vendor) => $value = (new VendorDecorator($entity, $key))->transform(),
+            ($entity instanceof PurchaseOrder) => $value = (new PurchaseOrderDecorator($entity, $key))->transform(),
+            default => $value = '',
+        };
+
+        return $value;
+    }
+
+}

app/Export/Decorators/DecoratorInterface.php

@@ -0,0 +1,16 @@
+<?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\Export\Decorators;
+
+interface DecoratorInterface {
+    public function transform(): string;
+}

app/Export/Decorators/ExpenseDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class ExpenseDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/InvoiceDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class InvoiceDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/PaymentDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class PaymentDecorator implements DecoratorInterface{
+
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/ProductDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class ProductDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/ProjectDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class ProjectDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/PurchaseOrderDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class PurchaseOrderDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/QuoteDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class QuoteDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/RecurringInvoiceDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class RecurringInvoiceDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/TaskDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class TaskDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Export/Decorators/VendorDecorator.php

@@ -0,0 +1,20 @@
+<?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\Export\Decorators;
+
+class VendorDecorator implements DecoratorInterface
+{
+    public function transform(): string
+    {
+        return 'Payment Decorator';
+    }
+}

app/Factory/CompanyFactory.php

@@ -11,13 +11,13 @@
 
 namespace App\Factory;
 
-use App\DataMapper\ClientRegistrationFields;
-use App\DataMapper\CompanySettings;
-use App\DataMapper\Tax\TaxModel;
-use App\Libraries\MultiDB;
-use App\Models\Company;
 use App\Utils\Ninja;
+use App\Models\Company;
+use App\Libraries\MultiDB;
 use App\Utils\Traits\MakesHash;
+use App\DataMapper\Tax\TaxModel;
+use App\DataMapper\CompanySettings;
+use App\DataMapper\ClientRegistrationFields;
 
 class CompanyFactory
 {
@@ -48,7 +48,7 @@ class CompanyFactory
         $company->markdown_email_enabled = true;
         $company->markdown_enabled = false;
         $company->tax_data = new TaxModel();
-        
+        $company->first_month_of_year = 1;
         return $company;
     }
 }

app/Filters/DesignFilters.php

@@ -93,6 +93,7 @@ class DesignFilters extends QueryFilters
 
         return $this->builder->where('is_template', $bool_val);
     }
+
     /**
      * Filter the designs by `is_custom` column.
      *

app/Http/Controllers/Auth/LoginController.php

@@ -527,7 +527,10 @@ class LoginController extends BaseController
 
         if (request()->has('id_token')) {
             $user = $google->getTokenResponse(request()->input('id_token'));
-        } else {
+        }elseif(request()->has('access_token')){
+            $user = $google->harvestUser(request()->input('access_token'));
+        } 
+        else {
             return response()->json(['message' => 'Illegal request'], 403);
         }
 

app/Http/Controllers/EmailController.php

@@ -69,8 +69,11 @@ class EmailController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('cc_email') && $request->cc_email && (Ninja::isSelfHost() || $user->account->isPaidHostedClient())) {
+        if ($request->has('cc_email') && (Ninja::isSelfHost() || $user->account->isPaidHostedClient())) {
-            $mo->cc[] = new Address($request->cc_email);
+ 
+            foreach($request->cc_email as $email)
+                $mo->cc[] = new Address($email);
+
         }
 
         $entity_obj->invitations->each(function ($invitation) use ($entity_obj, $mo) {

app/Http/Controllers/ExportController.php

@@ -56,11 +56,14 @@ class ExportController extends BaseController
      */
     public function index(StoreExportRequest $request)
     {
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
         $hash = Str::uuid();
         $url = \Illuminate\Support\Facades\URL::temporarySignedRoute('protected_download', now()->addHour(), ['hash' => $hash]);
         Cache::put($hash, $url, now()->addHour());
 
-        CompanyExport::dispatch(auth()->user()->getCompany(), auth()->user(), $hash);
+        CompanyExport::dispatch($user->getCompany(), $user, $hash);
 
         return response()->json(['message' => 'Processing', 'url' => $url], 200);
     }

app/Http/Controllers/InvoiceController.php

@@ -416,7 +416,6 @@ class InvoiceController extends BaseController
 
         $invoice->service()
                 ->triggeredActions($request)
-                // ->deletePdf()
                 ->adjustInventory($old_invoice);
 
         event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

app/Http/Controllers/PreviewController.php

@@ -137,9 +137,9 @@ class PreviewController extends BaseController
      */
     public function show()
     {
-        // if(request()->has('template')) {
+        if(request()->has('template')) {
             return $this->template();
-        // }
+        }
 
         if (request()->has('entity') &&
             request()->has('entity_id') &&

app/Http/Controllers/ProtectedDownloadController.php

@@ -19,10 +19,10 @@ use Illuminate\Support\Facades\Storage;
 class ProtectedDownloadController extends BaseController
 {
 
-    public function index(Request $request)
+    public function index(Request $request, string $hash)
     {
         /** @var string $hashed_path */
-        $hashed_path = Cache::pull($request->hash);
+        $hashed_path = Cache::pull($hash);
         
         if (!$hashed_path) {
             throw new SystemError('File no longer available', 404);

app/Http/Middleware/Locale.php

@@ -17,6 +17,48 @@ use Illuminate\Support\Facades\App;
 
 class Locale
 {
+    private array $locales = [
+                        'en',
+                        'it',
+                        'de',
+                        'fr',
+                        'pt_BR',
+                        'nl',
+                        'es',
+                        'nb_NO',
+                        'da',
+                        'ja',
+                        'sv',
+                        'es_ES',
+                        'fr_CA',
+                        'lt',
+                        'pl',
+                        'cs',
+                        'hr',
+                        'sq',
+                        'el',
+                        'en_GB',
+                        'pt_PT',
+                        'sl',
+                        'fi',
+                        'ro',
+                        'tr_TR',
+                        'th',
+                        'mk_MK',
+                        'zh_TW',
+                        'ru_RU',
+                        'ar',
+                        'fa',
+                        'lv_LV',
+                        'sr',
+                        'sk',
+                        'et',
+                        'bg',
+                        'he',
+                        'km_KH',
+                        'hu',
+                        'fr_CH',
+                    ];
     /**
      * Handle an incoming request.
      *
@@ -25,10 +67,10 @@ class Locale
      * @return mixed
      */
     public function handle($request, Closure $next)
-    {
+    { 
         /*LOCALE SET */
-        if ($request->has('lang') && is_string($request->input('lang'))) {
+        if ($request->has('lang') && in_array($request->input('lang','en'), $this->locales) ) {
-            $locale = $request->string('lang','en');
+            $locale = $request->input('lang');
             App::setLocale($locale);
         } elseif (auth()->guard('contact')->user()) {
             App::setLocale(auth()->guard('contact')->user()->client()->setEagerLoads([])->first()->locale());

app/Http/Middleware/VendorLocale.php

@@ -17,6 +17,48 @@ use Illuminate\Support\Facades\App;
 
 class VendorLocale
 {
+        private array $locales = [
+                        'en',
+                        'it',
+                        'de',
+                        'fr',
+                        'pt_BR',
+                        'nl',
+                        'es',
+                        'nb_NO',
+                        'da',
+                        'ja',
+                        'sv',
+                        'es_ES',
+                        'fr_CA',
+                        'lt',
+                        'pl',
+                        'cs',
+                        'hr',
+                        'sq',
+                        'el',
+                        'en_GB',
+                        'pt_PT',
+                        'sl',
+                        'fi',
+                        'ro',
+                        'tr_TR',
+                        'th',
+                        'mk_MK',
+                        'zh_TW',
+                        'ru_RU',
+                        'ar',
+                        'fa',
+                        'lv_LV',
+                        'sr',
+                        'sk',
+                        'et',
+                        'bg',
+                        'he',
+                        'km_KH',
+                        'hu',
+                        'fr_CH',
+                    ];
     /**
      * Handle an incoming request.
      *
@@ -32,7 +74,7 @@ class VendorLocale
         }
 
         /*LOCALE SET */
-        if ($request->has('lang') && is_string($request->input('lang'))) {
+        if ($request->has('lang') && in_array($request->input('lang','en'), $this->locales) ) {
             $locale = $request->input('lang');
             App::setLocale($locale);
         } elseif (auth()->guard('vendor')->user()) {

app/Http/Requests/Email/SendEmailRequest.php

@@ -43,8 +43,10 @@ class SendEmailRequest extends Request
             'template' => 'bail|required',
             'entity' => 'bail|required',
             'entity_id' => 'bail|required',
-            'cc_email' => 'bail|sometimes|email|nullable',
+            'cc_email.*' => 'bail|sometimes|email|nullable',
         ];
+
+
     }
 
     public function prepareForValidation()
@@ -72,6 +74,14 @@ class SendEmailRequest extends Request
             $input['entity'] = "App\Models\\".ucfirst(Str::camel($input['entity']));
         }
 
+        if(isset($input['cc_email'])){
+            $input['cc_email'] = collect(explode(",", $input['cc_email']))->map(function($email){
+                return trim($email);
+            })->filter(function($email){
+                return filter_var($email, FILTER_VALIDATE_EMAIL);
+            })->slice(0,4)->toArray();
+        }
+
         $this->replace($input);
     }
 

app/Http/Requests/Import/ImportRequest.php

@@ -22,7 +22,10 @@ class ImportRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->isAdmin();
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        return $user->isAdmin();
     }
 
     public function rules()

app/Import/Definitions/TaskMap.php

@@ -24,7 +24,7 @@ class TaskMap
             4 => 'client.name',
             5 => 'client.email',
             6 => 'task.description',
-            7 => 'task.is_billable',
+            7 => 'task.billable',
             8 => 'task.start_date',
             9 => 'task.end_date',
             10 => 'task.start_time',

app/Import/Providers/BaseImport.php

@@ -162,11 +162,12 @@ class BaseImport
 
     private function groupTasks($csvData, $key)
     {
+        nlog($csvData[0]);
 
-        if (! $key || count(array_column($csvData, $key)) == 0) {
+        if (! $key || !is_array($csvData) || count($csvData) == 0 || !isset($csvData[0]['task.number']) || empty($csvData[0]['task.number'])) {
             return $csvData;
         }
-
+        
         // Group by tasks.
         $grouped = [];
 
@@ -495,7 +496,7 @@ class BaseImport
                 ];
             }
         }
-nlog($count);
+        
         return $count;
     }
 

app/Import/Transformer/BaseTransformer.php

@@ -77,7 +77,7 @@ class BaseTransformer
     }
 
     public function getString($data, $field)
-    {
+    {   
         return isset($data[$field]) && $data[$field] ? trim($data[$field]) : '';
     }
 
@@ -179,6 +179,7 @@ class BaseTransformer
 
     public function getClient($client_name, $client_email)
     {
+
         if (! empty($client_name)) {
             $client_id_search = Client::query()->where('company_id', $this->company->id)
                 ->where('is_deleted', false)

app/Import/Transformer/Csv/TaskTransformer.php

@@ -29,8 +29,11 @@ class TaskTransformer extends BaseTransformer
     {
         $this->stubbed_timestamp = time();
 
-        $task_data = reset($task_items_data);
+        if(count($task_items_data) == count($task_items_data, COUNT_RECURSIVE)) 
-
+            $task_data = $task_items_data;
+        else 
+            $task_data = reset($task_items_data);
+        
         $clientId = $this->getClient(
             $this->getString($task_data, 'client.name'),
             $this->getString($task_data, 'client.email')

app/Jobs/Company/CompanyExport.php

@@ -492,7 +492,7 @@ class CompanyExport implements ShouldQueue
         $nmo->company = $company_reference;
         $nmo->settings = $this->company->settings;
         
-        NinjaMailerJob::dispatch($nmo, true);
+        (new NinjaMailerJob($nmo, true))->handle();
         
         UnlinkFile::dispatch(config('filesystems.default'), $storage_path)->delay(now()->addHours(1));
 

app/Jobs/Import/CSVIngest.php

@@ -74,7 +74,7 @@ class CSVIngest implements ShouldQueue
 
         $engine = $this->bootEngine();
 
-        foreach (['client', 'product', 'invoice', 'payment', 'vendor', 'expense', 'quote', 'bank_transaction', 'recurring_invoice'] as $entity) {
+        foreach (['client', 'product', 'invoice', 'payment', 'vendor', 'expense', 'quote', 'bank_transaction', 'recurring_invoice', 'task'] as $entity) {
             $engine->import($entity);
         }
 

app/Jobs/Payment/EmailPayment.php

@@ -74,6 +74,7 @@ class EmailPayment implements ShouldQueue
 
             if($this->settings->payment_email_all_contacts && $this->payment->invoices && $this->payment->invoices->count() >= 1) {
                 $this->emailAllContacts($email_builder);
+                return;
             }
 
             $invitation = null;

app/Jobs/Payment/EmailRefundPayment.php

@@ -96,8 +96,6 @@ class EmailRefundPayment implements ShouldQueue
                 }
             }
 
-
-           
             $nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
             $nmo->to_user = $this->contact;
             $nmo->settings = $this->settings;

app/Jobs/PostMark/ProcessPostmarkWebhook.php

@@ -388,7 +388,7 @@ class ProcessPostmarkWebhook implements ShouldQueue
                         'delivery_message' => $event->Details->DeliveryMessage ?? $event->Details->Summary ?? '',
                         'server' => $event->Details->DestinationServer ??  '',
                         'server_ip' => $event->Details->DestinationIP ?? '',
-                        'date' => \Carbon\Carbon::parse($event->ReceivedAt)->format('Y-m-d H:m:s') ?? '',
+                        'date' => \Carbon\Carbon::parse($event->ReceivedAt)->format('Y-m-d H:i:s') ?? '',
                     ];
 
             })->toArray();

app/Libraries/OAuth/Providers/Google.php

@@ -3,7 +3,6 @@
 namespace App\Libraries\OAuth\Providers;
 
 use Google_Client;
-
 class Google implements ProviderInterface
 {
     public function getTokenResponse($token)
@@ -27,4 +26,28 @@ class Google implements ProviderInterface
     {
         return $payload['name'];
     }
+
+    public function harvestUser($access_token)
+    {
+        $client = new Google_Client();
+        $client->setClientId(config('ninja.auth.google.client_id'));
+        $client->setClientSecret(config('ninja.auth.google.client_secret'));
+        $client->setAccessToken($access_token);
+
+        $oauth2 = new \Google_Service_Oauth2($client);
+
+        try {
+            $userInfo = $oauth2->userinfo->get();
+        }
+        catch (\Exception $e) {
+            return false;
+        }
+
+        return [
+            'email' => $userInfo['email'],
+            'sub' => $userInfo['id'],
+            'name' => $userInfo['name'],
+        ];
+
+    }
 }

app/Models/Presenters/ClientPresenter.php

@@ -103,7 +103,7 @@ class ClientPresenter extends EntityPresenter
         if ($cityState = $this->getShippingCityState()) {
             $str .= e($cityState).'<br/>';
         }
-        if ($country = $client->shipping_country) {
+        if ($country = $client->shipping_country ?? $client->country) {
             $str .= e($country->name).'<br/>';
         }
 

app/Models/Task.php

@@ -261,10 +261,10 @@ class Task extends BaseModel
             $parent_entity = $this->client ?? $this->company;
 
             if($log[0])
-                $log[0] = Carbon::createFromTimestamp($log[0])->format($parent_entity->date_format().' H:m:s');
+                $log[0] = Carbon::createFromTimestamp($log[0])->format($parent_entity->date_format().' H:i:s');
 
             if($log[1] && $log[1] != 0)
-                $log[1] = Carbon::createFromTimestamp($log[1])->format($parent_entity->date_format().' H:m:s');
+                $log[1] = Carbon::createFromTimestamp($log[1])->format($parent_entity->date_format().' H:i:s');
             else     
                 $log[1] = ctrans('texts.running');
 
@@ -291,17 +291,21 @@ class Task extends BaseModel
 
             if($log[0])
                 $logged['start_date_raw'] = $log[0];
-                $logged['start_date'] = Carbon::createFromTimestamp($log[0])->format($parent_entity->date_format().' H:m:s');
+                $logged['start_date'] = Carbon::createFromTimestamp($log[0])->setTimeZone($this->company->timezone()->name)->format($parent_entity->date_format().' H:i:s');
 
             if($log[1] && $log[1] != 0) {
                 $logged['end_date_raw'] = $log[1];
-                $logged['end_date'] = Carbon::createFromTimestamp($log[1])->format($parent_entity->date_format().' H:m:s');
+                $logged['end_date'] = Carbon::createFromTimestamp($log[1])->setTimeZone($this->company->timezone()->name)->format($parent_entity->date_format().' H:i:s');
             }
             else{
                 $logged['end_date_raw'] = 0;
                 $logged['end_date'] = ctrans('texts.running');
             }
-            $logged['duration'] = $duration;
+
+            $logged['description'] = $log[2];
+            $logged['billable'] = $log[3];
+            $logged['duration_raw'] = $duration;
+            $logged['duration'] = gmdate("H:i:s", $duration);
 
             return $logged;
 

app/PaymentDrivers/BaseDriver.php

@@ -743,29 +743,20 @@ class BaseDriver extends AbstractPaymentDriver
         }
 
         $invoices_string = str_replace(["*","<",">","'",'"'], "-", $invoices_string);
-        // $invoices_string = "I-".$invoices_string;
-        // $invoices_string = substr($invoices_string, 0, 22);
         
 // 2023-11-02 - improve the statement descriptor for string
+
 $company_name = $this->client->company->present()->name();
+$company_name = str_replace(["*","<",">","'",'"'], "-", $company_name);
 
-if(ctype_digit(substr($company_name, 0, 1)))
+if(ctype_digit(substr($company_name, 0, 1))) {
-    $company_name = "X" . $company_name;
+    $company_name = "I" . $company_name;
-
+}
-$suffix = strlen($invoices_string) + 1;
-
-$length = 22 - $suffix;
-
-$company_name = substr($company_name, 0, $length);
 
+$company_name = substr($company_name, 0, 11);
 $descriptor = "{$company_name} {$invoices_string}";
-
+$descriptor = substr($descriptor, 0, 22);
-$invoices_string = str_pad($descriptor, 5, ctrans('texts.invoice'), STR_PAD_RIGHT);
+return $descriptor;
-$invoices_string = substr($invoices_string, 0, 22);
-
-        // $invoices_string = str_pad($invoices_string, 5, ctrans('texts.invoice'), STR_PAD_LEFT);
-
-        return $invoices_string;
 
     }
     /**

app/Repositories/ClientContactRepository.php

@@ -28,7 +28,7 @@ class ClientContactRepository extends BaseRepository
 
     public function save(array $data, Client $client) : void
     {
-        //06-09-2022 sometimes users pass a contact object instead of a nested array, this sequence handles this scenario
+
         if (isset($data['contacts']) && (count($data['contacts']) !== count($data['contacts'], COUNT_RECURSIVE))) {
             $contacts = collect($data['contacts']);
         } elseif (isset($data['contacts'])) {

app/Repositories/VendorContactRepository.php

@@ -25,8 +25,12 @@ class VendorContactRepository extends BaseRepository
 
     public function save(array $data, Vendor $vendor) : void
     {
-        if (isset($data['contacts'])) {
+
+        if (isset($data['contacts']) && (count($data['contacts']) !== count($data['contacts'], COUNT_RECURSIVE))) {
             $contacts = collect($data['contacts']);
+        } elseif (isset($data['contacts'])) {
+            $temp_array[] = $data['contacts'];
+            $contacts = collect($temp_array);
         } else {
             $contacts = collect();
         }
@@ -80,10 +84,10 @@ class VendorContactRepository extends BaseRepository
 
         });
 
-        $vendor->load('contacts');
+        $vendor->fresh();
 
         //always made sure we have one blank contact to maintain state
-        if ($vendor->contacts->count() == 0) {
+        if ($vendor->contacts()->count() == 0) {
             $new_contact = new VendorContact;
             $new_contact->vendor_id = $vendor->id;
             $new_contact->company_id = $vendor->company_id;

app/Repositories/VendorRepository.php

@@ -55,19 +55,15 @@ class VendorRepository extends BaseRepository
 
         if ($vendor->number == '' || ! $vendor->number) {
             $vendor->number = $this->getNextVendorNumber($vendor);
-        } //todo write tests for this and make sure that custom vendor numbers also works as expected from here
+        } 
 
         $vendor->saveQuietly();
 
-        if (isset($data['contacts'])) {
+        if (isset($data['contacts']) || $vendor->contacts()->count() == 0) {
             $this->contact_repo->save($data, $vendor);
         }
 
-        if (empty($data['name'])) {
+        if (array_key_exists('documents', $data) && count($data['documents']) >= 1) {
-            $data['name'] = $vendor->present()->name();
-        }
-
-        if (array_key_exists('documents', $data)) {
             $this->saveDocuments($data['documents'], $vendor);
         }
 

app/Services/Client/Statement.php

@@ -158,7 +158,12 @@ class Statement
                             ->where('company_id', $this->client->company_id)
                             ->first();
         
-        $ts = $template->service()->build([
+        $ts = $template->service();
+        $ts->addGlobal(['show_credits' => $this->options['show_credits_table']]);
+        $ts->addGlobal(['show_aging' => $this->options['show_aging_table']]);
+        $ts->addGlobal(['show_payments' => $this->options['show_payments_table']]);
+        
+        $ts->build([
             'variables' => collect([$variables]),
             'invoices' => $this->getInvoices()->get(),
             'payments' => $this->options['show_payments_table'] ? $this->getPayments()->get() : collect([]),
@@ -400,6 +405,7 @@ class Statement
     protected function getAging(): array
     {
         return [
+            ctrans('texts.current') => $this->getAgingAmount('0'),
             '0-30' => $this->getAgingAmount('30'),
             '30-60' => $this->getAgingAmount('60'),
             '60-90' => $this->getAgingAmount('90'),
@@ -421,14 +427,23 @@ class Statement
         $from = $ranges[0];
         $to = $ranges[1];
 
-        $amount = Invoice::withTrashed()
+        $query = Invoice::withTrashed()
             ->where('client_id', $this->client->id)
             ->where('company_id', $this->client->company_id)
             ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
             ->where('balance', '>', 0)
-            ->where('is_deleted', 0)
+            ->where('is_deleted', 0);
-            ->whereBetween('due_date', [$to, $from])
+
-            ->sum('balance');
+            if($range == '0'){
+                $query->where(function ($q) use($to, $from){
+                    $q->whereBetween('due_date', [$to, $from])->orWhereNull('due_date');
+                });
+            }
+            else {
+                $query->whereBetween('due_date', [$to, $from]);
+            }
+            
+            $amount = $query->sum('balance');
 
         return Number::formatMoney($amount, $this->client);
     }
@@ -444,6 +459,10 @@ class Statement
         $ranges = [];
 
         switch ($range) {
+            case '0':
+                $ranges[0] = now()->subYears(50);
+                $ranges[1] = now()->startOfDay()->subMinute();
+                return $ranges;
             case '30':
                 $ranges[0] = now()->startOfDay();
                 $ranges[1] = now()->startOfDay()->subDays(30);

app/Services/ClientPortal/InstantPayment.php

@@ -83,6 +83,8 @@ class InstantPayment
                 ->with(['message' => 'No payable invoices selected.']);
         }
 
+        $invoices = Invoice::query()->whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->withTrashed()->get();
+
         $client = $invoices->first()->client;
         $settings = $client->getMergedSettings();
 

app/Services/Invoice/MarkPaid.php

@@ -90,7 +90,7 @@ class MarkPaid extends AbstractService
             'amount' => $this->payable_balance,
         ]);
 
-        if ($payment->company->getSetting('send_email_on_mark_paid')) {
+        if ($payment->client->getSetting('send_email_on_mark_paid')) {
             $payment->service()->sendEmail();
         }
 

app/Services/Pdf/PdfMock.php

@@ -483,12 +483,15 @@ class PdfMock
     '_rate3' => '',
     '$taxes' => '$40.00',
     '$total' => '$10.00',
+    '$refund' => '', 
+    '$refunded' => '', 
     '$phone' => ' ',
     '$terms' => 'Default company invoice terms',
     '$from' => 'Bob Jones',
     '$item' => '',
     '$date' => '25/Feb/2023',
     '$tax' => '',
+    '$net' => 'Net',
     '$dir' => 'ltr',
     '$to' => 'Jimmy Giggles',
     '$show_paid_stamp' => $this->settings->show_paid_stamp ? 'flex' : 'none',
@@ -803,6 +806,8 @@ class PdfMock
             '$tax_rate1_label' => ctrans('texts.tax_rate1'),
             '$tax_rate2_label' => ctrans('texts.tax_rate2'),
             '$tax_rate3_label' => ctrans('texts.tax_rate3'),
+            '$refund_label' => ctrans('texts.refund'),
+            '$refunded_label' => ctrans('texts.refunded'),
             '$phone_label' => ctrans('texts.phone'),
             '$email_label' => ctrans('texts.email'),
             '$taxes_label' => ctrans('texts.taxes'),
@@ -811,6 +816,7 @@ class PdfMock
             '$item_label' => ctrans('texts.item'),
             '$date_label' => ctrans('texts.date'),
             '$tax_label' => ctrans('texts.tax'),
+            '$net_label' => ctrans('texts.net'),
             '$dir_label' => '',
             '$to_label' => ctrans('texts.to'),
             '$start_date_label' => ctrans('texts.start_date'),
@@ -1115,6 +1121,8 @@ class PdfMock
           '$tax_rate1' => '',
           '$tax_rate2' => '',
           '$tax_rate3' => '',
+          '$refund' => 'Refund',
+          '$refunded' => 'Refunded',
           '$total' => '$10,256.40',
           '$taxes' => '$488.40',
           '$phone' => ' ',
@@ -1123,6 +1131,7 @@ class PdfMock
           '$date' => '14/Mar/2023',
           '$tax' => '',
           '$dir' => 'ltr',
+          '$net' => 'Net',
           '$to' => '',
         ],
         'labels' => $this->vendorLabels(),
@@ -1334,6 +1343,8 @@ class PdfMock
           '$tax_rate1_label' => ctrans('texts.tax_rate1'),
           '$tax_rate2_label' => ctrans('texts.tax_rate2'),
           '$tax_rate3_label' => ctrans('texts.tax_rate3'),
+          '$refund_label' => ctrans('texts.refund'),
+          '$refunded_label' => ctrans('texts.refunded'),
           '$total_label' => ctrans('texts.total'),
           '$taxes_label' => ctrans('texts.taxes'),
           '$phone_label' => ctrans('texts.phone'),
@@ -1341,6 +1352,7 @@ class PdfMock
           '$item_label' => ctrans('texts.item'),
           '$date_label' => ctrans('texts.date'),
           '$tax_label' => ctrans('texts.tax'),
+          '$net_label' => ctrans('texts.net'),
           '$dir_label' => '',
           '$to_label' => ctrans('texts.to'),
         ];

app/Services/Template/TemplateAction.php

@@ -96,6 +96,7 @@ class TemplateAction implements ShouldQueue
             Project::class => $resource->with('client'),
             Expense::class => $resource->with('client'),
             Payment::class => $resource->with('invoices', 'client'),
+            Client::class => $resource,
         };
 
         $result = $resource->withTrashed()
@@ -103,7 +104,7 @@ class TemplateAction implements ShouldQueue
             ->where('company_id', $this->company->id)
             ->get();
 
-            nlog($result->toArray());
+            // nlog($result->toArray());
 
         if($result->count() <= 1) {
             $data[$key] = collect($result);
@@ -111,7 +112,6 @@ class TemplateAction implements ShouldQueue
             $data[$key] = $result;
         }
 
-        
         $ts = $template_service
                     ->setCompany($this->company)
                     ->build($data);

app/Services/Template/TemplateService.php

@@ -11,31 +11,32 @@
 
 namespace App\Services\Template;
 
+use App\Models\User;
+use App\Models\Quote;
+use App\Utils\Number;
+use Twig\Error\Error;
 use App\Models\Client;
-use App\Models\Company;
 use App\Models\Credit;
 use App\Models\Design;
+use App\Models\Vendor;
+use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\Project;
-use App\Models\PurchaseOrder;
-use App\Models\Quote;
-use App\Models\RecurringInvoice;
-use App\Models\Vendor;
-use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\HtmlEngine;
-use App\Utils\Number;
+use Twig\Error\LoaderError;
+use Twig\Error\SyntaxError;
+use Twig\Error\RuntimeError;
+use App\Models\PurchaseOrder;
+use App\Utils\VendorHtmlEngine;
+use Twig\Sandbox\SecurityError;
+use App\Models\RecurringInvoice;
 use App\Utils\PaymentHtmlEngine;
 use App\Utils\Traits\MakesDates;
+use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\Traits\Pdf\PdfMaker;
-use App\Utils\VendorHtmlEngine;
-use League\CommonMark\CommonMarkConverter;
-use Twig\Error\Error;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;
 use Twig\Extra\Intl\IntlExtension;
-use Twig\Sandbox\SecurityError;
+use League\CommonMark\CommonMarkConverter;
 
 class TemplateService
 {
@@ -52,6 +53,8 @@ class TemplateService
 
     private array $variables = [];
 
+    private array $global_vars = [];
+
     public ?Company $company;
 
     private ?Client $client;
@@ -120,9 +123,10 @@ class TemplateService
      * @return self
      */
     public function build(array $data): self
-    {nlog($data);
+    {
         $this->compose()
              ->processData($data)
+             ->setGlobals()
              ->parseNinjaBlocks()
              ->processVariables($data)
              ->parseGlobalStacks()
@@ -144,6 +148,25 @@ class TemplateService
         return $this;
     }
 
+    private function setGlobals(): self
+    {
+
+        foreach($this->global_vars as $key => $value) {
+            $this->twig->addGlobal($key, $value);
+        }
+        
+        $this->global_vars = [];
+
+        return $this;
+    }
+
+    public function addGlobal(array $var): self
+    {   
+        $this->global_vars = array_merge($this->global_vars, $var);
+        
+        return $this;
+    }
+
     /**
      * Returns a Mock Template
      *
@@ -158,6 +181,10 @@ class TemplateService
 
         $this->data = $tm->engines;
         $this->variables = $tm->variables[0];
+        $this->twig->addGlobal('currency_code', $this->company->currency()->code);
+        $this->twig->addGlobal('show_credits', true);
+        $this->twig->addGlobal('show_aging', true);
+        $this->twig->addGlobal('show_payments', true);
 
         $this->parseNinjaBlocks()
              ->parseGlobalStacks()
@@ -549,6 +576,8 @@ class TemplateService
 
         $this->payment = $payment;
 
+        $this->addGlobal(['currency_code' => $payment->currency->code ?? $this->company->currency()->code]);
+
         $credits = $payment->credits->map(function ($credit) use ($payment) {
             return [
                 'credit' => $credit->number,
@@ -616,7 +645,7 @@ class TemplateService
             'paymentables' => $pivot,
             'refund_activity' => $this->getPaymentRefundActivity($payment),
         ];
-
+        
         return $data;
 
     }
@@ -849,7 +878,7 @@ class TemplateService
             return [
                 'number' => (string) $task->number ?: '',
                 'description' => (string) $task->description ?: '',
-                'duration' => $task->duration ?: 0,
+                'duration' => $task->calcDuration() ?: 0,
                 'rate' => Number::formatMoney($task->rate ?? 0, $task->client ?? $task->company),
                 'rate_raw' => $task->rate ?? 0,
                 'created_at' => $this->translateDate($task->created_at, $task->client ? $task->client->date_format() : $task->company->date_format(), $task->client ? $task->client->locale() : $task->company->locale()),
@@ -863,6 +892,7 @@ class TemplateService
                 'custom_value3' => $task->custom_value3 ?: '',
                 'custom_value4' => $task->custom_value4 ?: '',
                 'status' => $task->status ? $task->status->name : '',
+                'user' => $this->userInfo($task->user),
                 'client' => $task->client ? [
                             'name' => $task->client->present()->name(),
                             'balance' => $task->client->balance,
@@ -894,6 +924,14 @@ class TemplateService
 
     }
 
+    private function userInfo(User $user): array
+    {
+        return [
+            'name' => $user->present()->name(),
+            'email' => $user->email,
+        ];
+    }
+
     private function transformProject(Project $project, bool $nested = false): array
     {
         
@@ -921,7 +959,7 @@ class TemplateService
                     'payment_balance' => $project->client->payment_balance,
                     'credit_balance' => $project->client->credit_balance,
                 ] : [],
-
+            'user' => $this->userInfo($project->user)
         ];
 
     }

app/Transformers/CompanyTransformer.php

@@ -136,7 +136,7 @@ class CompanyTransformer extends EntityTransformer
             'custom_fields' =>  (object) $company->custom_fields ?? $std,
             'size_id' => (string) $company->size_id ?: '',
             'industry_id' => (string) $company->industry_id ?: '',
-            'first_month_of_year' => (string) $company->first_month_of_year ?: '',
+            'first_month_of_year' => (string) $company->first_month_of_year ?: '1',
             'first_day_of_week' => (string) $company->first_day_of_week ?: '',
             'subdomain' => (string) $company->subdomain ?: '',
             'portal_mode' => (string) $company->portal_mode ?: '',

app/Utils/HtmlEngine.php

@@ -166,6 +166,7 @@ class HtmlEngine
         $data['$exchange_rate'] = ['value' => $this->entity->exchange_rate ?: ' ', 'label' => ctrans('texts.exchange_rate')];
         $data['$triangular_tax'] = ['value' => ctrans('texts.triangular_tax'), 'label' => ''];
         $data['$tax_info'] = ['value' => $this->taxLabel(), 'label' => ''];
+        $data['$net'] = ['value' => '', 'label' => ctrans('texts.net')];
         
         if ($this->entity_string == 'invoice' || $this->entity_string == 'recurring_invoice') {
             $data['$entity'] = ['value' => ctrans('texts.invoice'), 'label' => ctrans('texts.invoice')];
@@ -326,7 +327,7 @@ class HtmlEngine
             $data['$amount_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
             $data['$due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->client->date_format(), $this->client->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
         } else {
-            if ($this->entity->status_id == 1) {
+            if ($this->entity->status_id == 1 || $this->entity_string == 'recurring_invoice') {
                 $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->amount, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
                 $data['$balance_due_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.balance_due')];
                 $data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
@@ -664,6 +665,8 @@ class HtmlEngine
         $data['$payment.custom2'] = ['value' => '', 'label' => ctrans('texts.payment')];
         $data['$payment.custom3'] = ['value' => '', 'label' => ctrans('texts.payment')];
         $data['$payment.custom4'] = ['value' => '', 'label' => ctrans('texts.payment')];
+        $data['$refund'] = ['value' => '', 'label' => ctrans('texts.refund')];
+        $data['$refunded'] = ['value' => '', 'label' => ctrans('texts.refunded')];
 
         $data['$payment.amount'] = ['value' => '', 'label' => ctrans('texts.payment')];
         $data['$payment.date'] = ['value' => '', 'label' => ctrans('texts.payment_date')];

lang/en/texts.php

@@ -5189,6 +5189,30 @@ $LANG = array(
     'payment_receipt' => 'Payment Receipt # :number',
     'load_template_description' => 'The template will be applied to following:',
     'run_template' => 'Run template',
+    'statement_design' => 'Statement Design',
+    'delivery_note_design' => 'Delivery Note Design',
+    'payment_receipt_design' => 'Payment Receipt Design',
+    'payment_refund_design' => 'Payment Refund Design',
+    'task_extension_banner' => 'Add the Chrome extension to manage your tasks',
+    'watch_video' => 'Watch Video',
+    'view_extension' => 'View Extension',
+    'reactivate_email' => 'Reactivate Email',
+    'email_reactivated' => 'Successfully reactivated email',
+    'template_help' => 'Enable using the design as a template',
+    'quarter' => 'Quarter',
+    'item_description' => 'Item Description',
+    'task_item' => 'Task Item',
+    'record_state' => 'Record State',
+    'save_files_to_this_folder' => 'Save files to this folder',
+    'downloads_folder' => 'Downloads Folder',
+    'total_invoiced_quotes' => 'Invoiced Quotes',
+    'total_invoice_paid_quotes' => 'Invoice Paid Quotes',
+    'downloads_folder_does_not_exist' => 'The downloads folder does not exist :value',
+    'user_logged_in_notification' => 'User Logged in Notification',
+    'user_logged_in_notification_help' => 'Send an email when logging in from a new location',
+    'payment_email_all_contacts' => 'Payment Email To All Contacts',
+    'payment_email_all_contacts_help' => 'Sends the payment email to all contacts when enabled',
+    'add_line' => 'Add Line',
 ); 
 
 return $LANG;

openapi/api-docs.yaml

@@ -17926,18 +17926,22 @@ components:
           description: 'The hashed if of the contact'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         user_id:
           description: 'The hashed id of the user who created the contact'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         company_id:
           description: 'The hashed id of the company'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         client_id:
           description: 'The hashed id of the client'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         first_name:
           description: 'The first name of the contact'
           type: string
@@ -17974,18 +17978,26 @@ components:
           description: 'The terms of service which the contact has accpeted'
           type: string
           example: 'A long set of ToS'
+          readOnly: true
         password:
           description: 'The hashed password of the contact'
           type: string
           example: '*****'
-        confirmation-code:
+        confirmation_code:
           description: 'The confirmation code used to authenticate the contacts email address'
           type: string
           example: 333-sdjkh34gbasd
+          readOnly: true
         token:
           description: 'A uuid based token.'
           type: string
           example: 333-sdjkh34gbasd
+          readOnly: true
+        contact_key:
+          description: 'A unique identifier for the contact'
+          type: string
+          example: JD0X52bkfZlJRiroCJ0tcSiAjsJTntZ5uqKdiZ0a
+          readOnly: true
         is_primary:
           description: 'Defines is this contact is the primary contact for the client'
           type: boolean
@@ -18007,31 +18019,37 @@ components:
           type: number
           format: integer
           example: '3'
+          readOnly: true
         email_verified_at:
           description: 'The date which the contact confirmed their email'
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         last_login:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         created_at:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         updated_at:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         deleted_at:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
       type: object
     ClientContactRequest:
       properties:
@@ -18092,14 +18110,17 @@ components:
           description: 'The hashed id of the user id'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         company_id:
           description: 'The hashed id of the company'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         vendor_id:
           description: 'The hashed id of the vendor'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         first_name:
           description: 'The first name of the contact'
           type: string
@@ -18108,6 +18129,16 @@ components:
           description: 'The last name of the contact'
           type: string
           example: Windsor
+        contact_key:
+          description: 'A unique identifier for the contact'
+          type: string
+          example: JD0X52bkfZlJRiroCJ0tcSiAjsJTntZ5uqKdiZ0a
+          readOnly: true
+        confirmation_code:
+          description: 'The confirmation code used to authenticate the contacts email address'
+          type: string
+          example: 333-sdjkh34gbasd
+          readOnly: true
         phone:
           description: 'The contacts phone number'
           type: string
@@ -18132,6 +18163,16 @@ components:
           description: 'The contact email address'
           type: string
           example: harry@windsor.com
+        email_verified_at:
+          description: 'The date which the contact confirmed their email'
+          type: number
+          format: integer
+          example: '134341234234'
+          readOnly: true
+        password:
+          description: 'The hashed password of the contact'
+          type: string
+          example: '*****'
         is_primary:
           description: 'Boolean flag determining if the contact is the primary contact for the vendor'
           type: boolean
@@ -19463,10 +19504,6 @@ components:
           description: 'The hashed id of the company. This is a unique identifier for the company.'
           type: string
           example: Opnel5aKBz
-        client_id:
-          description: 'The hashed id of the client. This is a unique identifier for the client.'
-          type: string
-          example: Opnel5aKBz
         contacts:
           type: array
           items:
@@ -19596,8 +19633,6 @@ components:
           type: string
           example: 'Bob the vendor'
           readOnly: true
-        settings:
-          $ref: '#/components/schemas/CompanySettings'
       type: object
     ClientSettings:
       required:

openapi/components/schemas/client_contact.yaml

@@ -4,18 +4,22 @@
           description: 'The hashed if of the contact'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         user_id:
           description: 'The hashed id of the user who created the contact'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         company_id:
           description: 'The hashed id of the company'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         client_id:
           description: 'The hashed id of the client'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         first_name:
           description: 'The first name of the contact'
           type: string
@@ -52,18 +56,26 @@
           description: 'The terms of service which the contact has accpeted'
           type: string
           example: 'A long set of ToS'
+          readOnly: true
         password:
           description: 'The hashed password of the contact'
           type: string
           example: '*****'
-        confirmation-code:
+        confirmation_code:
           description: 'The confirmation code used to authenticate the contacts email address'
           type: string
           example: 333-sdjkh34gbasd
+          readOnly: true
         token:
           description: 'A uuid based token.'
           type: string
           example: 333-sdjkh34gbasd
+          readOnly: true
+        contact_key:
+          description: 'A unique identifier for the contact'
+          type: string
+          example: JD0X52bkfZlJRiroCJ0tcSiAjsJTntZ5uqKdiZ0a
+          readOnly: true
         is_primary:
           description: 'Defines is this contact is the primary contact for the client'
           type: boolean
@@ -85,29 +97,35 @@
           type: number
           format: integer
           example: '3'
+          readOnly: true
         email_verified_at:
           description: 'The date which the contact confirmed their email'
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         last_login:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         created_at:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         updated_at:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
         deleted_at:
           description: Timestamp
           type: number
           format: integer
           example: '134341234234'
+          readOnly: true
       type: object

openapi/components/schemas/vendor.yaml

@@ -17,10 +17,6 @@
           description: 'The hashed id of the company. This is a unique identifier for the company.'
           type: string
           example: Opnel5aKBz
-        client_id:
-          description: 'The hashed id of the client. This is a unique identifier for the client.'
-          type: string
-          example: Opnel5aKBz
         contacts:
           type: array
           items:
@@ -150,6 +146,4 @@
           type: string
           example: 'Bob the vendor'
           readOnly: true
-        settings:
-          $ref: '#/components/schemas/CompanySettings'
       type: object

openapi/components/schemas/vendor_contact.yaml

@@ -9,14 +9,17 @@
           description: 'The hashed id of the user id'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         company_id:
           description: 'The hashed id of the company'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         vendor_id:
           description: 'The hashed id of the vendor'
           type: string
           example: Opnel5aKBz
+          readOnly: true
         first_name:
           description: 'The first name of the contact'
           type: string
@@ -25,6 +28,16 @@
           description: 'The last name of the contact'
           type: string
           example: Windsor
+        contact_key:
+          description: 'A unique identifier for the contact'
+          type: string
+          example: JD0X52bkfZlJRiroCJ0tcSiAjsJTntZ5uqKdiZ0a
+          readOnly: true
+        confirmation_code:
+          description: 'The confirmation code used to authenticate the contacts email address'
+          type: string
+          example: 333-sdjkh34gbasd
+          readOnly: true
         phone:
           description: 'The contacts phone number'
           type: string
@@ -49,6 +62,16 @@
           description: 'The contact email address'
           type: string
           example: harry@windsor.com
+        email_verified_at:
+          description: 'The date which the contact confirmed their email'
+          type: number
+          format: integer
+          example: '134341234234'
+          readOnly: true
+        password:
+          description: 'The hashed password of the contact'
+          type: string
+          example: '*****'
         is_primary:
           description: 'Boolean flag determining if the contact is the primary contact for the vendor'
           type: boolean

tests/Feature/VendorApiTest.php

@@ -47,6 +47,24 @@ class VendorApiTest extends TestCase
         Model::reguard();
     }
 
+
+    public function testVendorContactCreation()
+    {
+        $data = [
+            'name' => 'hewwo',
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->postJson('/api/v1/vendors', $data);
+
+        $arr = $response->json();
+
+        $this->assertEquals('hewwo', $arr['data']['name']);
+        $this->assertEquals(1, count($arr['data']['contacts']));
+    }   
+
     public function testVendorLoggedInEvents()
     {
         $v = \App\Models\Vendor::factory()->create([
@@ -69,12 +87,6 @@ class VendorApiTest extends TestCase
 
         Event::assertDispatched(VendorContactLoggedIn::class);
         
-        // $vc->fresh();
-        // $v->fresh();
-
-        // $this->assertNotNull($vc->fresh()->last_login);
-        // $this->assertNotNull($v->fresh()->last_login);
-
     }
 
     public function testVendorLocale()