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

Fix card expiration formatting; store card details from all payment triggers

Browse Source
This commit is contained in:
Joshua Dwire 2016-04-25 10:06:27 -04:00
parent 6e3b53f3cb
commit b57ebbf8aa
3 changed files with 62 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/Http/Controllers/PaymentController.php
View File

@ -482,49 +482,7 @@ class PaymentController extends BaseController
} }
if ($response->isSuccessful()) { if ($response->isSuccessful()) {
$last4 = null; $payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, null, $details, $response);
$expiration = null;
$card_type_id = null;
if (!empty($details['card'])) {
$card = $details['card'];
$last4 = substr($card->number, -4);
$year = $card->expiryYear;
if (strlen($year) == 2) {
$year = '20' . $year;
}
$expiration = $year . '-' . $card->expiryMonth . '-00';
$card_type_id = $this->detectCardType($card->number);
}
if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
$card = $response->getSource();
if (!$card) {
$card = $response->getCard();
}
if ($card) {
$last4 = $card['last4'];
$expiration = $card['exp_year'] . '-' . $card['exp_month'] . '-00';
$stripe_card_types = array(
'Visa' => CARD_VISA,
'American Express' => CARD_AMERICAN_EXPRESS,
'MasterCard' => CARD_MASTERCARD,
'Discover' => CARD_DISCOVER,
'JCB' => CARD_JCB,
'Diners Club' => CARD_DINERS_CLUB
);
if (!empty($stripe_card_types[$card['brand']])) {
$card_type_id = $stripe_card_types[$card['brand']];
} else {
$card_type_id = CARD_UNKNOWN;
}
}
}
$payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, null, $last4, $expiration, $card_type_id);
Session::flash('message', trans('texts.applied_payment')); Session::flash('message', trans('texts.applied_payment'));
if ($account->account_key == NINJA_ACCOUNT_KEY) { if ($account->account_key == NINJA_ACCOUNT_KEY) {
@ -558,24 +516,6 @@ class PaymentController extends BaseController
} }
} }
private function detectCardType($number)
{
if (preg_match('/^3[47][0-9]{13}$/',$number)) {
return CARD_AMERICAN_EXPRESS;
} elseif (preg_match('/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/',$number)) {
return CARD_DINERS_CLUB;
} elseif (preg_match('/^6(?:011|5[0-9][0-9])[0-9]{12}$/',$number)) {
return CARD_DISCOVER;
} elseif (preg_match('/^(?:2131|1800|35\d{3})\d{11}$/',$number)) {
return CARD_JCB;
} elseif (preg_match('/^5[1-5][0-9]{14}$/',$number)) {
return CARD_MASTERCARD;
} elseif (preg_match('/^4[0-9]{12}(?:[0-9]{3})?$/',$number)) {
return CARD_VISA;
}
return CARD_UNKNOWN;
}
public function offsite_payment() public function offsite_payment()
{ {
$payerId = Request::query('PayerID'); $payerId = Request::query('PayerID');
@ -637,7 +577,7 @@ class PaymentController extends BaseController
if ($response->isCancelled()) { if ($response->isCancelled()) {
// do nothing // do nothing
} elseif ($response->isSuccessful()) { } elseif ($response->isSuccessful()) {
$payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, $payerId); $payment = $this->paymentService->createPayment($invitation, $accountGateway, $ref, $payerId, $details, $purchaseResponse);
Session::flash('message', trans('texts.applied_payment')); Session::flash('message', trans('texts.applied_payment'));
} else { } else {
$this->error('offsite', $response->getMessage(), $accountGateway); $this->error('offsite', $response->getMessage(), $accountGateway);

2
app/Http/Controllers/PublicClientController.php
View File

@ -344,7 +344,7 @@ class PublicClientController extends BaseController
->addColumn('payment_source', function ($model) { ->addColumn('payment_source', function ($model) {
if (!$model->card_type_code) return ''; if (!$model->card_type_code) return '';
$card_type = trans("texts.card_" . $model->card_type_code); $card_type = trans("texts.card_" . $model->card_type_code);
$expiration = trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($model->expiration, false)->format('m/d'))); $expiration = trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($model->expiration, false)->format('m/y')));
return '<img height="22" src="'.URL::to('/images/credit_cards/'.$model->card_type_code.'.png').'" alt="'.htmlentities($card_type).'">&nbsp; &bull;&bull;&bull;'.$model->last4.' '.$expiration; return '<img height="22" src="'.URL::to('/images/credit_cards/'.$model->card_type_code.'.png').'" alt="'.htmlentities($card_type).'">&nbsp; &bull;&bull;&bull;'.$model->last4.' '.$expiration;
}) })
->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); }) ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); })

66
app/Services/PaymentService.php
View File

