mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 13:12:50 +01:00
Minor fixes
This commit is contained in:
parent
63863c881c
commit
c58241a5cc
@ -59,7 +59,6 @@ class InvoiceController extends Controller
|
|||||||
|
|
||||||
$invoice->service()->removeUnpaidGatewayFees()->save();
|
$invoice->service()->removeUnpaidGatewayFees()->save();
|
||||||
|
|
||||||
|
|
||||||
$invitation = $invoice->invitations()->where('client_contact_id', auth()->user()->id)->first();
|
$invitation = $invoice->invitations()->where('client_contact_id', auth()->user()->id)->first();
|
||||||
|
|
||||||
if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {
|
if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {
|
||||||
|
@ -221,6 +221,9 @@ class BaseTransformer
|
|||||||
{
|
{
|
||||||
$name = strtolower(trim($name));
|
$name = strtolower(trim($name));
|
||||||
|
|
||||||
|
if(strlen($name) == 2)
|
||||||
|
return $this->getCountryIdBy2($name);
|
||||||
|
|
||||||
return isset($this->maps['countries'][$name]) ? $this->maps['countries'][$name] : null;
|
return isset($this->maps['countries'][$name]) ? $this->maps['countries'][$name] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user