From 4c319a2dadee437253d31a9568398dfce37925c6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 8 Jul 2018 13:04:58 +0300
Subject: [PATCH] Fixes for the mobile app

---
 app/Http/Controllers/ClientPortalController.php   | 2 +-
 app/Libraries/Utils.php                           | 8 ++++----
 app/Ninja/Transformers/UserAccountTransformer.php | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index b774030b97c2..38d0651733f5 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -69,7 +69,7 @@ class ClientPortalController extends BaseController
 
         if (request()->silent) {
             session(['silent:' . $client->id => true]);
-            return redirect(request()->url());
+            return redirect(request()->url() . '?borderless=' . request()->borderless);
         }
 
         if (! $account->checkSubdomain(Request::server('HTTP_HOST'))) {
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 8c4478567cc2..f0112cc52f24 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -521,13 +521,13 @@ class Utils
                 $country->name = trans('texts.country_'.$country->name);
             })->sortBy(function ($country) {
                 return $country->name;
-            });
+            })->values();
 
             $data['paymentTypes'] = Cache::get('paymentTypes')->each(function ($pType) {
                 $pType->name = trans('texts.payment_type_'.$pType->name);
             })->sortBy(function ($pType) {
                 return $pType->name;
-            });
+            })->values();
 
             $data['languages'] = Cache::get('languages')->each(function ($lang) {
                 $lang->name = trans('texts.lang_'.$lang->name);
@@ -536,10 +536,10 @@ class Utils
             });
 
             $data['currencies'] = Cache::get('currencies')->each(function ($currency) {
-                $currency->name = trans('texts.currency_' . Str::slug($currency->name, '_'));
+                $currency->name = trans('texts.currency_' . \Str::slug($currency->name, '_'));
             })->sortBy(function ($currency) {
                 return $currency->name;
-            });
+            })->values();
         }
 
         return $data;
diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php
index e681b29e623d..5088d36d370f 100644
--- a/app/Ninja/Transformers/UserAccountTransformer.php
+++ b/app/Ninja/Transformers/UserAccountTransformer.php
@@ -159,6 +159,7 @@ class UserAccountTransformer extends EntityTransformer
             'custom_invoice_taxes1' => (bool) $account->custom_invoice_taxes1,
             'custom_invoice_taxes2' => (bool) $account->custom_invoice_taxes1,
             'custom_fields' => $account->custom_fields ?: '',
+			'invoice_fields' => $account->invoice_fields ?: '',
         ];
     }
 }