@ -214,7 +214,7 @@ class PaymentService extends BaseService
return $token; return $token;
} }
public function createPayment($invitation, $accountGateway, $ref, $payerId = null, $last4 = null, $expiration = null, $card_type_id = null, $routing_number = null) public function createPayment($invitation, $accountGateway, $ref, $payerId = null, $paymentDetails = null, $purchaseResponse = null)
{ {
$invoice = $invitation->invoice; $invoice = $invitation->invoice;
@ -227,10 +227,44 @@ class PaymentService extends BaseService
$payment->contact_id = $invitation->contact_id; $payment->contact_id = $invitation->contact_id;
$payment->transaction_reference = $ref; $payment->transaction_reference = $ref;
$payment->payment_date = date_create()->format('Y-m-d'); $payment->payment_date = date_create()->format('Y-m-d');
$payment->last4 = $last4;
$payment->expiration = $expiration; if (!empty($paymentDetails['card'])) {
$payment->card_type_id = $card_type_id; $card = $paymentDetails['card'];
$payment->routing_number = $routing_number; $payment->last4 = substr($card->number, -4);
$year = $card->expiryYear;
if (strlen($year) == 2) {
$year = '20' . $year;
}
$payment->expiration = $year . '-' . $card->expiryMonth . '-00';
$payment->card_type_id = $this->detectCardType($card->number);
}
if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
$card = $purchaseResponse->getSource();
if (!$card) {
$card = $purchaseResponse->getCard();
}
if ($card) {
$payment->last4 = $card['last4'];
$payment->expiration = $card['exp_year'] . '-' . $card['exp_month'] . '-00';
$stripe_card_types = array(
'Visa' => CARD_VISA,
'American Express' => CARD_AMERICAN_EXPRESS,
'MasterCard' => CARD_MASTERCARD,
'Discover' => CARD_DISCOVER,
'JCB' => CARD_JCB,
'Diners Club' => CARD_DINERS_CLUB
);
if (!empty($stripe_card_types[$card['brand']])) {
$payment->card_type_id = $stripe_card_types[$card['brand']];
} else {
$payment->card_type_id = CARD_UNKNOWN;
}
}
}
if ($payerId) { if ($payerId) {
$payment->payer_id = $payerId; $payment->payer_id = $payerId;
@ -294,6 +328,24 @@ class PaymentService extends BaseService
return $payment; return $payment;
} }
private function detectCardType($number)
{
if (preg_match('/^3[47][0-9]{13}$/',$number)) {
return CARD_AMERICAN_EXPRESS;
} elseif (preg_match('/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/',$number)) {
return CARD_DINERS_CLUB;
} elseif (preg_match('/^6(?:011|5[0-9][0-9])[0-9]{12}$/',$number)) {
return CARD_DISCOVER;
} elseif (preg_match('/^(?:2131|1800|35\d{3})\d{11}$/',$number)) {
return CARD_JCB;
} elseif (preg_match('/^5[1-5][0-9]{14}$/',$number)) {
return CARD_MASTERCARD;
} elseif (preg_match('/^4[0-9]{12}(?:[0-9]{3})?$/',$number)) {
return CARD_VISA;
}
return CARD_UNKNOWN;
}
public function completePurchase($gateway, $accountGateway, $details, $token) public function completePurchase($gateway, $accountGateway, $details, $token)
{ {
if ($accountGateway->isGateway(GATEWAY_MOLLIE)) { if ($accountGateway->isGateway(GATEWAY_MOLLIE)) {
@ -328,7 +380,7 @@ class PaymentService extends BaseService
if ($response->isSuccessful()) { if ($response->isSuccessful()) {
$ref = $response->getTransactionReference(); $ref = $response->getTransactionReference();
return $this->createPayment($invitation, $accountGateway, $ref); return $this->createPayment($invitation, $accountGateway, $ref, $details, $response);
} else { } else {
return false; return false;
} }
@ -387,7 +439,7 @@ class PaymentService extends BaseService
function ($model) { function ($model) {
if (!$model->card_type_code) return ''; if (!$model->card_type_code) return '';
$card_type = trans("texts.card_" . $model->card_type_code); $card_type = trans("texts.card_" . $model->card_type_code);
$expiration = trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($model->expiration, false)->format('m/d'))); $expiration = trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($model->expiration, false)->format('m/y')));
return '<img height="22" src="'.URL::to('/images/credit_cards/'.$model->card_type_code.'.png').'" alt="'.htmlentities($card_type).'">&nbsp; &bull;&bull;&bull;'.$model->last4.' '.$expiration; return '<img height="22" src="'.URL::to('/images/credit_cards/'.$model->card_type_code.'.png').'" alt="'.htmlentities($card_type).'">&nbsp; &bull;&bull;&bull;'.$model->last4.' '.$expiration;
} }
], ],