Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on ApplePay

Browse Source
This commit is contained in:
Hillel Coren 2018-01-14 12:00:59 +02:00
parent 051466c48f
commit 32d0c9d7db
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en/texts.php
View File

@ -2569,7 +2569,7 @@ $LANG = array(
'verification_file' => 'Verification File', 'verification_file' => 'Verification File',
'verification_file_missing' => 'The verification file is needed to accept payments.', '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_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', 'optional_payment_methods' => 'Optional Payment Methods',
'add_subscription' => 'Add Subscription', 'add_subscription' => 'Add Subscription',
'target_url' => 'Target', 'target_url' => 'Target',

6
resources/views/accounts/account_gateway.blade.php
View File

@ -205,11 +205,11 @@
{!! Former::checkbox('enable_apple_pay') {!! Former::checkbox('enable_apple_pay')
->label(trans('texts.apple_pay')) ->label(trans('texts.apple_pay'))
->text(trans('texts.enable_apple_pay')) ->text(trans('texts.enable_apple_pay'))
->disabled(Utils::isNinja() && ! $account->subdomain) ->disabled(Utils::isNinjaProd() && ! $account->subdomain)
->help((Utils::isNinja() && ! $account->subdomain) ? trans('texts.requires_subdomain', [ ->help((Utils::isNinjaProd() && ! $account->subdomain) ? trans('texts.requires_subdomain', [
'link' => link_to('/settings/client_portal', trans('texts.subdomain_is_set'), ['target' => '_blank']) 'link' => link_to('/settings/client_portal', trans('texts.subdomain_is_set'), ['target' => '_blank'])
]) : ($accountGateway && $accountGateway->getApplePayEnabled() && Utils::isRootFolder() && ! $accountGateway->getAppleMerchantId() ? 'verification_file_missing' : ]) : ($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']), 'domain' => $account->subdomain . '.' . APP_DOMAIN, 'link' => link_to('https://dashboard.stripe.com/account/apple_pay', 'Stripe', ['target' => '_blank']),
]) : '')) ]) : ''))
->value(1) !!} ->value(1) !!}

2
resources/views/invoices/view.blade.php
View File

@ -141,7 +141,7 @@
// do nothing // do nothing
} else { } else {
console.log('not supported'); console.log('not supported');
$('#paymentButtons ul.dropdown-menu li').last().remove(); //$('#paymentButtons ul.dropdown-menu li').last().remove();
} }
}); });