'; + } else { + $html .= '
';
+ }
+ $html .= '•••'.$paymentMethod['last4'].'
';
+
+ $paymentTypes[] = [
+ 'url' => URL::to("/payment/{$invitation->invitation_key}/token/".$paymentMethod['id']),
+ 'label' => $html,
+ ];
+ }
+ }
+ }
+
+
+ foreach(Gateway::$paymentTypes as $type) {
+ if ($gateway = $account->getGatewayByType($type)) {
+ $types = array($type);
+
+ if ($type == PAYMENT_TYPE_STRIPE) {
+ $types = array(PAYMENT_TYPE_STRIPE_CREDIT_CARD);
+ if ($gateway->getAchEnabled()) {
+ $types[] = PAYMENT_TYPE_STRIPE_ACH;
+ }
+ }
+
+ foreach($types as $type) {
+ $typeLink = strtolower(str_replace('PAYMENT_TYPE_', '', $type));
+ $url = URL::to("/payment/{$invitation->invitation_key}/{$typeLink}");
+
+ // PayPal doesn't allow being run in an iframe so we need to open in new tab
+ if ($type === PAYMENT_TYPE_PAYPAL && $account->iframe_url) {
+ $url = 'javascript:window.open("' . $url . '", "_blank")';
+ }
+
+ if ($type == PAYMENT_TYPE_STRIPE_CREDIT_CARD) {
+ $label = trans('texts.' . strtolower(PAYMENT_TYPE_CREDIT_CARD));
+ } elseif ($type == PAYMENT_TYPE_STRIPE_ACH) {
+ $label = trans('texts.' . strtolower(PAYMENT_TYPE_DIRECT_DEBIT));
+ } else {
+ $label = trans('texts.' . strtolower($type));
+ }
+
+ $paymentTypes[] = [
+ 'url' => $url, 'label' => $label
+ ];
}
- $paymentTypes[] = [
- 'url' => $url, 'label' => trans('texts.'.strtolower($type))
- ];
}
}
@@ -224,9 +265,6 @@ class PublicClientController extends BaseController
'color' => $color,
'account' => $account,
'client' => $client,
- 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL),
- 'showDocuments' => $account->hasFeature(FEATURE_DOCUMENTS),
- 'clientViewCSS' => $account->clientViewCSS(),
'clientFontUrl' => $account->getFontsUrl(),
];
@@ -248,7 +286,7 @@ class PublicClientController extends BaseController
->addColumn('activity_type_id', function ($model) {
$data = [
'client' => Utils::getClientDisplayName($model),
- 'user' => $model->is_system ? ('' . trans('texts.system') . '') : ($model->user_first_name . ' ' . $model->user_last_name),
+ 'user' => $model->is_system ? ('' . trans('texts.system') . '') : ($model->user_first_name . ' ' . $model->user_last_name),
'invoice' => trans('texts.invoice') . ' ' . $model->invoice,
'contact' => Utils::getClientDisplayName($model),
'payment' => trans('texts.payment') . ($model->payment ? ' ' . $model->payment : ''),
@@ -280,10 +318,7 @@ class PublicClientController extends BaseController
$data = [
'color' => $color,
- 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL),
- 'hideDashboard' => !$account->enable_client_portal_dashboard,
- 'showDocuments' => $account->hasFeature(FEATURE_DOCUMENTS),
- 'clientViewCSS' => $account->clientViewCSS(),
+ 'account' => $account,
'clientFontUrl' => $account->getFontsUrl(),
'title' => trans('texts.invoices'),
'entityType' => ENTITY_INVOICE,
@@ -317,10 +352,7 @@ class PublicClientController extends BaseController
$color = $account->primary_color ? $account->primary_color : '#0b4d78';
$data = [
'color' => $color,
- 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL),
- 'hideDashboard' => !$account->enable_client_portal_dashboard,
- 'showDocuments' => $account->hasFeature(FEATURE_DOCUMENTS),
- 'clientViewCSS' => $account->clientViewCSS(),
+ 'account' => $account,
'clientFontUrl' => $account->getFontsUrl(),
'entityType' => ENTITY_PAYMENT,
'title' => trans('texts.payments'),
@@ -345,8 +377,17 @@ class PublicClientController extends BaseController
if (!$model->last4) return '';
$code = str_replace(' ', '', strtolower($model->payment_type));
$card_type = trans("texts.card_" . $code);
- $expiration = trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($model->expiration, false)->format('m/y')));
- return '.'){kind=small}
•••'.$model->last4.' '.$expiration;
+ if ($model->payment_type_id != PAYMENT_TYPE_ACH) {
+ $expiration = trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($model->expiration, false)->format('m/y')));
+ return ' . '){kind=small}
•••' . $model->last4 . ' ' . $expiration;
+ } else {
+ $bankData = PaymentController::getBankData($model->routing_number);
+ if (is_array($bankData)) {
+ return $bankData['name'].' •••' . $model->last4;
+ } else {
+ return ' . '){kind=small}
•••' . $model->last4;
+ }
+ }
})
->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); })
->addColumn('payment_date', function ($model) { return Utils::dateToString($model->payment_date); })
@@ -397,10 +438,7 @@ class PublicClientController extends BaseController
$color = $account->primary_color ? $account->primary_color : '#0b4d78';
$data = [
'color' => $color,
- 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL),
- 'hideDashboard' => !$account->enable_client_portal_dashboard,
- 'showDocuments' => $account->hasFeature(FEATURE_DOCUMENTS),
- 'clientViewCSS' => $account->clientViewCSS(),
+ 'account' => $account,
'clientFontUrl' => $account->getFontsUrl(),
'title' => trans('texts.quotes'),
'entityType' => ENTITY_QUOTE,
@@ -435,10 +473,7 @@ class PublicClientController extends BaseController
$color = $account->primary_color ? $account->primary_color : '#0b4d78';
$data = [
'color' => $color,
- 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL),
- 'hideDashboard' => !$account->enable_client_portal_dashboard,
- 'showDocuments' => $account->hasFeature(FEATURE_DOCUMENTS),
- 'clientViewCSS' => $account->clientViewCSS(),
+ 'account' => $account,
'clientFontUrl' => $account->getFontsUrl(),
'title' => trans('texts.documents'),
'entityType' => ENTITY_DOCUMENT,
@@ -632,4 +667,169 @@ class PublicClientController extends BaseController
return DocumentController::getDownloadResponse($document);
}
+ public function paymentMethods()
+ {
+ if (!$invitation = $this->getInvitation()) {
+ return $this->returnError();
+ }
+
+ $client = $invitation->invoice->client;
+ $account = $client->account;
+ $paymentMethods = $this->paymentService->getClientPaymentMethods($client);
+
+ $data = array(
+ 'account' => $account,
+ 'color' => $account->primary_color ? $account->primary_color : '#0b4d78',
+ 'client' => $client,
+ 'clientViewCSS' => $account->clientViewCSS(),
+ 'clientFontUrl' => $account->getFontsUrl(),
+ 'paymentMethods' => $paymentMethods,
+ 'gateway' => $account->getTokenGateway(),
+ 'title' => trans('texts.payment_methods')
+ );
+
+ return response()->view('payments.paymentmethods', $data);
+ }
+
+ public function verifyPaymentMethod()
+ {
+ $sourceId = Input::get('source_id');
+ $amount1 = Input::get('verification1');
+ $amount2 = Input::get('verification2');
+
+ if (!$invitation = $this->getInvitation()) {
+ return $this->returnError();
+ }
+
+ $client = $invitation->invoice->client;
+ $result = $this->paymentService->verifyClientPaymentMethod($client, $sourceId, $amount1, $amount2);
+
+ if (is_string($result)) {
+ Session::flash('error', $result);
+ } else {
+ Session::flash('message', trans('texts.payment_method_verified'));
+ }
+
+ return redirect()->to('/client/paymentmethods/');
+ }
+
+ public function removePaymentMethod($sourceId)
+ {
+ if (!$invitation = $this->getInvitation()) {
+ return $this->returnError();
+ }
+
+ $client = $invitation->invoice->client;
+ $result = $this->paymentService->removeClientPaymentMethod($client, $sourceId);
+
+ if (is_string($result)) {
+ Session::flash('error', $result);
+ } else {
+ Session::flash('message', trans('texts.payment_method_removed'));
+ }
+
+ return redirect()->to('/client/paymentmethods/');
+ }
+
+ public function addPaymentMethod($paymentType)
+ {
+ if (!$invitation = $this->getInvitation()) {
+ return $this->returnError();
+ }
+
+ $invoice = $invitation->invoice;
+ $client = $invitation->invoice->client;
+ $account = $client->account;
+
+ $typeLink = $paymentType;
+ $paymentType = 'PAYMENT_TYPE_' . strtoupper($paymentType);
+ $accountGateway = $invoice->client->account->getTokenGateway();
+ $gateway = $accountGateway->gateway;
+ $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes();
+
+
+ $data = [
+ 'showBreadcrumbs' => false,
+ 'client' => $client,
+ 'contact' => $invitation->contact,
+ 'gateway' => $gateway,
+ 'accountGateway' => $accountGateway,
+ 'acceptedCreditCardTypes' => $acceptedCreditCardTypes,
+ 'paymentType' => $paymentType,
+ 'countries' => Cache::get('countries'),
+ 'currencyId' => $client->getCurrencyId(),
+ 'currencyCode' => $client->currency ? $client->currency->code : ($account->currency ? $account->currency->code : 'USD'),
+ 'account' => $account,
+ 'url' => URL::to('client/paymentmethods/add/'.$typeLink),
+ 'clientFontUrl' => $account->getFontsUrl(),
+ 'showAddress' => $accountGateway->show_address,
+ ];
+
+ if ($paymentType == PAYMENT_TYPE_STRIPE_ACH) {
+
+ $data['currencies'] = Cache::get('currencies');
+ }
+
+ if ($gateway->id == GATEWAY_BRAINTREE) {
+ $data['braintreeClientToken'] = $this->paymentService->getBraintreeClientToken($account);
+ }
+
+ return View::make('payments.add_paymentmethod', $data);
+ }
+
+ public function postAddPaymentMethod($paymentType)
+ {
+ if (!$invitation = $this->getInvitation()) {
+ return $this->returnError();
+ }
+
+ $paymentType = 'PAYMENT_TYPE_' . strtoupper($paymentType);
+ $client = $invitation->invoice->client;
+ $account = $client->account;
+
+ $accountGateway = $account->getGatewayByType($paymentType);
+ $sourceToken = $accountGateway->gateway_id == GATEWAY_STRIPE ? Input::get('stripeToken'):Input::get('payment_method_nonce');
+
+ if ($sourceToken) {
+ $details = array('token' => $sourceToken);
+ $gateway = $this->paymentService->createGateway($accountGateway);
+ $sourceId = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id);
+ } else {
+ return Redirect::to('payment/'.$invitationKey)->withInput(Request::except('cvv'));
+ }
+
+ if(empty($sourceId)) {
+ $this->error('Token-No-Ref', $this->paymentService->lastError, $accountGateway);
+ return Redirect::to('payment/'.$invitationKey)->withInput(Request::except('cvv'));
+ } else if ($paymentType == PAYMENT_TYPE_STRIPE_ACH && empty($usingPlaid) ) {
+ // The user needs to complete verification
+ Session::flash('message', trans('texts.bank_account_verification_next_steps'));
+ return Redirect::to('client/paymentmethods/add/' . $paymentType);
+ } else {
+ Session::flash('message', trans('texts.payment_method_added'));
+ return redirect()->to('/client/paymentmethods/');
+ }
+ }
+
+ public function setDefaultPaymentMethod(){
+ if (!$invitation = $this->getInvitation()) {
+ return $this->returnError();
+ }
+
+ $validator = Validator::make(Input::all(), array('source' => 'required'));
+ if ($validator->fails()) {
+ return Redirect::to('client/paymentmethods');
+ }
+
+ $client = $invitation->invoice->client;
+ $result = $this->paymentService->setClientDefaultPaymentMethod($client, Input::get('source'));
+
+ if (is_string($result)) {
+ Session::flash('error', $result);
+ } else {
+ Session::flash('message', trans('texts.payment_method_set_as_default'));
+ }
+
+ return redirect()->to('/client/paymentmethods/');
+ }
}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index d6cd8f497aec..d21883c566b9 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -40,9 +40,15 @@ Route::group(['middleware' => 'auth:client'], function() {
Route::get('download/{invitation_key}', 'PublicClientController@download');
Route::get('view', 'HomeController@viewLogo');
Route::get('approve/{invitation_key}', 'QuoteController@approve');
- Route::get('payment/{invitation_key}/{payment_type?}', 'PaymentController@show_payment');
+ Route::get('payment/{invitation_key}/{payment_type?}/{source_id?}', 'PaymentController@show_payment');
Route::post('payment/{invitation_key}', 'PaymentController@do_payment');
Route::match(['GET', 'POST'], 'complete', 'PaymentController@offsite_payment');
+ Route::get('client/paymentmethods', 'PublicClientController@paymentMethods');
+ Route::post('client/paymentmethods/verify', 'PublicClientController@verifyPaymentMethod');
+ Route::get('client/paymentmethods/add/{payment_type}', 'PublicClientController@addPaymentMethod');
+ Route::post('client/paymentmethods/add/{payment_type}', 'PublicClientController@postAddPaymentMethod');
+ Route::post('client/paymentmethods/default', 'PublicClientController@setDefaultPaymentMethod');
+ Route::post('client/paymentmethods/{source_id}/remove', 'PublicClientController@removePaymentMethod');
Route::get('client/quotes', 'PublicClientController@quoteIndex');
Route::get('client/invoices', 'PublicClientController@invoiceIndex');
Route::get('client/documents', 'PublicClientController@documentIndex');
@@ -60,6 +66,7 @@ Route::group(['middleware' => 'auth:client'], function() {
});
+Route::get('bank/{routing_number}', 'PaymentController@getBankInfo');
Route::get('license', 'PaymentController@show_license_payment');
Route::post('license', 'PaymentController@do_license_payment');
Route::get('claim_license', 'PaymentController@claim_license');
@@ -615,6 +622,7 @@ if (!defined('CONTACT_EMAIL')) {
define('TOKEN_BILLING_ALWAYS', 4);
define('PAYMENT_TYPE_CREDIT', 1);
+ define('PAYMENT_TYPE_ACH', 5);
define('PAYMENT_TYPE_VISA', 6);
define('PAYMENT_TYPE_MASTERCARD', 7);
define('PAYMENT_TYPE_AMERICAN_EXPRESS', 8);
@@ -633,6 +641,8 @@ if (!defined('CONTACT_EMAIL')) {
define('PAYMENT_TYPE_PAYPAL', 'PAYMENT_TYPE_PAYPAL');
define('PAYMENT_TYPE_STRIPE', 'PAYMENT_TYPE_STRIPE');
+ define('PAYMENT_TYPE_STRIPE_CREDIT_CARD', 'PAYMENT_TYPE_STRIPE_CREDIT_CARD');
+ define('PAYMENT_TYPE_STRIPE_ACH', 'PAYMENT_TYPE_STRIPE_ACH');
define('PAYMENT_TYPE_CREDIT_CARD', 'PAYMENT_TYPE_CREDIT_CARD');
define('PAYMENT_TYPE_DIRECT_DEBIT', 'PAYMENT_TYPE_DIRECT_DEBIT');
define('PAYMENT_TYPE_BITCOIN', 'PAYMENT_TYPE_BITCOIN');
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 44b49d44e1fe..234d9a5b63ca 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -379,6 +379,10 @@ class Account extends Eloquent
public function getGatewayByType($type = PAYMENT_TYPE_ANY)
{
+ if ($type == PAYMENT_TYPE_STRIPE_ACH || $type == PAYMENT_TYPE_STRIPE_CREDIT_CARD) {
+ $type = PAYMENT_TYPE_STRIPE;
+ }
+
foreach ($this->account_gateways as $gateway) {
if (!$type || $type == PAYMENT_TYPE_ANY) {
return $gateway;
diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php
index c1c8d3e851dd..221cea40ce99 100644
--- a/app/Ninja/Repositories/PaymentRepository.php
+++ b/app/Ninja/Repositories/PaymentRepository.php
@@ -56,6 +56,7 @@ class PaymentRepository extends BaseRepository
'payments.refunded',
'payments.expiration',
'payments.last4',
+ 'payments.routing_number',
'invoices.is_deleted as invoice_is_deleted',
'gateways.name as gateway_name',
'gateways.id as gateway_id',
@@ -107,6 +108,7 @@ class PaymentRepository extends BaseRepository
'clients.public_id as client_public_id',
'payments.amount',
'payments.payment_date',
+ 'payments.payment_type_id',
'invoices.public_id as invoice_public_id',
'invoices.invoice_number',
'contacts.first_name',
@@ -117,6 +119,7 @@ class PaymentRepository extends BaseRepository
'payments.refunded',
'payments.expiration',
'payments.last4',
+ 'payments.routing_number',
'payments.payment_status_id',
'payment_statuses.name as payment_status_name'
);
diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php
index 6bfcf2e12559..8ad8a990eb34 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@@ -5,6 +5,7 @@ use Auth;
use URL;
use DateTime;
use Event;
+use Cache;
use Omnipay;
use Session;
use CreditCard;
@@ -13,6 +14,7 @@ use App\Models\Account;
use App\Models\Country;
use App\Models\Client;
use App\Models\Invoice;
+use App\Http\Controllers\PaymentController;
use App\Models\AccountGatewayToken;
use App\Ninja\Repositories\PaymentRepository;
use App\Ninja\Repositories\AccountRepository;
@@ -155,8 +157,159 @@ class PaymentService extends BaseService
];
}
+ public function getClientPaymentMethods($client) {
+ $token = $client->getGatewayToken($accountGateway);
+ if (!$token) {
+ return null;
+ }
+
+ $gateway = $this->createGateway($accountGateway);
+
+ $paymentMethods = array();
+ if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
+ $response = $gateway->fetchCustomer(array('customerReference' => $token))->send();
+ if (!$response->isSuccessful()) {
+ return null;
+ }
+
+ $data = $response->getData();
+ $default_source = $data['default_source'];
+ $sources = isset($data['sources']) ? $data['sources']['data'] : $data['cards']['data'];
+
+ $paymentTypes = Cache::get('paymentTypes');
+ $currencies = Cache::get('currencies');
+ foreach ($sources as $source) {
+ if ($source['object'] == 'bank_account') {
+ $paymentMethods[] = array(
+ 'id' => $source['id'],
+ 'default' => $source['id'] == $default_source,
+ 'type' => $paymentTypes->find(PAYMENT_TYPE_ACH),
+ 'currency' => $currencies->where('code', strtoupper($source['currency']))->first(),
+ 'last4' => $source['last4'],
+ 'routing_number' => $source['routing_number'],
+ 'bank_name' => $source['bank_name'],
+ 'status' => $source['status'],
+ );
+ } elseif ($source['object'] == 'card') {
+ $paymentMethods[] = array(
+ 'id' => $source['id'],
+ 'default' => $source['id'] == $default_source,
+ 'type' => $paymentTypes->find($this->parseCardType($source['brand'])),
+ 'last4' => $source['last4'],
+ 'expiration' => $source['exp_year'] . '-' . $source['exp_month'] . '-00',
+ );
+ }
+ }
+ } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
+
+ }
+
+ return $paymentMethods;
+ }
+
+ public function verifyClientPaymentMethod($client, $sourceId, $amount1, $amount2) {
+ $token = $client->getGatewayToken($accountGateway);
+ if ($accountGateway->gateway_id != GATEWAY_STRIPE) {
+ return 'Unsupported gateway';
+ }
+
+ try{
+ // Omnipay doesn't support verifying payment methods
+ // Also, it doesn't want to urlencode without putting numbers inside the brackets
+ $response = (new \GuzzleHttp\Client(['base_uri'=>'https://api.stripe.com/v1/']))->request(
+ 'POST',
+ 'customers/'.$token.'/sources/'.$sourceId.'/verify',
+ [
+ 'body' => 'amounts[]='.intval($amount1).'&amounts[]='.intval($amount2),
+ 'headers' => ['content-type' => 'application/x-www-form-urlencoded'],
+ 'auth' => [$accountGateway->getConfig()->apiKey,''],
+ ]
+ );
+ return json_decode($response->getBody(), true);
+ } catch (\GuzzleHttp\Exception\BadResponseException $e) {
+ $response = $e->getResponse();
+ $body = json_decode($response->getBody(), true);
+
+ if ($body && $body['error'] && $body['error']['type'] == 'invalid_request_error') {
+ return $body['error']['message'];
+ }
+
+ return $e->getMessage();
+ }
+ }
+
+ public function removeClientPaymentMethod($client, $sourceId) {
+ $token = $client->getGatewayToken($accountGateway/* return parameter */);
+ if (!$token) {
+ return null;
+ }
+
+ $gateway = $this->createGateway($accountGateway);
+
+ if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
+ $response = $gateway->deleteCard(array('customerReference' => $token, 'cardReference'=>$sourceId))->send();
+ if (!$response->isSuccessful()) {
+ return $response->getMessage();
+ }
+ } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
+
+ }
+
+ return true;
+ }
+
+ public function setClientDefaultPaymentMethod($client, $sourceId) {
+ $token = $client->getGatewayToken($accountGateway/* return parameter */);
+ if (!$token) {
+ return null;
+ }
+
+ $gateway = $this->createGateway($accountGateway);
+
+ if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
+ try{
+ // Omnipay doesn't support setting a default source
+ $response = (new \GuzzleHttp\Client(['base_uri'=>'https://api.stripe.com/v1/']))->request(
+ 'POST',
+ 'customers/'.$token,
+ [
+ 'body' => 'default_card='.$sourceId,
+ 'headers' => ['content-type' => 'application/x-www-form-urlencoded'],
+ 'auth' => [$accountGateway->getConfig()->apiKey,''],
+ ]
+ );
+ return true;
+ } catch (\GuzzleHttp\Exception\BadResponseException $e) {
+ $response = $e->getResponse();
+ $body = json_decode($response->getBody(), true);
+
+ if ($body && $body['error'] && $body['error']['type'] == 'invalid_request_error') {
+ return $body['error']['message'];
+ }
+
+ return $e->getMessage();
+ }
+ } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
+
+ }
+
+ return true;
+ }
+
public function createToken($gateway, $details, $accountGateway, $client, $contactId, &$customerReference = null)
{
+ $customerReference = $client->getGatewayToken();
+
+ if ($customerReference) {
+ $details['customerReference'] = $customerReference;
+
+ $customerResponse = $gateway->fetchCustomer(array('customerReference'=>$customerReference))->send();
+
+ if (!$customerResponse->isSuccessful()){
+ $customerReference = null; // The customer might not exist anymore
+ }
+ }
+
if ($accountGateway->gateway->id == GATEWAY_STRIPE) {
$tokenResponse = $gateway->createCard($details)->send();
$cardReference = $tokenResponse->getCardReference();
@@ -170,10 +323,15 @@ class PaymentService extends BaseService
}
}
} elseif ($accountGateway->gateway->id == GATEWAY_BRAINTREE) {
- $tokenResponse = $gateway->createCustomer(array('customerData'=>array()))->send();
+ if (!$customerReference) {
+ $tokenResponse = $gateway->createCustomer(array('customerData' => array()))->send();
+ if ($tokenResponse->isSuccessful()) {
+ $customerReference = $tokenResponse->getCustomerData()->id;
+ }
+ }
- if ($tokenResponse->isSuccessful()) {
- $details['customerId'] = $customerReference = $tokenResponse->getCustomerData()->id;
+ if ($customerReference) {
+ $details['customerId'] = $customerReference;
$tokenResponse = $gateway->createPaymentMethod($details)->send();
$cardReference = $tokenResponse->getData()->paymentMethod->token;
@@ -264,54 +422,26 @@ class PaymentService extends BaseService
}
if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
- $card = $purchaseResponse->getSource();
- if (!$card) {
- $card = $purchaseResponse->getCard();
- }
+ $data = $purchaseResponse->getData();
+ $source = !empty($data['source'])?$data['source']:$data['card'];
- if ($card) {
- $payment->last4 = $card['last4'];
- $payment->expiration = $card['exp_year'] . '-' . $card['exp_month'] . '-00';
- $stripe_card_types = array(
- 'Visa' => PAYMENT_TYPE_VISA,
- 'American Express' => PAYMENT_TYPE_AMERICAN_EXPRESS,
- 'MasterCard' => PAYMENT_TYPE_MASTERCARD,
- 'Discover' => PAYMENT_TYPE_DISCOVER,
- 'JCB' => PAYMENT_TYPE_JCB,
- 'Diners Club' => PAYMENT_TYPE_DINERS,
- );
+ if ($source) {
+ $payment->last4 = $source['last4'];
- if (!empty($stripe_card_types[$card['brand']])) {
- $payment->payment_type_id = $stripe_card_types[$card['brand']];
- } else {
- $payment->payment_type_id = PAYMENT_TYPE_CREDIT_CARD_OTHER;
+ if ($source['object'] == 'bank_account') {
+ $payment->routing_number = $source['routing_number'];
+ $payment->payment_type_id = PAYMENT_TYPE_ACH;
+ }
+ else{
+ $payment->expiration = $card['exp_year'] . '-' . $card['exp_month'] . '-00';
+ $payment->payment_type_id = $this->parseCardType($card['brand']);
}
}
} elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) {
$card = $purchaseResponse->getData()->transaction->creditCardDetails;
$payment->last4 = $card->last4;
$payment->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00';
-
- $braintree_card_types = array(
- 'Visa' => PAYMENT_TYPE_VISA,
- 'American Express' => PAYMENT_TYPE_AMERICAN_EXPRESS,
- 'MasterCard' => PAYMENT_TYPE_MASTERCARD,
- 'Discover' => PAYMENT_TYPE_DISCOVER,
- 'JCB' => PAYMENT_TYPE_JCB,
- 'Diners Club' => PAYMENT_TYPE_DINERS,
- 'Carte Blanche' => PAYMENT_TYPE_CARTE_BLANCHE,
- 'China UnionPay' => PAYMENT_TYPE_UNIONPAY,
- 'Laser' => PAYMENT_TYPE_LASER,
- 'Maestro' => PAYMENT_TYPE_MAESTRO,
- 'Solo' => PAYMENT_TYPE_SOLO,
- 'Switch' => PAYMENT_TYPE_SWITCH,
- );
-
- if (!empty($braintree_card_types[$card->cardType])) {
- $payment->payment_type_id = $braintree_card_types[$card->cardType];
- } else {
- $payment->payment_type_id = PAYMENT_TYPE_CREDIT_CARD_OTHER;
- }
+ $payment->payment_type_id = $this->parseCardType($card->cardType);
}
if ($payerId) {
@@ -375,6 +505,29 @@ class PaymentService extends BaseService
return $payment;
}
+
+ private function parseCardType($cardName) {
+ $cardTypes = array(
+ 'Visa' => PAYMENT_TYPE_VISA,
+ 'American Express' => PAYMENT_TYPE_AMERICAN_EXPRESS,
+ 'MasterCard' => PAYMENT_TYPE_MASTERCARD,
+ 'Discover' => PAYMENT_TYPE_DISCOVER,
+ 'JCB' => PAYMENT_TYPE_JCB,
+ 'Diners Club' => PAYMENT_TYPE_DINERS,
+ 'Carte Blanche' => PAYMENT_TYPE_CARTE_BLANCHE,
+ 'China UnionPay' => PAYMENT_TYPE_UNIONPAY,
+ 'Laser' => PAYMENT_TYPE_LASER,
+ 'Maestro' => PAYMENT_TYPE_MAESTRO,
+ 'Solo' => PAYMENT_TYPE_SOLO,
+ 'Switch' => PAYMENT_TYPE_SWITCH
+ );
+
+ if (!empty($cardTypes[$cardName])) {
+ return $cardTypes[$cardName];
+ } else {
+ return PAYMENT_TYPE_CREDIT_CARD_OTHER;
+ }
+ }
private function detectCardType($number)
{
@@ -493,12 +646,21 @@ class PaymentService extends BaseService
],
[
'source',
- function ($model) {
+ function ($model) {
if (!$model->last4) return '';
$code = str_replace(' ', '', strtolower($model->payment_type));
$card_type = trans("texts.card_" . $code);
- $expiration = trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($model->expiration, false)->format('m/y')));
- return ' •••'.$model->last4.' '.$expiration;
+ if ($model->payment_type_id != PAYMENT_TYPE_ACH) {
+ $expiration = trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($model->expiration, false)->format('m/y')));
+ return ' •••' . $model->last4 . ' ' . $expiration;
+ } else {
+ $bankData = PaymentController::getBankData($model->routing_number);
+ if (is_array($bankData)) {
+ return $bankData['name'].' •••' . $model->last4;
+ } else {
+ return ' •••' . $model->last4;
+ }
+ }
}
],
[
diff --git a/composer.json b/composer.json
index 8eafa6224f42..01c6a26f51cf 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"omnipay/mollie": "dev-master#22956c1a62a9662afa5f5d119723b413770ac525",
"omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
"omnipay/gocardless": "dev-master",
- "omnipay/stripe": "2.3.2",
+ "omnipay/stripe": "dev-master",
"laravel/framework": "5.2.*",
"laravelcollective/html": "5.2.*",
"laravelcollective/bus": "5.2.*",
@@ -73,7 +73,8 @@
"league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-rackspace": "~1.0",
"barracudanetworks/archivestream-php": "^1.0",
- "omnipay/braintree": "~2.0@dev"
+ "omnipay/braintree": "~2.0@dev",
+ "gatepay/FedACHdir": "dev-master@dev"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
@@ -122,5 +123,23 @@
},
"config": {
"preferred-install": "dist"
- }
+ },
+ "repositories": [
+ {
+ "type": "package",
+ "package": {
+ "name": "gatepay/FedACHdir",
+ "version": "dev-master",
+ "dist": {
+ "url": "https://github.com/gatepay/FedACHdir/archive/master.zip",
+ "type": "zip"
+ },
+ "source": {
+ "url": "git@github.com:gatepay/FedACHdir.git",
+ "type": "git",
+ "reference": "origin/master"
+ }
+ }
+ }
+ ]
}
diff --git a/composer.lock b/composer.lock
index 787493b08070..23b08f2d7e9d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "e2b43d6bd5e87dfb9b3be07e89a2bd9f",
- "content-hash": "480134957ff37fd0f46b5d90909da660",
+ "hash": "039f9d8f2e342f6c05dadb3523883a47",
+ "content-hash": "fd558fd1e187969baf015eab8e288e5b",
"packages": [
{
"name": "agmscode/omnipay-agms",
@@ -2011,6 +2011,17 @@
],
"time": "2015-01-16 08:41:13"
},
+ {
+ "name": "gatepay/FedACHdir",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "git@github.com:gatepay/FedACHdir.git",
+ "reference": "origin/master"
+ },
+ "type": "library",
+ "time": "2016-04-29 12:01:22"
+ },
{
"name": "guzzle/guzzle",
"version": "v3.8.1",
@@ -5771,16 +5782,16 @@
},
{
"name": "omnipay/stripe",
- "version": "v2.3.2",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/omnipay-stripe.git",
- "reference": "fe05ddd73d9ae38ca026dbc270ca98aaf3f99da4"
+ "reference": "0ea7a647ee01e29c152814e11c2ea6307e5b0db9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/fe05ddd73d9ae38ca026dbc270ca98aaf3f99da4",
- "reference": "fe05ddd73d9ae38ca026dbc270ca98aaf3f99da4",
+ "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/0ea7a647ee01e29c152814e11c2ea6307e5b0db9",
+ "reference": "0ea7a647ee01e29c152814e11c2ea6307e5b0db9",
"shasum": ""
},
"require": {
@@ -5824,7 +5835,7 @@
"payment",
"stripe"
],
- "time": "2016-03-19 08:35:06"
+ "time": "2016-04-26 08:34:50"
},
{
"name": "omnipay/targetpay",
@@ -9985,6 +9996,7 @@
"omnipay/mollie": 20,
"omnipay/2checkout": 20,
"omnipay/gocardless": 20,
+ "omnipay/stripe": 20,
"anahkiasen/former": 20,
"chumper/datatable": 20,
"intervention/image": 20,
@@ -10005,7 +10017,8 @@
"labs7in0/omnipay-wechat": 20,
"laracasts/presenter": 20,
"jlapp/swaggervel": 20,
- "omnipay/braintree": 20
+ "omnipay/braintree": 20,
+ "gatepay/fedachdir": 20
},
"prefer-stable": false,
"prefer-lowest": false,
diff --git a/public/images/credit_cards/ach.png b/public/images/credit_cards/ach.png
new file mode 100644
index 000000000000..16cf86bdb3ec
Binary files /dev/null and b/public/images/credit_cards/ach.png differ
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 467e836a2820..83fdb5481daa 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -502,7 +502,7 @@ $LANG = array(
'resend_confirmation' => 'Resend confirmation email',
'confirmation_resent' => 'The confirmation email was resent',
'gateway_help_42' => ':link to sign up for BitPay.Note: use a Legacy API Key, not an API token.', - 'payment_type_credit_card' => 'Other Providers', + 'payment_type_credit_card' => 'Credit Card', 'payment_type_paypal' => 'PayPal', 'payment_type_bitcoin' => 'Bitcoin', 'knowledge_base' => 'Knowledge Base', @@ -1205,6 +1205,7 @@ $LANG = array( 'card_solo' => 'Solo', 'card_switch' => 'Switch', 'card_visacard' => 'Visa', + 'card_ach' => 'ACH', 'payment_type_stripe' => 'Stripe', 'ach' => 'ACH', @@ -1218,6 +1219,39 @@ $LANG = array( 'public_key' => 'Public Key', 'plaid_optional' => '(optional)', 'plaid_environment_help' => 'When a Stripe test key is given, Plaid\'s development environement (tartan) will be used.', + 'other_providers' => 'Other Providers', + 'country_not_supported' => 'That country is not supported.', + 'invalid_routing_number' => 'The routing number is not valid.', + 'invalid_account_number' => 'The account number is not valid.', + 'account_number_mismatch' => 'The account numbers do not match.', + 'missing_account_holder_type' => 'Please select an individual or company account.', + 'missing_account_holder_name' => 'Please enter the account holder\'s name.', + 'routing_number' => 'Routing Number', + 'confirm_account_number' => 'Confirm Account Number', + 'individual_account' => 'Individual Account', + 'company_account' => 'Company Account', + 'account_holder_name' => 'Account Holder Name', + 'add_account' => 'Add Account', + 'payment_methods' => 'Payment Methods', + 'complete_verification' => 'Complete Verification', + 'verification_amount1' => 'Amount 1', + 'verification_amount2' => 'Amount 2', + 'payment_method_verified' => 'Verification completed successfully', + 'verification_failed' => 'Verification Failed', + 'remove_payment_method' => 'Remove Payment Method', + 'confirm_remove_payment_method' => 'Are you sure you want to remove this payment method?', + 'remove' => 'Remove', + 'payment_method_removed' => 'Removed payment method.', + 'bank_account_verification_help' => 'We have made two deposits into your account with the description "VERIFICATION". These deposits will take 1-2 business days to appear on your statement. Please enter the amounts below.', + 'bank_account_verification_next_steps' => 'We have made two deposits into your account with the description "VERIFICATION". These deposits will take 1-2 business days to appear on your statement. + Once you have the amounts, come back to this payment methods page and click "Complete Verification" next to the account.', + 'unknown_bank' => 'Unknown Bank', + 'ach_verification_delay_help' => 'You will be able to use the account after completing verification. Verification usually takes 1-2 business days.', + 'add_credit_card' => 'Add Credit Card', + 'payment_method_added' => 'Added payment method.', + 'use_for_auto_bill' => 'Use For Autobill', + 'used_for_auto_bill' => 'Autobill Payment Method', + 'payment_method_set_as_default' => 'Set Autobill payment method.' ); return $LANG; diff --git a/resources/views/clientauth/login.blade.php b/resources/views/clientauth/login.blade.php index 6ad28a593831..e5baee7c05aa 100644 --- a/resources/views/clientauth/login.blade.php +++ b/resources/views/clientauth/login.blade.php @@ -69,7 +69,7 @@ {{ Former::populateField('remember', 'true') }}
- @if (!isset($hideLogo) || !$hideLogo)
+ @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL))
 }})
