Renamed client view to client portal

app/Http/Controllers/AccountController.php

@@ -1,7 +1,6 @@
-<?php namespace App\Http\Controllers;
+<?php namespace app\Http\Controllers;
 
 use Auth;
-use Exception;
 use File;
 use Image;
 use Input;
@@ -25,13 +24,10 @@ use App\Ninja\Repositories\AccountRepository;
 use App\Ninja\Repositories\ReferralRepository;
 use App\Ninja\Mailers\UserMailer;
 use App\Ninja\Mailers\ContactMailer;
-use App\Events\UserSignedUp;
 use App\Events\UserLoggedIn;
 use App\Events\UserSettingsChanged;
 use App\Services\AuthService;
 
-use App\Commands\CreateClient;
-
 class AccountController extends BaseController
 {
     protected $accountRepo;
@@ -103,6 +99,7 @@ class AccountController extends BaseController
         event(new UserLoggedIn());
 
         $redirectTo = Input::get('redirect_to') ?: 'invoices/create';
+
         return Redirect::to($redirectTo)->with('sign_up', Input::get('sign_up'));
     }
 
@@ -129,6 +126,7 @@ class AccountController extends BaseController
     public function getSearchData()
     {
         $data = $this->accountRepo->getSearchData();
+
         return Response::json($data);
     }
 
@@ -152,7 +150,7 @@ class AccountController extends BaseController
             return View::make('accounts.import_export', ['title' => trans('texts.import_export')]);
         } elseif ($section == ACCOUNT_INVOICE_DESIGN || $section == ACCOUNT_CUSTOMIZE_DESIGN) {
             return self::showInvoiceDesign($section);
-        } elseif ($section == ACCOUNT_CLIENT_VIEW_STYLING) {
+        } elseif ($section == ACCOUNT_CLIENT_PORTAL) {
             return self::showClientViewStyling();
         } elseif ($section === ACCOUNT_TEMPLATES_AND_REMINDERS) {
             return self::showTemplates();
@@ -166,8 +164,9 @@ class AccountController extends BaseController
             $data = [
                 'account' => Account::with('users')->findOrFail(Auth::user()->account_id),
                 'title' => trans("texts.{$section}"),
-                'section' => $section
+                'section' => $section,
             ];
+
             return View::make("accounts.{$section}", $data);
         }
     }
@@ -205,8 +204,9 @@ class AccountController extends BaseController
             'account' => Account::with('users')->findOrFail(Auth::user()->account_id),
             'title' => trans("texts.invoice_settings"),
             'section' => ACCOUNT_INVOICE_SETTINGS,
-            'recurringHours' => $recurringHours
+            'recurringHours' => $recurringHours,
         ];
+
         return View::make("accounts.invoice_settings", $data);
     }
 
@@ -366,6 +366,7 @@ class AccountController extends BaseController
         if ($section == ACCOUNT_CUSTOMIZE_DESIGN) {
             $data['customDesign'] = ($account->custom_design && !$design) ? $account->custom_design : $design;
         }
+
         return View::make("accounts.{$section}", $data);
     }
 
@@ -385,11 +386,11 @@ class AccountController extends BaseController
 
         $data = [
             'client_view_css' => $css,
-            'title' => trans("texts.client_view_styling"),
+            'title' => trans("texts.client_portal"),
-            'section' => ACCOUNT_CLIENT_VIEW_STYLING
+            'section' => ACCOUNT_CLIENT_PORTAL,
         ];
 
-        return View::make("accounts.client_view_styling", $data);
+        return View::make("accounts.client_portal", $data);
     }
 
     private function showTemplates()
@@ -410,6 +411,7 @@ class AccountController extends BaseController
         }
         $data['emailFooter'] = $account->getEmailFooter();
         $data['title'] = trans('texts.email_templates');
+
         return View::make('accounts.templates_and_reminders', $data);
     }
 
@@ -433,8 +435,8 @@ class AccountController extends BaseController
             return AccountController::saveInvoiceDesign();
         } elseif ($section === ACCOUNT_CUSTOMIZE_DESIGN) {
             return AccountController::saveCustomizeDesign();
-        } elseif ($section === ACCOUNT_CLIENT_VIEW_STYLING) {
+        } elseif ($section === ACCOUNT_CLIENT_PORTAL) {
-            return AccountController::saveClientViewStyling();
+            return AccountController::saveClientPortal();
         } elseif ($section === ACCOUNT_TEMPLATES_AND_REMINDERS) {
             return AccountController::saveEmailTemplates();
         } elseif ($section === ACCOUNT_PRODUCTS) {
@@ -444,7 +446,8 @@ class AccountController extends BaseController
         }
     }
 
