From 805f5cf1893a824e223c788f4b7aa0d57855b9f2 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 25 Apr 2014 16:04:57 +0300 Subject: [PATCH] Text changes --- app/lang/en/texts.php | 1 + app/models/User.php | 2 +- app/ninja/repositories/AccountRepository.php | 2 +- app/routes.php | 1 + app/views/accounts/custom_fields.blade.php | 10 ++++++++++ app/views/accounts/nav.blade.php | 6 +++--- app/views/header.blade.php | 18 +++++++++++++----- app/views/invoices/edit.blade.php | 2 +- app/views/master.blade.php | 2 ++ app/views/public/splash.blade.php | 2 +- public/images/pro-plan-chart.png | Bin 0 -> 163865 bytes 11 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 public/images/pro-plan-chart.png diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index 6cf6ff353386..0e6faf7c6b3d 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -341,4 +341,5 @@ return array( 'created_product' => 'Successfully created product', 'archived_product' => 'Successfully archived product', + 'pro_plan_custom_fields' => ':link to enable custom fields by joining the Pro Plan' ); diff --git a/app/models/User.php b/app/models/User.php index 11741b5fc85f..07bae4f74cf0 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -121,7 +121,7 @@ class User extends ConfideUser implements UserInterface, RemindableInterface public function getPopOverText() { - if (!Auth::check()) + if (!Auth::check() || Session::has('error')) { return false; } diff --git a/app/ninja/repositories/AccountRepository.php b/app/ninja/repositories/AccountRepository.php index f17f96a9b3a4..eb9d3f6ad241 100755 --- a/app/ninja/repositories/AccountRepository.php +++ b/app/ninja/repositories/AccountRepository.php @@ -182,7 +182,7 @@ class AccountRepository $accountGateway->user_id = $user->id; $accountGateway->gateway_id = NINJA_GATEWAY_ID; $accountGateway->public_id = 1; - $accountGateway->config = isset($_ENV['NINJA_GATEWAY_CONFIG']) ? $_ENV['NINJA_GATEWAY_CONFIG'] : null; + $accountGateway->config = NINJA_GATEWAY_CONFIG; $account->account_gateways()->save($accountGateway); } diff --git a/app/routes.php b/app/routes.php index 6da40f42a111..7a7deb4427f3 100755 --- a/app/routes.php +++ b/app/routes.php @@ -192,6 +192,7 @@ define('PRO_PLAN_PRICE', 50); define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN'); define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); define('NINJA_GATEWAY_ID', GATEWAY_PAYPAL_EXPRESS); +define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}'); /* diff --git a/app/views/accounts/custom_fields.blade.php b/app/views/accounts/custom_fields.blade.php index 5e83614bb014..b79de815c8d2 100644 --- a/app/views/accounts/custom_fields.blade.php +++ b/app/views/accounts/custom_fields.blade.php @@ -3,6 +3,16 @@ @section('content') @parent + @if (!Auth::user()->account->isPro()) +
+
+
{{ trans('texts.pro_plan_custom_fields', ['link'=>''.trans('texts.pro_plan.remove_logo_link').'']) }}
+  

  +

+
+ @endif + + {{ Former::open()->addClass('col-md-8 col-md-offset-2 warn-on-exit') }} {{ Former::populate($account) }} diff --git a/app/views/accounts/nav.blade.php b/app/views/accounts/nav.blade.php index cae5809b5566..db3b1940b704 100755 --- a/app/views/accounts/nav.blade.php +++ b/app/views/accounts/nav.blade.php @@ -5,10 +5,10 @@

 

diff --git a/app/views/header.blade.php b/app/views/header.blade.php index a3b9f42e762e..05e44b479720 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -119,6 +119,7 @@ @if (Auth::user()->getPopOverText())