Invoice Ninja | {{ trans('texts.account_login') }}
diff --git a/resources/views/clientauth/password.blade.php b/resources/views/clientauth/password.blade.php index 79fc36a9a775..9b08937ed1bd 100644 --- a/resources/views/clientauth/password.blade.php +++ b/resources/views/clientauth/password.blade.php @@ -54,7 +54,7 @@ {!! Former::open('client/recover_password')->addClass('form-signin') !!}
- @if (!isset($hideLogo) || !$hideLogo)
+ @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL))
Invoice Ninja | {{ trans('texts.password_recovery') }}
diff --git a/resources/views/clientauth/reset.blade.php b/resources/views/clientauth/reset.blade.php index bd2f5f2d2bec..f8f0924a0cbc 100644 --- a/resources/views/clientauth/reset.blade.php +++ b/resources/views/clientauth/reset.blade.php @@ -58,7 +58,7 @@ )) !!}
- @if (!isset($hideLogo) || !$hideLogo)
+ @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL))
{{ trans('texts.client_portal') }}
@else
{{ isset($title) ? ($title . ' | Invoice Ninja') : ('Invoice Ninja | ' . trans('texts.app_title')) }}
diff --git a/resources/views/payments/add_paymentmethod.blade.php b/resources/views/payments/add_paymentmethod.blade.php
new file mode 100644
index 000000000000..1f1a08bc8b10
--- /dev/null
+++ b/resources/views/payments/add_paymentmethod.blade.php
@@ -0,0 +1,611 @@
+@extends('public.header')
+
+@section('head')
+ @parent
+ @if (!empty($braintreeClientToken))
+
+
+ @elseif ($accountGateway->getPublishableStripeKey())
+
+
+ @else
+
+ @endif
+
+@stop
+
+@section('content')
+
+ @include('payments.payment_css')
+
+
+ @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+ {!! Former::vertical_open($url)
+ ->autocomplete('on')
+ ->addClass('payment-form')
+ ->id('payment-form')
+ ->rules(array(
+ 'first_name' => 'required',
+ 'last_name' => 'required',
+ 'account_number' => 'required',
+ 'routing_number' => 'required',
+ 'account_holder_name' => 'required',
+ 'account_holder_type' => 'required'
+ )) !!}
+ @else
+ {!! Former::vertical_open($url)
+ ->autocomplete('on')
+ ->addClass('payment-form')
+ ->id('payment-form')
+ ->rules(array(
+ 'first_name' => 'required',
+ 'last_name' => 'required',
+ 'card_number' => 'required',
+ 'expiration_month' => 'required',
+ 'expiration_year' => 'required',
+ 'cvv' => 'required',
+ 'address1' => 'required',
+ 'city' => 'required',
+ 'state' => 'required',
+ 'postal_code' => 'required',
+ 'country_id' => 'required',
+ 'phone' => 'required',
+ 'email' => 'required|email'
+ )) !!}
+ @endif
+
+ @if ($client)
+ {{ Former::populate($client) }}
+ {{ Former::populateField('first_name', $contact->first_name) }}
+ {{ Former::populateField('last_name', $contact->last_name) }}
+ @if (!$client->country_id && $client->account->country_id)
+ {{ Former::populateField('country_id', $client->account->country_id) }}
+ {{ Former::populateField('country', $client->account->country->iso_3166_2) }}
+ @endif
+ @if (!$client->currency_id && $client->account->currency_id)
+ {{ Former::populateField('currency_id', $client->account->currency_id) }}
+ {{ Former::populateField('currency', $client->account->currency->code) }}
+ @endif
+ @endif
+
+ @if (Utils::isNinjaDev())
+ {{ Former::populateField('first_name', 'Test') }}
+ {{ Former::populateField('last_name', 'Test') }}
+ {{ Former::populateField('address1', '350 5th Ave') }}
+ {{ Former::populateField('city', 'New York') }}
+ {{ Former::populateField('state', 'NY') }}
+ {{ Former::populateField('postal_code', '10118') }}
+ {{ Former::populateField('country_id', 840) }}
+ @endif
+
+
+
Invoice Ninja | {{ trans('texts.set_password') }}
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php index 13d83c3746cf..f6aebb6cb78b 100644 --- a/resources/views/invoices/view.blade.php +++ b/resources/views/invoices/view.blade.php @@ -14,6 +14,12 @@ body { background-color: #f8f8f8; } + + .dropdown-menu li a{ + overflow:hidden; + margin-top:5px; + margin-bottom:5px; + } @stop diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 0cdb55ea5573..ea6ab96ef6d6 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -1,7 +1,7 @@ - @if (isset($hideLogo) && $hideLogo) + @if (isset($account) && $account->hasFeature(FEATURE_WHITE_LABEL))
+
+
+ {!! Former::close() !!}
+
+
+
+@stop
\ No newline at end of file
diff --git a/resources/views/payments/payment.blade.php b/resources/views/payments/payment.blade.php
index d11c09416e83..6d54eac19a00 100644
--- a/resources/views/payments/payment.blade.php
+++ b/resources/views/payments/payment.blade.php
@@ -67,6 +67,14 @@
var $form = $(this);
var data = {
+ @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+ account_holder_name: $('#account_holder_name').val(),
+ account_holder_type: $('[name=account_holder_type]:checked').val(),
+ currency: $("#currency").val(),
+ country: $("#country").val(),
+ routing_number: $('#routing_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, ''),
+ account_number: $('#account_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '')
+ @else
name: $('#first_name').val() + ' ' + $('#last_name').val(),
address_line1: $('#address1').val(),
address_line2: $('#address2').val(),
@@ -78,27 +86,56 @@
cvc: $('#cvv').val(),
exp_month: $('#expiration_month').val(),
exp_year: $('#expiration_year').val()
+ @endif
};
- // Validate the card details
- if (!Stripe.card.validateCardNumber(data.number)) {
- $('#js-error-message').html('{{ trans('texts.invalid_card_number') }}').fadeIn();
- return false;
- }
- if (!Stripe.card.validateExpiry(data.exp_month, data.exp_year)) {
- $('#js-error-message').html('{{ trans('texts.invalid_expiry') }}').fadeIn();
- return false;
- }
- if (!Stripe.card.validateCVC(data.cvc)) {
- $('#js-error-message').html('{{ trans('texts.invalid_cvv') }}').fadeIn();
- return false;
- }
+ @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+ // Validate the account details
+ if (!data.account_holder_type) {
+ $('#js-error-message').html('{{ trans('texts.missing_account_holder_type') }}').fadeIn();
+ return false;
+ }
+ if (!data.account_holder_name) {
+ $('#js-error-message').html('{{ trans('texts.missing_account_holder_name') }}').fadeIn();
+ return false;
+ }
+ if (!data.routing_number || !Stripe.bankAccount.validateRoutingNumber(data.routing_number, data.country)) {
+ $('#js-error-message').html('{{ trans('texts.invalid_routing_number') }}').fadeIn();
+ return false;
+ }
+ if (data.account_number != $('#confirm_account_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '')) {
+ $('#js-error-message').html('{{ trans('texts.account_number_mismatch') }}').fadeIn();
+ return false;
+ }
+ if (!data.account_number || !Stripe.bankAccount.validateAccountNumber(data.account_number, data.country)) {
+ $('#js-error-message').html('{{ trans('texts.invalid_account_number') }}').fadeIn();
+ return false;
+ }
+ @else
+ // Validate the card details
+ if (!Stripe.card.validateCardNumber(data.number)) {
+ $('#js-error-message').html('{{ trans('texts.invalid_card_number') }}').fadeIn();
+ return false;
+ }
+ if (!Stripe.card.validateExpiry(data.exp_month, data.exp_year)) {
+ $('#js-error-message').html('{{ trans('texts.invalid_expiry') }}').fadeIn();
+ return false;
+ }
+ if (!Stripe.card.validateCVC(data.cvc)) {
+ $('#js-error-message').html('{{ trans('texts.invalid_cvv') }}').fadeIn();
+ return false;
+ }
+ @endif
// Disable the submit button to prevent repeated clicks
$form.find('button').prop('disabled', true);
$('#js-error-message').hide();
-
+
+ @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+ Stripe.bankAccount.createToken(data, stripeResponseHandler);
+ @else
Stripe.card.createToken(data, stripeResponseHandler);
+ @endif
// Prevent the form from submitting with the default action
return false;
@@ -111,6 +148,11 @@
if (response.error) {
// Show the errors on the form
var error = response.error.message;
+ @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+ if(response.error.param == 'bank_account[country]') {
+ error = "{{trans('texts.country_not_supported')}}";
+ }
+ @endif
$form.find('button').prop('disabled', false);
$('#js-error-message').html(error).fadeIn();
} else {
@@ -144,6 +186,21 @@
@include('payments.payment_css')
+
+@if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+{!! Former::vertical_open($url)
+ ->autocomplete('on')
+ ->addClass('payment-form')
+ ->id('payment-form')
+ ->rules(array(
+ 'first_name' => 'required',
+ 'last_name' => 'required',
+ 'account_number' => 'required',
+ 'routing_number' => 'required',
+ 'account_holder_name' => 'required',
+ 'account_holder_type' => 'required'
+ )) !!}
+@else
{!! Former::vertical_open($url)
->autocomplete('on')
->addClass('payment-form')
@@ -163,6 +220,7 @@
'phone' => 'required',
'email' => 'required|email'
)) !!}
+@endif
@if ($client)
{{ Former::populate($client) }}
@@ -170,6 +228,11 @@
{{ Former::populateField('last_name', $contact->last_name) }}
@if (!$client->country_id && $client->account->country_id)
{{ Former::populateField('country_id', $client->account->country_id) }}
+ {{ Former::populateField('country', $client->account->country->iso_3166_2) }}
+ @endif
+ @if (!$client->currency_id && $client->account->currency_id)
+ {{ Former::populateField('currency_id', $client->account->currency_id) }}
+ {{ Former::populateField('currency', $client->account->currency->code) }}
@endif
@endif
@@ -243,7 +306,10 @@
+ +
+
+
+
+
+
+
+
+
+
+
+
+ @if ($client)
+ {{ $paymentTitle }}
+ @endif
+
+
+ {{ $client->getDisplayName() }}
+ @if(isset($invoiceNumber)) +{{ trans('texts.invoice') . ' ' . $invoiceNumber }}| {{ trans('texts.amount_due') }}: {{ $account->formatMoney($amount, $client, true) }}
+ @endif + @elseif ($paymentTitle) +{{ $paymentTitle }}
{{ $paymentSubtitle }}
+ @endif
+
+ @if (Request::secure() || Utils::isNinjaDev())
+
+
+
+ @endif
+ {{ trans('texts.secure_payment') }}
+{{ trans('texts.256_encryption') }}
+
+
+ {!! Button::success(strtoupper(trans('texts.add_account')))
+ ->submit()
+ ->large() !!}
+
+ @else
+
+ @if(isset($amount))
+ {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, true) ))
+ ->submit()
+ ->large() !!}
+ @else
+ {!! Button::success(strtoupper(trans('texts.add_credit_card') ))
+ ->submit()
+ ->large() !!}
+ @endif
+
+
+
+ {{ trans('texts.contact_information') }}
+
+
+ @if (isset($paymentTitle))
+
+ {!! Former::text('first_name')
+ ->placeholder(trans('texts.first_name'))
+ ->autocomplete('given-name')
+ ->label('') !!}
+
+
+ {!! Former::text('last_name')
+ ->placeholder(trans('texts.last_name'))
+ ->autocomplete('family-name')
+ ->label('') !!}
+
+
+
+ @endif
+
+
+ {!! Former::text('email')
+ ->placeholder(trans('texts.email'))
+ ->autocomplete('email')
+ ->label('') !!}
+
+
{{ trans('texts.billing_address') }} + @if($paymentType != PAYMENT_TYPE_STRIPE_ACH) + {{ trans('texts.payment_footer1') }}
+ @endif +
+
+
+ {!! Former::text('address1')
+ ->autocomplete('address-line1')
+ ->placeholder(trans('texts.address1'))
+ ->label('') !!}
+
+
+ {!! Former::text('address2')
+ ->autocomplete('address-line2')
+ ->placeholder(trans('texts.address2'))
+ ->label('') !!}
+
+
+
+
+ {!! Former::text('city')
+ ->autocomplete('address-level2')
+ ->placeholder(trans('texts.city'))
+ ->label('') !!}
+
+
+ {!! Former::text('state')
+ ->autocomplete('address-level1')
+ ->placeholder(trans('texts.state'))
+ ->label('') !!}
+
+
+
+
+
+ {!! Former::text('postal_code')
+ ->autocomplete('postal-code')
+ ->placeholder(trans('texts.postal_code'))
+ ->label('') !!}
+
+
+ {!! Former::select('country_id')
+ ->placeholder(trans('texts.country_id'))
+ ->fromQuery($countries, 'name', 'id')
+ ->addGroupClass('country-select')
+ ->label('') !!}
+
+
{{ trans('texts.billing_method') }}
+ + + + @if($paymentType == PAYMENT_TYPE_STRIPE_ACH) +{{ trans('texts.ach_verification_delay_help') }}
+
+
+
+
+
+ {!! Former::radios('account_holder_type')->radios(array(
+ trans('texts.individual_account') => array('value' => 'individual'),
+ trans('texts.company_account') => array('value' => 'company'),
+ ))->inline()->label(''); !!}
+
+
+ {!! Former::text('account_holder_name')
+ ->placeholder(trans('texts.account_holder_name'))
+ ->label('') !!}
+
+
+
+
+ {!! Former::select('country')
+ ->placeholder(trans('texts.country_id'))
+ ->fromQuery($countries, 'name', 'iso_3166_2')
+ ->addGroupClass('country-select')
+ ->label('') !!}
+
+
+ {!! Former::select('currency')
+ ->placeholder(trans('texts.currency_id'))
+ ->fromQuery($currencies, 'name', 'code')
+ ->addGroupClass('currency-select')
+ ->label('') !!}
+
+
+
+
+ {!! Former::text('')
+ ->id('routing_number')
+ ->placeholder(trans('texts.routing_number'))
+ ->label('') !!}
+
+
+
+
+
+
+
+ {!! Former::text('')
+ ->id('account_number')
+ ->placeholder(trans('texts.account_number'))
+ ->label('') !!}
+
+
+ {!! Former::text('')
+ ->id('confirm_account_number')
+ ->placeholder(trans('texts.confirm_account_number'))
+ ->label('') !!}
+
+
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::text($accountGateway->getPublishableStripeKey() ? '' : 'card_number')
+ ->id('card_number')
+ ->placeholder(trans('texts.card_number'))
+ ->autocomplete('cc-number')
+ ->label('') !!}
+ @endif
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::text($accountGateway->getPublishableStripeKey() ? '' : 'cvv')
+ ->id('cvv')
+ ->placeholder(trans('texts.cvv'))
+ ->autocomplete('off')
+ ->label('') !!}
+ @endif
+
+
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::select($accountGateway->getPublishableStripeKey() ? '' : 'expiration_month')
+ ->id('expiration_month')
+ ->autocomplete('cc-exp-month')
+ ->placeholder(trans('texts.expiration_month'))
+ ->addOption('01 - January', '1')
+ ->addOption('02 - February', '2')
+ ->addOption('03 - March', '3')
+ ->addOption('04 - April', '4')
+ ->addOption('05 - May', '5')
+ ->addOption('06 - June', '6')
+ ->addOption('07 - July', '7')
+ ->addOption('08 - August', '8')
+ ->addOption('09 - September', '9')
+ ->addOption('10 - October', '10')
+ ->addOption('11 - November', '11')
+ ->addOption('12 - December', '12')->label('')
+ !!}
+ @endif
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::select($accountGateway->getPublishableStripeKey() ? '' : 'expiration_year')
+ ->id('expiration_year')
+ ->autocomplete('cc-exp-year')
+ ->placeholder(trans('texts.expiration_year'))
+ ->addOption('2016', '2016')
+ ->addOption('2017', '2017')
+ ->addOption('2018', '2018')
+ ->addOption('2019', '2019')
+ ->addOption('2020', '2020')
+ ->addOption('2021', '2021')
+ ->addOption('2022', '2022')
+ ->addOption('2023', '2023')
+ ->addOption('2024', '2024')
+ ->addOption('2025', '2025')
+ ->addOption('2026', '2026')->label('')
+ !!}
+ @endif
+
+
+
+
+
+ @if (isset($amount) && $client && $account->showTokenCheckbox($storageGateway/* will contain gateway id */))
+ selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top">
+
+
+ @if ($storageGateway == GATEWAY_STRIPE)
+ {!! trans('texts.token_billing_secure', ['link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) !!}
+ @elseif ($storageGateway == GATEWAY_BRAINTREE)
+ {!! trans('texts.token_billing_secure', ['link' => link_to('https://www.braintreepayments.com/', 'Braintree', ['target' => '_blank'])]) !!}
+ @endif
+
+ @endif
+
+
+
+ @if (isset($acceptedCreditCardTypes))
+
+
+ @foreach ($acceptedCreditCardTypes as $card)
+ ![{{ $card['alt'] }}]({{ $card['source'] }})
+ @endforeach
+
+ @endif
+ +
+ @endif + + +
+
+ +
{{ trans('texts.billing_address') }} {{ trans('texts.payment_footer1') }}
+{{ trans('texts.billing_address') }} + @if($paymentType != PAYMENT_TYPE_STRIPE_ACH) + {{ trans('texts.payment_footer1') }}
+ @endif
{!! Former::text('address1')
@@ -292,113 +358,178 @@
@endif
{{ trans('texts.billing_method') }}
-
-
-
- @if (!empty($braintreeClientToken))
-
- @else
- {!! Former::text($accountGateway->getPublishableStripeKey() ? '' : 'card_number')
- ->id('card_number')
- ->placeholder(trans('texts.card_number'))
- ->autocomplete('cc-number')
- ->label('') !!}
- @endif
-
-
- @if (!empty($braintreeClientToken))
-
- @else
- {!! Former::text($accountGateway->getPublishableStripeKey() ? '' : 'cvv')
- ->id('cvv')
- ->placeholder(trans('texts.cvv'))
- ->autocomplete('off')
- ->label('') !!}
- @endif
-
-
-
-
- @if (!empty($braintreeClientToken))
-
- @else
- {!! Former::select($accountGateway->getPublishableStripeKey() ? '' : 'expiration_month')
- ->id('expiration_month')
- ->autocomplete('cc-exp-month')
- ->placeholder(trans('texts.expiration_month'))
- ->addOption('01 - January', '1')
- ->addOption('02 - February', '2')
- ->addOption('03 - March', '3')
- ->addOption('04 - April', '4')
- ->addOption('05 - May', '5')
- ->addOption('06 - June', '6')
- ->addOption('07 - July', '7')
- ->addOption('08 - August', '8')
- ->addOption('09 - September', '9')
- ->addOption('10 - October', '10')
- ->addOption('11 - November', '11')
- ->addOption('12 - December', '12')->label('')
- !!}
- @endif
-
-
- @if (!empty($braintreeClientToken))
-
- @else
- {!! Former::select($accountGateway->getPublishableStripeKey() ? '' : 'expiration_year')
- ->id('expiration_year')
- ->autocomplete('cc-exp-year')
- ->placeholder(trans('texts.expiration_year'))
- ->addOption('2016', '2016')
- ->addOption('2017', '2017')
- ->addOption('2018', '2018')
- ->addOption('2019', '2019')
- ->addOption('2020', '2020')
- ->addOption('2021', '2021')
- ->addOption('2022', '2022')
- ->addOption('2023', '2023')
- ->addOption('2024', '2024')
- ->addOption('2025', '2025')
- ->addOption('2026', '2026')->label('')
- !!}
- @endif
-
-
-
').add(document.createTextNode(data.city + ", " + data.state)); + routingNumberCache[routingNumber] = els; + + // Still the same number? + if (routingNumber == $('#routing_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '')) { + $('#bank_name').empty().append(els).show(); + } + }, + error:function(xhr) { + if (xhr.status == 404) { + var els = $(document.createTextNode('{{trans('texts.unknown_bank')}}')); + ; + routingNumberCache[routingNumber] = els; + + // Still the same number? + if (routingNumber == $('#routing_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '')) { + $('#bank_name').empty().append(els).show(); + } + } + } + }) + } + },10)}) }); diff --git a/resources/views/payments/paymentmethods.blade.php b/resources/views/payments/paymentmethods.blade.php new file mode 100644 index 000000000000..1a368ebc8412 --- /dev/null +++ b/resources/views/payments/paymentmethods.blade.php @@ -0,0 +1,149 @@ +@extends('public.header') + +@section('content') + + + }})
@endif
- @if ($client && $account->showTokenCheckbox($storageGateway/* will contain gateway id */))
- selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top">
-
-
- @if ($storageGateway == GATEWAY_STRIPE)
- {!! trans('texts.token_billing_secure', ['link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) !!}
- @elseif ($storageGateway == GATEWAY_BRAINTREE)
- {!! trans('texts.token_billing_secure', ['link' => link_to('https://www.braintreepayments.com/', 'Braintree', ['target' => '_blank'])]) !!}
- @endif
-
- @endif
-
-
- @if (isset($acceptedCreditCardTypes))
-
+ {!! Button::success(strtoupper(trans('texts.add_account')))
+ ->submit()
+ ->large() !!}
+
+ @else
+
- {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, true) ))
- ->submit()
- ->large() !!}
-
-
+ {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, true) ))
+ ->submit()
+ ->large() !!}
+
+
@@ -422,7 +553,47 @@
});
$('#country_id').combobox();
+ $('#country').combobox();
+ $('#currency').combobox();
$('#first_name').focus();
+
+ var routingNumberCache = {};
+ $('#routing_number, #country').on('change keypress keyup keydown paste', function(){setTimeout(function () {
+ var routingNumber = $('#routing_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+
+ if (routingNumber.length != 9 || $("#country").val() != 'US' || routingNumberCache[routingNumber] === false) {
+ $('#bank_name').hide();
+ } else if (routingNumberCache[routingNumber]) {
+ $('#bank_name').empty().append(routingNumberCache[routingNumber]).show();
+ } else {
+ routingNumberCache[routingNumber] = false;
+ $('#bank_name').hide();
+ $.ajax({
+ url:"{{ URL::to('/bank') }}/" + routingNumber,
+ success:function(data) {
+ var els = $().add(document.createTextNode(data.name)).add('
- @foreach ($acceptedCreditCardTypes as $card)
-
- @endforeach
+ @if($paymentType == PAYMENT_TYPE_STRIPE_ACH)
+
+ {{ trans('texts.ach_verification_delay_help') }}
+
+
-
+
+
+ {!! Former::radios('account_holder_type')->radios(array(
+ trans('texts.individual_account') => array('value' => 'individual'),
+ trans('texts.company_account') => array('value' => 'company'),
+ ))->inline()->label(''); !!}
+
+
+ {!! Former::text('account_holder_name')
+ ->placeholder(trans('texts.account_holder_name'))
+ ->label('') !!}
- @endif
+
+
+ {!! Former::select('country')
+ ->placeholder(trans('texts.country_id'))
+ ->fromQuery($countries, 'name', 'iso_3166_2')
+ ->addGroupClass('country-select')
+ ->label('') !!}
+
+
+ {!! Former::select('currency')
+ ->placeholder(trans('texts.currency_id'))
+ ->fromQuery($currencies, 'name', 'code')
+ ->addGroupClass('currency-select')
+ ->label('') !!}
+
+
+
+
+ {!! Former::text('')
+ ->id('routing_number')
+ ->placeholder(trans('texts.routing_number'))
+ ->label('') !!}
+
+
+
+
+
+
+
+ {!! Former::text('')
+ ->id('account_number')
+ ->placeholder(trans('texts.account_number'))
+ ->label('') !!}
+
+
+ {!! Former::text('')
+ ->id('confirm_account_number')
+ ->placeholder(trans('texts.confirm_account_number'))
+ ->label('') !!}
+
+
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::text($accountGateway->getPublishableStripeKey() ? '' : 'card_number')
+ ->id('card_number')
+ ->placeholder(trans('texts.card_number'))
+ ->autocomplete('cc-number')
+ ->label('') !!}
+ @endif
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::text($accountGateway->getPublishableStripeKey() ? '' : 'cvv')
+ ->id('cvv')
+ ->placeholder(trans('texts.cvv'))
+ ->autocomplete('off')
+ ->label('') !!}
+ @endif
+
+
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::select($accountGateway->getPublishableStripeKey() ? '' : 'expiration_month')
+ ->id('expiration_month')
+ ->autocomplete('cc-exp-month')
+ ->placeholder(trans('texts.expiration_month'))
+ ->addOption('01 - January', '1')
+ ->addOption('02 - February', '2')
+ ->addOption('03 - March', '3')
+ ->addOption('04 - April', '4')
+ ->addOption('05 - May', '5')
+ ->addOption('06 - June', '6')
+ ->addOption('07 - July', '7')
+ ->addOption('08 - August', '8')
+ ->addOption('09 - September', '9')
+ ->addOption('10 - October', '10')
+ ->addOption('11 - November', '11')
+ ->addOption('12 - December', '12')->label('')
+ !!}
+ @endif
+
+
+ @if (!empty($braintreeClientToken))
+
+ @else
+ {!! Former::select($accountGateway->getPublishableStripeKey() ? '' : 'expiration_year')
+ ->id('expiration_year')
+ ->autocomplete('cc-exp-year')
+ ->placeholder(trans('texts.expiration_year'))
+ ->addOption('2016', '2016')
+ ->addOption('2017', '2017')
+ ->addOption('2018', '2018')
+ ->addOption('2019', '2019')
+ ->addOption('2020', '2020')
+ ->addOption('2021', '2021')
+ ->addOption('2022', '2022')
+ ->addOption('2023', '2023')
+ ->addOption('2024', '2024')
+ ->addOption('2025', '2025')
+ ->addOption('2026', '2026')->label('')
+ !!}
+ @endif
+
+
+
-
+ @if ($client && $account->showTokenCheckbox($storageGateway/* will contain gateway id */))
+ selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top">
+
+
+ @if ($storageGateway == GATEWAY_STRIPE)
+ {!! trans('texts.token_billing_secure', ['link' => link_to('https://stripe.com/', 'Stripe.com', ['target' => '_blank'])]) !!}
+ @elseif ($storageGateway == GATEWAY_BRAINTREE)
+ {!! trans('texts.token_billing_secure', ['link' => link_to('https://www.braintreepayments.com/', 'Braintree', ['target' => '_blank'])]) !!}
+ @endif
+
+ @endif
+
+
+ @if (isset($acceptedCreditCardTypes))
+
+
+ @foreach ($acceptedCreditCardTypes as $card)
+
+ @endforeach
+
+ @endif
+ -
+
+
+ @endif
').add(document.createTextNode(data.city + ", " + data.state)); + routingNumberCache[routingNumber] = els; + + // Still the same number? + if (routingNumber == $('#routing_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '')) { + $('#bank_name').empty().append(els).show(); + } + }, + error:function(xhr) { + if (xhr.status == 404) { + var els = $(document.createTextNode('{{trans('texts.unknown_bank')}}')); + ; + routingNumberCache[routingNumber] = els; + + // Still the same number? + if (routingNumber == $('#routing_number').val().replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '')) { + $('#bank_name').empty().append(els).show(); + } + } + } + }) + } + },10)}) }); diff --git a/resources/views/payments/paymentmethods.blade.php b/resources/views/payments/paymentmethods.blade.php new file mode 100644 index 000000000000..1a368ebc8412 --- /dev/null +++ b/resources/views/payments/paymentmethods.blade.php @@ -0,0 +1,149 @@ +@extends('public.header') + +@section('content') + + +
+
+
+ {!! Button::success(strtoupper(trans('texts.add_credit_card')))
+ ->asLinkTo(URL::to('/client/paymentmethods/add/'.($gateway->getPaymentType() == PAYMENT_TYPE_STRIPE ? 'stripe_credit_card' : 'credit_card'))) !!}
+ @if($gateway->getACHEnabled())
+
+ {!! Button::success(strtoupper(trans('texts.add_bank_account')))
+ ->asLinkTo(URL::to('/client/paymentmethods/add/stripe_ach')) !!}
+ @endif
+
+
+
+
+
+
+
+ {!! Former::open(URL::to('/client/paymentmethods/default'))->id('defaultSourceForm') !!}
+
+ {!! Former::close() !!}
+
+
+@stop
\ No newline at end of file
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index 4f753b4a8d3e..d760747c33e8 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -7,9 +7,7 @@
@endif
- @if (!empty($clientViewCSS))
-
- @endif
+
@stop
@section('body')
@@ -68,15 +66,15 @@
- @if (!isset($hideLogo) || !$hideLogo)
+ @if (!isset($account) || !$account->hasFeature(FEATURE_WHITE_LABEL))
{{-- Per our license, please do not remove or modify this link. --}}
{{ $title }}
+ + @foreach ($paymentMethods as $paymentMethod) +
+
+ .'.png'))}})
name)))}}">
+
+ •••••{{$paymentMethod['last4']}}
+
+ @if($paymentMethod['type']->id == PAYMENT_TYPE_ACH)
+ {{ $paymentMethod['bank_name'] }}
+ @if($paymentMethod['status'] == 'new')
+ ({{trans('texts.complete_verification')}})
+ @elseif($paymentMethod['status'] == 'verification_failed')
+ ({{trans('texts.verification_failed')}})
+ @endif
+ @else
+ {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))) !!}
+ @endif
+ @if($paymentMethod['default'])
+ ({{trans('texts.used_for_auto_bill')}})
+ @elseif($paymentMethod['type']->id != PAYMENT_TYPE_ACH || $paymentMethod['status'] == 'verified')
+ ({{trans('texts.use_for_auto_bill')}})
+ @endif
+ ×
+
+ @endforeach
+
+ name)))}}">
+
+ •••••{{$paymentMethod['last4']}}
+
+ @if($paymentMethod['type']->id == PAYMENT_TYPE_ACH)
+ {{ $paymentMethod['bank_name'] }}
+ @if($paymentMethod['status'] == 'new')
+ ({{trans('texts.complete_verification')}})
+ @elseif($paymentMethod['status'] == 'verification_failed')
+ ({{trans('texts.verification_failed')}})
+ @endif
+ @else
+ {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))) !!}
+ @endif
+ @if($paymentMethod['default'])
+ ({{trans('texts.used_for_auto_bill')}})
+ @elseif($paymentMethod['type']->id != PAYMENT_TYPE_ACH || $paymentMethod['status'] == 'verified')
+ ({{trans('texts.use_for_auto_bill')}})
+ @endif
+ ×
+
@endif