From 32d0c9d7db765efa1f341f1d6c045ee96738b1b6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 14 Jan 2018 12:00:59 +0200
Subject: [PATCH] Working on ApplePay

---
 resources/lang/en/texts.php                        | 2 +-
 resources/views/accounts/account_gateway.blade.php | 6 +++---
 resources/views/invoices/view.blade.php            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 08702d5e61e2..3402cd1ececb 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2569,7 +2569,7 @@ $LANG = array(
     'verification_file' => 'Verification File',
     'verification_file_missing' => 'The verification file is needed to accept payments.',
     'apple_pay_domain' => 'Use <code>:domain</code> as the domain in :link.',
-    'apple_pay_not_supported' => 'Sorry, Apple/Google Pay isn\'t supported',
+    'apple_pay_not_supported' => 'Sorry, Apple/Google Pay isn\'t supported by your browser',
     'optional_payment_methods' => 'Optional Payment Methods',
     'add_subscription' => 'Add Subscription',
     'target_url' => 'Target',
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index 2383a548ca2d..2e0d8b6917e1 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -205,11 +205,11 @@
 			{!! Former::checkbox('enable_apple_pay')
                 ->label(trans('texts.apple_pay'))
                 ->text(trans('texts.enable_apple_pay'))
-				->disabled(Utils::isNinja() && ! $account->subdomain)
-				->help((Utils::isNinja() && ! $account->subdomain) ? trans('texts.requires_subdomain', [
+				->disabled(Utils::isNinjaProd() && ! $account->subdomain)
+				->help((Utils::isNinjaProd() && ! $account->subdomain) ? trans('texts.requires_subdomain', [
 					'link' => link_to('/settings/client_portal', trans('texts.subdomain_is_set'), ['target' => '_blank'])
 				]) : ($accountGateway && $accountGateway->getApplePayEnabled() && Utils::isRootFolder() && ! $accountGateway->getAppleMerchantId() ? 'verification_file_missing' :
-					Utils::isNinja() ? trans('texts.apple_pay_domain', [
+					Utils::isNinjaProd() ? trans('texts.apple_pay_domain', [
 						'domain' => $account->subdomain . '.' . APP_DOMAIN, 'link' => link_to('https://dashboard.stripe.com/account/apple_pay', 'Stripe', ['target' => '_blank']),
 					]) : ''))
                 ->value(1) !!}
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index dfc2d2d107e0..47c0ba857fcf 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -141,7 +141,7 @@
 	                    // do nothing
 	                } else {
 	                    console.log('not supported');
-						$('#paymentButtons ul.dropdown-menu li').last().remove();
+						//$('#paymentButtons ul.dropdown-menu li').last().remove();
 	                }
 	            });