From b8170f0324018c0ed6a7e9f692bf305787c80906 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Sat, 23 Apr 2016 16:40:19 -0400 Subject: [PATCH 01/37] Support refunds from the admin UI --- app/Events/PaymentWasRefunded.php | 25 +++++ app/Http/Controllers/AccountController.php | 9 +- app/Http/Controllers/PaymentController.php | 6 +- .../Controllers/PublicClientController.php | 33 +++++- app/Http/routes.php | 7 ++ app/Listeners/ActivityListener.php | 13 +++ app/Listeners/CreditListener.php | 20 +++- app/Listeners/InvoiceListener.php | 15 ++- app/Models/Activity.php | 2 + app/Models/Payment.php | 52 +++++++++ app/Models/PaymentStatus.php | 8 ++ app/Ninja/Repositories/ActivityRepository.php | 1 + app/Ninja/Repositories/PaymentRepository.php | 16 ++- app/Providers/EventServiceProvider.php | 5 + app/Services/ActivityService.php | 4 +- app/Services/PaymentService.php | 104 ++++++++++++++++++ .../2016_04_23_182223_payments_changes.php | 49 +++++++++ database/seeds/DatabaseSeeder.php | 1 + database/seeds/PaymentStatusSeeder.php | 36 ++++++ database/seeds/UpdateSeeder.php | 1 + resources/lang/en/texts.php | 14 +++ resources/views/list.blade.php | 56 +++++++++- 22 files changed, 457 insertions(+), 20 deletions(-) create mode 100644 app/Events/PaymentWasRefunded.php create mode 100644 app/Models/PaymentStatus.php create mode 100644 database/migrations/2016_04_23_182223_payments_changes.php create mode 100644 database/seeds/PaymentStatusSeeder.php diff --git a/app/Events/PaymentWasRefunded.php b/app/Events/PaymentWasRefunded.php new file mode 100644 index 000000000000..54eeeabc3259 --- /dev/null +++ b/app/Events/PaymentWasRefunded.php @@ -0,0 +1,25 @@ +payment = $payment; + $this->refundAmount = $refundAmount; + } + +} diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 3f8917b65427..cf0e4508610e 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -182,14 +182,7 @@ class AccountController extends BaseController if ($account->company->payment) { $payment = $account->company->payment; - - $gateway = $this->paymentService->createGateway($payment->account_gateway); - $refund = $gateway->refund(array( - 'transactionReference' => $payment->transaction_reference, - 'amount' => $payment->amount - )); - $refund->send(); - $payment->delete(); + $this->paymentService->refund($payment); Session::flash('message', trans('texts.plan_refunded')); \Log::info("Refunded Plan Payment: {$account->name} - {$user->email}"); } else { diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 1f53b4a0bc54..f5ecc89f8e8e 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -57,6 +57,7 @@ class PaymentController extends BaseController 'method', 'payment_amount', 'payment_date', + 'status', '' ]), )); @@ -630,11 +631,12 @@ class PaymentController extends BaseController public function bulk() { $action = Input::get('action'); + $amount = Input::get('amount'); $ids = Input::get('public_id') ? Input::get('public_id') : Input::get('ids'); - $count = $this->paymentService->bulk($ids, $action); + $count = $this->paymentService->bulk($ids, $action, array('amount'=>$amount)); if ($count > 0) { - $message = Utils::pluralize($action.'d_payment', $count); + $message = Utils::pluralize($action=='refund'?'refunded_payment':$action.'d_payment', $count); Session::flash('message', $message); } diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php index 32d6d53c3887..d756bd7eaaa0 100644 --- a/app/Http/Controllers/PublicClientController.php +++ b/app/Http/Controllers/PublicClientController.php @@ -252,6 +252,9 @@ class PublicClientController extends BaseController 'invoice' => trans('texts.invoice') . ' ' . $model->invoice, 'contact' => Utils::getClientDisplayName($model), 'payment' => trans('texts.payment') . ($model->payment ? ' ' . $model->payment : ''), + 'credit' => $model->payment_amount ? Utils::formatMoney($model->credit, $model->currency_id, $model->country_id) : '', + 'payment_amount' => $model->payment_amount ? Utils::formatMoney($model->payment_amount, $model->currency_id, $model->country_id) : null, + 'adjustment' => $model->adjustment ? Utils::formatMoney($model->adjustment, $model->currency_id, $model->country_id) : null, ]; return trans("texts.activity_{$model->activity_type_id}", $data); @@ -321,7 +324,7 @@ class PublicClientController extends BaseController 'clientFontUrl' => $account->getFontsUrl(), 'entityType' => ENTITY_PAYMENT, 'title' => trans('texts.payments'), - 'columns' => Utils::trans(['invoice', 'transaction_reference', 'method', 'payment_amount', 'payment_date']) + 'columns' => Utils::trans(['invoice', 'transaction_reference', 'method', 'payment_amount', 'payment_date', 'status']) ]; return response()->view('public_list', $data); @@ -340,8 +343,36 @@ class PublicClientController extends BaseController ->addColumn('payment_type', function ($model) { return $model->payment_type ? $model->payment_type : ($model->account_gateway_id ? 'Online payment' : ''); }) ->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); }) + ->addColumn('status', function ($model) { return $this->getPaymentStatusLabel($model); }) ->make(); } + + private function getPaymentStatusLabel($model) + { + $label = trans("texts.status_" . strtolower($model->payment_status_name)); + $class = 'default'; + switch ($model->payment_status_id) { + case PAYMENT_STATUS_PENDING: + $class = 'info'; + break; + case PAYMENT_STATUS_COMPLETED: + $class = 'success'; + break; + case PAYMENT_STATUS_FAILED: + $class = 'danger'; + break; + case PAYMENT_STATUS_PARTIALLY_REFUNDED: + $label = trans('texts.status_partially_refunded_amount', [ + 'amount' => Utils::formatMoney($model->refunded, $model->currency_id, $model->country_id), + ]); + $class = 'primary'; + break; + case PAYMENT_STATUS_REFUNDED: + $class = 'default'; + break; + } + return "

$label

"; + } public function quoteIndex() { diff --git a/app/Http/routes.php b/app/Http/routes.php index 48f06e5e7b3d..25041048f102 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -398,6 +398,7 @@ if (!defined('CONTACT_EMAIL')) { //define('ACTIVITY_TYPE_UPDATE_PAYMENT', 11); define('ACTIVITY_TYPE_ARCHIVE_PAYMENT', 12); define('ACTIVITY_TYPE_DELETE_PAYMENT', 13); + define('ACTIVITY_TYPE_REFUNDED_PAYMENT', 39); define('ACTIVITY_TYPE_CREATE_CREDIT', 14); //define('ACTIVITY_TYPE_UPDATE_CREDIT', 15); @@ -474,6 +475,12 @@ if (!defined('CONTACT_EMAIL')) { define('INVOICE_STATUS_APPROVED', 4); define('INVOICE_STATUS_PARTIAL', 5); define('INVOICE_STATUS_PAID', 6); + + define('PAYMENT_STATUS_PENDING', 1); + define('PAYMENT_STATUS_FAILED', 2); + define('PAYMENT_STATUS_COMPLETED', 3); + define('PAYMENT_STATUS_PARTIALLY_REFUNDED', 4); + define('PAYMENT_STATUS_REFUNDED', 5); define('PAYMENT_TYPE_CREDIT', 1); define('CUSTOM_DESIGN', 11); diff --git a/app/Listeners/ActivityListener.php b/app/Listeners/ActivityListener.php index 52c2e26f9027..811d1050b9cb 100644 --- a/app/Listeners/ActivityListener.php +++ b/app/Listeners/ActivityListener.php @@ -22,6 +22,7 @@ use App\Events\QuoteInvitationWasViewed; use App\Events\QuoteInvitationWasApproved; use App\Events\PaymentWasCreated; use App\Events\PaymentWasDeleted; +use App\Events\PaymentWasRefunded; use App\Events\PaymentWasArchived; use App\Events\PaymentWasRestored; use App\Events\CreditWasCreated; @@ -309,6 +310,18 @@ class ActivityListener ); } + public function refundedPayment(PaymentWasRefunded $event) + { + $payment = $event->payment; + + $this->activityRepo->create( + $payment, + ACTIVITY_TYPE_REFUNDED_PAYMENT, + $event->refundAmount, + $event->refundAmount * -1 + ); + } + public function archivedPayment(PaymentWasArchived $event) { if ($event->payment->is_deleted) { diff --git a/app/Listeners/CreditListener.php b/app/Listeners/CreditListener.php index bed71a47f59d..5c2ce2539d80 100644 --- a/app/Listeners/CreditListener.php +++ b/app/Listeners/CreditListener.php @@ -3,6 +3,7 @@ use Carbon; use App\Models\Credit; use App\Events\PaymentWasDeleted; +use App\Events\PaymentWasRefunded; use App\Ninja\Repositories\CreditRepository; class CreditListener @@ -26,7 +27,24 @@ class CreditListener $credit = Credit::createNew(); $credit->client_id = $payment->client_id; $credit->credit_date = Carbon::now()->toDateTimeString(); - $credit->balance = $credit->amount = $payment->amount; + $credit->balance = $credit->amount = $payment->amount - $payment->refunded; + $credit->private_notes = $payment->transaction_reference; + $credit->save(); + } + + public function refundedPayment(PaymentWasRefunded $event) + { + $payment = $event->payment; + + // if the payment was from a credit we need to refund the credit + if ($payment->payment_type_id != PAYMENT_TYPE_CREDIT) { + return; + } + + $credit = Credit::createNew(); + $credit->client_id = $payment->client_id; + $credit->credit_date = Carbon::now()->toDateTimeString(); + $credit->balance = $credit->amount = $event->refundAmount; $credit->private_notes = $payment->transaction_reference; $credit->save(); } diff --git a/app/Listeners/InvoiceListener.php b/app/Listeners/InvoiceListener.php index 91f3de8cc213..290a8f4a0426 100644 --- a/app/Listeners/InvoiceListener.php +++ b/app/Listeners/InvoiceListener.php @@ -7,6 +7,7 @@ use App\Events\InvoiceWasUpdated; use App\Events\InvoiceWasCreated; use App\Events\PaymentWasCreated; use App\Events\PaymentWasDeleted; +use App\Events\PaymentWasRefunded; use App\Events\PaymentWasRestored; use App\Events\InvoiceInvitationWasViewed; @@ -58,7 +59,17 @@ class InvoiceListener { $payment = $event->payment; $invoice = $payment->invoice; - $adjustment = $payment->amount; + $adjustment = $payment->amount - $payment->refunded; + + $invoice->updateBalances($adjustment); + $invoice->updatePaidStatus(); + } + + public function refundedPayment(PaymentWasRefunded $event) + { + $payment = $event->payment; + $invoice = $payment->invoice; + $adjustment = $event->refundAmount; $invoice->updateBalances($adjustment); $invoice->updatePaidStatus(); @@ -72,7 +83,7 @@ class InvoiceListener $payment = $event->payment; $invoice = $payment->invoice; - $adjustment = $payment->amount * -1; + $adjustment = ($payment->amount - $payment->refunded) * -1; $invoice->updateBalances($adjustment); $invoice->updatePaidStatus(); diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 921c037d5f69..2fa9e6e8e349 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -70,6 +70,8 @@ class Activity extends Eloquent 'quote' => $invoice ? link_to($invoice->getRoute(), $invoice->getDisplayName()) : null, 'contact' => $contactId ? $client->getDisplayName() : $user->getDisplayName(), 'payment' => $payment ? $payment->transaction_reference : null, + 'payment_amount' => $payment ? $account->formatMoney($payment->amount, $payment) : null, + 'adjustment' => $this->adjustment ? $account->formatMoney($this->adjustment, $this) : asdf, 'credit' => $credit ? $account->formatMoney($credit->amount, $client) : null, ]; diff --git a/app/Models/Payment.php b/app/Models/Payment.php index a2e8b2591fe3..22924cc61297 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -1,7 +1,9 @@ belongsTo('App\Models\PaymentType'); + } + + public function payment_status() + { + return $this->belongsTo('App\Models\PaymentStatus'); } public function getRoute() @@ -69,6 +76,51 @@ class Payment extends EntityModel return trim("payment {$this->transaction_reference}"); } + public function isPending() + { + return $this->payment_status_id = PAYMENT_STATUS_PENDING; + } + + public function isFailed() + { + return $this->payment_status_id = PAYMENT_STATUS_FAILED; + } + + public function isCompleted() + { + return $this->payment_status_id >= PAYMENT_STATUS_COMPLETED; + } + + public function isPartiallyRefunded() + { + return $this->payment_status_id == PAYMENT_STATUS_PARTIALLY_REFUNDED; + } + + public function isRefunded() + { + return $this->payment_status_id == PAYMENT_STATUS_REFUNDED; + } + + public function recordRefund($amount = null) + { + if (!$this->isRefunded()) { + if (!$amount) { + $amount = $this->amount; + } + + $new_refund = min($this->amount, $this->refunded + $amount); + $refund_change = $new_refund - $this->refunded; + + if ($refund_change) { + $this->refunded = $new_refund; + $this->payment_status_id = $this->refunded == $this->amount ? PAYMENT_STATUS_REFUNDED : PAYMENT_STATUS_PARTIALLY_REFUNDED; + $this->save(); + + Event::fire(new PaymentWasRefunded($this, $refund_change)); + } + } + } + public function getEntityType() { return ENTITY_PAYMENT; diff --git a/app/Models/PaymentStatus.php b/app/Models/PaymentStatus.php new file mode 100644 index 000000000000..fdb1e0f43d5b --- /dev/null +++ b/app/Models/PaymentStatus.php @@ -0,0 +1,8 @@ +join('clients', 'clients.id', '=', 'payments.client_id') ->join('invoices', 'invoices.id', '=', 'payments.invoice_id') ->join('contacts', 'contacts.client_id', '=', 'clients.id') + ->join('payment_statuses', 'payment_statuses.id', '=', 'payments.payment_status_id') ->leftJoin('payment_types', 'payment_types.id', '=', 'payments.payment_type_id') ->leftJoin('account_gateways', 'account_gateways.id', '=', 'payments.account_gateway_id') ->leftJoin('gateways', 'gateways.id', '=', 'account_gateways.gateway_id') @@ -39,6 +40,8 @@ class PaymentRepository extends BaseRepository 'clients.user_id as client_user_id', 'payments.amount', 'payments.payment_date', + 'payments.payment_status_id', + 'payments.payment_type_id', 'invoices.public_id as invoice_public_id', 'invoices.user_id as invoice_user_id', 'invoices.invoice_number', @@ -50,8 +53,11 @@ class PaymentRepository extends BaseRepository 'payments.deleted_at', 'payments.is_deleted', 'payments.user_id', + 'payments.refunded', 'invoices.is_deleted as invoice_is_deleted', - 'gateways.name as gateway_name' + 'gateways.name as gateway_name', + 'gateways.id as gateway_id', + 'payment_statuses.name as payment_status_name' ); if (!\Session::get('show_trash:payment')) { @@ -78,6 +84,7 @@ class PaymentRepository extends BaseRepository ->join('clients', 'clients.id', '=', 'payments.client_id') ->join('invoices', 'invoices.id', '=', 'payments.invoice_id') ->join('contacts', 'contacts.client_id', '=', 'clients.id') + ->join('payment_statuses', 'payment_statuses.id', '=', 'payments.payment_status_id') ->leftJoin('invitations', function ($join) { $join->on('invitations.invoice_id', '=', 'invoices.id') ->on('invitations.contact_id', '=', 'contacts.id'); @@ -104,7 +111,10 @@ class PaymentRepository extends BaseRepository 'contacts.last_name', 'contacts.email', 'payment_types.name as payment_type', - 'payments.account_gateway_id' + 'payments.account_gateway_id', + 'payments.refunded', + 'payments.payment_status_id', + 'payment_statuses.name as payment_status_name' ); if ($filter) { @@ -189,6 +199,4 @@ class PaymentRepository extends BaseRepository parent::restore($payment); } - - } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index bb4e94d79546..3ce5fcfa29e0 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -107,6 +107,11 @@ class EventServiceProvider extends ServiceProvider { 'App\Listeners\InvoiceListener@deletedPayment', 'App\Listeners\CreditListener@deletedPayment', ], + 'App\Events\PaymentWasRefunded' => [ + 'App\Listeners\ActivityListener@refundedPayment', + 'App\Listeners\InvoiceListener@refundedPayment', + 'App\Listeners\CreditListener@refundedPayment', + ], 'App\Events\PaymentWasRestored' => [ 'App\Listeners\ActivityListener@restoredPayment', 'App\Listeners\InvoiceListener@restoredPayment', diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php index d3b08b997189..6f6ef4b35956 100644 --- a/app/Services/ActivityService.php +++ b/app/Services/ActivityService.php @@ -44,7 +44,9 @@ class ActivityService extends BaseService 'quote' => $model->invoice ? link_to('/quotes/' . $model->invoice_public_id, $model->invoice)->toHtml() : null, 'contact' => $model->contact_id ? link_to('/clients/' . $model->client_public_id, Utils::getClientDisplayName($model))->toHtml() : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), 'payment' => $model->payment ?: '', - 'credit' => Utils::formatMoney($model->credit, $model->currency_id, $model->country_id) + 'credit' => $model->payment_amount ? Utils::formatMoney($model->credit, $model->currency_id, $model->country_id) : '', + 'payment_amount' => $model->payment_amount ? Utils::formatMoney($model->payment_amount, $model->currency_id, $model->country_id) : null, + 'adjustment' => $model->adjustment ? Utils::formatMoney($model->adjustment, $model->currency_id, $model->country_id) : null ]; return trans("texts.activity_{$model->activity_type_id}", $data); diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index 61af6cd2336c..8e24370bd930 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -23,6 +23,10 @@ class PaymentService extends BaseService { public $lastError; protected $datatableService; + + protected static $refundableGateways = array( + GATEWAY_STRIPE + ); public function __construct(PaymentRepository $paymentRepo, AccountRepository $accountRepo, DatatableService $datatableService) { @@ -375,6 +379,12 @@ class PaymentService extends BaseService function ($model) { return Utils::dateToString($model->payment_date); } + ], + [ + 'payment_status_name', + function ($model) use ($entityType) { + return self::getStatusLabel($entityType, $model); + } ] ]; } @@ -390,9 +400,103 @@ class PaymentService extends BaseService function ($model) { return Payment::canEditItem($model); } + ], + [ + trans('texts.refund_payment'), + function ($model) { + $max_refund = number_format($model->amount - $model->refunded, 2); + $formatted = Utils::formatMoney($max_refund, $model->currency_id, $model->country_id); + $symbol = Utils::getFromCache($model->currency_id, 'currencies')->symbol; + return "javascript:showRefundModal({$model->public_id}, '{$max_refund}', '{$formatted}', '{$symbol}')"; + }, + function ($model) { + return Payment::canEditItem($model) && ( + ($model->transaction_reference && in_array($model->gateway_id , static::$refundableGateways)) + || $model->payment_type_id == PAYMENT_TYPE_CREDIT + ); + } ] ]; } + + public function bulk($ids, $action, $params = array()) + { + if ($action == 'refund') { + if ( ! $ids ) { + return 0; + } + $payments = $this->getRepo()->findByPublicIdsWithTrashed($ids); + foreach ($payments as $payment) { + if($payment->canEdit()){ + if(!empty($params['amount'])) { + $this->refund($payment, floatval($params['amount'])); + } else { + $this->refund($payment); + } + } + } + + return count($payments); + } else { + return parent::bulk($ids, $action); + } + } + + private function getStatusLabel($entityType, $model) + { + $label = trans("texts.status_" . strtolower($model->payment_status_name)); + $class = 'default'; + switch ($model->payment_status_id) { + case PAYMENT_STATUS_PENDING: + $class = 'info'; + break; + case PAYMENT_STATUS_COMPLETED: + $class = 'success'; + break; + case PAYMENT_STATUS_FAILED: + $class = 'danger'; + break; + case PAYMENT_STATUS_PARTIALLY_REFUNDED: + $label = trans('texts.status_partially_refunded_amount', [ + 'amount' => Utils::formatMoney($model->refunded, $model->currency_id, $model->country_id), + ]); + $class = 'primary'; + break; + case PAYMENT_STATUS_REFUNDED: + $class = 'default'; + break; + } + return "

$label

"; + } + + public function refund($payment, $amount = null) { + if (!$amount) { + $amount = $payment->amount; + } + + $amount = min($amount, $payment->amount - $payment->refunded); + + if (!$amount) { + return; + } + + if ($payment->payment_type_id != PAYMENT_TYPE_CREDIT) { + $accountGateway = $this->createGateway($payment->account_gateway); + $refund = $accountGateway->refund(array( + 'transactionReference' => $payment->transaction_reference, + 'amount' => $amount, + )); + $response = $refund->send(); + + if ($response->isSuccessful()) { + $payment->recordRefund($amount); + } else { + $this->error('Unknown', $response->getMessage(), $accountGateway); + } + } else { + $payment->recordRefund($amount); + } + } } diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php new file mode 100644 index 000000000000..641ec06e2c2d --- /dev/null +++ b/database/migrations/2016_04_23_182223_payments_changes.php @@ -0,0 +1,49 @@ +increments('id'); + $table->string('name'); + }); + + (new \PaymentStatusSeeder())->run(); + + Schema::table('payments', function($table) + { + $table->decimal('refunded', 13, 2); + $table->unsignedInteger('payment_status_id')->default(3); + $table->foreign('payment_status_id')->references('id')->on('payment_statuses'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('payments', function($table) + { + $table->dropColumn('refunded'); + $table->dropForeign('payments_payment_status_id_foreign'); + $table->dropColumn('payment_status_id'); + }); + + Schema::dropIfExists('payment_statuses'); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 8791f30e71fb..753a1ce54e30 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -19,6 +19,7 @@ class DatabaseSeeder extends Seeder $this->call('FontsSeeder'); $this->call('BanksSeeder'); $this->call('InvoiceStatusSeeder'); + $this->call('PaymentStatusSeeder'); $this->call('CurrenciesSeeder'); $this->call('DateFormatsSeeder'); $this->call('InvoiceDesignsSeeder'); diff --git a/database/seeds/PaymentStatusSeeder.php b/database/seeds/PaymentStatusSeeder.php new file mode 100644 index 000000000000..8e93d57798fd --- /dev/null +++ b/database/seeds/PaymentStatusSeeder.php @@ -0,0 +1,36 @@ +createPaymentStatuses(); + + Eloquent::reguard(); + } + + private function createPaymentStatuses() + { + $statuses = [ + ['id' => '1', 'name' => 'Pending'], + ['id' => '2', 'name' => 'Failed'], + ['id' => '3', 'name' => 'Completed'], + ['id' => '4', 'name' => 'Partially Refunded'], + ['id' => '5', 'name' => 'Refunded'], + ]; + + foreach ($statuses as $status) { + $record = PaymentStatus::find($status['id']); + if ($record) { + $record->name = $status['name']; + $record->save(); + } else { + PaymentStatus::create($status); + } + } + } +} diff --git a/database/seeds/UpdateSeeder.php b/database/seeds/UpdateSeeder.php index e4d43f78e512..e5335e311b42 100644 --- a/database/seeds/UpdateSeeder.php +++ b/database/seeds/UpdateSeeder.php @@ -15,6 +15,7 @@ class UpdateSeeder extends Seeder $this->call('FontsSeeder'); $this->call('BanksSeeder'); $this->call('InvoiceStatusSeeder'); + $this->call('PaymentStatusSeeder'); $this->call('CurrenciesSeeder'); $this->call('DateFormatsSeeder'); $this->call('InvoiceDesignsSeeder'); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 37478c5d73e3..ae717b297b23 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1176,6 +1176,20 @@ $LANG = array( 'page_size' => 'Page Size', 'live_preview_disabled' => 'Live preview has been disabled to support selected font', 'invoice_number_padding' => 'Padding', + + // Payment updates + 'refund_payment' => 'Refund Payment', + 'refund_max' => 'Max:', + 'refund' => 'Refund', + 'are_you_sure_refund' => 'Refund selected payments?', + 'status_pending' => 'Pending', + 'status_completed' => 'Completed', + 'status_failed' => 'Failed', + 'status_partially_refunded' => 'Partially Refunded', + 'status_partially_refunded_amount' => ':amount Refunded', + 'status_refunded' => 'Refunded', + 'refunded_payment' => 'Refunded Payment', + 'activity_39' => ':user refunded :adjustment of a :payment_amount payment (:payment)', ); diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php index 8e8ba97116d7..07db6b5e6b91 100644 --- a/resources/views/list.blade.php +++ b/resources/views/list.blade.php @@ -53,7 +53,41 @@ ->setOptions('sPaginationType', 'bootstrap') ->setOptions('aaSorting', [[isset($sortCol) ? $sortCol : '1', 'desc']]) ->render('datatable') !!} - + + @if ($entityType == ENTITY_PAYMENT) + + @endif + {!! Former::close() !!} + + @elseif ($accountGateway->getPublishableStripeKey()) From c536bd8569ccf8335987794f3a516797d606ad48 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Fri, 29 Apr 2016 17:50:21 -0400 Subject: [PATCH 10/37] Add basic ACH support --- .../Controllers/AccountGatewayController.php | 2 +- .../Controllers/ClientAuth/AuthController.php | 5 +- .../ClientAuth/PasswordController.php | 9 +- app/Http/Controllers/PaymentController.php | 149 ++++- .../Controllers/PublicClientController.php | 286 ++++++-- app/Http/routes.php | 12 +- app/Models/Account.php | 4 + app/Ninja/Repositories/PaymentRepository.php | 3 + app/Services/PaymentService.php | 254 ++++++-- composer.json | 25 +- composer.lock | 29 +- public/images/credit_cards/ach.png | Bin 0 -> 1949 bytes resources/lang/en/texts.php | 36 +- resources/views/clientauth/login.blade.php | 2 +- resources/views/clientauth/password.blade.php | 2 +- resources/views/clientauth/reset.blade.php | 2 +- resources/views/invoices/view.blade.php | 6 + resources/views/master.blade.php | 2 +- .../payments/add_paymentmethod.blade.php | 611 ++++++++++++++++++ resources/views/payments/payment.blade.php | 401 ++++++++---- .../views/payments/paymentmethods.blade.php | 149 +++++ resources/views/public/header.blade.php | 21 +- 22 files changed, 1746 insertions(+), 264 deletions(-) create mode 100644 public/images/credit_cards/ach.png create mode 100644 resources/views/payments/add_paymentmethod.blade.php create mode 100644 resources/views/payments/paymentmethods.blade.php diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php index 08b2d1355f80..1ef8d61e98b8 100644 --- a/app/Http/Controllers/AccountGatewayController.php +++ b/app/Http/Controllers/AccountGatewayController.php @@ -117,7 +117,7 @@ class AccountGatewayController extends BaseController } } - $paymentTypes[$type] = trans('texts.'.strtolower($type)); + $paymentTypes[$type] = $type == PAYMENT_TYPE_CREDIT_CARD ? trans('texts.other_providers'): trans('texts.'.strtolower($type)); if ($type == PAYMENT_TYPE_BITCOIN) { $paymentTypes[$type] .= ' - BitPay'; diff --git a/app/Http/Controllers/ClientAuth/AuthController.php b/app/Http/Controllers/ClientAuth/AuthController.php index ed5f199ac255..e3951b5464b8 100644 --- a/app/Http/Controllers/ClientAuth/AuthController.php +++ b/app/Http/Controllers/ClientAuth/AuthController.php @@ -32,9 +32,8 @@ class AuthController extends Controller { $invoice = $invitation->invoice; $client = $invoice->client; $account = $client->account; - - $data['hideLogo'] = $account->hasFeature(FEATURE_WHITE_LABEL); - $data['clientViewCSS'] = $account->clientViewCSS(); + + $data['account'] = $account; $data['clientFontUrl'] = $account->getFontsUrl(); } } diff --git a/app/Http/Controllers/ClientAuth/PasswordController.php b/app/Http/Controllers/ClientAuth/PasswordController.php index 35576b47ae39..822764315a0e 100644 --- a/app/Http/Controllers/ClientAuth/PasswordController.php +++ b/app/Http/Controllers/ClientAuth/PasswordController.php @@ -49,9 +49,7 @@ class PasswordController extends Controller { $invoice = $invitation->invoice; $client = $invoice->client; $account = $client->account; - - $data['hideLogo'] = $account->hasFeature(FEATURE_WHITE_LABEL); - $data['clientViewCSS'] = $account->clientViewCSS(); + $data['account'] = $account; $data['clientFontUrl'] = $account->getFontsUrl(); } } @@ -116,9 +114,8 @@ class PasswordController extends Controller { $invoice = $invitation->invoice; $client = $invoice->client; $account = $client->account; - - $data['hideLogo'] = $account->hasFeature(FEATURE_WHITE_LABEL); - $data['clientViewCSS'] = $account->clientViewCSS(); + + $data['account'] = $account; $data['clientFontUrl'] = $account->getFontsUrl(); } } diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index f9c497c64ea8..fadcdd0394b4 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -137,7 +137,7 @@ class PaymentController extends BaseController ]; } - public function show_payment($invitationKey, $paymentType = false) + public function show_payment($invitationKey, $paymentType = false, $sourceId = false) { $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail(); @@ -155,27 +155,31 @@ class PaymentController extends BaseController if ($paymentType == PAYMENT_TYPE_TOKEN) { $useToken = true; - $paymentType = PAYMENT_TYPE_CREDIT_CARD; + $accountGateway = $invoice->client->account->getTokenGateway(); + $paymentType = $accountGateway->getPaymentType(); + } else { + $accountGateway = $invoice->client->account->getGatewayByType($paymentType); } + Session::put($invitation->id . 'payment_type', $paymentType); - $accountGateway = $invoice->client->account->getGatewayByType($paymentType); $gateway = $accountGateway->gateway; $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes(); - - // Handle offsite payments - if ($useToken || $paymentType != PAYMENT_TYPE_CREDIT_CARD + $isOffsite = ($paymentType != PAYMENT_TYPE_CREDIT_CARD && $accountGateway->getPaymentType() != PAYMENT_TYPE_STRIPE) || $gateway->id == GATEWAY_EWAY || $gateway->id == GATEWAY_TWO_CHECKOUT || $gateway->id == GATEWAY_PAYFAST - || $gateway->id == GATEWAY_MOLLIE) { + || $gateway->id == GATEWAY_MOLLIE; + + // Handle offsite payments + if ($useToken || $isOffsite) { if (Session::has('error')) { Session::reflash(); return Redirect::to('view/'.$invitationKey); } else { - return self::do_payment($invitationKey, false, $useToken); + return self::do_payment($invitationKey, false, $useToken, $sourceId); } } @@ -189,22 +193,24 @@ class PaymentController extends BaseController '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' => $client->account, - 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL), - 'hideHeader' => $account->isNinjaAccount(), - 'clientViewCSS' => $account->clientViewCSS(), - 'clientFontUrl' => $account->getFontsUrl(), + 'clientFontUrl' => $client->account->getFontsUrl(), 'showAddress' => $accountGateway->show_address, ]; - if ($gateway->id = GATEWAY_BRAINTREE) { + 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.payment', $data); + return View::make('payments.add_paymentmethod', $data); } public function show_license_payment() @@ -235,7 +241,7 @@ class PaymentController extends BaseController $account = $this->accountRepo->getNinjaAccount(); $account->load('account_gateways.gateway'); - $accountGateway = $account->getGatewayByType(PAYMENT_TYPE_CREDIT_CARD); + $accountGateway = $account->getGatewayByType(PAYMENT_TYPE_STRIPE_CREDIT_CARD); $gateway = $accountGateway->gateway; $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes(); @@ -260,7 +266,7 @@ class PaymentController extends BaseController 'showAddress' => true, ]; - return View::make('payments.payment', $data); + return View::make('payments.add_paymentmethod', $data); } public function do_license_payment() @@ -291,7 +297,7 @@ class PaymentController extends BaseController $account = $this->accountRepo->getNinjaAccount(); $account->load('account_gateways.gateway'); - $accountGateway = $account->getGatewayByType(PAYMENT_TYPE_CREDIT_CARD); + $accountGateway = $account->getGatewayByType(PAYMENT_TYPE_STRIPE_CREDIT_CARD); try { $affiliate = Affiliate::find(Session::get('affiliate_id')); @@ -367,13 +373,14 @@ class PaymentController extends BaseController } } - public function do_payment($invitationKey, $onSite = true, $useToken = false) + public function do_payment($invitationKey, $onSite = true, $useToken = false, $sourceId = false) { $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail(); $invoice = $invitation->invoice; $client = $invoice->client; $account = $client->account; - $accountGateway = $account->getGatewayByType(Session::get($invitation->id . 'payment_type')); + $paymentType = Session::get($invitation->id . 'payment_type'); + $accountGateway = $account->getGatewayByType($paymentType); $rules = [ @@ -445,11 +452,20 @@ class PaymentController extends BaseController if ($useToken) { $details['customerReference'] = $client->getGatewayToken(); unset($details['token']); - } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing')) { - $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference); + if ($sourceId) { + $details['cardReference'] = $sourceId; + } + } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing') || $paymentType == PAYMENT_TYPE_STRIPE_ACH) { + $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */); if ($token) { $details['token'] = $token; $details['customerReference'] = $customerReference; + + 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'); + } } else { $this->error('Token-No-Ref', $this->paymentService->lastError, $accountGateway); return Redirect::to('payment/'.$invitationKey)->withInput(Request::except('cvv')); @@ -463,11 +479,15 @@ class PaymentController extends BaseController if ($useToken) { $details['customerId'] = $customerId = $client->getGatewayToken(); - $customer = $gateway->findCustomer($customerId)->send(); - $details['paymentMethodToken'] = $customer->getData()->paymentMethods[0]->token; + if (!$sourceId) { + $customer = $gateway->findCustomer($customerId)->send(); + $details['paymentMethodToken'] = $customer->getData()->paymentMethods[0]->token; + } else { + $details['paymentMethodToken'] = $sourceId; + } unset($details['token']); } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing')) { - $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference); + $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */); if ($token) { $details['paymentMethodToken'] = $token; $details['customerId'] = $customerReference; @@ -683,4 +703,85 @@ class PaymentController extends BaseController Session::flash('error', $message); Utils::logError("Payment Error [{$type}]: " . ($exception ? Utils::getErrorString($exception) : $message), 'PHP', true); } + + public function getBankInfo($routingNumber) { + if (strlen($routingNumber) != 9 || !preg_match('/\d{9}/', $routingNumber)) { + return response()->json([ + 'message' => 'Invalid routing number', + ], 400); + } + + $data = static::getBankData($routingNumber); + + if (is_string($data)) { + return response()->json([ + 'message' => $data, + ], 500); + } elseif (!empty($data)) { + return $data; + } + + return response()->json([ + 'message' => 'Bank not found', + ], 404); + } + + public static function getBankData($routingNumber) { + $cached = Cache::get('bankData:'.$routingNumber); + + if ($cached != null) { + return $cached == false ? null : $cached; + } + + $dataPath = base_path('vendor/gatepay/FedACHdir/FedACHdir.txt'); + + if (!file_exists($dataPath) || !$size = filesize($dataPath)) { + return 'Invalid data file'; + } + + $lineSize = 157; + $numLines = $size/$lineSize; + + if ($numLines % 1 != 0) { + // The number of lines should be an integer + return 'Invalid data file'; + } + + // Format: http://www.sco.ca.gov/Files-21C/Bank_Master_Interface_Information_Package.pdf + $file = fopen($dataPath, 'r'); + + // Binary search + $low = 0; + $high = $numLines - 1; + while ($low <= $high) { + $mid = floor(($low + $high) / 2); + + fseek($file, $mid * $lineSize); + $thisNumber = fread($file, 9); + + if ($thisNumber > $routingNumber) { + $high = $mid - 1; + } else if ($thisNumber < $routingNumber) { + $low = $mid + 1; + } else { + $data = array('routing_number' => $thisNumber); + fseek($file, 26, SEEK_CUR); + $data['name'] = trim(fread($file, 36)); + $data['address'] = trim(fread($file, 36)); + $data['city'] = trim(fread($file, 20)); + $data['state'] = fread($file, 2); + $data['zip'] = fread($file, 5).'-'.fread($file, 4); + $data['phone'] = fread($file, 10); + break; + } + } + + if (!empty($data)) { + Cache::put('bankData:'.$routingNumber, $data, 5); + return $data; + } else { + Cache::put('bankData:'.$routingNumber, false, 5); + return null; + } + } } diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php index 28391cf7140e..868a116719e8 100644 --- a/app/Http/Controllers/PublicClientController.php +++ b/app/Http/Controllers/PublicClientController.php @@ -10,6 +10,8 @@ use Request; use Response; use Session; use Datatable; +use Validator; +use Cache; use App\Models\Gateway; use App\Models\Invitation; use App\Models\Document; @@ -94,7 +96,7 @@ class PublicClientController extends BaseController $paymentTypes = $this->getPaymentTypes($client, $invitation); $paymentURL = ''; - if (count($paymentTypes)) { + if (count($paymentTypes) == 1) { $paymentURL = $paymentTypes[0]['url']; if (!$account->isGatewayConfigured(GATEWAY_PAYPAL_EXPRESS)) { $paymentURL = URL::to($paymentURL); @@ -126,11 +128,6 @@ class PublicClientController extends BaseController 'account' => $account, 'showApprove' => $showApprove, 'showBreadcrumbs' => false, - 'hideLogo' => $account->hasFeature(FEATURE_WHITE_LABEL), - 'hideHeader' => $account->isNinjaAccount() || !$account->enable_client_portal, - 'hideDashboard' => !$account->enable_client_portal_dashboard, - 'showDocuments' => $account->hasFeature(FEATURE_DOCUMENTS), - 'clientViewCSS' => $account->clientViewCSS(), 'clientFontUrl' => $account->getFontsUrl(), 'invoice' => $invoice->hidePrivateFields(), 'invitation' => $invitation, @@ -161,23 +158,67 @@ class PublicClientController extends BaseController $paymentTypes = []; $account = $client->account; - if ($client->getGatewayToken()) { - $paymentTypes[] = [ - 'url' => URL::to("payment/{$invitation->invitation_key}/token"), 'label' => trans('texts.use_card_on_file') - ]; - } - foreach(Gateway::$paymentTypes as $type) { - if ($account->getGatewayByType($type)) { - $typeLink = strtolower(str_replace('PAYMENT_TYPE_', '', $type)); - $url = URL::to("/payment/{$invitation->invitation_key}/{$typeLink}"); + $paymentMethods = $this->paymentService->getClientPaymentMethods($client); - // 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 ($paymentMethods) { + foreach ($paymentMethods as $paymentMethod) { + if ($paymentMethod['type']->id != PAYMENT_TYPE_ACH || $paymentMethod['status'] == 'verified') { + + if ($paymentMethod['type']->id == PAYMENT_TYPE_ACH) { + $html = '
'.htmlentities($paymentMethod['bank_name']).'
'; + } else { + $code = htmlentities(str_replace(' ', '', strtolower($paymentMethod['type']->name))); + $html = ''.trans('; + } + + if ($paymentMethod['type']->id != PAYMENT_TYPE_ACH) { + $html .= '
'.trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))).'
'; + } 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 ''.htmlentities($card_type).'  •••'.$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 '' . htmlentities($card_type) . '  •••' . $model->last4 . ' ' . $expiration; + } else { + $bankData = PaymentController::getBankData($model->routing_number); + if (is_array($bankData)) { + return $bankData['name'].'  •••' . $model->last4; + } else { + return '' . htmlentities($card_type) . '  •••' . $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 ''.htmlentities($card_type).'  •••'.$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 '' . htmlentities($card_type) . '  •••' . $model->last4 . ' ' . $expiration; + } else { + $bankData = PaymentController::getBankData($model->routing_number); + if (is_array($bankData)) { + return $bankData['name'].'  •••' . $model->last4; + } else { + return '' . htmlentities($card_type) . '  •••' . $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 0000000000000000000000000000000000000000..16cf86bdb3ecf921944306c6b7fb6eff3b332497 GIT binary patch literal 1949 zcmV;O2V(e%P)y{D4^00%uuL_t(o!_}C7Y?W6T$3M?G=WTC$ zZ*Ol~?m84kaplJX%?cQ4JF7ybOq~89YX$^mEW}vRU=Ti|AR8^)AjXl?LTn9R!*5>fklAaj6ln#PoMtmmaSXeH(FZkTL<2?Z|>V? zA6mCAT~bo=cVNm`7#R!C^UBN1*DPDUeBGjk2B#ntruSdR={b9f2{rf9)6+>`Uy?1G zHm3iyW5>pHI{gzMd9B9u^*CElQ1I1;`|tnThRvH7R#(r`v66AP-4{6B@@G0fIDpA7 zq-fj(3L`OQe{#0E=SvIkI(p>Dx6YkAcLZqtUou=h|L(h=Yg)5rT3KnCl$MS|Db0!3 zUgquQ^^{f4BAx0(8HaFu0<%^;jOSTgH$@_Gp4ay5aUb8j>5a2z&n^c(ype#%S65eW z|Mu$D3-6dQQ?LccRn-kYoefRJYA=cF?s$HtmlGgJPTN`So(S|l1e4` z<+g3<7oLCq(Nrq+Fwi#=0BVFl3o0rq9$UA5ecQHQ{rcXT+B#K!%dI#8*i13`1#}*N z*9VzlMCm~sg$iPXi^}=ts_&SWcKmVe+?txxz=E-0SYol*@=B={|9eA@jZIZoh16PN+#BQg~|mFU_y}`hW*;h^tUOJz3182(&GJm zZYcN(P&i4%F58n1mL(TU=XZ@wwB$r?cGIh`x#Qb zU3~thyRo9L3OIPBKh;gTKSA@;Pp6-4ZeHKh)AJ~h8VTS@b8BmxS2s1)S5#C;JRT?C zaRLJ}BETOV-AC8yV@$05GJjZc2VdOsI)%4P8V0anJqy+)nd~HyxM&}H48XmxKFgAeaSv;>7 zH{HXFzkea!{N$7CIyyQw$fSx2`_hgbeq+zYdKM7@5&X(eBqIKFixLF!+hl4HR8V8# z-$z>LIeU^xpKHkeXA#7Ll>m4S8CDcni-;f00=S-!-r^yWM1U=uHevdb$)|Sh+*x|z z!i63{X{}XfXJ-b07{naTQddH7jVrxGrX;|7@~bm=0mA3TWX`QzU;V+QF^F({2A z;C8oDJ7>;3V9$W;HCzxGCl5?uG?~C?jfh~BLPT&J$N%PnAQ)qOumR9q;0i$-gEGNl za|!?5^Rn%nynGOa#={#Tz|C-LiZ%u%L3AgU~`^DDSy1c zNf$6$W5thytiwtpUYh=)NF0t~$2eH+V6j;Ph@gYo7~i;OU7zv5p{vP4#P6?64q#)j z8HUBTC(8IAo~>4-AJ7 zA3o|@d*&CLH?Q2gckhV-44*i4YDFXxSunGzYRKt`M5DuMArh?`l_Vn3=&<7dR87tF zBL@#o?>K*c74U;><89lwKjeDe7vkmRHIZ=mrn<{bUbk`k literal 0 HcmV?d00001 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))

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)) {{ 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 + + +
+

 

+ +
+
+ +
+
+
+ @if ($client) +

{{ $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()) +
+

{{ trans('texts.secure_payment') }}

+
{{ trans('texts.256_encryption') }}
+
+ @endif +
+
+ +

 
 

+ +
+

{{ trans('texts.contact_information') }}

+
+
+ {!! 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('') !!} +
+
+ @if (isset($paymentTitle)) +
+
+ {!! Former::text('email') + ->placeholder(trans('texts.email')) + ->autocomplete('email') + ->label('') !!} +
+
+ @endif + +

 
 

+ + @if ($showAddress) +

{{ 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('') !!} +
+
+ +

 
 

+ @endif + +

{{ 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('') !!} +
+
+
+ {!! Button::success(strtoupper(trans('texts.add_account'))) + ->submit() + ->large() !!} +
+ @else +
+
+ @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'] }} + @endforeach +
+ @endif +
+
+ +

 

+
+ @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 +
+

 

+ @endif + + +
+ +
+
+ + +

 

+

 

+ +
+ + {!! 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 ($showAddress) -

{{ 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 -
-
-
-
- @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) - {{ $card['alt'] }} - @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('') !!} +
+
+
+ {!! Button::success(strtoupper(trans('texts.add_account'))) + ->submit() + ->large() !!} +
+ @else +
+
+ @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) + {{ $card['alt'] }} + @endforeach +
+ @endif +
+
-

 

-
- {!! 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() !!} +
+

 

+ @endif
@@ -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('
').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') + + +
+ +

{{ $title }}

+ + @foreach ($paymentMethods as $paymentMethod) +
+ + {{trans(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 + +
+ {!! 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. --}} @endif
- @if (!empty($paymentMethods)) + @if (!empty($account->getTokenGatewayId()))

{{ trans('texts.payment_methods') }}

diff --git a/resources/views/payments/add_paymentmethod.blade.php b/resources/views/payments/add_paymentmethod.blade.php index 8eb639300c08..b2e13dcac841 100644 --- a/resources/views/payments/add_paymentmethod.blade.php +++ b/resources/views/payments/add_paymentmethod.blade.php @@ -34,6 +34,8 @@ } }, onError: function(e) { + var $form = $('.payment-form'); + $form.find('button').prop('disabled', false); // Show the errors on the form if (e.details && e.details.invalidFieldKeys.length) { var invalidField = e.details.invalidFieldKeys[0]; @@ -54,6 +56,10 @@ } }); $('.payment-form').submit(function(event) { + var $form = $(this); + + // Disable the submit button to prevent repeated clicks + $form.find('button').prop('disabled', true); $('#js-error-message').hide(); }); }); diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php index 4d88b907339e..caff83653566 100644 --- a/resources/views/payments/paymentmethods_list.blade.php +++ b/resources/views/payments/paymentmethods_list.blade.php @@ -16,6 +16,7 @@ display:inline-block; } +@if(!empty($paymentMethods)) @foreach ($paymentMethods as $paymentMethod)
@@ -41,6 +42,7 @@ ×
@endforeach +@endif
{!! Button::success(strtoupper(trans('texts.add_credit_card'))) From 0fc44962d4c858c87b0ea5b9df001c421dee4866 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Fri, 6 May 2016 22:33:03 -0400 Subject: [PATCH 26/37] Add Braintree/PayPal support --- .../Controllers/AccountGatewayController.php | 18 ++- app/Http/Controllers/PaymentController.php | 112 +++++++++++------- .../Controllers/PublicClientController.php | 71 +++++++++-- app/Http/routes.php | 4 +- app/Models/Account.php | 9 ++ app/Models/AccountGateway.php | 5 + app/Ninja/Repositories/PaymentRepository.php | 2 + app/Services/PaymentService.php | 34 ++++-- .../2016_04_23_182223_payments_changes.php | 2 + .../credit_cards/{paypa.png => paypal.png} | Bin resources/lang/en/texts.php | 8 +- .../views/accounts/account_gateway.blade.php | 20 ++++ resources/views/invoices/view.blade.php | 39 ++++++ .../payments/add_paymentmethod.blade.php | 36 +++++- .../payments/paymentmethods_list.blade.php | 66 +++++++++-- 15 files changed, 347 insertions(+), 79 deletions(-) rename public/images/credit_cards/{paypa.png => paypal.png} (100%) diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php index 1ef8d61e98b8..bd7cb2599b54 100644 --- a/app/Http/Controllers/AccountGatewayController.php +++ b/app/Http/Controllers/AccountGatewayController.php @@ -110,13 +110,25 @@ class AccountGatewayController extends BaseController continue; } + if ($type == PAYMENT_TYPE_STRIPE && $account->getGatewayByType(PAYMENT_TYPE_CREDIT_CARD)) { + // Another gateway is already handling credit card payments + continue; + } + if ($type == PAYMENT_TYPE_DIRECT_DEBIT && $stripeGateway = $account->getGatewayByType(PAYMENT_TYPE_STRIPE)) { - if (!empty($stripeGateway->getConfig()->enableAch)) { + if (!empty($stripeGateway->getAchEnabled())) { // Stripe is already handling ACH payments continue; } } + if ($type == PAYMENT_TYPE_PAYPAL && $braintreeGateway = $account->getGatewayConfig(GATEWAY_BRAINTREE)) { + if (!empty($braintreeGateway->getPayPalEnabled())) { + // PayPal is already enabled + continue; + } + } + $paymentTypes[$type] = $type == PAYMENT_TYPE_CREDIT_CARD ? trans('texts.other_providers'): trans('texts.'.strtolower($type)); if ($type == PAYMENT_TYPE_BITCOIN) { @@ -300,6 +312,10 @@ class AccountGatewayController extends BaseController $config->enableAch = boolval(Input::get('enable_ach')); } + if ($gatewayId == GATEWAY_BRAINTREE) { + $config->enablePayPal = boolval(Input::get('enable_paypal')); + } + $cardCount = 0; if ($creditcards) { foreach ($creditcards as $card => $value) { diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 555f9965e382..84d281478193 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -152,63 +152,83 @@ class PaymentController extends BaseController $account->account_gateways[0]->getPaymentType(); } - if ($paymentType == PAYMENT_TYPE_TOKEN) { - $useToken = true; - $accountGateway = $invoice->client->account->getTokenGateway(); - $paymentType = $accountGateway->getPaymentType(); - } else { - $accountGateway = $invoice->client->account->getGatewayByType($paymentType); - } + $data = array(); - Session::put($invitation->id . 'payment_type', $paymentType); - - $gateway = $accountGateway->gateway; - - $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes(); - - $isOffsite = ($paymentType != PAYMENT_TYPE_CREDIT_CARD && $accountGateway->getPaymentType() != PAYMENT_TYPE_STRIPE) - || $gateway->id == GATEWAY_EWAY - || $gateway->id == GATEWAY_TWO_CHECKOUT - || $gateway->id == GATEWAY_PAYFAST - || $gateway->id == GATEWAY_MOLLIE; - - // Handle offsite payments - if ($useToken || $isOffsite) { - if (Session::has('error')) { - Session::reflash(); - return Redirect::to('view/'.$invitationKey); + if ($paymentType != PAYMENT_TYPE_BRAINTREE_PAYPAL) { + if ($paymentType == PAYMENT_TYPE_TOKEN) { + $useToken = true; + $accountGateway = $invoice->client->account->getTokenGateway(); + $paymentType = $accountGateway->getPaymentType(); } else { - return self::do_payment($invitationKey, false, $useToken, $sourceId); + $accountGateway = $invoice->client->account->getGatewayByType($paymentType); } + + Session::put($invitation->id . 'payment_type', $paymentType); + + $gateway = $accountGateway->gateway; + + $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes(); + + $isOffsite = ($paymentType != PAYMENT_TYPE_CREDIT_CARD && $accountGateway->getPaymentType() != PAYMENT_TYPE_STRIPE) + || $gateway->id == GATEWAY_EWAY + || $gateway->id == GATEWAY_TWO_CHECKOUT + || $gateway->id == GATEWAY_PAYFAST + || $gateway->id == GATEWAY_MOLLIE; + + // Handle offsite payments + if ($useToken || $isOffsite) { + if (Session::has('error')) { + Session::reflash(); + return Redirect::to('view/' . $invitationKey); + } else { + return self::do_payment($invitationKey, false, $useToken, $sourceId); + } + } + + $data += [ + 'accountGateway' => $accountGateway, + 'acceptedCreditCardTypes' => $acceptedCreditCardTypes, + 'gateway' => $gateway, + '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); + } + + } else { + if ($deviceData = Input::get('details')) { + Session::put($invitation->id . 'device_data', $deviceData); + } + + Session::put($invitation->id . 'payment_type', PAYMENT_TYPE_BRAINTREE_PAYPAL); + $paypalDetails = json_decode(Input::get('details')); + if (!$sourceId || !$paypalDetails) { + return Redirect::to('view/'.$invitationKey); + } + $data['paypalDetails'] = $paypalDetails; } - $data = [ + $data += [ 'showBreadcrumbs' => false, 'url' => 'payment/'.$invitationKey, 'amount' => $invoice->getRequestedAmount(), 'invoiceNumber' => $invoice->invoice_number, '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' => $client->account, + 'sourceId' => $sourceId, 'clientFontUrl' => $client->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); } @@ -381,7 +401,6 @@ class PaymentController extends BaseController $paymentType = Session::get($invitation->id . 'payment_type'); $accountGateway = $account->getGatewayByType($paymentType); - $rules = [ 'first_name' => 'required', 'last_name' => 'required', @@ -399,7 +418,9 @@ class PaymentController extends BaseController ); } - if ($accountGateway->show_address) { + $requireAddress = $accountGateway->show_address && $paymentType != PAYMENT_TYPE_STRIPE_ACH && $paymentType != PAYMENT_TYPE_BRAINTREE_PAYPAL; + + if ($requireAddress) { $rules = array_merge($rules, [ 'address1' => 'required', 'city' => 'required', @@ -418,7 +439,7 @@ class PaymentController extends BaseController ->withInput(Request::except('cvv')); } - if ($accountGateway->update_address) { + if ($requireAddress && $accountGateway->update_address) { $client->address1 = trim(Input::get('address1')); $client->address2 = trim(Input::get('address2')); $client->city = trim(Input::get('city')); @@ -471,6 +492,11 @@ class PaymentController extends BaseController } } } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { + $deviceData = Input::get('device_data'); + if (!$deviceData) { + $deviceData = Session::get($invitation->id . 'device_data'); + } + if ($token = Input::get('payment_method_nonce')) { $details['token'] = $token; unset($details['card']); @@ -496,6 +522,10 @@ class PaymentController extends BaseController return Redirect::to('payment/'.$invitationKey)->withInput(Request::except('cvv')); } } + + if($deviceData) { + $details['deviceData'] = $deviceData; + } } $response = $gateway->purchase($details)->send(); diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php index 72e48c2e2444..6f43314ad3d5 100644 --- a/app/Http/Controllers/PublicClientController.php +++ b/app/Http/Controllers/PublicClientController.php @@ -95,6 +95,7 @@ class PublicClientController extends BaseController 'phone', ]); + $data = array(); $paymentTypes = $this->getPaymentTypes($client, $invitation); $paymentURL = ''; if (count($paymentTypes) == 1) { @@ -104,6 +105,12 @@ class PublicClientController extends BaseController } } + if ($braintreeGateway = $account->getGatewayConfig(GATEWAY_BRAINTREE)){ + if($braintreeGateway->getPayPalEnabled()) { + $data['braintreeClientToken'] = $this->paymentService->getBraintreeClientToken($account); + } + } + $showApprove = $invoice->quote_invoice_id ? false : true; if ($invoice->due_date) { $showApprove = time() < strtotime($invoice->due_date); @@ -125,7 +132,7 @@ class PublicClientController extends BaseController } } - $data = array( + $data += array( 'account' => $account, 'showApprove' => $showApprove, 'showBreadcrumbs' => false, @@ -167,20 +174,28 @@ class PublicClientController extends BaseController if ($paymentMethod['type']->id == PAYMENT_TYPE_ACH) { $html = '
'.htmlentities($paymentMethod['bank_name']).'
'; + } elseif ($paymentMethod['type']->id == PAYMENT_TYPE_ID_PAYPAL) { + $html = ''.trans('; } else { $code = htmlentities(str_replace(' ', '', strtolower($paymentMethod['type']->name))); $html = ''.trans('; } - if ($paymentMethod['type']->id != PAYMENT_TYPE_ACH) { + $url = URL::to("/payment/{$invitation->invitation_key}/token/".$paymentMethod['id']); + + if ($paymentMethod['type']->id == PAYMENT_TYPE_ID_PAYPAL) { + $html .= '  '.$paymentMethod['email'].''; + $url .= '#braintree_paypal'; + } elseif ($paymentMethod['type']->id != PAYMENT_TYPE_ACH) { $html .= '
'.trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))).'
'; + $html .= '•••'.$paymentMethod['last4'].'
'; } else { $html .= '
'; + $html .= '•••'.$paymentMethod['last4'].'
'; } - $html .= '•••'.$paymentMethod['last4'].'
'; $paymentTypes[] = [ - 'url' => URL::to("/payment/{$invitation->invitation_key}/token/".$paymentMethod['id']), + 'url' => $url, 'label' => $html, ]; } @@ -219,6 +234,13 @@ class PublicClientController extends BaseController $paymentTypes[] = [ 'url' => $url, 'label' => $label ]; + + if($gateway->getPayPalEnabled()) { + $paymentTypes[] = [ + 'label' => trans('texts.paypal'), + 'url' => $url = URL::to("/payment/{$invitation->invitation_key}/braintree_paypal"), + ]; + } } } } @@ -270,6 +292,12 @@ class PublicClientController extends BaseController 'gateway' => $account->getTokenGateway(), 'paymentMethods' => $this->paymentService->getClientPaymentMethods($client), ]; + + if ($braintreeGateway = $account->getGatewayConfig(GATEWAY_BRAINTREE)){ + if($braintreeGateway->getPayPalEnabled()) { + $data['braintreeClientToken'] = $this->paymentService->getBraintreeClientToken($account); + } + } return response()->view('invited.dashboard', $data); } @@ -413,18 +441,21 @@ class PublicClientController extends BaseController ->addColumn('invoice_number', function ($model) { return $model->invitation_key ? link_to('/view/'.$model->invitation_key, $model->invoice_number)->toHtml() : $model->invoice_number; }) ->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : 'Manual entry'; }) ->addColumn('payment_type', function ($model) { return ($model->payment_type && !$model->last4) ? $model->payment_type : ($model->account_gateway_id ? 'Online payment' : ''); }) - ->addColumn('payment_source', function ($model) { - if (!$model->last4) return ''; + ->addColumn('payment_source', function ($model) { $code = str_replace(' ', '', strtolower($model->payment_type)); $card_type = trans("texts.card_" . $code); if ($model->payment_type_id != PAYMENT_TYPE_ACH) { - $expiration = trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($model->expiration, false)->format('m/y'))); - return '' . htmlentities($card_type) . '  •••' . $model->last4 . ' ' . $expiration; - } else { + if($model->last4) { + $expiration = trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($model->expiration, false)->format('m/y'))); + return '' . htmlentities($card_type) . '  •••' . $model->last4 . ' ' . $expiration; + } elseif ($model->email) { + return $model->email; + } + } elseif ($model->last4) { $bankData = PaymentController::getBankData($model->routing_number); if (is_array($bankData)) { return $bankData['name'].'  •••' . $model->last4; - } else { + } elseif($model->last4) { return '' . htmlentities($card_type) . '  •••' . $model->last4; } } @@ -728,6 +759,12 @@ class PublicClientController extends BaseController 'title' => trans('texts.payment_methods') ); + if ($braintreeGateway = $account->getGatewayConfig(GATEWAY_BRAINTREE)){ + if($braintreeGateway->getPayPalEnabled()) { + $data['braintreeClientToken'] = $this->paymentService->getBraintreeClientToken($account); + } + } + return response()->view('payments.paymentmethods', $data); } @@ -771,7 +808,7 @@ class PublicClientController extends BaseController return redirect()->to($client->account->enable_client_portal?'/client/dashboard':'/client/paymentmethods/'); } - public function addPaymentMethod($paymentType) + public function addPaymentMethod($paymentType, $token=false) { if (!$invitation = $this->getInvitation()) { return $this->returnError(); @@ -785,6 +822,18 @@ class PublicClientController extends BaseController $paymentType = 'PAYMENT_TYPE_' . strtoupper($paymentType); $accountGateway = $invoice->client->account->getTokenGateway(); $gateway = $accountGateway->gateway; + + if ($token && $paymentType == PAYMENT_TYPE_BRAINTREE_PAYPAL) { + $sourceId = $this->paymentService->createToken($this->paymentService->createGateway($accountGateway), array('token'=>$token), $accountGateway, $client, $invitation->contact_id); + + if(empty($sourceId)) { + $this->paymentMethodError('Token-No-Ref', $this->paymentService->lastError, $accountGateway); + } else { + Session::flash('message', trans('texts.payment_method_added')); + } + return redirect()->to($account->enable_client_portal?'/client/dashboard':'/client/paymentmethods/'); + } + $acceptedCreditCardTypes = $accountGateway->getCreditcardTypes(); diff --git a/app/Http/routes.php b/app/Http/routes.php index 82a5b00f2cd4..09d53a76b50c 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -45,7 +45,7 @@ Route::group(['middleware' => 'auth:client'], function() { 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::get('client/paymentmethods/add/{payment_type}/{source_id?}', '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'); @@ -638,6 +638,7 @@ if (!defined('CONTACT_EMAIL')) { define('PAYMENT_TYPE_EUROCARD', 11); define('PAYMENT_TYPE_NOVA', 12); define('PAYMENT_TYPE_CREDIT_CARD_OTHER', 13); + define('PAYMENT_TYPE_ID_PAYPAL', 14); define('PAYMENT_TYPE_CARTE_BLANCHE', 17); define('PAYMENT_TYPE_UNIONPAY', 18); define('PAYMENT_TYPE_JCB', 19); @@ -650,6 +651,7 @@ if (!defined('CONTACT_EMAIL')) { 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_BRAINTREE_PAYPAL', 'PAYMENT_TYPE_BRAINTREE_PAYPAL'); 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 234d9a5b63ca..2915b4c86d6c 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -383,6 +383,15 @@ class Account extends Eloquent $type = PAYMENT_TYPE_STRIPE; } + if ($type == PAYMENT_TYPE_BRAINTREE_PAYPAL) { + $gateway = $this->getGatewayConfig(GATEWAY_BRAINTREE); + + if (!$gateway || !$gateway->getPayPalEnabled()){ + return false; + } + return $gateway; + } + foreach ($this->account_gateways as $gateway) { if (!$type || $type == PAYMENT_TYPE_ANY) { return $gateway; diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php index 13a990bb3ae4..6de95e8593cf 100644 --- a/app/Models/AccountGateway.php +++ b/app/Models/AccountGateway.php @@ -77,6 +77,11 @@ class AccountGateway extends EntityModel return !empty($this->getConfigField('enableAch')); } + public function getPayPAlEnabled() + { + return !empty($this->getConfigField('enablePayPal')); + } + public function getPlaidSecret() { if ( ! $this->isGateway(GATEWAY_STRIPE)) { diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php index 221cea40ce99..b2022f2e197f 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.email', 'payments.routing_number', 'invoices.is_deleted as invoice_is_deleted', 'gateways.name as gateway_name', @@ -119,6 +120,7 @@ class PaymentRepository extends BaseRepository 'payments.refunded', 'payments.expiration', 'payments.last4', + 'payments.email', '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 01d420eefde2..3ec068ba91fb 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -234,6 +234,13 @@ class PaymentService extends BaseService 'last4' => $source->last4, 'expiration' => $source->expirationYear . '-' . $source->expirationMonth . '-00', ); + } elseif ($source instanceof \Braintree\PayPalAccount) { + $paymentMethods[] = array( + 'id' => $source->token, + 'default' => $source->isDefault(), + 'type' => $paymentTypes->find(PAYMENT_TYPE_ID_PAYPAL), + 'email' => $source->email, + ); } } } @@ -524,10 +531,16 @@ class PaymentService extends BaseService } } } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { - $card = $purchaseResponse->getData()->transaction->creditCardDetails; - $payment->last4 = $card->last4; - $payment->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00'; - $payment->payment_type_id = $this->parseCardType($card->cardType); + $transaction = $purchaseResponse->getData()->transaction; + if ($transaction->paymentInstrumentType == 'credit_card') { + $card = $transaction->creditCardDetails; + $payment->last4 = $card->last4; + $payment->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00'; + $payment->payment_type_id = $this->parseCardType($card->cardType); + } elseif ($transaction->paymentInstrumentType == 'paypal_account') { + $payment->payment_type_id = PAYMENT_TYPE_ID_PAYPAL; + $payment->email = $transaction->paypalDetails->payerEmail; + } } if ($payerId) { @@ -734,17 +747,20 @@ class PaymentService extends BaseService [ 'source', function ($model) { - if (!$model->last4) return ''; $code = str_replace(' ', '', strtolower($model->payment_type)); $card_type = trans("texts.card_" . $code); if ($model->payment_type_id != PAYMENT_TYPE_ACH) { - $expiration = trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($model->expiration, false)->format('m/y'))); - return '' . htmlentities($card_type) . '  •••' . $model->last4 . ' ' . $expiration; - } else { + if($model->last4) { + $expiration = trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($model->expiration, false)->format('m/y'))); + return '' . htmlentities($card_type) . '  •••' . $model->last4 . ' ' . $expiration; + } elseif ($model->email) { + return $model->email; + } + } elseif ($model->last4) { $bankData = PaymentController::getBankData($model->routing_number); if (is_array($bankData)) { return $bankData['name'].'  •••' . $model->last4; - } else { + } elseif($model->last4) { return '' . htmlentities($card_type) . '  •••' . $model->last4; } } diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php index 1f8c2037feef..fea4e739775e 100644 --- a/database/migrations/2016_04_23_182223_payments_changes.php +++ b/database/migrations/2016_04_23_182223_payments_changes.php @@ -32,6 +32,7 @@ class PaymentsChanges extends Migration $table->smallInteger('last4')->unsigned()->nullable(); $table->date('expiration')->nullable(); $table->text('gateway_error')->nullable(); + $table->string('email')->nullable(); }); Schema::table('invoices', function($table) @@ -61,6 +62,7 @@ class PaymentsChanges extends Migration $table->dropColumn('last4'); $table->dropColumn('expiration'); $table->dropColumn('gateway_error'); + $table->dropColumn('email'); }); Schema::table('invoices', function ($table) { diff --git a/public/images/credit_cards/paypa.png b/public/images/credit_cards/paypal.png similarity index 100% rename from public/images/credit_cards/paypa.png rename to public/images/credit_cards/paypal.png diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 5ff2f333d833..70f585bc0f5c 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1276,7 +1276,13 @@ $LANG = array( 'disabled_by_client' => 'Disabled by client', 'manage_auto_bill' => 'Manage Auto-bill', 'enabled' => 'Enabled', - '' + 'paypal' => 'PayPal', + 'braintree_enable_paypal' => 'Enable PayPal payments through BrainTree', + 'braintree_paypal_disabled_help' => 'The PayPal gateway is processing PayPal payments', + 'braintree_paypal_help' => 'You must also :link.', + 'braintree_paypal_help_link_text' => 'link PayPal to your BrainTree account', + 'token_billing_braintree_paypal' => 'Save payment details', + 'add_paypal_account' => 'Add PayPal Account' ); return $LANG; diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index 4d4e79d7a157..bd5f100671a6 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -23,6 +23,7 @@ {!! Former::populateField('update_address', intval($accountGateway->update_address)) !!} {!! Former::populateField('publishable_key', $accountGateway->getPublishableStripeKey() ? str_repeat('*', strlen($accountGateway->getPublishableStripeKey())) : '') !!} {!! Former::populateField('enable_ach', $accountGateway->getAchEnabled() ? '1' : null) !!} + {!! Former::populateField('enable_paypal', $accountGateway->getPayPalEnabled() ? '1' : null) !!} {!! Former::populateField('plaid_client_id', $accountGateway->getPlaidClientId() ? str_repeat('*', strlen($accountGateway->getPlaidClientId())) : '') !!} {!! Former::populateField('plaid_secret', $accountGateway->getPlaidSecret() ? str_repeat('*', strlen($accountGateway->getPlaidSecret())) : '') !!} {!! Former::populateField('plaid_public_key', $accountGateway->getPlaidPublicKey() ? str_repeat('*', strlen($accountGateway->getPlaidPublicKey())) : '') !!} @@ -95,6 +96,25 @@ ->options($tokenBillingOptions) ->help(trans('texts.token_billing_help')) !!} @endif + + @if ($gateway->id == GATEWAY_BRAINTREE) + @if ($account->getGatewayByType(PAYMENT_TYPE_PAYPAL)) + {!! Former::checkbox('enable_paypal') + ->label(trans('texts.paypal')) + ->text(trans('texts.braintree_enable_paypal')) + ->value(null) + ->disabled(true) + ->help(trans('texts.braintree_paypal_disabled_help')) !!} + @else + {!! Former::checkbox('enable_paypal') + ->label(trans('texts.paypal')) + ->help(trans('texts.braintree_paypal_help', [ + 'link'=>''. + trans('texts.braintree_paypal_help_link_text').'' + ])) + ->text(trans('texts.braintree_enable_paypal')) !!} + @endif + @endif
@endforeach diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php index f6aebb6cb78b..31c8f68a9e84 100644 --- a/resources/views/invoices/view.blade.php +++ b/resources/views/invoices/view.blade.php @@ -21,6 +21,45 @@ margin-bottom:5px; } + + @if (!empty($braintreeClientToken)) + + + @endif @stop @section('content') diff --git a/resources/views/payments/add_paymentmethod.blade.php b/resources/views/payments/add_paymentmethod.blade.php index b2e13dcac841..5e49b08d6f8c 100644 --- a/resources/views/payments/add_paymentmethod.blade.php +++ b/resources/views/payments/add_paymentmethod.blade.php @@ -64,7 +64,7 @@ }); }); - @elseif ($accountGateway->getPublishableStripeKey()) + @elseif (isset($accountGateway) && $accountGateway->getPublishableStripeKey()) - @if ($accountGateway->getPlaidEnabled()) + @if (isset($accountGateway) && $accountGateway->getPlaidEnabled()) @endif diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php index caff83653566..3436315acf6a 100644 --- a/resources/views/payments/paymentmethods_list.blade.php +++ b/resources/views/payments/paymentmethods_list.blade.php @@ -16,28 +16,65 @@ display:inline-block; } +@if (!empty($braintreeClientToken)) + + +@endif @if(!empty($paymentMethods)) @foreach ($paymentMethods as $paymentMethod)
{{trans(name)))}}"> + @if(!empty($paymentMethod['last4'])) •••••{{$paymentMethod['last4']}} + @endif @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 + {{ $paymentMethod['bank_name'] }} + @if($paymentMethod['status'] == 'new') + ({{trans('texts.complete_verification')}}) + @elseif($paymentMethod['status'] == 'verification_failed') + ({{trans('texts.verification_failed')}}) + @endif + @elseif($paymentMethod['type']->id == PAYMENT_TYPE_ID_PAYPAL) + {{ $paymentMethod['email'] }} @else - {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))) !!} + {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))) !!} @endif @if($paymentMethod['default']) - ({{trans('texts.used_for_auto_bill')}}) + ({{trans('texts.used_for_auto_bill')}}) @elseif($paymentMethod['type']->id != PAYMENT_TYPE_ACH || $paymentMethod['status'] == 'verified') - ({{trans('texts.use_for_auto_bill')}}) + ({{trans('texts.use_for_auto_bill')}}) @endif ×
@@ -49,8 +86,15 @@ ->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')) !!} + {!! Button::success(strtoupper(trans('texts.add_bank_account'))) + ->asLinkTo(URL::to('/client/paymentmethods/add/stripe_ach')) !!} + @endif + @if($gateway->getPayPalEnabled()) +   + {!! Button::success(strtoupper(trans('texts.add_paypal_account'))) + ->withAttributes(['id'=>'add-paypal']) + ->asLinkTo(URL::to('/client/paymentmethods/add/braintree_paypal')) !!} +
@endif From 20f6f32a068099ff29f2d39c10b31b2527c6612d Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Mon, 9 May 2016 16:29:02 -0400 Subject: [PATCH 27/37] Update UI for configuring auto bill --- .../Controllers/PublicClientController.php | 4 +- app/Http/routes.php | 1 + app/Models/Client.php | 4 +- app/Models/Invoice.php | 2 +- app/Ninja/Repositories/InvoiceRepository.php | 23 +++++------ .../2016_04_23_182223_payments_changes.php | 28 ++++++++++---- resources/lang/en/texts.php | 5 ++- resources/views/invoices/edit.blade.php | 38 ++++++++++--------- resources/views/invoices/knockout.blade.php | 4 +- resources/views/public_list.blade.php | 2 +- 10 files changed, 63 insertions(+), 48 deletions(-) diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php index 6f43314ad3d5..c5b22ee16204 100644 --- a/app/Http/Controllers/PublicClientController.php +++ b/app/Http/Controllers/PublicClientController.php @@ -963,8 +963,8 @@ class PublicClientController extends BaseController $enable = Input::get('enable'); $invoice = $client->invoices->where('public_id', intval($publicId))->first(); - if ($invoice && $invoice->is_recurring && $invoice->enable_auto_bill > AUTO_BILL_OFF) { - $invoice->auto_bill = $enable ? true : false; + if ($invoice && $invoice->is_recurring && ($invoice->auto_bill == AUTO_BILL_OPT_IN || $invoice->auto_bill == AUTO_BILL_OPT_OUT)) { + $invoice->client_enable_auto_bill = $enable ? true : false; $invoice->save(); } diff --git a/app/Http/routes.php b/app/Http/routes.php index 09d53a76b50c..a3bf59d22289 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -698,6 +698,7 @@ if (!defined('CONTACT_EMAIL')) { define('AUTO_BILL_OFF', 0); define('AUTO_BILL_OPT_IN', 1); define('AUTO_BILL_OPT_OUT', 2); + define('AUTO_BILL_ALWAYS', 3); // These must be lowercase define('PLAN_FREE', 'free'); diff --git a/app/Models/Client.php b/app/Models/Client.php index a60d44793c22..19a7968bf965 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -320,8 +320,8 @@ class Client extends EntityModel $this->save(); } - public function hasAutoBillInvoices(){ - return $this->invoices()->where('auto_bill', 1)->count() > 0; + public function hasAutoBillConfigurableInvoices(){ + return $this->invoices()->whereIn('auto_bill', [AUTO_BILL_OPT_IN, AUTO_BILL_OPT_OUT])->count() > 0; } } diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index c0da6b8faff6..33ce1bf8f648 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -35,7 +35,7 @@ class Invoice extends EntityModel implements BalanceAffecting protected $casts = [ 'is_recurring' => 'boolean', 'has_tasks' => 'boolean', - 'auto_bill' => 'boolean', + 'client_enable_auto_bill' => 'boolean', 'has_expenses' => 'boolean', ]; diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index ac7af064f71a..f0bc159191e5 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -160,7 +160,7 @@ class InvoiceRepository extends BaseRepository ->where('invoices.is_deleted', '=', false) ->where('clients.deleted_at', '=', null) ->where('invoices.is_recurring', '=', true) - ->where('invoices.enable_auto_bill', '>', AUTO_BILL_OFF) + ->whereIn('invoices.auto_bill', [AUTO_BILL_OPT_IN, AUTO_BILL_OPT_OUT]) //->where('invoices.start_date', '>=', date('Y-m-d H:i:s')) ->select( DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'), @@ -174,7 +174,7 @@ class InvoiceRepository extends BaseRepository 'invoices.amount', 'invoices.start_date', 'invoices.end_date', - 'invoices.auto_bill', + 'invoices.client_enable_auto_bill', 'frequencies.name as frequency' ); @@ -183,8 +183,8 @@ class InvoiceRepository extends BaseRepository ->addColumn('start_date', function ($model) { return Utils::fromSqlDate($model->start_date); }) ->addColumn('end_date', function ($model) { return Utils::fromSqlDate($model->end_date); }) ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); }) - ->addColumn('auto_bill', function ($model) { - if ($model->auto_bill) { + ->addColumn('client_enable_auto_bill', function ($model) { + if ($model->client_enable_auto_bill) { return trans('texts.enabled') . ' ('.trans('texts.disable').')'; } else { return trans('texts.disabled') . ' ('.trans('texts.enable').')'; @@ -317,17 +317,12 @@ class InvoiceRepository extends BaseRepository $invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0; $invoice->start_date = Utils::toSqlDate($data['start_date']); $invoice->end_date = Utils::toSqlDate($data['end_date']); - $invoice->auto_bill = isset($data['auto_bill']) && $data['auto_bill'] ? true : false; - $invoice->enable_auto_bill = isset($data['enable_auto_bill']) ? intval($data['enable_auto_bill']) : 0; + $invoice->client_enable_auto_bill = isset($data['client_enable_auto_bill']) && $data['client_enable_auto_bill'] ? true : false; + $invoice->auto_bill = isset($data['auto_bill']) ? intval($data['auto_bill']) : 0; - if ($invoice->enable_auto_bill != AUTO_BILL_OPT_IN && $invoice->enable_auto_bill != AUTO_BILL_OPT_OUT ) { - // Auto-bill is not enabled - $invoice->enable_auto_bill = AUTO_BILL_OFF; - $invoice->auto_bill = false; - } elseif ($isNew) { - $invoice->auto_bill = $invoice->enable_auto_bill == AUTO_BILL_OPT_OUT; + if ($invoice->auto_bill < AUTO_BILL_OFF || $invoice->auto_bill > AUTO_BILL_ALWAYS ) { + $invoice->auto_bill = AUTO_BILL_OFF; } - if (isset($data['recurring_due_date'])) { $invoice->due_date = $data['recurring_due_date']; @@ -811,7 +806,7 @@ class InvoiceRepository extends BaseRepository $recurInvoice->last_sent_date = date('Y-m-d'); $recurInvoice->save(); - if ($recurInvoice->auto_bill) { + if ($recurInvoice->auto_bill == AUTO_BILL_ALWAYS || ($recurInvoice->auto_bill != AUTO_BILL_OFF && $recurInvoice->client_enable_auto_bill)) { if ($this->paymentService->autoBillInvoice($invoice)) { // update the invoice reference to match its actual state // this is to ensure a 'payment received' email is sent diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php index fea4e739775e..2e6cdcb6ec05 100644 --- a/database/migrations/2016_04_23_182223_payments_changes.php +++ b/database/migrations/2016_04_23_182223_payments_changes.php @@ -13,21 +13,21 @@ class PaymentsChanges extends Migration public function up() { Schema::dropIfExists('payment_statuses'); - + Schema::create('payment_statuses', function($table) { $table->increments('id'); $table->string('name'); }); - + (new \PaymentStatusSeeder())->run(); - + Schema::table('payments', function($table) { $table->decimal('refunded', 13, 2); $table->unsignedInteger('payment_status_id')->default(PAYMENT_STATUS_COMPLETED); $table->foreign('payment_status_id')->references('id')->on('payment_statuses'); - + $table->unsignedInteger('routing_number')->nullable(); $table->smallInteger('last4')->unsigned()->nullable(); $table->date('expiration')->nullable(); @@ -37,12 +37,12 @@ class PaymentsChanges extends Migration Schema::table('invoices', function($table) { - $table->tinyInteger('enable_auto_bill')->default(AUTO_BILL_OFF); + $table->boolean('client_enable_auto_bill')->default(false); }); \DB::table('invoices') ->where('auto_bill', '=', 1) - ->update(array('enable_auto_bill' => AUTO_BILL_OPT_OUT)); + ->update(array('client_enable_auto_bill' => 1, 'auto_bill' => AUTO_BILL_OPT_OUT)); } /** @@ -65,8 +65,22 @@ class PaymentsChanges extends Migration $table->dropColumn('email'); }); + \DB::table('invoices') + ->where(function($query){ + $query->where('auto_bill', '=', AUTO_BILL_ALWAYS); + $query->orwhere(function($query){ + $query->where('auto_bill', '!=', AUTO_BILL_OFF); + $query->where('client_enable_auto_bill', '=', 1); + }); + }) + ->update(array('auto_bill' => 1)); + + \DB::table('invoices') + ->where('auto_bill', '!=', 1) + ->update(array('auto_bill' => 0)); + Schema::table('invoices', function ($table) { - $table->dropColumn('enable_auto_bill'); + $table->dropColumn('client_enable_auto_bill'); }); Schema::dropIfExists('payment_statuses'); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 70f585bc0f5c..163538ed4f88 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1272,8 +1272,9 @@ $LANG = array( 'off' => 'Off', 'opt_in' => 'Opt-in', 'opt_out' => 'Opt-out', - 'enabled_by_client' => 'Enabled by client', - 'disabled_by_client' => 'Disabled by client', + 'always' => 'Always', + 'opted_out' => 'Opted out', + 'opted_in' => 'Opted in', 'manage_auto_bill' => 'Manage Auto-bill', 'enabled' => 'Enabled', 'paypal' => 'PayPal', diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index d69f4c201201..b99d11d9d955 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -159,23 +159,27 @@ @if($account->getTokenGatewayId()) - {!! Former::radios('enable_auto_bill')->radios([ - trans('texts.off') => array('name' => 'enable_auto_bill', 'value' => 0, 'data-bind' => "checked: enable_auto_bill, valueUpdate: 'afterkeydown', checkedValue:0"), - trans('texts.opt_in') => array('name' => 'enable_auto_bill', 'value' => 1, 'data-bind' => "checked: enable_auto_bill, valueUpdate: 'afterkeydown', checkedValue:1"), - trans('texts.opt_out') => array('name' => 'enable_auto_bill', 'value' => 2, 'data-bind' => "checked: enable_auto_bill, valueUpdate: 'afterkeydown', checkedValue:2"), - ])->inline() - ->label(trans('texts.auto_bill')) !!} - -
-
-
-
- {{trans('texts.enabled_by_client')}} ({{trans('texts.disable')}}) -
-
- {{trans('texts.disabled_by_client')}} ({{trans('texts.enable')}}) -
-
+
+ {!! Former::select('auto_bill') + ->data_bind("value: auto_bill, valueUpdate: 'afterkeydown', event:{change:function(){if(auto_bill()==1)client_enable_auto_bill(0);if(auto_bill()==2)client_enable_auto_bill(1)}}") + ->options([ + 0 => trans('texts.off'), + 1 => trans('texts.opt_in'), + 2 => trans('texts.opt_out'), + 3 => trans('texts.always'), + ]) !!} +
+ +
+
{{trans('texts.auto_bill')}}
+
+ {{trans('texts.opted_in')}} - ({{trans('texts.disable')}}) +
+
+
+
{{trans('texts.auto_bill')}}
+
+ {{trans('texts.opted_out')}} - ({{trans('texts.enable')}})
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php index 5b39703105ca..c7730eae2d22 100644 --- a/resources/views/invoices/knockout.blade.php +++ b/resources/views/invoices/knockout.blade.php @@ -188,8 +188,8 @@ function InvoiceModel(data) { self.tax_rate2 = ko.observable(); self.is_recurring = ko.observable(0); self.is_quote = ko.observable({{ $entityType == ENTITY_QUOTE ? '1' : '0' }}); - self.auto_bill = ko.observable(false); - self.enable_auto_bill = ko.observable(0); + self.auto_bill = ko.observable(0); + self.client_enable_auto_bill = ko.observable(false); self.invoice_status_id = ko.observable(0); self.invoice_items = ko.observableArray(); self.documents = ko.observableArray(); diff --git a/resources/views/public_list.blade.php b/resources/views/public_list.blade.php index d6ee070b50e3..1a5a17171b08 100644 --- a/resources/views/public_list.blade.php +++ b/resources/views/public_list.blade.php @@ -35,7 +35,7 @@
--> - @if($entityType == ENTITY_INVOICE && $account->getTokenGatewayId() && $client->hasAutoBillInvoices()) + @if($entityType == ENTITY_INVOICE && $account->getTokenGatewayId() && $client->hasAutoBillConfigurableInvoices())
{!! Button::info(trans("texts.manage_auto_bill"))->asLinkTo(URL::to('/client/invoices/recurring'))->appendIcon(Icon::create('repeat')) !!}
From 07a82870e1748525fde87e4f001ed47844afbd7b Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 10:27:21 -0400 Subject: [PATCH 28/37] Merge in change to include email when creating Stripe customer --- .../views/payments/add_paymentmethod.blade.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/payments/add_paymentmethod.blade.php b/resources/views/payments/add_paymentmethod.blade.php index 5e49b08d6f8c..2d90ff004f7f 100644 --- a/resources/views/payments/add_paymentmethod.blade.php +++ b/resources/views/payments/add_paymentmethod.blade.php @@ -83,6 +83,7 @@ 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 + email: $('#email').val(), name: $('#first_name').val() + ' ' + $('#last_name').val(), address_line1: $('#address1').val(), address_line2: $('#address2').val(), @@ -280,6 +281,7 @@ {{ Former::populate($client) }} {{ Former::populateField('first_name', $contact->first_name) }} {{ Former::populateField('last_name', $contact->last_name) }} + {{ Former::populateField('email', $contact->email) }} @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) }} @@ -351,16 +353,14 @@ ->label('') !!}
- @if (isset($paymentTitle)) -
-
- {!! Former::text('email') - ->placeholder(trans('texts.email')) - ->autocomplete('email') - ->label('') !!} -
+
+
+ {!! Former::text('email') + ->placeholder(trans('texts.email')) + ->autocomplete('email') + ->label('') !!}
- @endif +

 
 

