Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2863 from OXINARF/pr/stripe-improvements

Browse Source 
Stripe improvements
This commit is contained in:
Hillel Coren 2019-06-05 09:50:13 +03:00 committed by GitHub
commit 1dada2035c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Ninja/PaymentDrivers/StripePaymentDriver.php
View File

@ -273,6 +273,11 @@ class StripePaymentDriver extends BasePaymentDriver
} elseif ($isBitcoin) { } elseif ($isBitcoin) {
$payment->payment_type_id = PAYMENT_TYPE_BITCOIN; $payment->payment_type_id = PAYMENT_TYPE_BITCOIN;
} }
} else if (! $paymentMethod && $this->isGatewayType(GATEWAY_TYPE_CREDIT_CARD) && ! strcmp($this->purchaseResponse['payment_method_details']['type'], "card")) {
$card = $this->purchaseResponse['payment_method_details']['card'];
$payment->last4 = $card['last4'];
$payment->expiration = $card['exp_year'] . '-' . $card['exp_month'] . '-01';
$payment->payment_type_id = PaymentType::parseCardType($card['brand']);
} }
return $payment; return $payment;

21
resources/views/payments/credit_card.blade.php
View File

@ -154,11 +154,12 @@
@if ($client) @if ($client)
{{ Former::populate($client) }} {{ Former::populate($client) }}
{{ Former::populateField('country_id', (string) $client->country_id) }}
{{ Former::populateField('first_name', $contact->first_name) }} {{ Former::populateField('first_name', $contact->first_name) }}
{{ Former::populateField('last_name', $contact->last_name) }} {{ Former::populateField('last_name', $contact->last_name) }}
{{ Former::populateField('email', $contact->email) }} {{ Former::populateField('email', $contact->email) }}
@if (!$client->country_id && $client->account->country_id) @if (!$client->country_id && $client->account->country_id)
{{ Former::populateField('country_id', $client->account->country_id) }} {{ Former::populateField('country_id', (string) $client->account->country_id) }}
{{ Former::populateField('shipping_country_id', $client->account->country_id) }} {{ Former::populateField('shipping_country_id', $client->account->country_id) }}
@endif @endif
@endif @endif
@ -170,7 +171,7 @@
{{ Former::populateField('city', 'New York') }} {{ Former::populateField('city', 'New York') }}
{{ Former::populateField('state', 'NY') }} {{ Former::populateField('state', 'NY') }}
{{ Former::populateField('postal_code', '10118') }} {{ Former::populateField('postal_code', '10118') }}
{{ Former::populateField('country_id', 840) }} {{ Former::populateField('country_id', (string) 840) }}
<script> <script>
$(function() { $(function() {
@ -253,7 +254,7 @@
<div class="col-md-6"> <div class="col-md-6">
{!! Former::select('country_id') {!! Former::select('country_id')
->placeholder(trans('texts.country_id')) ->placeholder(trans('texts.country_id'))
->fromQuery($countries, 'name', 'id') ->fromQuery($countries, 'name', ['value' => 'id', 'data-iso_3166_2' => 'iso_3166_2'])
->addGroupClass('country-select') ->addGroupClass('country-select')
->label('') !!} ->label('') !!}
</div> </div>
@ -453,13 +454,17 @@
var options = { var options = {
name: document.getElementById('first_name').value + ' ' + document.getElementById('last_name').value name: document.getElementById('first_name').value + ' ' + document.getElementById('last_name').value,
@if (!empty($accountGateway->show_address))
address_line1: $('#address1').val(),
address_line2: $('#address2').val(),
address_city: $('#city').val(),
address_state: $('#state').val(),
address_zip: $('#postal_code').val(),
address_country: $("#country_id option:selected").attr('data-iso_3166_2')
@endif
}; };
if (document.getElementById('postal_code')) {
options.address_zip = document.getElementById('postal_code').value;
}
stripe.createToken(cardNumber, options).then(function(result) { stripe.createToken(cardNumber, options).then(function(result) {
if (result.error) { if (result.error) {
// Inform the user if there was an error. // Inform the user if there was an error.