-    private function saveCustomizeDesign() {
+    private function saveCustomizeDesign()
+    {
         if (Auth::user()->account->isPro()) {
             $account = Auth::user()->account;
             $account->custom_design = Input::get('custom_design');
@@ -457,10 +460,10 @@ class AccountController extends BaseController
         return Redirect::to('settings/'.ACCOUNT_CUSTOMIZE_DESIGN);
     }
 
-    private function saveClientViewStyling() {
+    private function saveClientPortal()
+    {
         // Only allowed for pro Invoice Ninja users or white labeled self-hosted users
         if ((Utils::isNinja() && Auth::user()->account->isPro()) || Auth::user()->account->isWhiteLabel()) {
-            
             $input_css = Input::get('client_view_css');
             if (Utils::isNinja()) {
                 // Allow referencing the body element
@@ -488,9 +491,8 @@ class AccountController extends BaseController
                 $output_css = $purifier->context->get('StyleBlocks');
 
                 // Get the first style block
-                $sanitized_css = $output_css[0];
+                $sanitized_css = count($output_css) ? $output_css[0] : '';
-            }
+            } else {
-            else{
                 $sanitized_css = $input_css;
             }
 
@@ -501,7 +503,7 @@ class AccountController extends BaseController
             Session::flash('message', trans('texts.updated_settings'));
         }
 
-        return Redirect::to('settings/' . ACCOUNT_CLIENT_VIEW_STYLING);
+        return Redirect::to('settings/'.ACCOUNT_CLIENT_PORTAL);
     }
 
     private function saveEmailTemplates()
@@ -549,6 +551,7 @@ class AccountController extends BaseController
         $account->save();
 
         Session::flash('message', trans('texts.updated_settings'));
+
         return Redirect::to('settings/'.ACCOUNT_TAX_RATES);
     }
 
@@ -561,6 +564,7 @@ class AccountController extends BaseController
         $account->save();
 
         Session::flash('message', trans('texts.updated_settings'));
+
         return Redirect::to('settings/'.ACCOUNT_PRODUCTS);
     }
 
@@ -608,7 +612,6 @@ class AccountController extends BaseController
     private function saveInvoiceSettings()
     {
         if (Auth::user()->account->isPro()) {
-            
             $rules = [
                 'invoice_number_pattern' => 'has_counter',
                 'quote_number_pattern' => 'has_counter',
@@ -668,6 +671,7 @@ class AccountController extends BaseController
 
                 if (!$account->share_counter && $account->invoice_number_prefix == $account->quote_number_prefix) {
                     Session::flash('error', trans('texts.invalid_counter'));
+
                     return Redirect::to('settings/'.ACCOUNT_INVOICE_SETTINGS)->withInput();
                 } else {
                     $account->save();
@@ -792,6 +796,7 @@ class AccountController extends BaseController
             event(new UserSettingsChanged());
 
             Session::flash('message', trans('texts.updated_settings'));
+
             return Redirect::to('settings/'.ACCOUNT_COMPANY_DETAILS);
         }
     }
@@ -826,6 +831,7 @@ class AccountController extends BaseController
 
             event(new UserSettingsChanged());
             Session::flash('message', trans('texts.updated_settings'));
+
             return Redirect::to('settings/'.ACCOUNT_USER_DETAILS);
         }
     }
@@ -844,6 +850,7 @@ class AccountController extends BaseController
         event(new UserSettingsChanged());
 
         Session::flash('message', trans('texts.updated_settings'));
+
         return Redirect::to('settings/'.ACCOUNT_LOCALIZATION);
     }
 

app/Http/routes.php

@@ -278,7 +278,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('ACCOUNT_ADVANCED_SETTINGS', 'advanced_settings');
     define('ACCOUNT_INVOICE_SETTINGS', 'invoice_settings');
     define('ACCOUNT_INVOICE_DESIGN', 'invoice_design');
-    define('ACCOUNT_CLIENT_VIEW_STYLING', 'client_view_styling');
+    define('ACCOUNT_CLIENT_PORTAL', 'client_portal');
     define('ACCOUNT_EMAIL_SETTINGS', 'email_settings');
     define('ACCOUNT_CHARTS_AND_REPORTS', 'charts_and_reports');
     define('ACCOUNT_USER_MANAGEMENT', 'user_management');

app/Models/Account.php

@@ -35,7 +35,7 @@ class Account extends Eloquent
     public static $advancedSettings = [
         ACCOUNT_INVOICE_SETTINGS,
         ACCOUNT_INVOICE_DESIGN,
-        ACCOUNT_CLIENT_VIEW_STYLING,
+        ACCOUNT_CLIENT_PORTAL,
         ACCOUNT_EMAIL_SETTINGS,
         ACCOUNT_TEMPLATES_AND_REMINDERS,
         ACCOUNT_CHARTS_AND_REPORTS,

resources/lang/en/texts.php

@@ -476,8 +476,6 @@ return array(
     'id_number' => 'ID Number',
     'white_label_link' => 'White label',
     'white_label_text' => 'Purchase a white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.',
-    'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',
-    'white_label_purchase_link' => 'Purchase a white label license',
     'white_label_header' => 'White Label',
     'bought_white_label' => 'Successfully enabled white label license',
     'white_labeled' => 'White labeled',
@@ -997,4 +995,7 @@ return array(
     'email_designs' => 'Email Designs',
     'assigned_when_sent' => 'Assigned when sent',
 
+    'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',
+    'white_label_purchase_link' => 'Purchase a white label license',
+    
 );

resources/views/accounts/client_portal.blade.php

@@ -22,7 +22,7 @@
     </div>
     @endif
 
-    @include('accounts.nav', ['selected' => ACCOUNT_CLIENT_VIEW_STYLING])
+    @include('accounts.nav', ['selected' => ACCOUNT_CLIENT_PORTAL])
 
 	<div class="row">
 		<div class="col-md-12">