diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 6d25eda2f1..cd66cfcbd5 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -59,7 +59,6 @@ class InvoiceController extends Controller $invoice->service()->removeUnpaidGatewayFees()->save(); - $invitation = $invoice->invitations()->where('client_contact_id', auth()->user()->id)->first(); if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) { diff --git a/app/Import/Transformers/BaseTransformer.php b/app/Import/Transformers/BaseTransformer.php index cfe6c3cf12..f2bdb227d0 100644 --- a/app/Import/Transformers/BaseTransformer.php +++ b/app/Import/Transformers/BaseTransformer.php @@ -221,6 +221,9 @@ class BaseTransformer { $name = strtolower(trim($name)); + if(strlen($name) == 2) + return $this->getCountryIdBy2($name); + return isset($this->maps['countries'][$name]) ? $this->maps['countries'][$name] : null; }