From ad39f106dbbf876fe9d47e295d48aafc202b8550 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 11:24:04 -0400 Subject: [PATCH 29/37] Remove email parameter when creating credit card token --- resources/views/payments/add_paymentmethod.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/payments/add_paymentmethod.blade.php b/resources/views/payments/add_paymentmethod.blade.php index 2d90ff004f7f..c0e5ef5f1868 100644 --- a/resources/views/payments/add_paymentmethod.blade.php +++ b/resources/views/payments/add_paymentmethod.blade.php @@ -83,7 +83,6 @@ 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 - email: $('#email').val(), name: $('#first_name').val() + ' ' + $('#last_name').val(), address_line1: $('#address1').val(), address_line2: $('#address2').val(), From 88ec714cd561bc4cf3613f975170b556499f8428 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 18:46:32 -0400 Subject: [PATCH 30/37] Store Stripe card summary locally --- app/Http/Controllers/PaymentController.php | 189 ++++----- .../Controllers/PublicClientController.php | 49 +-- app/Http/routes.php | 4 + app/Models/AccountGatewayToken.php | 14 + app/Models/Client.php | 7 +- app/Models/Payment.php | 16 +- app/Models/PaymentMethod.php | 157 ++++++++ app/Services/PaymentService.php | 372 ++++++++++-------- .../2016_05_10_144219_wepay_integration.php | 83 ++++ resources/lang/en/texts.php | 7 +- .../views/accounts/account_gateway.blade.php | 21 +- .../payments/paymentmethods_list.blade.php | 33 +- 12 files changed, 627 insertions(+), 325 deletions(-) create mode 100644 app/Models/PaymentMethod.php create mode 100644 database/migrations/2016_05_10_144219_wepay_integration.php diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 8618fafdba58..491bac77033a 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -20,6 +20,7 @@ use App\Models\PaymentType; use App\Models\License; use App\Models\Payment; use App\Models\Affiliate; +use App\Models\PaymentMethod; use App\Ninja\Repositories\PaymentRepository; use App\Ninja\Repositories\InvoiceRepository; use App\Ninja\Repositories\AccountRepository; @@ -406,6 +407,7 @@ class PaymentController extends BaseController $account = $client->account; $paymentType = Session::get($invitation->id . 'payment_type'); $accountGateway = $account->getGatewayByType($paymentType); + $paymentMethod = null; $rules = [ 'first_name' => 'required', @@ -435,6 +437,17 @@ class PaymentController extends BaseController 'country_id' => 'required', ]); } + + if ($useToken) { + if(!$sourceId) { + Session::flash('error', trans('texts.no_payment_method_specified')); + return Redirect::to('payment/' . $invitationKey)->withInput(Request::except('cvv')); + } else { + $customerReference = $client->getGatewayToken($accountGateway, $accountGatewayToken/* return parameter*/); + $paymentMethod = PaymentMethod::scope($sourceId, $account->id, $accountGatewayToken->id)->firstOrFail(); + $sourceReference = $paymentMethod->source_reference; + } + } if ($onSite) { $validator = Validator::make(Input::all(), $rules); @@ -476,11 +489,9 @@ class PaymentController extends BaseController } if ($useToken) { - $details['customerReference'] = $client->getGatewayToken(); + $details['customerReference'] = $customerReference; unset($details['token']); - if ($sourceId) { - $details['cardReference'] = $sourceId; - } + $details['cardReference'] = $sourceReference; } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing') || $paymentType == PAYMENT_TYPE_STRIPE_ACH) { $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */); if ($token) { @@ -509,13 +520,8 @@ class PaymentController extends BaseController } if ($useToken) { - $details['customerId'] = $customerId = $client->getGatewayToken(); - if (!$sourceId) { - $customer = $gateway->findCustomer($customerId)->send(); - $details['paymentMethodToken'] = $customer->getData()->paymentMethods[0]->token; - } else { - $details['paymentMethodToken'] = $sourceId; - } + $details['customerId'] = $customerReference; + $details['paymentMethodToken'] = $sourceReference; unset($details['token']); } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing')) { $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */); @@ -536,7 +542,6 @@ class PaymentController extends BaseController $response = $gateway->purchase($details)->send(); - if ($accountGateway->gateway_id == GATEWAY_EWAY) { $ref = $response->getData()['AccessCode']; } elseif ($accountGateway->gateway_id == GATEWAY_TWO_CHECKOUT) { @@ -563,7 +568,7 @@ class PaymentController extends BaseController } if ($response->isSuccessful()) { - $payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, null, $details, $response); + $payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, null, $details, $paymentMethod, $response); Session::flash('message', trans('texts.applied_payment')); if ($account->account_key == NINJA_ACCOUNT_KEY) { @@ -660,7 +665,7 @@ class PaymentController extends BaseController if ($response->isCancelled()) { // do nothing } elseif ($response->isSuccessful()) { - $payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, $payerId, $details, $purchaseResponse); + $payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, $payerId, $details, null, $purchaseResponse); Session::flash('message', trans('texts.applied_payment')); } else { $this->error('offsite', $response->getMessage(), $accountGateway); @@ -738,7 +743,7 @@ class PaymentController extends BaseController ], 400); } - $data = static::getBankData($routingNumber); + $data = PaymentMethod::lookupBankData($routingNumber); if (is_string($data)) { return response()->json([ @@ -753,75 +758,10 @@ class PaymentController extends BaseController ], 404); } - public static function getBankData($routingNumber) { - $cached = Cache::get('bankData:'.$routingNumber); - - if ($cached != null) { - return $cached == false ? null : $cached; - } - - $dataPath = base_path('vendor/gatepay/FedACHdir/FedACHdir.txt'); - - if (!file_exists($dataPath) || !$size = filesize($dataPath)) { - return 'Invalid data file'; - } - - $lineSize = 157; - $numLines = $size/$lineSize; - - if ($numLines % 1 != 0) { - // The number of lines should be an integer - return 'Invalid data file'; - } - - // Format: http://www.sco.ca.gov/Files-21C/Bank_Master_Interface_Information_Package.pdf - $file = fopen($dataPath, 'r'); - - // Binary search - $low = 0; - $high = $numLines - 1; - while ($low <= $high) { - $mid = floor(($low + $high) / 2); - - fseek($file, $mid * $lineSize); - $thisNumber = fread($file, 9); - - if ($thisNumber > $routingNumber) { - $high = $mid - 1; - } else if ($thisNumber < $routingNumber) { - $low = $mid + 1; - } else { - $data = array('routing_number' => $thisNumber); - fseek($file, 26, SEEK_CUR); - $data['name'] = trim(fread($file, 36)); - $data['address'] = trim(fread($file, 36)); - $data['city'] = trim(fread($file, 20)); - $data['state'] = fread($file, 2); - $data['zip'] = fread($file, 5).'-'.fread($file, 4); - $data['phone'] = fread($file, 10); - break; - } - } - - if (!empty($data)) { - Cache::put('bankData:'.$routingNumber, $data, 5); - return $data; - } else { - Cache::put('bankData:'.$routingNumber, false, 5); - return null; - } - } - public function handlePaymentWebhook($accountKey, $gatewayId) { $gatewayId = intval($gatewayId); - if ($gatewayId != GATEWAY_STRIPE) { - return response()->json([ - 'message' => 'Unsupported gateway', - ], 404); - } - $account = Account::where('accounts.account_key', '=', $accountKey)->first(); if (!$account) { @@ -830,27 +770,48 @@ class PaymentController extends BaseController ], 404); } + $accountGateway = $account->getGatewayConfig(intval($gatewayId)); + + if (!$accountGateway) { + return response()->json([ + 'message' => 'Unknown gateway', + ], 404); + } + + switch($gatewayId) { + case GATEWAY_STRIPE: + return $this->handleStripeWebhook($accountGateway); + default: + return response()->json([ + 'message' => 'Unsupported gateway', + ], 404); + } + } + + protected function handleStripeWebhook($accountGateway) { $eventId = Input::get('id'); $eventType= Input::get('type'); + $accountId = $accountGateway->account_id; if (!$eventId) { - return response()->json([ - 'message' => 'Missing event id', - ], 400); + return response()->json(['message' => 'Missing event id'], 400); } if (!$eventType) { - return response()->json([ - 'message' => 'Missing event type', - ], 400); + return response()->json(['message' => 'Missing event type'], 400); } - if (!in_array($eventType, array('charge.failed', 'charge.succeeded'))) { + $supportedEvents = array( + 'charge.failed', + 'charge.succeeded', + 'customer.source.updated', + 'customer.source.deleted', + ); + + if (!in_array($eventType, $supportedEvents)) { return array('message' => 'Ignoring event'); } - $accountGateway = $account->getGatewayConfig(intval($gatewayId)); - // Fetch the event directly from Stripe for security $eventDetails = $this->paymentService->makeStripeCall($accountGateway, 'GET', 'events/'.$eventId); @@ -861,33 +822,47 @@ class PaymentController extends BaseController } if ($eventType != $eventDetails['type']) { - return response()->json([ - 'message' => 'Event type mismatch', - ], 400); + return response()->json(['message' => 'Event type mismatch'], 400); } if (!$eventDetails['pending_webhooks']) { - return response()->json([ - 'message' => 'This is not a pending event', - ], 400); + return response()->json(['message' => 'This is not a pending event'], 400); } - $charge = $eventDetails['data']['object']; - $transactionRef = $charge['id']; - $payment = Payment::where('transaction_reference', '=', $transactionRef)->first(); + if ($eventType == 'charge.failed' || $eventType == 'charge.succeeded') { + $charge = $eventDetails['data']['object']; + $transactionRef = $charge['id']; - if (!$payment) { - return array('message' => 'Unknown payment'); - } + $payment = Payment::scope(false, $accountId)->where('transaction_reference', '=', $transactionRef)->first(); - if ($eventType == 'charge.failed') { - if (!$payment->isFailed()) { - $payment->markFailed($charge['failure_message']); - $this->userMailer->sendNotification($payment->user, $payment->invoice, 'payment_failed', $payment); + if (!$payment) { + return array('message' => 'Unknown payment'); + } + + if ($eventType == 'charge.failed') { + if (!$payment->isFailed()) { + $payment->markFailed($charge['failure_message']); + $this->userMailer->sendNotification($payment->user, $payment->invoice, 'payment_failed', $payment); + } + } elseif ($eventType == 'charge.succeeded') { + $payment->markComplete(); + } + } elseif($eventType == 'customer.source.updated' || $eventType == 'customer.source.deleted') { + $source = $eventDetails['data']['object']; + $sourceRef = $source['id']; + + $paymentMethod = PaymentMethod::scope(false, $accountId)->where('source_reference', '=', $sourceRef)->first(); + + if (!$paymentMethod) { + return array('message' => 'Unknown payment method'); + } + + if ($eventType == 'customer.source.deleted') { + $paymentMethod->delete(); + } elseif ($eventType == 'customer.source.updated') { + $this->paymentService->convertPaymentMethodFromStripe($source, null, $paymentMethod)->save(); } - } elseif ($eventType == 'charge.succeeded') { - $payment->markComplete(); } return array('message' => 'Processed successfully'); diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php index c5b22ee16204..b0bc58a45165 100644 --- a/app/Http/Controllers/PublicClientController.php +++ b/app/Http/Controllers/PublicClientController.php @@ -16,6 +16,7 @@ use Redirect; use App\Models\Gateway; use App\Models\Invitation; use App\Models\Document; +use App\ModelsPaymentMethod; use App\Ninja\Repositories\InvoiceRepository; use App\Ninja\Repositories\PaymentRepository; use App\Ninja\Repositories\ActivityRepository; @@ -170,28 +171,30 @@ class PublicClientController extends BaseController if ($paymentMethods) { foreach ($paymentMethods as $paymentMethod) { - if ($paymentMethod['type']->id != PAYMENT_TYPE_ACH || $paymentMethod['status'] == 'verified') { + if ($paymentMethod->payment_type_id != PAYMENT_TYPE_ACH || $paymentMethod->status == PAYMENT_METHOD_STATUS_VERIFIED) { + $code = htmlentities(str_replace(' ', '', strtolower($paymentMethod->payment_type->name))); - if ($paymentMethod['type']->id == PAYMENT_TYPE_ACH) { - $html = '
'.htmlentities($paymentMethod['bank_name']).'
'; - } elseif ($paymentMethod['type']->id == PAYMENT_TYPE_ID_PAYPAL) { + if ($paymentMethod->payment_type_id == PAYMENT_TYPE_ACH) { + if($paymentMethod->bank_data) { + $html = '
' . htmlentities($paymentMethod->bank_data->name) . '
'; + } + } elseif ($paymentMethod->payment_type_id == PAYMENT_TYPE_ID_PAYPAL) { $html = ''.trans('; } else { - $code = htmlentities(str_replace(' ', '', strtolower($paymentMethod['type']->name))); $html = ''.trans('; } - $url = URL::to("/payment/{$invitation->invitation_key}/token/".$paymentMethod['id']); + $url = URL::to("/payment/{$invitation->invitation_key}/token/".$paymentMethod->public_id); - if ($paymentMethod['type']->id == PAYMENT_TYPE_ID_PAYPAL) { - $html .= '  '.$paymentMethod['email'].''; + if ($paymentMethod->payment_type_id == PAYMENT_TYPE_ID_PAYPAL) { + $html .= '  '.$paymentMethod->email.''; $url .= '#braintree_paypal'; - } elseif ($paymentMethod['type']->id != PAYMENT_TYPE_ACH) { - $html .= '
'.trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))).'
'; - $html .= '•••'.$paymentMethod['last4'].'
'; + } elseif ($paymentMethod->payment_type_id != PAYMENT_TYPE_ACH) { + $html .= '
'.trans('texts.card_expiration', array('expires' => Utils::fromSqlDate($paymentMethod->expiration, false)->format('m/y'))).'
'; + $html .= '•••'.$paymentMethod->last4.'
'; } else { $html .= '
'; - $html .= '•••'.$paymentMethod['last4'].'
'; + $html .= '•••'.$paymentMethod->last4.'
'; } $paymentTypes[] = [ @@ -452,9 +455,9 @@ class PublicClientController extends BaseController return $model->email; } } elseif ($model->last4) { - $bankData = PaymentController::getBankData($model->routing_number); - if (is_array($bankData)) { - return $bankData['name'].'  •••' . $model->last4; + $bankData = PaymentMethod::lookupBankData($model->routing_number); + if (is_object($bankData)) { + return $bankData->name.'  •••' . $model->last4; } elseif($model->last4) { return '' . htmlentities($card_type) . '  •••' . $model->last4; } @@ -770,7 +773,7 @@ class PublicClientController extends BaseController public function verifyPaymentMethod() { - $sourceId = Input::get('source_id'); + $publicId = Input::get('source_id'); $amount1 = Input::get('verification1'); $amount2 = Input::get('verification2'); @@ -779,7 +782,7 @@ class PublicClientController extends BaseController } $client = $invitation->invoice->client; - $result = $this->paymentService->verifyClientPaymentMethod($client, $sourceId, $amount1, $amount2); + $result = $this->paymentService->verifyClientPaymentMethod($client, $publicId, $amount1, $amount2); if (is_string($result)) { Session::flash('error', $result); @@ -790,14 +793,14 @@ class PublicClientController extends BaseController return redirect()->to($client->account->enable_client_portal?'/client/dashboard':'/client/paymentmethods/'); } - public function removePaymentMethod($sourceId) + public function removePaymentMethod($publicId) { if (!$invitation = $this->getInvitation()) { return $this->returnError(); } $client = $invitation->invoice->client; - $result = $this->paymentService->removeClientPaymentMethod($client, $sourceId); + $result = $this->paymentService->removeClientPaymentMethod($client, $publicId); if (is_string($result)) { Session::flash('error', $result); @@ -824,9 +827,9 @@ class PublicClientController extends BaseController $gateway = $accountGateway->gateway; if ($token && $paymentType == PAYMENT_TYPE_BRAINTREE_PAYPAL) { - $sourceId = $this->paymentService->createToken($this->paymentService->createGateway($accountGateway), array('token'=>$token), $accountGateway, $client, $invitation->contact_id); + $sourceReference = $this->paymentService->createToken($this->paymentService->createGateway($accountGateway), array('token'=>$token), $accountGateway, $client, $invitation->contact_id); - if(empty($sourceId)) { + if(empty($sourceReference)) { $this->paymentMethodError('Token-No-Ref', $this->paymentService->lastError, $accountGateway); } else { Session::flash('message', trans('texts.payment_method_added')); @@ -895,12 +898,12 @@ class PublicClientController extends BaseController if (!empty($details)) { $gateway = $this->paymentService->createGateway($accountGateway); - $sourceId = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id); + $sourceReference = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id); } else { return Redirect::to('client/paymentmethods/add/' . $typeLink)->withInput(Request::except('cvv')); } - if(empty($sourceId)) { + if(empty($sourceReference)) { $this->paymentMethodError('Token-No-Ref', $this->paymentService->lastError, $accountGateway); return Redirect::to('client/paymentmethods/add/' . $typeLink)->withInput(Request::except('cvv')); } else if ($paymentType == PAYMENT_TYPE_STRIPE_ACH && empty($usingPlaid) ) { diff --git a/app/Http/routes.php b/app/Http/routes.php index 241049810960..e8d7f9bbeac3 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -647,6 +647,10 @@ if (!defined('CONTACT_EMAIL')) { define('PAYMENT_TYPE_SOLO', 22); define('PAYMENT_TYPE_SWITCH', 23); + define('PAYMENT_METHOD_STATUS_NEW', 'new'); + define('PAYMENT_METHOD_STATUS_VERIFICATION_FAILED', 'verification_failed'); + define('PAYMENT_METHOD_STATUS_VERIFIED', 'verified'); + 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'); diff --git a/app/Models/AccountGatewayToken.php b/app/Models/AccountGatewayToken.php index b706882af77d..06494325662e 100644 --- a/app/Models/AccountGatewayToken.php +++ b/app/Models/AccountGatewayToken.php @@ -8,4 +8,18 @@ class AccountGatewayToken extends Eloquent use SoftDeletes; protected $dates = ['deleted_at']; public $timestamps = true; + + protected $casts = [ + 'uses_local_payment_methods' => 'boolean', + ]; + + public function payment_methods() + { + return $this->hasMany('App\Models\PaymentMethod'); + } + + public function default_payment_method() + { + return $this->hasOne('App\Models\PaymentMethod', 'id', 'default_payment_method_id'); + } } \ No newline at end of file diff --git a/app/Models/Client.php b/app/Models/Client.php index bc6e94e649fc..0198d46c200d 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -261,7 +261,7 @@ class Client extends EntityModel } - public function getGatewayToken(&$accountGateway) + public function getGatewayToken(&$accountGateway = null, &$token = null) { $account = $this->account; @@ -272,7 +272,10 @@ class Client extends EntityModel if (!count($account->account_gateways)) { return false; } - $accountGateway = $account->getTokenGateway(); + + if (!$accountGateway){ + $accountGateway = $account->getTokenGateway(); + } if (!$accountGateway) { return false; diff --git a/app/Models/Payment.php b/app/Models/Payment.php index faa42e3c93f3..b0001569dcc8 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -8,6 +8,7 @@ use App\Events\PaymentWasVoided; use App\Events\PaymentCompleted; use App\Events\PaymentVoided; use App\Events\PaymentFailed; +use App\Models\PaymentMethod; use Laracasts\Presenter\PresentableTrait; class Payment extends EntityModel @@ -56,7 +57,12 @@ class Payment extends EntityModel public function payment_type() { return $this->belongsTo('App\Models\PaymentType'); - } + } + + public function payment_method() + { + return $this->belongsTo('App\Models\PaymentMethod'); + } public function payment_status() { @@ -160,6 +166,14 @@ class Payment extends EntityModel { return ENTITY_PAYMENT; } + + public function getBankData() + { + if (!$this->routing_number) { + return null; + } + return PaymentMethod::lookupBankData($this->routing_number); + } } Payment::creating(function ($payment) { diff --git a/app/Models/PaymentMethod.php b/app/Models/PaymentMethod.php new file mode 100644 index 000000000000..62072dca090f --- /dev/null +++ b/app/Models/PaymentMethod.php @@ -0,0 +1,157 @@ +account_id = $accountGatewayToken->account_id; + $entity->account_gateway_token_id = $accountGatewayToken->id; + + $lastEntity = static::scope(false, $entity->account_id); + + $lastEntity = $lastEntity->orderBy('public_id', 'DESC') + ->first(); + + if ($lastEntity) { + $entity->public_id = $lastEntity->public_id + 1; + } else { + $entity->public_id = 1; + } + + return $entity; + } + + public function account() + { + return $this->belongsTo('App\Models\Account'); + } + + public function contact() + { + return $this->belongsTo('App\Models\Contact'); + } + + public function account_gateway_token() + { + return $this->belongsTo('App\Models\AccountGatewayToken'); + } + + public function payment_type() + { + return $this->belongsTo('App\Models\PaymentType'); + } + + public function currency() + { + return $this->belongsTo('App\Models\Currency'); + } + + public function payments() + { + return $this->hasMany('App\Models\Payments'); + } + + public function getBankData() + { + if (!$this->routing_number) { + return null; + } + return static::lookupBankData($this->routing_number); + } + + public function scopeScope($query, $publicId = false, $accountId = false, $accountGatewayTokenId = false) + { + $query = parent::scopeScope($query, $publicId, $accountId); + + if ($accountGatewayTokenId) { + $query->where($this->getTable() . '.account_gateway_token_id', '=', $accountGatewayTokenId); + } + + return $query; + } + + public static function lookupBankData($routingNumber) { + $cached = Cache::get('bankData:'.$routingNumber); + + if ($cached != null) { + return $cached == false ? null : $cached; + } + + $dataPath = base_path('vendor/gatepay/FedACHdir/FedACHdir.txt'); + + if (!file_exists($dataPath) || !$size = filesize($dataPath)) { + return 'Invalid data file'; + } + + $lineSize = 157; + $numLines = $size/$lineSize; + + if ($numLines % 1 != 0) { + // The number of lines should be an integer + return 'Invalid data file'; + } + + // Format: http://www.sco.ca.gov/Files-21C/Bank_Master_Interface_Information_Package.pdf + $file = fopen($dataPath, 'r'); + + // Binary search + $low = 0; + $high = $numLines - 1; + while ($low <= $high) { + $mid = floor(($low + $high) / 2); + + fseek($file, $mid * $lineSize); + $thisNumber = fread($file, 9); + + if ($thisNumber > $routingNumber) { + $high = $mid - 1; + } else if ($thisNumber < $routingNumber) { + $low = $mid + 1; + } else { + $data = new \stdClass(); + $data->routing_number = $thisNumber; + + fseek($file, 26, SEEK_CUR); + + $data->name = trim(fread($file, 36)); + $data->address = trim(fread($file, 36)); + $data->city = trim(fread($file, 20)); + $data->state = fread($file, 2); + $data->zip = fread($file, 5).'-'.fread($file, 4); + $data->phone = fread($file, 10); + break; + } + } + + if (!empty($data)) { + Cache::put('bankData:'.$routingNumber, $data, 5); + return $data; + } else { + Cache::put('bankData:'.$routingNumber, false, 5); + return null; + } + } +} + +PaymentMethod::deleting(function($paymentMethod) { + $accountGatewayToken = $paymentMethod->account_gateway_token; + if ($accountGatewayToken->default_payment_method_id == $paymentMethod->id) { + $newDefault = $accountGatewayToken->payment_methods->first(function($i, $paymentMethdod) use ($accountGatewayToken){ + return $paymentMethdod->id != $accountGatewayToken->default_payment_method_id; + }); + $accountGatewayToken->default_payment_method_id = $newDefault ? $newDefault->id : null; + $accountGatewayToken->save(); + } +}); \ No newline at end of file diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index 3f938141dd2b..101c79f92c34 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -10,6 +10,7 @@ use Omnipay; use Session; use CreditCard; use App\Models\Payment; +use App\Models\PaymentMethod; use App\Models\Account; use App\Models\Country; use App\Models\Client; @@ -26,7 +27,7 @@ class PaymentService extends BaseService { public $lastError; protected $datatableService; - + protected static $refundableGateways = array( GATEWAY_STRIPE, GATEWAY_BRAINTREE @@ -47,7 +48,7 @@ class PaymentService extends BaseService public function createGateway($accountGateway) { $gateway = Omnipay::create($accountGateway->gateway->provider); - $gateway->initialize((array) $accountGateway->getConfig()); + $gateway->initialize((array)$accountGateway->getConfig()); if ($accountGateway->isGateway(GATEWAY_DWOLLA)) { if ($gateway->getSandbox() && isset($_ENV['DWOLLA_SANDBOX_KEY']) && isset($_ENV['DWOLLA_SANSBOX_SECRET'])) { @@ -66,7 +67,7 @@ class PaymentService extends BaseService { $invoice = $invitation->invoice; $account = $invoice->account; - $key = $invoice->account_id.'-'.$invoice->invoice_number; + $key = $invoice->account_id . '-' . $invoice->invoice_number; $currencyCode = $invoice->client->currency ? $invoice->client->currency->code : ($invoice->account->currency ? $invoice->account->currency->code : 'USD'); if ($input) { @@ -94,7 +95,7 @@ class PaymentService extends BaseService $data['ButtonSource'] = 'InvoiceNinja_SP'; }; - if($input && $accountGateway->isGateway(GATEWAY_STRIPE)) { + if ($input && $accountGateway->isGateway(GATEWAY_STRIPE)) { if (!empty($input['stripeToken'])) { $data['token'] = $input['stripeToken']; unset($details['card']); @@ -118,12 +119,12 @@ class PaymentService extends BaseService 'expiryMonth' => isset($input['expiration_month']) ? $input['expiration_month'] : null, 'expiryYear' => isset($input['expiration_year']) ? $input['expiration_year'] : null, ]; - + // allow space until there's a setting to disable if (isset($input['cvv']) && $input['cvv'] != ' ') { $data['cvv'] = $input['cvv']; } - + if (isset($input['country_id'])) { $country = Country::find($input['country_id']); @@ -174,198 +175,134 @@ class PaymentService extends BaseService ]; } - public function getClientPaymentMethods($client) { - $token = $client->getGatewayToken($accountGateway); + public function getClientPaymentMethods($client) + { + $token = $client->getGatewayToken($accountGateway/* return parameter */, $accountGatewayToken/* return parameter */); if (!$token) { return null; } - $gateway = $this->createGateway($accountGateway); - - $paymentMethods = array(); - if ($accountGateway->gateway_id == GATEWAY_STRIPE) { + if (!$accountGatewayToken->uses_local_payment_methods && $accountGateway->gateway_id == GATEWAY_STRIPE) { + // Migrate Stripe data + $gateway = $this->createGateway($accountGateway); $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'); + // Load + $accountGatewayToken->payment_methods(); 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', - ); + $paymentMethod = $this->convertPaymentMethodFromStripe($source, $accountGatewayToken); + if ($paymentMethod) { + $paymentMethod->save(); + } + + if ($data['default_source'] == $source['id']) { + $accountGatewayToken->default_payment_method_id = $paymentMethod->id; } } - } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { - $response = $gateway->findCustomer($token)->send(); - $data = $response->getData(); - if (!($data instanceof \Braintree\Customer)) { - return null; - } - - $sources = $data->paymentMethods; - - $paymentTypes = Cache::get('paymentTypes'); - $currencies = Cache::get('currencies'); - foreach ($sources as $source) { - if ($source instanceof \Braintree\CreditCard) { - $paymentMethods[] = array( - 'id' => $source->token, - 'default' => $source->isDefault(), - 'type' => $paymentTypes->find($this->parseCardType($source->cardType)), - 'last4' => $source->last4, - 'expiration' => $source->expirationYear . '-' . $source->expirationMonth . '-00', - ); - } elseif ($source instanceof \Braintree\PayPalAccount) { - $paymentMethods[] = array( - 'id' => $source->token, - 'default' => $source->isDefault(), - 'type' => $paymentTypes->find(PAYMENT_TYPE_ID_PAYPAL), - 'email' => $source->email, - ); - } - } + $accountGatewayToken->uses_local_payment_methods = true; + $accountGatewayToken->save(); } - return $paymentMethods; + return $accountGatewayToken->payment_methods; } - public function verifyClientPaymentMethod($client, $sourceId, $amount1, $amount2) { + public function verifyClientPaymentMethod($client, $publicId, $amount1, $amount2) + { $token = $client->getGatewayToken($accountGateway); if ($accountGateway->gateway_id != GATEWAY_STRIPE) { return 'Unsupported gateway'; } + $paymentMethod = PaymentMethod::scope($publicId, $client->account_id, $accountGatewayToken->id)->firstOrFail(); // Omnipay doesn't support verifying payment methods // Also, it doesn't want to urlencode without putting numbers inside the brackets - return $this->makeStripeCall( + $result = $this->makeStripeCall( $accountGateway, 'POST', - 'customers/'.$token.'/sources/'.$sourceId.'/verify', - 'amounts[]='.intval($amount1).'&amounts[]='.intval($amount2) + 'customers/' . $token . '/sources/' . $paymentMethod->source_reference . '/verify', + 'amounts[]=' . intval($amount1) . '&amounts[]=' . intval($amount2) ); - } - public function removeClientPaymentMethod($client, $sourceId) { - $token = $client->getGatewayToken($accountGateway/* return parameter */); - if (!$token) { - return null; - } + if (!is_string($result)) { + $paymentMethod->status = PAYMENT_METHOD_STATUS_VERIFIED; + $paymentMethod->save(); - $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) { - // Make sure the source is owned by this client - $sources = $this->getClientPaymentMethods($client); - $ownsSource = false; - foreach ($sources as $source) { - if ($source['id'] == $sourceId) { - $ownsSource = true; - break; - } - } - if (!$ownsSource) { - return 'Unknown source'; - } - - $response = $gateway->deletePaymentMethod(array('token'=>$sourceId))->send(); - - if (!$response->isSuccessful()) { - return $response->getMessage(); + if (!$paymentMethod->account_gateway_token->default_payment_method_id) { + $paymentMethod->account_gateway_token->default_payment_method_id = $paymentMethod->id; + $paymentMethod->account_gateway_token->save(); } } - 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) { - - return $this->makeStripeCall( - $accountGateway, - 'POST', - 'customers/'.$token, - 'default_card='.$sourceId - ); - } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { - // Make sure the source is owned by this client - $sources = $this->getClientPaymentMethods($client); - $ownsSource = false; - foreach ($sources as $source) { - if ($source['id'] == $sourceId) { - $ownsSource = true; - break; - } - } - if (!$ownsSource) { - return 'Unknown source'; - } - - $response = $gateway->updatePaymentMethod(array( - 'token' => $sourceId, - 'makeDefault' => true, - ))->send(); - - if (!$response->isSuccessful()) { - return $response->getMessage(); - } - } - - return true; - } - - public function createToken($gateway, $details, $accountGateway, $client, $contactId, &$customerReference = null) + public function removeClientPaymentMethod($client, $publicId) { - $customerReference = $client->getGatewayToken(); + $token = $client->getGatewayToken($accountGateway/* return parameter */, $accountGatewayToken/* return parameter */); + if (!$token) { + return null; + } + + $paymentMethod = PaymentMethod::scope($publicId, $client->account_id, $accountGatewayToken->id)->firstOrFail(); + + $gateway = $this->createGateway($accountGateway); + + if ($accountGateway->gateway_id == GATEWAY_STRIPE) { + $response = $gateway->deleteCard(array('customerReference' => $token, 'cardReference' => $paymentMethod->source_reference))->send(); + if (!$response->isSuccessful()) { + return $response->getMessage(); + } + } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { + $response = $gateway->deletePaymentMethod(array('token' => $paymentMethod->source_reference))->send(); + + if (!$response->isSuccessful()) { + return $response->getMessage(); + } + } + + $paymentMethod->delete(); + + return true; + } + + public function setClientDefaultPaymentMethod($client, $publicId) + { + $token = $client->getGatewayToken($accountGateway/* return parameter */, $accountGatewayToken/* return parameter */); + if (!$token) { + return null; + } + + $paymentMethod = PaymentMethod::scope($publicId, $client->account_id, $accountGatewayToken->id)->firstOrFail(); + $paymentMethod->account_gateway_token->default_payment_method_id = $paymentMethod->id; + $paymentMethod->account_gateway_token->save(); + + return true; + } + + public function createToken($gateway, $details, $accountGateway, $client, $contactId, &$customerReference = null, &$paymentMethod = null) + { + $customerReference = $client->getGatewayToken($accountGateway, $accountGatewayToken/* return paramenter */); if ($customerReference) { $details['customerReference'] = $customerReference; if ($accountGateway->gateway->id == GATEWAY_STRIPE) { - $customerResponse = $gateway->fetchCustomer(array('customerReference'=>$customerReference))->send(); + $customerResponse = $gateway->fetchCustomer(array('customerReference' => $customerReference))->send(); - if (!$customerResponse->isSuccessful()){ + if (!$customerResponse->isSuccessful()) { $customerReference = null; // The customer might not exist anymore } } elseif ($accountGateway->gateway->id == GATEWAY_BRAINTREE) { $customer = $gateway->findCustomer($customerReference)->send()->getData(); - if (!($customer instanceof \Braintree\Customer)){ + if (!($customer instanceof \Braintree\Customer)) { $customerReference = null; // The customer might not exist anymore } } @@ -413,7 +350,7 @@ class PaymentService extends BaseService } else { $data = $tokenResponse->getData(); if ($data && $data['error'] && $data['error']['type'] == 'invalid_request_error') { - $this->lastError = $data['error']['message']; + $this->lastError = $data['error']['message']; return; } } @@ -435,7 +372,7 @@ class PaymentService extends BaseService if ($customerReference) { $token = AccountGatewayToken::where('client_id', '=', $client->id) - ->where('account_gateway_id', '=', $accountGateway->id)->first(); + ->where('account_gateway_id', '=', $accountGateway->id)->first(); if (!$token) { $token = new AccountGatewayToken(); @@ -447,6 +384,9 @@ class PaymentService extends BaseService $token->token = $customerReference; $token->save(); + + $paymentMethod = $this->createPaymentMethodFromGatewayResponse($tokenResponse, $accountGateway, $accountGatewayToken, $contactId); + } else { $this->lastError = $tokenResponse->getMessage(); } @@ -454,6 +394,104 @@ class PaymentService extends BaseService return $sourceReference; } + public function convertPaymentMethodFromStripe($source, $accountGatewayToken = null, $paymentMethod = null) { + // Creating a new one or updating an existing one + if (!$paymentMethod) { + $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod(); + } + + $paymentMethod->last4 = $source['last4']; + $paymentMethod->source_reference = $source['id']; + + if ($source['object'] == 'bank_account') { + $paymentMethod->routing_number = $source['routing_number']; + $paymentMethod->payment_type_id = PAYMENT_TYPE_ACH; + $paymentMethod->status = $source['status']; + $currency = Cache::get('currencies')->where('code', strtoupper($source['currency']))->first(); + if ($currency) { + $paymentMethod->currency_id = $currency->id; + $paymentMethod->setRelation('currency', $currency); + } + } elseif ($source['object'] == 'card') { + $paymentMethod->expiration = $source['exp_year'] . '-' . $source['exp_month'] . '-00'; + $paymentMethod->payment_type_id = $this->parseCardType($source['brand']); + } else { + return null; + } + + $paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id)); + + return $paymentMethod; + } + + public function convertPaymentMethodFromBraintree($source, $accountGatewayToken = null, $paymentMethod = null) { + // Creating a new one or updating an existing one + if (!$paymentMethod) { + $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod(); + } + + if ($source instanceof \Braintree\CreditCard) { + $paymentMethod->payment_type_id = $this->parseCardType($source->cardType); + $paymentMethod->last4 = $source->last4; + $paymentMethod->expiration = $source->expirationYear . '-' . $source->expirationMonth . '-00'; + } elseif ($source instanceof \Braintree\PayPalAccount) { + $paymentMethod->email = $source->email; + $paymentMethod->payment_type_id = PAYMENT_TYPE_ID_PAYPAL; + } else { + return null; + } + + $paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id)); + + $paymentMethod->source_reference = $source->token; + + return $paymentMethod; + } + + public function createPaymentMethodFromGatewayResponse($gatewayResponse, $accountGateway, $accountGatewayToken = null, $contactId = null) { + if ($accountGateway->gateway_id == GATEWAY_STRIPE) { + $data = $gatewayResponse->getData(); + if(!empty($data['object']) && ($data['object'] == 'card' || $data['object'] == 'bank_account')) { + $source = $data; + } else { + $source = !empty($data['source']) ? $data['source'] : $data['card']; + } + + if ($source) { + $paymentMethod = $this->convertPaymentMethodFromStripe($source, $accountGatewayToken); + } + } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { + $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod(); + + $transaction = $sourceResponse->getData()->transaction; + if ($transaction->paymentInstrumentType == 'credit_card') { + $card = $transaction->creditCardDetails; + $paymentMethod->last4 = $card->last4; + $paymentMethod->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00'; + $paymentMethod->payment_type_id = $this->parseCardType($card->cardType); + } elseif ($transaction->paymentInstrumentType == 'paypal_account') { + $paymentMethod->payment_type_id = PAYMENT_TYPE_ID_PAYPAL; + $paymentMethod->email = $transaction->paypalDetails->payerEmail; + } + + $paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id)); + } + + if (!empty($paymentMethod) && $accountGatewayToken && $contactId) { + $paymentMethod->account_gateway_token_id = $accountGatewayToken->id; + $paymentMethod->account_id = $accountGatewayToken->account_id; + $paymentMethod->contact_id = $contactId; + $paymentMethod->save(); + + if (!$paymentMethod->account_gateway_token->default_payment_method_id) { + $paymentMethod->account_gateway_token->default_payment_method_id = $paymentMethod->id; + $paymentMethod->account_gateway_token->save(); + } + } + + return $paymentMethod; + } + public function getCheckoutComToken($invitation) { $token = false; @@ -490,7 +528,7 @@ class PaymentService extends BaseService return $token; } - public function createPayment($invitation, $accountGateway, $ref, $payerId = null, $paymentDetails = null, $purchaseResponse = null) + public function createPayment($invitation, $accountGateway, $ref, $payerId = null, $paymentDetails = null, $paymentMethod = null, $purchaseResponse = null) { $invoice = $invitation->invoice; @@ -551,6 +589,10 @@ class PaymentService extends BaseService $payment->payer_id = $payerId; } + if ($paymentMethod) { + $payment->payment_method_id = $paymentMethod->id; + } + $payment->save(); // enable pro plan for hosted users @@ -665,28 +707,28 @@ class PaymentService extends BaseService public function autoBillInvoice($invoice) { $client = $invoice->client; - $account = $invoice->account; - $invitation = $invoice->invitations->first(); - $accountGateway = $account->getTokenGateway(); - $token = $client->getGatewayToken(); - if (!$invitation || !$accountGateway || !$token) { + // Make sure we've migrated in data from Stripe + $this->getClientPaymentMethods($client); + + $invitation = $invoice->invitations->first(); + $token = $client->getGatewayToken($accountGateway/* return parameter */, $accountGatewayToken/* return parameter */); + $defaultPaymentMethod = $accountGatewayToken->default_payment_method; + + if (!$invitation || !$token || !$defaultPaymentMethod) { return false; } // setup the gateway/payment info $gateway = $this->createGateway($accountGateway); $details = $this->getPaymentDetails($invitation, $accountGateway); - $details['customerReference'] = $token; if ($accountGateway->gateway_id == GATEWAY_STRIPE) { $details['customerReference'] = $token; - + $details['cardReference'] = $defaultPaymentMethod->sourceReference; } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { $details['customerId'] = $token; - $customer = $gateway->findCustomer($token)->send()->getData(); - $defaultPaymentMethod = $customer->defaultPaymentMethod(); - $details['paymentMethodToken'] = $defaultPaymentMethod->token; + $details['paymentMethodToken'] = $defaultPaymentMethod->sourceReference; } // submit purchase/get response @@ -694,7 +736,7 @@ class PaymentService extends BaseService if ($response->isSuccessful()) { $ref = $response->getTransactionReference(); - return $this->createPayment($invitation, $accountGateway, $ref, null, $details, $response); + return $this->createPayment($invitation, $accountGateway, $ref, null, $details, $defaultPaymentMethod, $response); } else { return false; } @@ -761,9 +803,9 @@ class PaymentService extends BaseService return $model->email; } } elseif ($model->last4) { - $bankData = PaymentController::getBankData($model->routing_number); - if (is_array($bankData)) { - return $bankData['name'].'  •••' . $model->last4; + $bankData = PaymentMethod::lookupBankData($model->routing_number); + if (is_object($bankData)) { + return $bankData->name.'  •••' . $model->last4; } elseif($model->last4) { return '' . htmlentities($card_type) . '  •••' . $model->last4; } diff --git a/database/migrations/2016_05_10_144219_wepay_integration.php b/database/migrations/2016_05_10_144219_wepay_integration.php new file mode 100644 index 000000000000..c2a48afd8098 --- /dev/null +++ b/database/migrations/2016_05_10_144219_wepay_integration.php @@ -0,0 +1,83 @@ +increments('id'); + $table->unsignedInteger('account_id'); + $table->unsignedInteger('contact_id')->nullable(); + $table->unsignedInteger('account_gateway_token_id'); + $table->unsignedInteger('payment_type_id'); + $table->string('source_reference'); + + $table->unsignedInteger('routing_number')->nullable(); + $table->smallInteger('last4')->unsigned()->nullable(); + $table->date('expiration')->nullable(); + $table->string('email')->nullable(); + $table->unsignedInteger('currency_id')->nullable(); + $table->string('status')->nullable(); + + $table->timestamps(); + $table->softDeletes(); + + $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); + $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade'); + $table->foreign('account_gateway_token_id')->references('id')->on('account_gateway_tokens'); + $table->foreign('payment_type_id')->references('id')->on('payment_types'); + $table->foreign('currency_id')->references('id')->on('currencies'); + + $table->unsignedInteger('public_id')->index(); + $table->unique( array('account_id','public_id') ); + }); + + Schema::table('payments', function($table) + { + $table->unsignedInteger('payment_method_id')->nullable(); + $table->foreign('payment_method_id')->references('id')->on('payment_methods'); + }); + + Schema::table('account_gateway_tokens', function($table) + { + $table->unsignedInteger('default_payment_method_id')->nullable(); + $table->foreign('default_payment_method_id')->references('id')->on('payment_methods'); + + $table->boolean('uses_local_payment_methods')->defalut(true); + }); + + \DB::table('account_gateway_tokens')->update(array('uses_local_payment_methods' => false)); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('payments', function($table) + { + $table->dropForeign('payments_payment_method_id_foreign'); + $table->dropColumn('payment_method_id'); + }); + + Schema::table('account_gateway_tokens', function($table) + { + $table->dropForeign('account_gateway_tokens_default_payment_method_id_foreign'); + $table->dropColumn('default_payment_method_id'); + $table->dropColumn('uses_local_payment_methods'); + }); + + Schema::dropIfExists('payment_methods'); + } +} diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 1a7d6a1267bb..32a31dca7d58 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1259,7 +1259,7 @@ $LANG = array( 'payment_method_set_as_default' => 'Set Autobill payment method.', 'activity_41' => ':payment_amount payment (:payment) failed', 'webhook_url' => 'Webhook URL', - 'stripe_webhook_help' => 'You must :link for ACH payment status to be updated.', + 'stripe_webhook_help' => 'You must :link.', 'stripe_webhook_help_link_text' => 'add this URL as an endpoint at Stripe', 'payment_method_error' => 'There was an error adding your payment methd. Please try again later.', 'notification_invoice_payment_failed_subject' => 'Payment failed for Invoice :invoice', @@ -1286,7 +1286,10 @@ $LANG = array( 'braintree_paypal_help' => 'You must also :link.', 'braintree_paypal_help_link_text' => 'link PayPal to your BrainTree account', 'token_billing_braintree_paypal' => 'Save payment details', - 'add_paypal_account' => 'Add PayPal Account' + 'add_paypal_account' => 'Add PayPal Account', + + + 'no_payment_method_specified' => 'No payment method specified', ); return $LANG; diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index bd5f100671a6..ade161f5b65f 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -97,6 +97,18 @@ ->help(trans('texts.token_billing_help')) !!} @endif + @if ($gateway->id == GATEWAY_STRIPE) +
+ +
+ +
{!! trans('texts.stripe_webhook_help', [ + 'link'=>''.trans('texts.stripe_webhook_help_link_text').'' + ]) !!}
+
+
+ @endif + @if ($gateway->id == GATEWAY_BRAINTREE) @if ($account->getGatewayByType(PAYMENT_TYPE_PAYPAL)) {!! Former::checkbox('enable_paypal') @@ -148,15 +160,6 @@ ->text(trans('texts.enable_ach')) ->help(trans('texts.stripe_ach_help')) !!}
-
- -
- -
{!! trans('texts.stripe_webhook_help', [ - 'link'=>''.trans('texts.stripe_webhook_help_link_text').'' - ]) !!}
-
-

{{trans('texts.plaid')}}

diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php index 3436315acf6a..1522f2ac0a94 100644 --- a/resources/views/payments/paymentmethods_list.blade.php +++ b/resources/views/payments/paymentmethods_list.blade.php @@ -53,30 +53,31 @@ @foreach ($paymentMethods as $paymentMethod)
- {{trans(name)))}}"> + {{trans(payment_type->name)))}}"> - @if(!empty($paymentMethod['last4'])) - •••••{{$paymentMethod['last4']}} + @if(!empty($paymentMethod->last4)) + •••••{{$paymentMethod->last4}} @endif - - @if($paymentMethod['type']->id == PAYMENT_TYPE_ACH) - {{ $paymentMethod['bank_name'] }} - @if($paymentMethod['status'] == 'new') - ({{trans('texts.complete_verification')}}) - @elseif($paymentMethod['status'] == 'verification_failed') + @if($paymentMethod->payment_type_id == PAYMENT_TYPE_ACH) + @if($paymentMethod->bank()) + {{ $paymentMethod->bank()->name }} + @endif + @if($paymentMethod->status == PAYMENT_METHOD_STATUS_NEW) + ({{trans('texts.complete_verification')}}) + @elseif($paymentMethod->status == PAYMENT_METHOD_STATUS_VERIFICATION_FAILED) ({{trans('texts.verification_failed')}}) @endif - @elseif($paymentMethod['type']->id == PAYMENT_TYPE_ID_PAYPAL) - {{ $paymentMethod['email'] }} + @elseif($paymentMethod->type_id == PAYMENT_TYPE_ID_PAYPAL) + {{ $paymentMethod->email }} @else - {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod['expiration'], false)->format('m/y'))) !!} + {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod->expiration, false)->format('m/y'))) !!} @endif - @if($paymentMethod['default']) + @if($paymentMethod->id == $paymentMethod->account_gateway_token->default_payment_method_id) ({{trans('texts.used_for_auto_bill')}}) - @elseif($paymentMethod['type']->id != PAYMENT_TYPE_ACH || $paymentMethod['status'] == 'verified') - ({{trans('texts.use_for_auto_bill')}}) + @elseif($paymentMethod->payment_type_id != PAYMENT_TYPE_ACH || $paymentMethod->status == PAYMENT_METHOD_STATUS_VERIFIED) + ({{trans('texts.use_for_auto_bill')}}) @endif - × + ×
@endforeach @endif From cc5cb091d7a431b486bcb9adc3cfd3ec671439f7 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 19:16:53 -0400 Subject: [PATCH 31/37] Store Braintree card summary locally --- app/Services/PaymentService.php | 45 +++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index 101c79f92c34..73d00b07e00e 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -359,6 +359,9 @@ class PaymentService extends BaseService $tokenResponse = $gateway->createCustomer(array('customerData' => array()))->send(); if ($tokenResponse->isSuccessful()) { $customerReference = $tokenResponse->getCustomerData()->id; + } else { + $this->lastError = $tokenResponse->getData()->message; + return; } } @@ -366,7 +369,12 @@ class PaymentService extends BaseService $details['customerId'] = $customerReference; $tokenResponse = $gateway->createPaymentMethod($details)->send(); - $sourceReference = $tokenResponse->getData()->paymentMethod->token; + if ($tokenResponse->isSuccessful()) { + $sourceReference = $tokenResponse->getData()->paymentMethod->token; + } else { + $this->lastError = $tokenResponse->getData()->message; + return; + } } } @@ -461,20 +469,26 @@ class PaymentService extends BaseService $paymentMethod = $this->convertPaymentMethodFromStripe($source, $accountGatewayToken); } } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { - $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod(); + $data = $gatewayResponse->getData(); - $transaction = $sourceResponse->getData()->transaction; - if ($transaction->paymentInstrumentType == 'credit_card') { - $card = $transaction->creditCardDetails; - $paymentMethod->last4 = $card->last4; - $paymentMethod->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00'; - $paymentMethod->payment_type_id = $this->parseCardType($card->cardType); - } elseif ($transaction->paymentInstrumentType == 'paypal_account') { - $paymentMethod->payment_type_id = PAYMENT_TYPE_ID_PAYPAL; - $paymentMethod->email = $transaction->paypalDetails->payerEmail; + if (!empty($data->transaction)) { + $transaction = $data->transaction; + + $paymentMethod = $accountGatewayToken ? PaymentMethod::createNew($accountGatewayToken) : new PaymentMethod(); + if ($transaction->paymentInstrumentType == 'credit_card') { + $card = $transaction->creditCardDetails; + $paymentMethod->last4 = $card->last4; + $paymentMethod->expiration = $card->expirationYear . '-' . $card->expirationMonth . '-00'; + $paymentMethod->payment_type_id = $this->parseCardType($card->cardType); + } elseif ($transaction->paymentInstrumentType == 'paypal_account') { + $paymentMethod->payment_type_id = PAYMENT_TYPE_ID_PAYPAL; + $paymentMethod->email = $transaction->paypalDetails->payerEmail; + } + $paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id)); + } elseif (!empty($data->paymentMethod)) { + $paymentMethod = $this->convertPaymentMethodFromBraintree($data->paymentMethod, $accountGatewayToken); } - $paymentMethod->setRelation('payment_type', Cache::get('paymentTypes')->find($paymentMethod->payment_type_id)); } if (!empty($paymentMethod) && $accountGatewayToken && $contactId) { @@ -722,13 +736,12 @@ class PaymentService extends BaseService // setup the gateway/payment info $gateway = $this->createGateway($accountGateway); $details = $this->getPaymentDetails($invitation, $accountGateway); + $details['customerReference'] = $token; if ($accountGateway->gateway_id == GATEWAY_STRIPE) { - $details['customerReference'] = $token; - $details['cardReference'] = $defaultPaymentMethod->sourceReference; + $details['cardReference'] = $defaultPaymentMethod->source_reference; } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { - $details['customerId'] = $token; - $details['paymentMethodToken'] = $defaultPaymentMethod->sourceReference; + $details['paymentMethodToken'] = $defaultPaymentMethod->source_reference; } // submit purchase/get response From 0ca073291e7193c8b508a902a531938fd950acbb Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 19:17:14 -0400 Subject: [PATCH 32/37] Make storing card summary locally part of payments changes --- .../2016_04_23_182223_payments_changes.php | 57 +++++++++++++ .../2016_05_10_144219_wepay_integration.php | 83 ------------------- 2 files changed, 57 insertions(+), 83 deletions(-) delete mode 100644 database/migrations/2016_05_10_144219_wepay_integration.php diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php index 2e6cdcb6ec05..c250c897333d 100644 --- a/database/migrations/2016_04_23_182223_payments_changes.php +++ b/database/migrations/2016_04_23_182223_payments_changes.php @@ -22,6 +22,37 @@ class PaymentsChanges extends Migration (new \PaymentStatusSeeder())->run(); + Schema::dropIfExists('payment_methods'); + + Schema::create('payment_methods', function($table) + { + $table->increments('id'); + $table->unsignedInteger('account_id'); + $table->unsignedInteger('contact_id')->nullable(); + $table->unsignedInteger('account_gateway_token_id'); + $table->unsignedInteger('payment_type_id'); + $table->string('source_reference'); + + $table->unsignedInteger('routing_number')->nullable(); + $table->smallInteger('last4')->unsigned()->nullable(); + $table->date('expiration')->nullable(); + $table->string('email')->nullable(); + $table->unsignedInteger('currency_id')->nullable(); + $table->string('status')->nullable(); + + $table->timestamps(); + $table->softDeletes(); + + $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); + $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade'); + $table->foreign('account_gateway_token_id')->references('id')->on('account_gateway_tokens'); + $table->foreign('payment_type_id')->references('id')->on('payment_types'); + $table->foreign('currency_id')->references('id')->on('currencies'); + + $table->unsignedInteger('public_id')->index(); + $table->unique( array('account_id','public_id') ); + }); + Schema::table('payments', function($table) { $table->decimal('refunded', 13, 2); @@ -33,6 +64,9 @@ class PaymentsChanges extends Migration $table->date('expiration')->nullable(); $table->text('gateway_error')->nullable(); $table->string('email')->nullable(); + + $table->unsignedInteger('payment_method_id')->nullable(); + $table->foreign('payment_method_id')->references('id')->on('payment_methods'); }); Schema::table('invoices', function($table) @@ -43,6 +77,17 @@ class PaymentsChanges extends Migration \DB::table('invoices') ->where('auto_bill', '=', 1) ->update(array('client_enable_auto_bill' => 1, 'auto_bill' => AUTO_BILL_OPT_OUT)); + + + Schema::table('account_gateway_tokens', function($table) + { + $table->unsignedInteger('default_payment_method_id')->nullable(); + $table->foreign('default_payment_method_id')->references('id')->on('payment_methods'); + + $table->boolean('uses_local_payment_methods')->defalut(true); + }); + + \DB::table('account_gateway_tokens')->update(array('uses_local_payment_methods' => false)); } /** @@ -63,6 +108,9 @@ class PaymentsChanges extends Migration $table->dropColumn('expiration'); $table->dropColumn('gateway_error'); $table->dropColumn('email'); + + $table->dropForeign('payments_payment_method_id_foreign'); + $table->dropColumn('payment_method_id'); }); \DB::table('invoices') @@ -84,5 +132,14 @@ class PaymentsChanges extends Migration }); Schema::dropIfExists('payment_statuses'); + + Schema::table('account_gateway_tokens', function($table) + { + $table->dropForeign('account_gateway_tokens_default_payment_method_id_foreign'); + $table->dropColumn('default_payment_method_id'); + $table->dropColumn('uses_local_payment_methods'); + }); + + Schema::dropIfExists('payment_methods'); } } diff --git a/database/migrations/2016_05_10_144219_wepay_integration.php b/database/migrations/2016_05_10_144219_wepay_integration.php deleted file mode 100644 index c2a48afd8098..000000000000 --- a/database/migrations/2016_05_10_144219_wepay_integration.php +++ /dev/null @@ -1,83 +0,0 @@ -increments('id'); - $table->unsignedInteger('account_id'); - $table->unsignedInteger('contact_id')->nullable(); - $table->unsignedInteger('account_gateway_token_id'); - $table->unsignedInteger('payment_type_id'); - $table->string('source_reference'); - - $table->unsignedInteger('routing_number')->nullable(); - $table->smallInteger('last4')->unsigned()->nullable(); - $table->date('expiration')->nullable(); - $table->string('email')->nullable(); - $table->unsignedInteger('currency_id')->nullable(); - $table->string('status')->nullable(); - - $table->timestamps(); - $table->softDeletes(); - - $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); - $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade'); - $table->foreign('account_gateway_token_id')->references('id')->on('account_gateway_tokens'); - $table->foreign('payment_type_id')->references('id')->on('payment_types'); - $table->foreign('currency_id')->references('id')->on('currencies'); - - $table->unsignedInteger('public_id')->index(); - $table->unique( array('account_id','public_id') ); - }); - - Schema::table('payments', function($table) - { - $table->unsignedInteger('payment_method_id')->nullable(); - $table->foreign('payment_method_id')->references('id')->on('payment_methods'); - }); - - Schema::table('account_gateway_tokens', function($table) - { - $table->unsignedInteger('default_payment_method_id')->nullable(); - $table->foreign('default_payment_method_id')->references('id')->on('payment_methods'); - - $table->boolean('uses_local_payment_methods')->defalut(true); - }); - - \DB::table('account_gateway_tokens')->update(array('uses_local_payment_methods' => false)); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('payments', function($table) - { - $table->dropForeign('payments_payment_method_id_foreign'); - $table->dropColumn('payment_method_id'); - }); - - Schema::table('account_gateway_tokens', function($table) - { - $table->dropForeign('account_gateway_tokens_default_payment_method_id_foreign'); - $table->dropColumn('default_payment_method_id'); - $table->dropColumn('uses_local_payment_methods'); - }); - - Schema::dropIfExists('payment_methods'); - } -} From b8514436a9a2df1406b25e41b5e0df1c7b4568cc Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 19:17:41 -0400 Subject: [PATCH 33/37] Pad last 4 card digits to a string of length 4, since we're storing it as an int --- app/Models/Payment.php | 5 +++++ resources/views/payments/paymentmethods_list.blade.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Models/Payment.php b/app/Models/Payment.php index b0001569dcc8..9171c9d22c69 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -174,6 +174,11 @@ class Payment extends EntityModel } return PaymentMethod::lookupBankData($this->routing_number); } + + public function getLast4Attribute($value) + { + return $value ? str_pad($value, 4, '0', STR_PAD_LEFT) : null; + } } Payment::creating(function ($payment) { diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php index 1522f2ac0a94..78b2653236ba 100644 --- a/resources/views/payments/paymentmethods_list.blade.php +++ b/resources/views/payments/paymentmethods_list.blade.php @@ -67,9 +67,9 @@ @elseif($paymentMethod->status == PAYMENT_METHOD_STATUS_VERIFICATION_FAILED) ({{trans('texts.verification_failed')}}) @endif - @elseif($paymentMethod->type_id == PAYMENT_TYPE_ID_PAYPAL) + @elseif($paymentMethod->payment_type_id == PAYMENT_TYPE_ID_PAYPAL) {{ $paymentMethod->email }} - @else + @elseif($paymentMethod->expiration) {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod->expiration, false)->format('m/y'))) !!} @endif @if($paymentMethod->id == $paymentMethod->account_gateway_token->default_payment_method_id) From 104264607bc135a0246428f0654b53603f2d4199 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 19:17:55 -0400 Subject: [PATCH 34/37] Pad last 4 card digits to a string of length 4, since we're storing it as an int --- app/Models/PaymentMethod.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Models/PaymentMethod.php b/app/Models/PaymentMethod.php index 62072dca090f..07c6d2e19e1f 100644 --- a/app/Models/PaymentMethod.php +++ b/app/Models/PaymentMethod.php @@ -71,6 +71,11 @@ class PaymentMethod extends EntityModel return static::lookupBankData($this->routing_number); } + public function getLast4Attribute($value) + { + return $value ? str_pad($value, 4, '0', STR_PAD_LEFT) : null; + } + public function scopeScope($query, $publicId = false, $accountId = false, $accountGatewayTokenId = false) { $query = parent::scopeScope($query, $publicId, $accountId); From 6138e1132f07735145aec5d2099ad8ec16dcfaa1 Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 19:18:12 -0400 Subject: [PATCH 35/37] Make sure payments reference newly added payment methods --- app/Http/Controllers/PaymentController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 491bac77033a..d86f8684074f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -493,7 +493,7 @@ class PaymentController extends BaseController unset($details['token']); $details['cardReference'] = $sourceReference; } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing') || $paymentType == PAYMENT_TYPE_STRIPE_ACH) { - $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */); + $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */, $paymentMethod/* return parameter */); if ($token) { $details['token'] = $token; $details['customerReference'] = $customerReference; @@ -524,7 +524,7 @@ class PaymentController extends BaseController $details['paymentMethodToken'] = $sourceReference; unset($details['token']); } elseif ($account->token_billing_type_id == TOKEN_BILLING_ALWAYS || Input::get('token_billing')) { - $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */); + $token = $this->paymentService->createToken($gateway, $details, $accountGateway, $client, $invitation->contact_id, $customerReference/* return parameter */, $paymentMethod/* return parameter */); if ($token) { $details['paymentMethodToken'] = $token; $details['customerId'] = $customerReference; From dcf231c6a524fadcf3626cefbd2b457caea1a7aa Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 21:30:52 -0400 Subject: [PATCH 36/37] Fix gateway ids --- app/Http/routes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index e8d7f9bbeac3..33d28899e5f1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -556,7 +556,8 @@ if (!defined('CONTACT_EMAIL')) { define('GATEWAY_DWOLLA', 43); define('GATEWAY_CHECKOUT_COM', 47); define('GATEWAY_CYBERSOURCE', 49); - define('GATEWAY_BRAINTREE', 62); + define('GATEWAY_WEPAY', 60); + define('GATEWAY_BRAINTREE', 61); define('EVENT_CREATE_CLIENT', 1); define('EVENT_CREATE_INVOICE', 2); From 258401715c6fddeb76c0933437bc081e0c1e451f Mon Sep 17 00:00:00 2001 From: Joshua Dwire Date: Tue, 10 May 2016 22:15:30 -0400 Subject: [PATCH 37/37] Update billing address when adding payment method --- app/Http/Controllers/PaymentController.php | 53 +++++++++++-------- .../Controllers/PublicClientController.php | 5 ++ app/Services/PaymentService.php | 2 +- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index d86f8684074f..fead7b7b0121 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -399,16 +399,7 @@ class PaymentController extends BaseController } } - public function do_payment($invitationKey, $onSite = true, $useToken = false, $sourceId = false) - { - $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail(); - $invoice = $invitation->invoice; - $client = $invoice->client; - $account = $client->account; - $paymentType = Session::get($invitation->id . 'payment_type'); - $accountGateway = $account->getGatewayByType($paymentType); - $paymentMethod = null; - + public static function processPaymentClientDetails($client, $accountGateway, $paymentType, $onSite = true){ $rules = [ 'first_name' => 'required', 'last_name' => 'required', @@ -437,17 +428,6 @@ class PaymentController extends BaseController 'country_id' => 'required', ]); } - - if ($useToken) { - if(!$sourceId) { - Session::flash('error', trans('texts.no_payment_method_specified')); - return Redirect::to('payment/' . $invitationKey)->withInput(Request::except('cvv')); - } else { - $customerReference = $client->getGatewayToken($accountGateway, $accountGatewayToken/* return parameter*/); - $paymentMethod = PaymentMethod::scope($sourceId, $account->id, $accountGatewayToken->id)->firstOrFail(); - $sourceReference = $paymentMethod->source_reference; - } - } if ($onSite) { $validator = Validator::make(Input::all(), $rules); @@ -469,6 +449,37 @@ class PaymentController extends BaseController } } + return true; + } + + public function do_payment($invitationKey, $onSite = true, $useToken = false, $sourceId = false) + { + $invitation = Invitation::with('invoice.invoice_items', 'invoice.client.currency', 'invoice.client.account.currency', 'invoice.client.account.account_gateways.gateway')->where('invitation_key', '=', $invitationKey)->firstOrFail(); + $invoice = $invitation->invoice; + $client = $invoice->client; + $account = $client->account; + $paymentType = Session::get($invitation->id . 'payment_type'); + $accountGateway = $account->getGatewayByType($paymentType); + $paymentMethod = null; + + + + if ($useToken) { + if(!$sourceId) { + Session::flash('error', trans('texts.no_payment_method_specified')); + return Redirect::to('payment/' . $invitationKey)->withInput(Request::except('cvv')); + } else { + $customerReference = $client->getGatewayToken($accountGateway, $accountGatewayToken/* return parameter*/); + $paymentMethod = PaymentMethod::scope($sourceId, $account->id, $accountGatewayToken->id)->firstOrFail(); + $sourceReference = $paymentMethod->source_reference; + } + } + + $result = static::processPaymentClientDetails($client, $accountGateway, $paymentType, $onSite); + if ($result !== true) { + return $result; + } + try { // For offsite payments send the client's details on file // If we're using a token then we don't need to send any other data diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php index b0bc58a45165..b8c089379116 100644 --- a/app/Http/Controllers/PublicClientController.php +++ b/app/Http/Controllers/PublicClientController.php @@ -884,6 +884,11 @@ class PublicClientController extends BaseController $accountGateway = $account->getGatewayByType($paymentType); $sourceToken = $accountGateway->gateway_id == GATEWAY_STRIPE ? Input::get('stripeToken'):Input::get('payment_method_nonce'); + $result = PaymentController::processPaymentClientDetails($client, $accountGateway, $paymentType); + if ($result !== true) { + return $result; + } + if ($sourceToken) { $details = array('token' => $sourceToken); } elseif (Input::get('plaidPublicToken')) { diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index 73d00b07e00e..d3ce97a7f935 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -98,7 +98,7 @@ class PaymentService extends BaseService if ($input && $accountGateway->isGateway(GATEWAY_STRIPE)) { if (!empty($input['stripeToken'])) { $data['token'] = $input['stripeToken']; - unset($details['card']); + unset($data['card']); } elseif (!empty($input['plaidPublicToken'])) { $data['plaidPublicToken'] = $input['plaidPublicToken']; $data['plaidAccountId'] = $input['plaidAccountId'];