Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Gateway/Request/PaymentDataBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Magento\Payment\Gateway\Request\BuilderInterface;
use Magento\Vault\Model\Ui\VaultConfigProvider;
use SubscribePro\Service\PaymentProfile\PaymentProfileInterface;

class PaymentDataBuilder implements BuilderInterface
{
Expand Down Expand Up @@ -38,6 +39,15 @@ public function build(array $buildSubject)
self::PAYMENT_METHOD_TOKEN => $payment->getAdditionalInformation(self::PAYMENT_METHOD_TOKEN),
VaultConfigProvider::IS_ACTIVE_CODE => $payment->getAdditionalInformation(
VaultConfigProvider::IS_ACTIVE_CODE
),
PaymentProfileInterface::CREDITCARD_TYPE => $payment->getCcType(),
PaymentProfileInterface::CREDITCARD_MONTH => $payment->getCcExpMonth(),
PaymentProfileInterface::CREDITCARD_YEAR => $payment->getCcExpYear(),
PaymentProfileInterface::CREDITCARD_LAST_DIGITS => $payment->getAdditionalInformation(
PaymentProfileInterface::CREDITCARD_LAST_DIGITS
),
PaymentProfileInterface::CREDITCARD_FIRST_DIGITS => $payment->getAdditionalInformation(
PaymentProfileInterface::CREDITCARD_FIRST_DIGITS
)
];
}
Expand Down
8 changes: 8 additions & 0 deletions Observer/Payment/DataAssigner.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

use Magento\Framework\Event\Observer;
use Magento\Quote\Api\Data\PaymentInterface;
use Magento\Sales\Api\Data\OrderPaymentInterface;
use SubscribePro\Service\PaymentProfile\PaymentProfileInterface;
use SubscribePro\Service\Transaction\TransactionInterface;
use Swarming\SubscribePro\Gateway\Request\PaymentDataBuilder;

Expand All @@ -15,6 +17,9 @@ class DataAssigner extends \Magento\Payment\Observer\AbstractDataAssignObserver
protected $additionalInformationList = [
PaymentDataBuilder::PAYMENT_METHOD_TOKEN,
TransactionInterface::BROWSER_INFO,
PaymentProfileInterface::CREDITCARD_FIRST_DIGITS,
PaymentProfileInterface::CREDITCARD_LAST_DIGITS,
PaymentProfileInterface::CREDITCARD_TYPE,
];

/**
Expand All @@ -37,5 +42,8 @@ public function execute(Observer $observer)
$paymentInfo->setAdditionalInformation($key, $additionalData[$key]);
}
}
$paymentInfo->setData(OrderPaymentInterface::CC_EXP_MONTH, $additionalData[OrderPaymentInterface::CC_EXP_MONTH] ?? '');
$paymentInfo->setData(OrderPaymentInterface::CC_EXP_YEAR, $additionalData[OrderPaymentInterface::CC_EXP_YEAR] ?? '');
$paymentInfo->setData(OrderPaymentInterface::CC_TYPE, $additionalData['creditcard_type'] ?? '');
}
}
8 changes: 7 additions & 1 deletion view/frontend/web/js/model/payment/cc-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,14 @@ define(
return {};
},

onPaymentMethod: function (token) {
onPaymentMethod: function (token, paymentMethod) {
this.paymentMethodToken(token);
this.selectedCardType(paymentMethod.card_type);
this.creditCardExpMonth(paymentMethod.month);
this.creditCardExpYear(paymentMethod.year);
this.creditCardFirstDigits(paymentMethod.first_six_digits);
this.creditCardLastDigits(paymentMethod.last_four_digits);

this.submitPayment();
},

Expand Down
8 changes: 7 additions & 1 deletion view/frontend/web/js/view/payment/method-renderer/cc-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,19 @@ define(
'method': this.getCode(),
'additional_data': {
'is_active_payment_token_enabler': customer.isLoggedIn(),
'payment_method_token': this.paymentMethodToken()
'payment_method_token': this.paymentMethodToken(),
'cc_exp_year': this.creditCardExpYear(),
'cc_exp_month': this.creditCardExpMonth(),
'creditcard_first_digits': this.creditCardFirstDigits(),
'creditcard_last_digits': this.creditCardLastDigits(),
'creditcard_type': this.selectedCardType(),
}
};

if (config.isThreeDSActive()) {
data.additional_data.browser_info = this.getThreeDSBrowserInfo();
}

return data;
},

Expand Down