diff --git a/Block/Cart/ApplePay.php b/Block/Cart/CheckoutConfig.php
similarity index 87%
rename from Block/Cart/ApplePay.php
rename to Block/Cart/CheckoutConfig.php
index 8b1ea55d..db7bd24b 100644
--- a/Block/Cart/ApplePay.php
+++ b/Block/Cart/CheckoutConfig.php
@@ -33,11 +33,12 @@
use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\View\Element\Template\Context;
-class ApplePay extends Onepage
+class CheckoutConfig extends Onepage
{
private Cart $cart;
private ConfigProvider $checkoutComConfigProvider;
private SerializerInterface $serializer;
+ private Config $checkoutComConfig;
public function __construct(
Cart $cart,
@@ -62,6 +63,7 @@ public function __construct(
);
$this->cart = $cart;
$this->checkoutComConfigProvider = $checkoutComConfigProvider;
+ $this->checkoutComConfig = $checkoutComConfig;
$this->serializer = $serializerInterface ?: ObjectManager::getInstance()
->get(JsonHexTag::class);
}
@@ -86,4 +88,10 @@ public function getSerializedCheckoutComConfig(): string
return $this->serializer->serialize($config);
}
+
+ public function isPaypalOrApplePayEnabled(): bool
+ {
+ return $this->checkoutComConfig->getValue('active', 'checkoutcom_apple_pay')
+ || $this->checkoutComConfig->getValue('active', 'checkoutcom_paypal');
+ }
}
diff --git a/Block/Paypal/Review/PaymentMethod.php b/Block/Paypal/Review/PaymentMethod.php
new file mode 100644
index 00000000..3d06a43f
--- /dev/null
+++ b/Block/Paypal/Review/PaymentMethod.php
@@ -0,0 +1,51 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Block\Paypal\Review;
+
+use CheckoutCom\Magento2\Model\Methods\PaypalMethod;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\View\Element\Template;
+use \Magento\Framework\View\Element\Template\Context as TemplateContext;
+
+class PaymentMethod extends Template
+{
+ protected Session $checkoutSession;
+ protected PaypalMethod $paypalMethod;
+
+ public function __construct(
+ TemplateContext $context,
+ Session $checkoutSession,
+ PaypalMethod $paypalMethod,
+ array $data = []
+ ) {
+ parent::__construct($context, $data);
+ $this->checkoutSession = $checkoutSession;
+ $this->paypalMethod = $paypalMethod;
+ }
+
+ public function getEmail(): string
+ {
+ return (string)$this->checkoutSession->getQuote()->getCustomerEmail();
+ }
+
+ public function getPaymentMethod(): string
+ {
+ return (string)$this->paypalMethod->getTitle();
+ }
+}
diff --git a/Block/Paypal/Review/PlaceOrderButton.php b/Block/Paypal/Review/PlaceOrderButton.php
new file mode 100644
index 00000000..75cc32c0
--- /dev/null
+++ b/Block/Paypal/Review/PlaceOrderButton.php
@@ -0,0 +1,66 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Block\Paypal\Review;
+
+use CheckoutCom\Magento2\Controller\Paypal\Review;
+use CheckoutCom\Magento2\Model\Methods\PaypalMethod;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\View\Element\Template;
+use \Magento\Framework\View\Element\Template\Context as TemplateContext;
+
+class PlaceOrderButton extends Template
+{
+ protected Session $checkoutSession;
+ protected RequestInterface $request;
+ protected PaypalMethod $paypalMethod;
+
+ public function __construct(
+ TemplateContext $context,
+ Session $checkoutSession,
+ RequestInterface $request,
+ PaypalMethod $paypalMethod,
+ array $data = []
+ ) {
+ parent::__construct($context, $data);
+ $this->checkoutSession = $checkoutSession;
+ $this->request = $request;
+ $this->paypalMethod = $paypalMethod;
+ }
+
+ public function getEmail(): string
+ {
+ return (string)$this->checkoutSession->getQuote()->getCustomerEmail();
+ }
+
+ public function canPlaceOrder(): bool
+ {
+ return (bool)$this->checkoutSession->getQuote()->getShippingAddress()->getShippingMethod();
+ }
+
+ public function getPaymentMethod(): string
+ {
+ return (string)$this->paypalMethod->getCode();
+ }
+
+ public function getContextId(): string
+ {
+ return (string)$this->request->getParam(Review::PAYMENT_CONTEXT_ID_PARAMETER);
+ }
+}
diff --git a/Block/Paypal/Review/ShippingAddress.php b/Block/Paypal/Review/ShippingAddress.php
new file mode 100644
index 00000000..6e4a352d
--- /dev/null
+++ b/Block/Paypal/Review/ShippingAddress.php
@@ -0,0 +1,163 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+namespace CheckoutCom\Magento2\Block\Paypal\Review;
+
+use CheckoutCom\Magento2\Controller\Paypal\Review;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Block\Address\Edit as CustomerAddressEdit;
+use Magento\Customer\Helper\Address;
+use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Model\Address\Config as AddressConfig;
+use Magento\Customer\Model\Session;
+use Magento\Directory\Helper\Data;
+use Magento\Directory\Model\ResourceModel\Country\CollectionFactory as CountryCollectionFactory;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\Cache\Type\Config;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
+
+class ShippingAddress extends CustomerAddressEdit
+{
+ protected CheckoutSession $checkoutSession;
+ protected AddressConfig $addressConfig;
+ protected CustomerInterfaceFactory $customerInterfaceFactory;
+ protected UrlInterface $url;
+ protected RequestInterface $request;
+
+ public function __construct(
+ Context $context,
+ Data $directoryHelper,
+ EncoderInterface $jsonEncoder,
+ Config $configCacheType,
+ CollectionFactory $regionCollectionFactory,
+ CountryCollectionFactory $countryCollectionFactory,
+ Session $customerSession,
+ AddressRepositoryInterface $addressRepository,
+ AddressInterfaceFactory $addressDataFactory,
+ CurrentCustomer $currentCustomer,
+ DataObjectHelper $dataObjectHelper,
+ CheckoutSession $checkoutSession,
+ AddressConfig $addressConfig,
+ CustomerInterfaceFactory $customerInterfaceFactory,
+ UrlInterface $url,
+ RequestInterface $request,
+ array $data = [],
+ AddressMetadataInterface $addressMetadata = null,
+ Address $addressHelper = null
+ ) {
+ parent::__construct(
+ $context,
+ $directoryHelper,
+ $jsonEncoder,
+ $configCacheType,
+ $regionCollectionFactory,
+ $countryCollectionFactory,
+ $customerSession,
+ $addressRepository,
+ $addressDataFactory,
+ $currentCustomer,
+ $dataObjectHelper,
+ $data,
+ $addressMetadata,
+ $addressHelper
+ );
+
+ $this->addressConfig = $addressConfig;
+ $this->checkoutSession = $checkoutSession;
+ $this->customerInterfaceFactory = $customerInterfaceFactory;
+ $this->url = $url;
+ $this->request = $request;
+
+ $this->_address = $this->checkoutSession->getQuote()->getShippingAddress();
+ }
+
+ /**
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function getAddress(): ?QuoteAddress
+ {
+ return $this->checkoutSession->getQuote()->getShippingAddress();
+ }
+
+ public function getCustomer(): CustomerInterface
+ {
+ return $this->customerInterfaceFactory->create();
+ }
+
+ public function isDefaultBilling(): bool
+ {
+ return false;
+ }
+
+ public function isDefaultShipping(): bool
+ {
+ return false;
+ }
+
+ public function canSetAsDefaultBilling(): bool
+ {
+ return false;
+ }
+
+ public function canSetAsDefaultShipping(): bool
+ {
+ return false;
+ }
+
+ public function getCustomerAddressCount(): int
+ {
+ return 1;
+ }
+
+ public function getRegion(): string
+ {
+ return (string)$this->getAddress()->getRegion();
+ }
+
+ public function getRegionId()
+ {
+ return $this->getAddress()->getRegionId() ?? 0;
+ }
+
+ public function getTitle(): Phrase
+ {
+ return __('Review Order');
+ }
+
+ public function getSaveUrl(): string
+ {
+ return $this->url->getUrl('checkoutcom/paypal/saveExpressShippingAddress', [
+ Review::PAYMENT_CONTEXT_ID_PARAMETER => $this->request->getParam(Review::PAYMENT_CONTEXT_ID_PARAMETER)
+ ]);
+ }
+}
diff --git a/Block/Paypal/Review/ShippingMethod.php b/Block/Paypal/Review/ShippingMethod.php
new file mode 100644
index 00000000..4b900317
--- /dev/null
+++ b/Block/Paypal/Review/ShippingMethod.php
@@ -0,0 +1,88 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Block\Paypal\Review;
+
+use CheckoutCom\Magento2\Controller\Paypal\Review;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context as TemplateContext;
+use Magento\Quote\Model\Quote\Address as QuoteAddresss;
+use Magento\Quote\Model\Quote\Address\Rate as QuoteRate;
+
+class ShippingMethod extends Template
+{
+ protected Session $checkoutSession;
+ protected UrlInterface $url;
+ protected RequestInterface $request;
+ protected PriceCurrencyInterface $priceCurrency;
+
+ public function __construct(
+ TemplateContext $context,
+ Session $checkoutSession,
+ RequestInterface $request,
+ UrlInterface $url,
+ PriceCurrencyInterface $priceCurrency,
+ array $data = []
+ ) {
+ parent::__construct($context, $data);
+ $this->checkoutSession = $checkoutSession;
+ $this->url = $url;
+ $this->request = $request;
+ $this->priceCurrency = $priceCurrency;
+ }
+
+ public function getRates(): array
+ {
+ $shippingAddress = $this->getShippingAddress();
+ $shippingAddress->collectShippingRates();
+
+ return $shippingAddress->getGroupedAllShippingRates();
+ }
+
+ public function getShippingMethodUpdateUrl(QuoteRate $carrierRate): string
+ {
+ return $this->url->getUrl('checkoutcom/paypal/saveExpressShippingMethod', [
+ Review::PAYMENT_CONTEXT_ID_PARAMETER => $this->request->getParam(Review::PAYMENT_CONTEXT_ID_PARAMETER),
+ Review::SHIPPING_METHOD_PARAMETER => $carrierRate->getCode()
+ ]);
+ }
+
+ public function isCurrentShippingRate(QuoteRate $carrierRate): bool
+ {
+ return $carrierRate->getCode() === $this->getShippingAddress()->getShippingMethod();
+ }
+
+ public function getFormatedPrice($price): string
+ {
+ return $this->priceCurrency->convertAndFormat(
+ $price,
+ false,
+ PriceCurrencyInterface::DEFAULT_PRECISION,
+ $this->checkoutSession->getQuote()->getStore()
+ );
+ }
+
+ private function getShippingAddress(): QuoteAddresss
+ {
+ return $this->checkoutSession->getQuote()->getShippingAddress();
+ }
+}
diff --git a/Block/Paypal/Script.php b/Block/Paypal/Script.php
new file mode 100644
index 00000000..64570cea
--- /dev/null
+++ b/Block/Paypal/Script.php
@@ -0,0 +1,76 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Block\Paypal;
+
+use CheckoutCom\Magento2\Gateway\Config\Config;
+use CheckoutCom\Magento2\Model\Methods\PaypalMethod;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context as TemplateContext;
+
+class Script extends Template
+{
+ private PaypalMethod $paypalMethod;
+ private Config $checkoutConfig;
+
+ public function __construct(
+ TemplateContext $context,
+ PaypalMethod $paypalMethod,
+ Config $checkoutConfig,
+ array $data = []
+ ) {
+ parent::__construct($context, $data);
+ $this->paypalMethod = $paypalMethod;
+ $this->checkoutConfig = $checkoutConfig;
+ }
+
+ public function getPaypalMerchantId(): string
+ {
+ return (string)$this->paypalMethod->getConfigData('merchant_id');
+ }
+
+ public function getClientId(): string
+ {
+ return (string)$this->paypalMethod->getConfigData('checkout_client_id');
+ }
+
+ public function getPartnerAttributionId(): string
+ {
+ return (string)$this->paypalMethod->getConfigData('checkout_partner_attribution_id');
+ }
+
+ public function getIntent(): string
+ {
+ return $this->checkoutConfig->needsAutoCapture() ? 'capture' : 'authorize';
+ }
+
+ public function getCommit(): string
+ {
+ return $this->isExpressButton() ? 'false' : 'true';
+ }
+
+ public function getPageType(): string
+ {
+ return $this->getScriptType() ?? 'checkout';
+ }
+
+ private function isExpressButton(): bool
+ {
+ return $this->getMode() === 'express';
+ }
+}
diff --git a/Controller/Api/V1.php b/Controller/Api/V1.php
index 21f8804d..8760a259 100644
--- a/Controller/Api/V1.php
+++ b/Controller/Api/V1.php
@@ -161,30 +161,14 @@ public function execute(): Json
if ($this->isValidRequest()) {
// Load the quote
$quote = $this->loadQuote();
- $order = null;
- $reservedOrderId = null;
-
- if ($this->config->isPaymentWithOrderFirst()) {
- // Create an order
- $order = $this->orderHandler->setMethodId('checkoutcom_card_payment')->handleOrder($quote);
- }
-
- if ($this->config->isPaymentWithPaymentFirst()) {
- // Reserved an order
- /** @var string $reservedOrderId */
- $reservedOrderId = $this->quoteHandler->getReference($quote);
- }
-
-
+ $order = $this->orderHandler->setMethodId('checkoutcom_card_payment')->handleOrder($quote);
// Process the payment
- if (($this->config->isPaymentWithPaymentFirst() && $this->quoteHandler->isQuote($quote) && $reservedOrderId !== null)
- || ($this->config->isPaymentWithOrderFirst() && $this->orderHandler->isOrder($order))
- ) {
+ if ($this->orderHandler->isOrder($order)) {
//Init values to request payment
- $amount = (float)$this->config->isPaymentWithPaymentFirst() ? $quote->getGrandTotal() : $order->getGrandTotal();
- $currency = (string)$this->config->isPaymentWithPaymentFirst() ? $quote->getQuoteCurrencyCode() : $order->getOrderCurrencyCode();
- $reference = (string)$this->config->isPaymentWithPaymentFirst() ? $reservedOrderId : $order->getIncrementId();
+ $amount = $order->getGrandTotal();
+ $currency = $order->getOrderCurrencyCode();
+ $reference = $order->getIncrementId();
// Get response and success
$response = $this->requestPayment($amount, $currency, $reference);
@@ -195,9 +179,6 @@ public function execute(): Json
// Process the response
$api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
if ($api->isValidResponse($response)) {
- // Create an order if processing is with payment first
- $order = $order === null ? $this->orderHandler->setMethodId('checkoutcom_card_payment')->handleOrder($quote) : $order;
-
// Get the payment details
$paymentDetails = $api->getPaymentDetails($response->id);
@@ -211,6 +192,9 @@ public function execute(): Json
$success = $response->isSuccessful();
$orderId = $order->getId();
} else {
+ // Delete the order if payment is first
+ $this->orderHandler->deleteOrder($order);
+
$errorMessage = __('The payment request was declined by the gateway.');
}
} else {
diff --git a/Controller/Api/V2.php b/Controller/Api/V2.php
index 702ec144..08421ae0 100644
--- a/Controller/Api/V2.php
+++ b/Controller/Api/V2.php
@@ -343,29 +343,20 @@ protected function hasValidFields()
*/
protected function processPayment(): array
{
- // Try to load a quote
- $quote = $this->config->isPaymentWithPaymentFirst() ? $this->loadQuote() : null;
- // Reserved an order
- $reservedOrderId = $this->config->isPaymentWithPaymentFirst() ? $this->quoteHandler->getReference($quote) : null;
- // Create Order if needed before paymen
- $orderBeforePayment = $this->config->isPaymentWithOrderFirst() ? $this->createOrder() : null;
+ // Create Order if needed before payment
+ $order = $this->createOrder();
// Process the payment
- if (($this->config->isPaymentWithPaymentFirst() && $this->quoteHandler->isQuote($quote) && $reservedOrderId !== null)
- || ($this->config->isPaymentWithOrderFirst() && $this->orderHandler->isOrder($orderBeforePayment))
- ) {
+ if ($this->orderHandler->isOrder($order)) {
//Init values to request payment
- $amount = (float)$this->config->isPaymentWithPaymentFirst() ? $quote->getGrandTotal() : $orderBeforePayment->getGrandTotal();
- $currency = (string)$this->config->isPaymentWithPaymentFirst() ? $quote->getQuoteCurrencyCode() : $orderBeforePayment->getOrderCurrencyCode();
- $reference = (string)$this->config->isPaymentWithPaymentFirst() ? $reservedOrderId : $orderBeforePayment->getIncrementId();
+ $amount = $order->getGrandTotal();
+ $currency = $order->getOrderCurrencyCode();
+ $reference = $order->getIncrementId();
// Get the payment response
$response = $this->getPaymentResponse($amount, $currency, $reference);
if ($this->api->isValidResponse($response)) {
- // Create Order
- $this->order = $order = ($orderBeforePayment === null) ? $this->createOrder() : $orderBeforePayment;
-
// Process the payment response
$is3ds = property_exists(
$response,
@@ -408,6 +399,9 @@ protected function processPayment(): array
if (isset($this->data->failure_url)) {
$this->result['redirect_url'] = $this->data->failure_url;
}
+
+ // Delete the order if payment is first
+ $this->orderHandler->deleteOrder($order);
}
// Update the order id
diff --git a/Controller/Apm/Display.php b/Controller/Apm/Display.php
index 536ccfe4..50e9daef 100644
--- a/Controller/Apm/Display.php
+++ b/Controller/Apm/Display.php
@@ -22,6 +22,7 @@
use CheckoutCom\Magento2\Gateway\Config\Config;
use CheckoutCom\Magento2\Model\Config\Backend\Source\ConfigService;
use CheckoutCom\Magento2\Model\Methods\AlternativePaymentMethod;
+use CheckoutCom\Magento2\Model\Service\ApiHandlerService;
use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Action\Context;
@@ -71,6 +72,12 @@ class Display extends Action
* @var QuoteHandlerService $quoteHandler
*/
private $quoteHandler;
+ /**
+ * $apiHandler field
+ *
+ * @var ApiHandlerService $apiHandler
+ */
+ private $apiHandler;
/**
* Display constructor
@@ -82,6 +89,7 @@ class Display extends Action
* @param QuoteHandlerService $quoteHandler
* @param StoreManagerInterface $storeManager
* @param ScopeConfigInterface $scopeConfig
+ * @param ApiHandlerService $apiHandler
*/
public function __construct(
Context $context,
@@ -90,7 +98,8 @@ public function __construct(
Config $config,
QuoteHandlerService $quoteHandler,
StoreManagerInterface $storeManager,
- ScopeConfigInterface $scopeConfig
+ ScopeConfigInterface $scopeConfig,
+ ApiHandlerService $apiHandler
) {
parent::__construct($context);
@@ -100,6 +109,7 @@ public function __construct(
$this->quoteHandler = $quoteHandler;
$this->storeManager = $storeManager;
$this->scopeConfig = $scopeConfig;
+ $this->apiHandler = $apiHandler;
}
/**
@@ -213,6 +223,7 @@ public function loadBlock(string $apmId, string $title): string
->setTemplate('CheckoutCom_Magento2::payment/apm/' . $apmId . '.phtml')
->setData('apm_id', $apmId)
->setData('title', $title)
+ ->setData('service_previous_mode', $this->apiHandler->isPreviousMode())
->toHtml();
}
}
diff --git a/Controller/Klarna/Context.php b/Controller/Klarna/Context.php
new file mode 100644
index 00000000..dfa18f39
--- /dev/null
+++ b/Controller/Klarna/Context.php
@@ -0,0 +1,126 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+namespace CheckoutCom\Magento2\Controller\Klarna;
+
+use Checkout\CheckoutApiException;
+use Checkout\Common\AccountHolder;
+use Checkout\Common\Address;
+use Checkout\Payments\Request\Source\AbstractRequestSource;
+use Checkout\Payments\Request\Source\Contexts\PaymentContextsKlarnaSource;
+use CheckoutCom\Magento2\Helper\Logger;
+use CheckoutCom\Magento2\Model\Service\PaymentContextRequestService;
+use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Phrase;
+use Magento\Framework\Serialize\SerializerInterface;
+
+class Context implements HttpPostActionInterface
+{
+ protected JsonFactory $resultJsonFactory;
+ protected PaymentContextRequestService $paymentContextRequestService;
+ protected RequestInterface $request;
+ protected QuoteHandlerService $quoteHandlerService;
+ protected Logger $logger;
+ protected SerializerInterface $serializer;
+
+ public function __construct(
+ JsonFactory $resultJsonFactory,
+ PaymentContextRequestService $paymentContextRequestService,
+ RequestInterface $request,
+ QuoteHandlerService $quoteHandlerService,
+ SerializerInterface $serializer,
+ Logger $logger
+ ) {
+ $this->resultJsonFactory = $resultJsonFactory;
+ $this->paymentContextRequestService = $paymentContextRequestService;
+ $this->request = $request;
+ $this->quoteHandlerService = $quoteHandlerService;
+ $this->logger = $logger;
+ $this->serializer = $serializer;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function execute(): Json
+ {
+ $resultJson = $this->resultJsonFactory->create();
+
+ try {
+ $resultJson->setData(
+ [
+ 'content' => $this->paymentContextRequestService
+ ->setShippingFeesAsItem(true)
+ ->collectDiscountAmountOnItemUnitPrice(false)
+ ->setForceAuthorizeMode((bool)$this->request->getParam('forceAuthorizeMode'))
+ ->makePaymentContextRequests(
+ $this->getKlarnaContextSource()
+ ),
+ ]
+ );
+ } catch (CheckoutApiException $apiException) {
+ $this->logger->write(sprintf('Error happen while requesting klarna context: %s', $apiException->getMessage()));
+ $resultJson->setData(
+ [
+ 'content' => [
+ 'error' => $this->resolveExceptionErrorMessage($apiException),
+ ],
+ ]
+ );
+ }
+
+ return $resultJson;
+ }
+
+ private function resolveExceptionErrorMessage(CheckoutApiException $apiException): Phrase
+ {
+ $errorDetails = !$apiException->error_details ? [] : $apiException->error_details;
+ $errorCodes = $errorDetails['error_codes'] ?? [];
+
+ return in_array('billing_country_invalid', $errorCodes) ?
+ __('This payment method is not available in your country') :
+ (
+ in_array('currency_not_supported', $errorCodes) ?
+ __('Currency is not supported for your country') : __('This payment method is not available')
+ );
+ }
+
+ private function getKlarnaContextSource(): AbstractRequestSource
+ {
+ $klarnaRequestSource = new PaymentContextsKlarnaSource();
+ $accountHolder = new AccountHolder();
+ $billingAddress = new Address();
+ $billingAddress->country = $this->getCountryId();
+ $accountHolder->billing_address = $billingAddress;
+ $klarnaRequestSource->account_holder = $accountHolder;
+
+ return $klarnaRequestSource;
+ }
+
+ /**
+ * If a country id is given on request parameters give it first, if no use the quote one
+ */
+ private function getCountryId(): string
+ {
+ return (string)$this->serializer->unserialize((string)$this->request->getContent())['country'] ?: $this->quoteHandlerService->getBillingAddress()->getCountry();
+ }
+}
diff --git a/Controller/Klarna/GetCustomerDatas.php b/Controller/Klarna/GetCustomerDatas.php
new file mode 100644
index 00000000..53beda39
--- /dev/null
+++ b/Controller/Klarna/GetCustomerDatas.php
@@ -0,0 +1,67 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+namespace CheckoutCom\Magento2\Controller\Klarna;
+
+use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+
+class GetCustomerDatas implements HttpPostActionInterface
+{
+ protected JsonFactory $resultJsonFactory;
+ protected RequestInterface $request;
+ protected QuoteHandlerService $quoteHandlerService;
+
+ public function __construct(
+ JsonFactory $resultJsonFactory,
+ RequestInterface $request,
+ QuoteHandlerService $quoteHandlerService
+ ) {
+ $this->resultJsonFactory = $resultJsonFactory;
+ $this->request = $request;
+ $this->quoteHandlerService = $quoteHandlerService;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function execute(): Json
+ {
+ // Get the request data
+ $quoteId = $this->request->getParam('quote_id');
+ $storeId = $this->request->getParam('store_id');
+
+ // Try to load a quote
+ $quote = $this->quoteHandlerService->getQuote([
+ 'entity_id' => $quoteId,
+ 'store_id' => $storeId,
+ ]);
+
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'billing' => $this->quoteHandlerService->getBillingAddress()->toArray(),
+ ]
+ );
+
+ return $resultJson;
+ }
+}
diff --git a/Controller/Payment/Fail.php b/Controller/Payment/Fail.php
index 775a2ab5..f07d2f16 100644
--- a/Controller/Payment/Fail.php
+++ b/Controller/Payment/Fail.php
@@ -191,6 +191,9 @@ public function execute(): ResponseInterface
// Handle the failed order
$this->orderStatusHandler->handleFailedPayment($order);
+ //Delete order if payment first
+ $this->orderHandler->deleteOrder($order);
+
$errorMessage = null;
if (isset($response['actions'][0]['response_code'])) {
$errorMessage = $this->paymentErrorHandlerService->getErrorMessage(
@@ -204,19 +207,10 @@ public function execute(): ResponseInterface
$order
);
- // Display error message and knet mandate info
+ // Display error message
$this->messageManager->addErrorMessage(
__('The transaction could not be processed.')
);
- $this->messageManager->addComplexNoticeMessage('knetInfoMessage', [
- 'postDate' => $response['source']['post_date'] ?? null,
- 'amount' => $amount ?? null,
- 'paymentId' => $response['source']['knet_payment_id'] ?? null,
- 'transactionId' => $response['source']['knet_transaction_id'] ?? null,
- 'authCode' => $response['source']['auth_code'] ?? null,
- 'reference' => $response['source']['bank_reference'] ?? null,
- 'resultCode' => $response['source']['knet_result'] ?? null,
- ]);
} else {
$this->messageManager->addErrorMessage(
$errorMessage ? $errorMessage->getText() : __('The transaction could not be processed.')
diff --git a/Controller/Payment/PlaceOrder.php b/Controller/Payment/PlaceOrder.php
index 9c601a91..05652945 100644
--- a/Controller/Payment/PlaceOrder.php
+++ b/Controller/Payment/PlaceOrder.php
@@ -219,18 +219,12 @@ public function execute(): Json
if (isset($data['methodId']) && !$this->isEmptyCardToken($data)) {
// Process the request
if ($this->getRequest()->isAjax() && $quote) {
- // Reserved an order
- /** @var string $reservedOrderId */
- $reservedOrderId = $this->config->isPaymentWithPaymentFirst() ? $this->quoteHandler->getReference($quote) : null;
- //Create order if it is needed before payment
- $order = $this->config->isPaymentWithOrderFirst() ? $this->orderHandler->setMethodId($data['methodId'])->handleOrder($quote) : null;
+ //Create order before payment
+ $order = $this->orderHandler->setMethodId($data['methodId'])->handleOrder($quote);
// Process the payment
- if (($this->config->isPaymentWithPaymentFirst() && $this->quoteHandler->isQuote($quote) && $reservedOrderId !== null)
- || ($this->config->isPaymentWithOrderFirst() && $this->orderHandler->isOrder($order)
- )
- ) {
+ if ($this->orderHandler->isOrder($order)) {
$log = false;
// Get the debug config value
$debug = $this->scopeConfig->getValue(
@@ -245,9 +239,9 @@ public function execute(): Json
);
//Init values to request payment
- $amount = (float)$this->config->isPaymentWithPaymentFirst() ? $quote->getGrandTotal() : $order->getGrandTotal();
- $currency = (string)$this->config->isPaymentWithPaymentFirst() ? $quote->getQuoteCurrencyCode() : $order->getOrderCurrencyCode();
- $reference = (string)$this->config->isPaymentWithPaymentFirst() ? $reservedOrderId : $order->getIncrementId();
+ $amount = (float) $order->getGrandTotal();
+ $currency = (string) $order->getOrderCurrencyCode();
+ $reference = (string) $order->getIncrementId();
// Get response and success
$response = $this->requestPayment($quote, $data, $amount, $currency, $reference);
@@ -262,11 +256,9 @@ public function execute(): Json
$api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
$isValidResponse = $api->isValidResponse($response);
+ $responseCode = isset($response['response_code']) ? $response['response_code'] : '';
- if ($isValidResponse) {
- // Create an order if processing is payment first
- $order = $order === null ? $this->orderHandler->setMethodId($data['methodId'])->handleOrder($quote) : $order;
-
+ if ($isValidResponse && $this->isAuthorized($responseCode)) {
// Add the payment info to the order
$order = $this->utilities->setPaymentData($order, $response, $data);
@@ -303,6 +295,9 @@ public function execute(): Json
if ($this->config->isPaymentWithOrderFirst()) {
$this->orderStatusHandler->handleFailedPayment($order);
}
+
+ // Delete the order if payment is first
+ $this->orderHandler->deleteOrder($order);
}
} else {
// Payment failed
@@ -380,4 +375,16 @@ protected function requestPayment(CartInterface $quote, array $data, float $amou
$reference
);
}
+
+ /**
+ * Check if response code is successful
+ *
+ * @param string $responseCode
+ *
+ * @return bool
+ */
+ protected function isAuthorized(string $responseCode): bool
+ {
+ return empty($responseCode) || mb_substr($responseCode, 0, 2) === PaymentErrorHandlerService::TRANSACTION_SUCCESS_DIGITS;
+ }
}
diff --git a/Controller/Payment/Verify.php b/Controller/Payment/Verify.php
index bbc4af89..2d4c4dde 100644
--- a/Controller/Payment/Verify.php
+++ b/Controller/Payment/Verify.php
@@ -161,16 +161,6 @@ public function execute(): ResponseInterface
$response['amount'] ?? null,
$order
);
-
- $this->messageManager->addComplexNoticeMessage('knetInfoMessage', [
- 'postDate' => $response['source']['post_date'] ?? null,
- 'amount' => $amount ?? null,
- 'paymentId' => $response['source']['knet_payment_id'] ?? null,
- 'transactionId' => $response['source']['knet_transaction_id'] ?? null,
- 'authCode' => $response['source']['auth_code'] ?? null,
- 'reference' => $response['source']['bank_reference'] ?? null,
- 'resultCode' => $response['source']['knet_result'] ?? null,
- ]);
}
if (isset($response['metadata']['successUrl']) &&
@@ -215,7 +205,7 @@ public function execute(): ResponseInterface
$this->messageManager->addErrorMessage(
__('An error has occurred, please select another payment method or retry in a few minutes')
);
-
+
$this->logger->write($e->getMessage());
return $this->_redirect('checkout/cart', ['_secure' => true]);
diff --git a/Controller/Paypal/Context.php b/Controller/Paypal/Context.php
new file mode 100644
index 00000000..3016431e
--- /dev/null
+++ b/Controller/Paypal/Context.php
@@ -0,0 +1,70 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+namespace CheckoutCom\Magento2\Controller\Paypal;
+
+use Checkout\Payments\Request\Source\AbstractRequestSource;
+use Checkout\Payments\Request\Source\Contexts\PaymentContextsPayPalSource;
+use CheckoutCom\Magento2\Model\Service\PaymentContextRequestService;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+
+class Context implements HttpPostActionInterface
+{
+ protected JsonFactory $resultJsonFactory;
+ protected PaymentContextRequestService $paymentContextRequestService;
+ protected RequestInterface $request;
+
+ public function __construct(
+ JsonFactory $resultJsonFactory,
+ PaymentContextRequestService $paymentContextRequestService,
+ RequestInterface $request
+ ) {
+ $this->resultJsonFactory = $resultJsonFactory;
+ $this->paymentContextRequestService = $paymentContextRequestService;
+ $this->request = $request;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function execute(): Json
+ {
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData(
+ [
+ 'content' => $this->paymentContextRequestService
+ ->setShippingFeesAsItem(false)
+ ->collectDiscountAmountOnItemUnitPrice(true)
+ ->setForceAuthorizeMode((bool)$this->request->getParam('forceAuthorizeMode'))
+ ->makePaymentContextRequests(
+ $this->getPaypalContext()
+ ),
+ ]
+ );
+
+ return $resultJson;
+ }
+
+ private function getPaypalContext(): AbstractRequestSource
+ {
+ return new PaymentContextsPayPalSource();
+ }
+}
diff --git a/Controller/Paypal/Review.php b/Controller/Paypal/Review.php
new file mode 100644
index 00000000..cc178a05
--- /dev/null
+++ b/Controller/Paypal/Review.php
@@ -0,0 +1,113 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Controller\Paypal;
+
+use CheckoutCom\Magento2\Model\Methods\PaypalMethod;
+use CheckoutCom\Magento2\Model\Service\PaymentContextRequestService;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Api\Data\PaymentInterfaceFactory;
+
+class Review implements HttpGetActionInterface
+{
+ public const PAYMENT_CONTEXT_ID_PARAMETER = 'contextId';
+ public const SHIPPING_METHOD_PARAMETER = 'method_code';
+
+ protected ResultFactory $resultFactory;
+ protected ManagerInterface $messageManager;
+ protected RequestInterface $request;
+ protected Session $checkoutSession;
+ protected PaymentContextRequestService $paymentContextRequestService;
+ protected RedirectFactory $redirectFactory;
+ protected UrlInterface $urlInterface;
+ protected PaymentInterfaceFactory $paymentInterfaceFactory;
+ protected PaypalMethod $paypalMethod;
+
+ public function __construct(
+ ResultFactory $resultFactory,
+ ManagerInterface $messageManager,
+ RequestInterface $request,
+ Session $checkoutSession,
+ PaymentContextRequestService $paymentContextRequestService,
+ RedirectFactory $redirectFactory,
+ UrlInterface $urlInterface,
+ PaymentInterfaceFactory $paymentInterfaceFactory,
+ PaypalMethod $paypalMethod
+ ) {
+ $this->resultFactory = $resultFactory;
+ $this->request = $request;
+ $this->messageManager = $messageManager;
+ $this->checkoutSession = $checkoutSession;
+ $this->paymentContextRequestService = $paymentContextRequestService;
+ $this->redirectFactory = $redirectFactory;
+ $this->urlInterface = $urlInterface;
+ $this->paymentInterfaceFactory = $paymentInterfaceFactory;
+ $this->paypalMethod = $paypalMethod;
+ }
+
+ /**
+ * @return ResultInterface
+ */
+ public function execute()
+ {
+ $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+
+ $quote = $this->checkoutSession->getQuote();
+ $redirectToCart = false;
+ $paymentContextId = $this->request->getParam(self::PAYMENT_CONTEXT_ID_PARAMETER);
+
+ // Check quote
+ if (!$quote || ($quote && !$quote->getId())) {
+ $this->messageManager->addErrorMessage(__('Your Cart is empty'));
+ $redirectToCart = true;
+ }
+
+ // Check if context is given
+ if (!$redirectToCart && !$paymentContextId) {
+ $this->messageManager->addErrorMessage(__('We cannot find your payment informations, please try again'));
+ $redirectToCart = true;
+ }
+
+ if (!$redirectToCart) {
+ /** @var PaymentInterface $paymentMethod */
+ $paymentMethod = $this->paymentInterfaceFactory->create();
+ $paymentMethod->setMethod($this->paypalMethod->getCode());
+
+ $contextDatas = $this->paymentContextRequestService->getPaymentContextById($paymentContextId, (int)$quote->getStoreId(), true, $paymentMethod);
+
+ if (empty($contextDatas)) {
+ $this->messageManager->addErrorMessage(__('We cannot find your payment informations, please try again'));
+ $redirectToCart = true;
+ }
+ }
+
+ if ($redirectToCart) {
+ return $this->redirectFactory->create()->setUrl($this->urlInterface->getUrl('checkout/cart'));
+ }
+
+ return $resultPage;
+ }
+}
diff --git a/Controller/Paypal/SaveData.php b/Controller/Paypal/SaveData.php
new file mode 100644
index 00000000..4e583f9a
--- /dev/null
+++ b/Controller/Paypal/SaveData.php
@@ -0,0 +1,139 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Controller\Paypal;
+
+use CheckoutCom\Magento2\Helper\Logger as LoggerHelper;
+use CheckoutCom\Magento2\Model\Methods\PaypalMethod;
+use CheckoutCom\Magento2\Model\Service\PaymentContextRequestService;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote;
+
+class SaveData
+{
+ protected ResultFactory $resultFactory;
+ protected ManagerInterface $messageManager;
+ protected RequestInterface $request;
+ protected Session $checkoutSession;
+ protected PaymentContextRequestService $paymentContextRequestService;
+ protected RedirectFactory $redirectFactory;
+ protected UrlInterface $urlInterface;
+ protected CartRepositoryInterface $cartRepository;
+ protected AddressInterfaceFactory $addressInterfaceFactory;
+ protected PaypalMethod $paypalMethod;
+ protected LoggerHelper $logger;
+
+ public function __construct(
+ LoggerHelper $loggerHelper,
+ ResultFactory $resultFactory,
+ ManagerInterface $messageManager,
+ RequestInterface $request,
+ Session $checkoutSession,
+ PaymentContextRequestService $paymentContextRequestService,
+ RedirectFactory $redirectFactory,
+ UrlInterface $urlInterface,
+ CartRepositoryInterface $cartRepository,
+ AddressInterfaceFactory $addressInterfaceFactory,
+ PaypalMethod $paypalMethod
+ ) {
+ $this->resultFactory = $resultFactory;
+ $this->request = $request;
+ $this->messageManager = $messageManager;
+ $this->checkoutSession = $checkoutSession;
+ $this->paymentContextRequestService = $paymentContextRequestService;
+ $this->redirectFactory = $redirectFactory;
+ $this->urlInterface = $urlInterface;
+ $this->cartRepository = $cartRepository;
+ $this->addressInterfaceFactory = $addressInterfaceFactory;
+ $this->paypalMethod = $paypalMethod;
+ $this->logger = $loggerHelper;
+ }
+
+ /**
+ * Control about current request
+ *
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ protected function shouldRedirectToCart(): bool
+ {
+ $quote = $this->checkoutSession->getQuote();
+ $redirectToCart = false;
+
+ $paymentContextId = $this->request->getParam(Review::PAYMENT_CONTEXT_ID_PARAMETER);
+
+ // Check quote
+ if (!$quote || ($quote && !$quote->getId())) {
+ $this->messageManager->addErrorMessage(__('Your Cart is empty'));
+ $redirectToCart = true;
+ }
+
+ // Check if context is given
+ if (!$redirectToCart && !$paymentContextId) {
+ $this->messageManager->addErrorMessage(__('We cannot find your payment informations, please try again'));
+ $redirectToCart = true;
+ }
+
+ // Check if context exists
+ if (!$redirectToCart) {
+ $contextDatas = $this->paymentContextRequestService->getPaymentContextById($paymentContextId, (int)$quote->getStoreId(), false);
+
+ if (empty($contextDatas)) {
+ $this->messageManager->addErrorMessage(__('We cannot find your payment informations, please try again'));
+ $redirectToCart = true;
+ }
+ }
+
+ return $redirectToCart;
+ }
+
+ /**
+ * Assign a shipping method to quote
+ */
+ protected function setShippingMethod(string $methodCode, CartInterface $quote): bool
+ {
+ try {
+ $shippingAddress = $quote->getShippingAddress();
+ $shippingAddress->setShippingMethod($methodCode)->setCollectShippingRates(true);
+ $cartExtension = $quote->getExtensionAttributes();
+ if ($cartExtension && $cartExtension->getShippingAssignments()) {
+ $cartExtension->getShippingAssignments()[0]
+ ->getShipping()
+ ->setMethod($methodCode);
+ }
+ $quote->collectTotals();
+
+ $this->cartRepository->save($quote);
+
+ return true;
+ } catch (Exception $e) {
+ $this->messageManager->addErrorMessage(__($e->getMessage()));
+
+ return false;
+ }
+ }
+}
diff --git a/Controller/Paypal/SaveExpressShippingAddress.php b/Controller/Paypal/SaveExpressShippingAddress.php
new file mode 100644
index 00000000..87b70bce
--- /dev/null
+++ b/Controller/Paypal/SaveExpressShippingAddress.php
@@ -0,0 +1,83 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Controller\Paypal;
+
+use Magento\Customer\Api\Data\AddressInterface as CustomerAddressInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Quote\Api\Data\AddressInterface;
+
+class SaveExpressShippingAddress extends SaveData implements HttpPostActionInterface
+{
+ /**
+ * @inheritDoc
+ */
+ public function execute(): Redirect
+ {
+ $quote = $this->checkoutSession->getQuote();
+
+ $redirectToCart = $this->shouldRedirectToCart();
+
+ if ($redirectToCart) {
+ return $this->redirectFactory->create()->setUrl($this->urlInterface->getUrl('checkout/cart'));
+ }
+
+ //Assign address and save quote
+ try {
+ $quoteAddress = $this->buildAddress();
+ $quote->setBillingAddress($quoteAddress)->setShippingAddress($quoteAddress);
+ $this->cartRepository->save($quote);
+
+ // Auto assign shipping method
+ $shippingAddress = $quote->getShippingAddress();
+ if ($this->paypalMethod->getConfigData('express_auto_method') && !$shippingAddress->getShippingMethod()) {
+ $shippingAddress->collectShippingRates();
+ $rates = $shippingAddress->getGroupedAllShippingRates();
+ if (!empty($rates)) {
+ foreach ($rates as $carrier) {
+ foreach ($carrier as $carrierMethod) {
+ $this->setShippingMethod($carrierMethod->getCode(), $quote);
+ break;
+ }
+ }
+ }
+ }
+ } catch (Exception $e) {
+ $this->logger->write(__('Error occured while saving paypal express shipping address: %1', $e->getMessage()));
+ $this->messageManager->addErrorMessage(__('Unable to save Addres'));
+ }
+
+ return $this->redirectFactory->create()->setRefererUrl();
+ }
+
+ public function buildAddress(): AddressInterface
+ {
+ $address = $this->addressInterfaceFactory->create();
+ $address->setFirstname($this->request->getParam(CustomerAddressInterface::FIRSTNAME));
+ $address->setLastName($this->request->getParam(CustomerAddressInterface::LASTNAME));
+ $address->setCompany($this->request->getParam(CustomerAddressInterface::COMPANY));
+ $address->setCountryId($this->request->getParam(CustomerAddressInterface::COUNTRY_ID));
+ $address->setPostCode($this->request->getParam(CustomerAddressInterface::POSTCODE));
+ $address->setRegionId($this->request->getParam(CustomerAddressInterface::REGION_ID));
+ $address->setCity($this->request->getParam(CustomerAddressInterface::CITY));
+ $address->setStreet($this->request->getParam(CustomerAddressInterface::STREET));
+ $address->setTelephone($this->request->getParam(CustomerAddressInterface::TELEPHONE));
+
+ return $address;
+ }
+}
diff --git a/Controller/Paypal/SaveExpressShippingMethod.php b/Controller/Paypal/SaveExpressShippingMethod.php
new file mode 100644
index 00000000..a44b6ad0
--- /dev/null
+++ b/Controller/Paypal/SaveExpressShippingMethod.php
@@ -0,0 +1,64 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+namespace CheckoutCom\Magento2\Controller\Paypal;
+
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
+
+class SaveExpressShippingMethod extends SaveData implements HttpGetActionInterface
+{
+ /**
+ * @inheritDoc
+ */
+ public function execute(): Redirect
+ {
+ $quote = $this->checkoutSession->getQuote();
+
+ $redirectToCart = $this->shouldRedirectToCart();
+ $methodCode = $this->request->getParam(Review::SHIPPING_METHOD_PARAMETER);
+ if (!$redirectToCart && !$methodCode) {
+ $this->messageManager->addErrorMessage(__('Missing shipping method'));
+
+ return $this->redirectFactory->create()->setRefererUrl();
+ }
+
+ if ($redirectToCart) {
+ return $this->redirectFactory->create()->setUrl($this->urlInterface->getUrl('checkout/cart'));
+ }
+
+ // Save Shipping address
+ try {
+ $shippingAddress = $quote->getShippingAddress();
+ $shippingAddress->setShippingMethod($methodCode)->setCollectShippingRates(true);
+ $cartExtension = $quote->getExtensionAttributes();
+ if ($cartExtension && $cartExtension->getShippingAssignments()) {
+ $cartExtension->getShippingAssignments()[0]
+ ->getShipping()
+ ->setMethod($methodCode);
+ }
+ $quote->collectTotals();
+
+ $this->cartRepository->save($quote);
+ } catch (Exception $e) {
+ $this->logger->write(__('Error occured while saving paypal express shipping method: %1', $e->getMessage()));
+ $this->messageManager->addErrorMessage(__('An error occurred while saving shipping method'));
+ }
+
+ return $this->redirectFactory->create()->setRefererUrl();
+ }
+}
diff --git a/Controller/Webhook/Callback.php b/Controller/Webhook/Callback.php
index caff9647..3a3df8c0 100644
--- a/Controller/Webhook/Callback.php
+++ b/Controller/Webhook/Callback.php
@@ -340,6 +340,9 @@ public function getPayload()
*/
protected function cardNeedsSaving(array $payload): bool
{
+ if (!isset($payload['data']['metadata'])) {
+ return false;
+ }
$metadata = $payload['data']['metadata'];
$id = $payload['data']['source']['id'] ?? '';
$saveCard = 0;
diff --git a/Gateway/Config/Config.php b/Gateway/Config/Config.php
index 50602670..85eb1126 100755
--- a/Gateway/Config/Config.php
+++ b/Gateway/Config/Config.php
@@ -314,7 +314,7 @@ public function getMethodsConfig(): array
{
$output = [];
/** @var array $paymentMethodsConfig */
- $paymentMethodsConfig = $this->scopeConfig->getValue(Loader::KEY_PAYMENT, ScopeInterface::SCOPE_WEBSITE);
+ $paymentMethodsConfig = $this->scopeConfig->getValue(Loader::KEY_PAYMENT, ScopeInterface::SCOPE_STORE);
/**
* Get only the active CheckoutCom methods
@@ -558,12 +558,22 @@ public function needsRiskRules($methodId): bool
}
/**
- * @param int $storeCode
+ * Check ABC refund after NAS migration
+ *
+ * @return bool
+ */
+ public function isAbcRefundAfterNasMigrationActive($storeCode = null): bool
+ {
+ return (bool) $this->getValue('abc_refund_enable', null, $storeCode, ScopeInterface::SCOPE_STORE);
+ }
+
+ /**
+ * @param string $storeCode
* @param string $scope
*
* @return Environment
*/
- public function getEnvironment(int $storeCode, string $scope): Environment
+ public function getEnvironment(string $storeCode, string $scope): Environment
{
if ((int)$this->getValue('environment', null, $storeCode, $scope) === 1) {
return Environment::sandbox();
@@ -571,5 +581,4 @@ public function getEnvironment(int $storeCode, string $scope): Environment
return Environment::production();
}
-
}
diff --git a/Model/Api/V3.php b/Model/Api/V3.php
index 1cf5b531..adab3e7a 100644
--- a/Model/Api/V3.php
+++ b/Model/Api/V3.php
@@ -152,12 +152,6 @@ class V3 implements V3Interface
* @var Object $api
*/
private $api;
- /**
- * $order field
- *
- * @var Object $order
- */
- private $order;
/**
* $quote field
*
@@ -295,10 +289,8 @@ private function execute(): PaymentResponseInterface
if ($this->isValidPublicKey()) {
if ($this->hasValidFields()) {
$this->result = $this->processPayment();
- if (!$this->result['success']) {
+ if (!$this->result['success'] && !$this->result['error_message']) {
$this->result['error_message'][] = __('The order could not be created.');
- // Handle order on failed payment
- $this->orderStatusHandler->handleFailedPayment($this->order);
}
}
} else {
@@ -333,25 +325,20 @@ private function isValidPublicKey(): bool
*/
private function processPayment(): array
{
- // Try to load a quote
- $quote = $this->config->isPaymentWithPaymentFirst() ? $this->loadQuote() : null;
- $reservedOrderId = $this->config->isPaymentWithPaymentFirst() ? $this->quoteHandler->getReference($quote) : null;
-
// Create order if needed before payment
- $orderBeforePayment = $this->config->isPaymentWithOrderFirst() ? $this->createOrder($this->data->getPaymentMethod()) : null;
+ $order = $this->createOrder($this->data->getPaymentMethod());
- if (($quote !== null && $reservedOrderId !== null) || $this->orderHandler->isOrder($orderBeforePayment)) {
+ if ($this->orderHandler->isOrder($order)) {
//Init values to request payment
- $amount = (float)$this->config->isPaymentWithPaymentFirst() ? $quote->getGrandTotal() : $orderBeforePayment->getGrandTotal();
- $currency = (string)$this->config->isPaymentWithPaymentFirst() ? $quote->getQuoteCurrencyCode() : $orderBeforePayment->getOrderCurrencyCode();
- $reference = (string)$this->config->isPaymentWithPaymentFirst() ? $reservedOrderId : $orderBeforePayment->getIncrementId();
+ $amount = $order->getGrandTotal();
+ $currency = $order->getOrderCurrencyCode();
+ $reference = $order->getIncrementId();
// Get the payment
$response = $this->getPaymentResponse($amount, $currency, $reference);
+ $isValidResponse = $this->api->isValidResponse($response);
- if ($this->api->isValidResponse($response)) {
- $this->order = $order = ($orderBeforePayment === null) ? $this->createOrder($this->data->getPaymentMethod()) : $orderBeforePayment;
-
+ if ($isValidResponse) {
// Process the payment response
$is3ds = property_exists($response, '_links')
&& isset($response->_links['redirect'])
@@ -371,7 +358,7 @@ private function processPayment(): array
}
// Update the result
- $this->result['success'] = $response->isSuccessful();
+ $this->result['success'] = $isValidResponse;
} else {
// Payment failed
if (isset($response->response_code)) {
@@ -380,6 +367,11 @@ private function processPayment(): array
);
}
+ // Handle order on failed payment if payment is order first.
+ if ($this->config->isPaymentWithOrderFirst()) {
+ $this->orderStatusHandler->handleFailedPayment($order);
+ }
+
// Token invalid/expired
if (method_exists($response, 'getErrors')) {
$this->result['error_message'] = array_merge(
@@ -391,6 +383,9 @@ private function processPayment(): array
if ($this->data->getFailureUrl()) {
$this->result['redirect_url'] = $this->data->getFailureUrl();
}
+
+ // Delete the order if payment is first
+ $this->orderHandler->deleteOrder($order);
}
// Update the order id
diff --git a/Model/Config/Backend/Source/ConfigRegion.php b/Model/Config/Backend/Source/ConfigRegion.php
new file mode 100644
index 00000000..84653c13
--- /dev/null
+++ b/Model/Config/Backend/Source/ConfigRegion.php
@@ -0,0 +1,47 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+declare(strict_types=1);
+
+namespace CheckoutCom\Magento2\Model\Config\Backend\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class ConfigRegion implements OptionSourceInterface
+{
+ public const REGION_GLOBAL = 'global';
+ public const REGION_KSA = 'ksa';
+
+ /**
+ * Options getter
+ *
+ * @return string[][]
+ */
+ public function toOptionArray(): array
+ {
+ return [
+ [
+ 'value' => self::REGION_GLOBAL,
+ 'label' => __('--')
+ ],
+ [
+ 'value' => self::REGION_KSA,
+ 'label' => __('KSA')
+ ]
+ ];
+ }
+}
diff --git a/Model/Files/Mada/apm_list.csv b/Model/Files/Mada/apm_list.csv
index 5f9d6e68..d95e296a 100644
--- a/Model/Files/Mada/apm_list.csv
+++ b/Model/Files/Mada/apm_list.csv
@@ -1,10 +1,9 @@
Id,Title
alipay,Alipay
boleto,Boleto
-giropay,Giropay
ideal,Ideal
poli,Poli
sepa,Sepa
sofort,Sofort
klarna,Klarna
-eps,EPS
\ No newline at end of file
+eps,EPS
diff --git a/Model/Methods/AlternativePaymentMethod.php b/Model/Methods/AlternativePaymentMethod.php
index 424c52a1..d53d71bd 100755
--- a/Model/Methods/AlternativePaymentMethod.php
+++ b/Model/Methods/AlternativePaymentMethod.php
@@ -27,7 +27,6 @@
use Checkout\Payments\Previous\Source\Apm\RequestBoletoSource;
use Checkout\Payments\Previous\Source\Apm\RequestEpsSource as PreviousRequestEpsSource;
use Checkout\Payments\Previous\Source\Apm\RequestFawrySource as PreviousRequestFawrySource;
-use Checkout\Payments\Previous\Source\Apm\RequestGiropaySource;
use Checkout\Payments\Previous\Source\Apm\RequestIdealSource as PreviousRequestIdealSource;
use Checkout\Payments\Previous\Source\Apm\RequestKlarnaSource;
use Checkout\Payments\Previous\Source\Apm\RequestKnetSource;
@@ -103,11 +102,10 @@ class AlternativePaymentMethod extends AbstractMethod
const NAS_UNAVAILABLE_APM = [
'alipay',
'boleto',
- 'giropay',
'klarna',
- 'knet',
'poli',
'sepa',
+ 'paypal'
];
/**
* List of unavailable apm for ABC mode
@@ -678,31 +676,6 @@ public function boleto(array $data): RequestBoletoSource
return $boletoSource;
}
- /**
- * Create source
- *
- * @param array $data
- *
- * @return RequestGiropaySource
- * @throws NoSuchEntityException
- */
- public function giropay(array $data): RequestGiropaySource
- {
- /** @var string $purpose */
- $purpose = substr(
- (string)__('Pay. req. from %1', $this->config->getStoreName()),
- 0,
- 27
- );
-
- $source = new RequestGiropaySource();
- $source->purpose = null;
- $source->bic = $this->getValue('bic', $data);
- $source->info_fields = null;
-
- return $source;
- }
-
/**
* @param array $data
*
@@ -714,10 +687,10 @@ public function ideal(array $data)
{
if ($this->apiHandler->isPreviousMode()) {
$source = new PreviousRequestIdealSource();
+ $source->bic = $data['bic'];
} else {
$source = new RequestIdealSource();
}
- $source->bic = $data['bic'];
$source->description = $data['description'];
$locale = explode('_', $this->shopperHandler->getCustomerLocale('nl_NL') ?? '');
$source->language = $locale[0];
@@ -1060,7 +1033,14 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canRefund()) {
@@ -1070,7 +1050,15 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
}
// Process the refund request
- $response = $api->refundOrder($payment, $amount);
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
if (!$api->isValidResponse($response)) {
throw new LocalizedException(
@@ -1109,7 +1097,12 @@ public function isAvailable(CartInterface $quote = null): bool
);
$apms = $this->config->getApms();
- $billingAddress = $this->quoteHandler->getBillingAddress()->getData();
+
+ if (!$quote) {
+ $quote = $this->quoteHandler->getQuote();
+ }
+
+ $billingAddress = $quote->getBillingAddress()->getData();
if (isset($billingAddress['country_id'])) {
foreach ($apms as $apm) {
diff --git a/Model/Methods/ApplePayMethod.php b/Model/Methods/ApplePayMethod.php
index 99bd777b..8fb31da0 100755
--- a/Model/Methods/ApplePayMethod.php
+++ b/Model/Methods/ApplePayMethod.php
@@ -494,7 +494,14 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canRefund()) {
@@ -504,7 +511,16 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
}
// Process the refund request
- $response = $api->refundOrder($payment, $amount);
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
+
if (!$api->isValidResponse($response)) {
throw new LocalizedException(
__('The refund request could not be processed.')
diff --git a/Model/Methods/CardPaymentMethod.php b/Model/Methods/CardPaymentMethod.php
index c1649c6d..fc176dd5 100755
--- a/Model/Methods/CardPaymentMethod.php
+++ b/Model/Methods/CardPaymentMethod.php
@@ -66,6 +66,9 @@ class CardPaymentMethod extends AbstractMethod
* @var string CODE
*/
const CODE = 'checkoutcom_card_payment';
+
+ const PREFERRED_SCHEMES = ['VISA','MASTERCARD','CARTES_BANCAIRES'];
+
/**
* $_code field
*
@@ -357,7 +360,7 @@ public function sendPaymentRequest(
}
// Preferred scheme
- if (isset($data['preferredScheme']) && $data['preferredScheme'] !== '') {
+ if (isset($data['preferredScheme']) && in_array((string) strtoupper($data['preferredScheme']), self::PREFERRED_SCHEMES)) {
$request->processing = ['preferred_scheme' => strtolower($data['preferredScheme'])];
}
@@ -427,7 +430,14 @@ public function capture(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canCapture()) {
@@ -558,7 +568,14 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canRefund()) {
@@ -568,7 +585,15 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
}
// Process the refund request
- $response = $api->refundOrder($payment, $amount);
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
if (!$api->isValidResponse($response)) {
throw new LocalizedException(
diff --git a/Model/Methods/GooglePayMethod.php b/Model/Methods/GooglePayMethod.php
index 594bf748..0a60e174 100755
--- a/Model/Methods/GooglePayMethod.php
+++ b/Model/Methods/GooglePayMethod.php
@@ -490,7 +490,14 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canRefund()) {
@@ -500,7 +507,16 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
}
// Process the refund request
- $response = $api->refundOrder($payment, $amount);
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
+
if (!$api->isValidResponse($response)) {
throw new LocalizedException(
__('The refund request could not be processed.')
diff --git a/Model/Methods/KlarnaMethod.php b/Model/Methods/KlarnaMethod.php
new file mode 100755
index 00000000..735f0914
--- /dev/null
+++ b/Model/Methods/KlarnaMethod.php
@@ -0,0 +1,501 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+declare(strict_types=1);
+
+namespace CheckoutCom\Magento2\Model\Methods;
+
+use Checkout\CheckoutApiException;
+use Checkout\CheckoutArgumentException;
+use Checkout\Payments\BillingDescriptor;
+use Checkout\Payments\PaymentType;
+use Checkout\Payments\Previous\PaymentRequest as PreviousPaymentRequest;
+use Checkout\Payments\Previous\Source\RequestTokenSource as PreviousRequestTokenSource;
+use Checkout\Payments\Request\PaymentRequest;
+use Checkout\Payments\Request\Source\RequestTokenSource;
+use CheckoutCom\Magento2\Gateway\Config\Config;
+use CheckoutCom\Magento2\Helper\Logger as LoggerHelper;
+use CheckoutCom\Magento2\Helper\Utilities;
+use CheckoutCom\Magento2\Model\Service\ApiHandlerService;
+use CheckoutCom\Magento2\Model\Service\PaymentContextRequestService;
+use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Payment\Helper\Data;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Payment\Model\Method\Logger;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class GooglePayMethod
+ */
+class KlarnaMethod extends AbstractMethod
+{
+ /**
+ * CODE constant
+ *
+ * @var string CODE
+ */
+ const CODE = 'checkoutcom_klarna';
+ /**
+ * $_code field
+ *
+ * @var string $_code
+ */
+ protected $_code = self::CODE;
+ /**
+ * $_canAuthorize field
+ *
+ * @var bool $_canAuthorize
+ */
+ protected $_canAuthorize = true;
+ /**
+ * $_canCapture field
+ *
+ * @var bool $_canCapture
+ */
+ protected $_canCapture = true;
+ /**
+ * $_canCapturePartial field
+ *
+ * @var bool $_canCapturePartial
+ */
+ protected $_canCapturePartial = true;
+ /**
+ * $_canVoid field
+ *
+ * @var bool $_canVoid
+ */
+ protected $_canVoid = true;
+ /**
+ * $_canUseInternal field
+ *
+ * @var bool $_canUseInternal
+ */
+ protected $_canUseInternal = false;
+ /**
+ * $_canUseCheckout field
+ *
+ * @var bool $_canUseCheckout
+ */
+ protected $_canUseCheckout = true;
+ /**
+ * $_canRefund field
+ *
+ * @var bool $_canRefund
+ */
+ protected $_canRefund = true;
+ /**
+ * $_canRefundInvoicePartial field
+ *
+ * @var bool $_canRefundInvoicePartial
+ */
+ protected $_canRefundInvoicePartial = true;
+ /**
+ * @var Json
+ */
+ private $json;
+ /**
+ * $config field
+ *
+ * @var Config $config
+ */
+ private $config;
+ /**
+ * $apiHandler field
+ *
+ * @var ApiHandlerService $apiHandler
+ */
+ private $apiHandler;
+ /**
+ * $utilities field
+ *
+ * @var Utilities $utilities
+ */
+ private $utilities;
+ /**
+ * $quoteHandler field
+ *
+ * @var QuoteHandlerService $quoteHandler
+ */
+ private $quoteHandler;
+ /**
+ * $ckoLogger field
+ *
+ * @var Logger $ckoLogger
+ */
+ private $ckoLogger;
+ /**
+ * $storeManager field
+ *
+ * @var StoreManagerInterface $storeManager
+ */
+ private $storeManager;
+ /**
+ * $backendAuthSession field
+ *
+ * @var Session $backendAuthSession
+ */
+ private $backendAuthSession;
+
+ private PaymentContextRequestService $contextService;
+
+ /**
+ * GooglePayMethod constructor
+ *
+ * @param Context $context
+ * @param Registry $registry
+ * @param ExtensionAttributesFactory $extensionFactory
+ * @param AttributeValueFactory $customAttributeFactory
+ * @param Data $paymentData
+ * @param ScopeConfigInterface $scopeConfig
+ * @param Logger $logger
+ * @param Config $config
+ * @param ApiHandlerService $apiHandler
+ * @param Utilities $utilities
+ * @param StoreManagerInterface $storeManager
+ * @param QuoteHandlerService $quoteHandler
+ * @param LoggerHelper $ckoLogger
+ * @param Session $backendAuthSession
+ * @param DirectoryHelper $directoryHelper
+ * @param DataObjectFactory $dataObjectFactory
+ * @param Json $json
+ * @param AbstractResource|null $resource
+ * @param AbstractDb|null $resourceCollection
+ * @param array $data
+ */
+ public function __construct(
+ Context $context,
+ Registry $registry,
+ ExtensionAttributesFactory $extensionFactory,
+ AttributeValueFactory $customAttributeFactory,
+ Data $paymentData,
+ ScopeConfigInterface $scopeConfig,
+ Logger $logger,
+ Config $config,
+ ApiHandlerService $apiHandler,
+ Utilities $utilities,
+ StoreManagerInterface $storeManager,
+ QuoteHandlerService $quoteHandler,
+ LoggerHelper $ckoLogger,
+ Session $backendAuthSession,
+ DirectoryHelper $directoryHelper,
+ DataObjectFactory $dataObjectFactory,
+ Json $json,
+ PaymentContextRequestService $contextService,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = []
+ ) {
+ parent::__construct(
+ $config,
+ $context,
+ $registry,
+ $extensionFactory,
+ $customAttributeFactory,
+ $paymentData,
+ $scopeConfig,
+ $logger,
+ $directoryHelper,
+ $dataObjectFactory,
+ $resource,
+ $resourceCollection,
+ $data
+ );
+
+ $this->config = $config;
+ $this->apiHandler = $apiHandler;
+ $this->utilities = $utilities;
+ $this->storeManager = $storeManager;
+ $this->quoteHandler = $quoteHandler;
+ $this->ckoLogger = $ckoLogger;
+ $this->backendAuthSession = $backendAuthSession;
+ $this->json = $json;
+ $this->contextService = $contextService;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws FileSystemException
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function sendPaymentRequest(array $data, float $amount, string $currency, string $reference = ''): array
+ {
+ // Get the store code
+ $storeCode = $this->storeManager->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Get the quote
+ $quote = $this->quoteHandler->getQuote();
+
+ // Set the payment
+ if ($this->apiHandler->isPreviousMode()) {
+ $request = new PreviousPaymentRequest();
+ } else {
+ $request = new PaymentRequest();
+ }
+
+ // Set parameters
+ $request->capture = $this->config->needsAutoCapture();
+ $request->amount = $this->utilities->formatDecimals($amount * 100);
+ $request->payment_context_id = $data['contextPaymentId'];
+ $request->processing_channel_id = $this->config->getValue('channel_id');
+ $request->reference = $reference;
+ $request->description = __('Payment request from %1', $this->config->getStoreName())->render();
+ $request->customer = $api->createCustomer($quote);
+ $request->payment_type = PaymentType::$regular;
+ $request->shipping = $api->createShippingAddress($quote);
+ $request->metadata['methodId'] = $this->_code;
+ $request->metadata['quoteData'] = $this->json->serialize($this->quoteHandler->getQuoteRequestData($quote));
+ $request->metadata = array_merge(
+ $request->metadata,
+ $this->apiHandler->getBaseMetadata()
+ );
+ // Billing descriptor
+ if ($this->config->needsDynamicDescriptor()) {
+ $billingDescriptor = new BillingDescriptor();
+ $billingDescriptor->city = $this->config->getValue('descriptor_city');
+ $billingDescriptor->name = $this->config->getValue('descriptor_name', null, null, ScopeInterface::SCOPE_STORE);
+ $request->billing_descriptor = $billingDescriptor;
+ }
+ // Set the token source
+ if ($this->apiHandler->isPreviousMode()) {
+ $tokenSource = new PreviousRequestTokenSource();
+ } else {
+ $tokenSource = new RequestTokenSource();
+ }
+
+ $request->currency = $currency;
+
+ $this->ckoLogger->additional($this->utilities->objectToArray($request), 'payment');
+
+ // Send the charge request
+ return $api->getCheckoutApi()->getPaymentsClient()->requestPayment($request);
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function capture(InfoInterface $payment, $amount): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ // Get the store code
+ $storeCode = $payment->getOrder()->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Check the status
+ if (!$this->canCapture()) {
+ throw new LocalizedException(
+ __('The capture action is not available.')
+ );
+ }
+
+ // Process the capture request
+ $response = $api->captureOrder($payment, (float)$amount);
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The capture request could not be processed.')
+ );
+ }
+
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ */
+ public function void(InfoInterface $payment): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ // Get the store code
+ $storeCode = $payment->getOrder()->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Check the status
+ if (!$this->canVoid()) {
+ throw new LocalizedException(
+ __('The void action is not available.')
+ );
+ }
+
+ // Process the void request
+ $response = $api->voidOrder($payment);
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The void request could not be processed.')
+ );
+ }
+
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ */
+ public function cancel(InfoInterface $payment): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ $order = $payment->getOrder();
+ // Get the store code
+ $storeCode = $order->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Check the status
+ if (!$this->canVoid()) {
+ throw new LocalizedException(
+ __('The void action is not available.')
+ );
+ }
+
+ // Process the void request
+ $response = $api->voidOrder($payment);
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The void request could not be processed.')
+ );
+ }
+
+ $comment = __(
+ 'Canceled order online, the voided amount is %1.',
+ $order->formatPriceTxt($order->getGrandTotal())
+ );
+ $payment->setMessage($comment);
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function refund(InfoInterface $payment, $amount): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ // Get the store code
+ $storeCode = $payment->getOrder()->getStore()->getCode();
+
+ // Initialize the API handler
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
+
+ // Check the status
+ if (!$this->canRefund()) {
+ throw new LocalizedException(
+ __('The refund action is not available.')
+ );
+ }
+
+ // Process the refund request
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
+
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The refund request could not be processed.')
+ );
+ }
+
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Check whether method is available
+ *
+ * @param CartInterface|null $quote
+ *
+ * @throws LocalizedException
+ */
+ public function isAvailable(CartInterface $quote = null): bool
+ {
+ if ($this->isModuleActive() && parent::isAvailable($quote) && null !== $quote) {
+ return $this->config->getValue('active', $this->_code) && !$this->backendAuthSession->isLoggedIn();
+ }
+
+ return false;
+ }
+
+ public function canUseForCurrency($currencyCode): bool
+ {
+ $availableCurrencies = array_filter(explode(',', $this->getConfigData('specificcurrencies') ?? ''));
+ if (!empty($availableCurrencies) && !in_array($currencyCode, $availableCurrencies)) {
+ return false;
+ }
+
+ return true;
+ }
+}
diff --git a/Model/Methods/MotoMethod.php b/Model/Methods/MotoMethod.php
index 5d435ebc..e6d8cacb 100755
--- a/Model/Methods/MotoMethod.php
+++ b/Model/Methods/MotoMethod.php
@@ -331,7 +331,14 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canRefund()) {
@@ -341,7 +348,16 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
}
// Process the refund request
- $response = $api->refundOrder($payment, $amount);
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
+
if (!$api->isValidResponse($response)) {
throw new LocalizedException(
__('The refund request could not be processed.')
diff --git a/Model/Methods/PaypalMethod.php b/Model/Methods/PaypalMethod.php
new file mode 100755
index 00000000..d873e355
--- /dev/null
+++ b/Model/Methods/PaypalMethod.php
@@ -0,0 +1,505 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+declare(strict_types=1);
+
+namespace CheckoutCom\Magento2\Model\Methods;
+
+use Checkout\CheckoutApiException;
+use Checkout\CheckoutArgumentException;
+use Checkout\Payments\BillingDescriptor;
+use Checkout\Payments\PaymentType;
+use Checkout\Payments\Previous\PaymentRequest as PreviousPaymentRequest;
+use Checkout\Payments\ProcessingSettings;
+use Checkout\Payments\Request\PaymentRequest;
+use CheckoutCom\Magento2\Gateway\Config\Config;
+use CheckoutCom\Magento2\Helper\Logger as LoggerHelper;
+use CheckoutCom\Magento2\Helper\Utilities;
+use CheckoutCom\Magento2\Model\Service\ApiHandlerService;
+use CheckoutCom\Magento2\Model\Service\PaymentContextRequestService;
+use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
+use Magento\Backend\Model\Auth\Session;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Payment\Helper\Data;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Payment\Model\Method\Logger;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class GooglePayMethod
+ */
+class PaypalMethod extends AbstractMethod
+{
+ /**
+ * CODE constant
+ *
+ * @var string CODE
+ */
+ const CODE = 'checkoutcom_paypal';
+ /**
+ * $_code field
+ *
+ * @var string $_code
+ */
+ protected $_code = self::CODE;
+ /**
+ * $_canAuthorize field
+ *
+ * @var bool $_canAuthorize
+ */
+ protected $_canAuthorize = true;
+ /**
+ * $_canCapture field
+ *
+ * @var bool $_canCapture
+ */
+ protected $_canCapture = true;
+ /**
+ * $_canCapturePartial field
+ *
+ * @var bool $_canCapturePartial
+ */
+ protected $_canCapturePartial = true;
+ /**
+ * $_canVoid field
+ *
+ * @var bool $_canVoid
+ */
+ protected $_canVoid = true;
+ /**
+ * $_canUseInternal field
+ *
+ * @var bool $_canUseInternal
+ */
+ protected $_canUseInternal = false;
+ /**
+ * $_canUseCheckout field
+ *
+ * @var bool $_canUseCheckout
+ */
+ protected $_canUseCheckout = true;
+ /**
+ * $_canRefund field
+ *
+ * @var bool $_canRefund
+ */
+ protected $_canRefund = true;
+ /**
+ * $_canRefundInvoicePartial field
+ *
+ * @var bool $_canRefundInvoicePartial
+ */
+ protected $_canRefundInvoicePartial = true;
+ /**
+ * @var Json
+ */
+ private $json;
+ /**
+ * $config field
+ *
+ * @var Config $config
+ */
+ private $config;
+ /**
+ * $apiHandler field
+ *
+ * @var ApiHandlerService $apiHandler
+ */
+ private $apiHandler;
+ /**
+ * $utilities field
+ *
+ * @var Utilities $utilities
+ */
+ private $utilities;
+ /**
+ * $quoteHandler field
+ *
+ * @var QuoteHandlerService $quoteHandler
+ */
+ private $quoteHandler;
+ /**
+ * $ckoLogger field
+ *
+ * @var Logger $ckoLogger
+ */
+ private $ckoLogger;
+ /**
+ * $storeManager field
+ *
+ * @var StoreManagerInterface $storeManager
+ */
+ private $storeManager;
+ /**
+ * $backendAuthSession field
+ *
+ * @var Session $backendAuthSession
+ */
+ private $backendAuthSession;
+
+ private PaymentContextRequestService $contextService;
+
+ /**
+ * GooglePayMethod constructor
+ *
+ * @param Context $context
+ * @param Registry $registry
+ * @param ExtensionAttributesFactory $extensionFactory
+ * @param AttributeValueFactory $customAttributeFactory
+ * @param Data $paymentData
+ * @param ScopeConfigInterface $scopeConfig
+ * @param Logger $logger
+ * @param Config $config
+ * @param ApiHandlerService $apiHandler
+ * @param Utilities $utilities
+ * @param StoreManagerInterface $storeManager
+ * @param QuoteHandlerService $quoteHandler
+ * @param LoggerHelper $ckoLogger
+ * @param Session $backendAuthSession
+ * @param DirectoryHelper $directoryHelper
+ * @param DataObjectFactory $dataObjectFactory
+ * @param Json $json
+ * @param AbstractResource|null $resource
+ * @param AbstractDb|null $resourceCollection
+ * @param array $data
+ */
+ public function __construct(
+ Context $context,
+ Registry $registry,
+ ExtensionAttributesFactory $extensionFactory,
+ AttributeValueFactory $customAttributeFactory,
+ Data $paymentData,
+ ScopeConfigInterface $scopeConfig,
+ Logger $logger,
+ Config $config,
+ ApiHandlerService $apiHandler,
+ Utilities $utilities,
+ StoreManagerInterface $storeManager,
+ QuoteHandlerService $quoteHandler,
+ LoggerHelper $ckoLogger,
+ Session $backendAuthSession,
+ DirectoryHelper $directoryHelper,
+ DataObjectFactory $dataObjectFactory,
+ Json $json,
+ PaymentContextRequestService $contextService,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = []
+ ) {
+ parent::__construct(
+ $config,
+ $context,
+ $registry,
+ $extensionFactory,
+ $customAttributeFactory,
+ $paymentData,
+ $scopeConfig,
+ $logger,
+ $directoryHelper,
+ $dataObjectFactory,
+ $resource,
+ $resourceCollection,
+ $data
+ );
+
+ $this->config = $config;
+ $this->apiHandler = $apiHandler;
+ $this->utilities = $utilities;
+ $this->storeManager = $storeManager;
+ $this->quoteHandler = $quoteHandler;
+ $this->ckoLogger = $ckoLogger;
+ $this->backendAuthSession = $backendAuthSession;
+ $this->json = $json;
+ $this->contextService = $contextService;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws FileSystemException
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function sendPaymentRequest(array $data, float $amount, string $currency, string $reference = ''): array
+ {
+ // Get the store code
+ $storeCode = $this->storeManager->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Get the quote
+ $quote = $this->quoteHandler->getQuote();
+
+ // Set the payment
+ if ($this->apiHandler->isPreviousMode()) {
+ $request = new PreviousPaymentRequest();
+ } else {
+ $request = new PaymentRequest();
+ }
+
+ // Set parameters
+ $request->capture = $this->config->needsAutoCapture();
+ $request->amount = $this->utilities->formatDecimals($amount * 100);
+ $request->payment_context_id = $data['contextPaymentId'];
+ $request->processing_channel_id = $this->config->getValue('channel_id');
+ $request->reference = $reference;
+ $request->metadata['methodId'] = $this->_code;
+ $request->description = __('Payment request from %1', $this->config->getStoreName())->render();
+ $request->customer = $api->createCustomer($quote);
+ $request->payment_type = PaymentType::$regular;
+ $request->shipping = $api->createShippingAddress($quote);
+ $request->metadata['quoteData'] = $this->json->serialize($this->quoteHandler->getQuoteRequestData($quote));
+ $request->metadata = array_merge(
+ $request->metadata,
+ $this->apiHandler->getBaseMetadata()
+ );
+ // Billing descriptor
+ if ($this->config->needsDynamicDescriptor()) {
+ $billingDescriptor = new BillingDescriptor();
+ $billingDescriptor->city = $this->config->getValue('descriptor_city');
+ $billingDescriptor->name = $this->config->getValue('descriptor_name', null, null, ScopeInterface::SCOPE_STORE);
+ $request->billing_descriptor = $billingDescriptor;
+ }
+
+ // Shipping fee
+ $shipping = $quote->getShippingAddress();
+ if ($shipping->getShippingDescription() && $shipping->getShippingInclTax() > 0) {
+ $processing = new ProcessingSettings();
+ $processing->shipping_amount = $this->utilities->formatDecimals($shipping->getShippingInclTax() * 100);
+ $request->processing = $processing;
+ }
+
+ $request->currency = $currency;
+
+ $this->ckoLogger->additional($this->utilities->objectToArray($request), 'payment');
+
+ // Send the charge request
+ return $api->getCheckoutApi()->getPaymentsClient()->requestPayment($request);
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function capture(InfoInterface $payment, $amount): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ // Get the store code
+ $storeCode = $payment->getOrder()->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Check the status
+ if (!$this->canCapture()) {
+ throw new LocalizedException(
+ __('The capture action is not available.')
+ );
+ }
+
+ // Process the capture request
+ $response = $api->captureOrder($payment, (float)$amount);
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The capture request could not be processed.')
+ );
+ }
+
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ */
+ public function void(InfoInterface $payment): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ // Get the store code
+ $storeCode = $payment->getOrder()->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Check the status
+ if (!$this->canVoid()) {
+ throw new LocalizedException(
+ __('The void action is not available.')
+ );
+ }
+
+ // Process the void request
+ $response = $api->voidOrder($payment);
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The void request could not be processed.')
+ );
+ }
+
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ */
+ public function cancel(InfoInterface $payment): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ $order = $payment->getOrder();
+ // Get the store code
+ $storeCode = $order->getStore()->getCode();
+
+ // Initialize the API handler
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ // Check the status
+ if (!$this->canVoid()) {
+ throw new LocalizedException(
+ __('The void action is not available.')
+ );
+ }
+
+ // Process the void request
+ $response = $api->voidOrder($payment);
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The void request could not be processed.')
+ );
+ }
+
+ $comment = __(
+ 'Canceled order online, the voided amount is %1.',
+ $order->formatPriceTxt($order->getGrandTotal())
+ );
+ $payment->setMessage($comment);
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @throws CheckoutApiException
+ * @throws CheckoutArgumentException
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ public function refund(InfoInterface $payment, $amount): AbstractMethod
+ {
+ if ($this->backendAuthSession->isLoggedIn()) {
+ // Get the store code
+ $storeCode = $payment->getOrder()->getStore()->getCode();
+
+ // Initialize the API handler
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
+
+ // Check the status
+ if (!$this->canRefund()) {
+ throw new LocalizedException(
+ __('The refund action is not available.')
+ );
+ }
+
+ // Process the refund request
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
+
+ if (!$api->isValidResponse($response)) {
+ throw new LocalizedException(
+ __('The refund request could not be processed.')
+ );
+ }
+
+ // Set the transaction id from response
+ $payment->setTransactionId($response['action_id']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Check whether method is available
+ *
+ * @param CartInterface|null $quote
+ *
+ * @throws LocalizedException
+ */
+ public function isAvailable(CartInterface $quote = null): bool
+ {
+ if ($this->isModuleActive() && parent::isAvailable($quote) && null !== $quote) {
+ return $this->config->getValue('active', $this->_code) && !$this->backendAuthSession->isLoggedIn();
+ }
+
+ return false;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function canUseForCurrency($currencyCode): bool
+ {
+ $availableCurrencies = array_filter(explode(',', $this->getConfigData('specificcurrencies') ?? ''));
+ if (!empty($availableCurrencies) && !in_array($currencyCode, $availableCurrencies)) {
+ return false;
+ }
+
+ return true;
+ }
+}
diff --git a/Model/Methods/VaultMethod.php b/Model/Methods/VaultMethod.php
index 90af924e..b39bae5c 100755
--- a/Model/Methods/VaultMethod.php
+++ b/Model/Methods/VaultMethod.php
@@ -551,7 +551,14 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
$storeCode = $payment->getOrder()->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Check the status
if (!$this->canRefund()) {
@@ -561,7 +568,16 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
}
// Process the refund request
- $response = $api->refundOrder($payment, $amount);
+ try {
+ $response = $api->refundOrder($payment, $amount);
+ } catch (CheckoutApiException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ $response = $api->refundOrder($payment, $amount);
+ }
+
if (!$api->isValidResponse($response)) {
throw new LocalizedException(
__('The refund request could not be processed.')
diff --git a/Model/Service/ApiHandlerService.php b/Model/Service/ApiHandlerService.php
index debe9a4c..03b62a6c 100644
--- a/Model/Service/ApiHandlerService.php
+++ b/Model/Service/ApiHandlerService.php
@@ -37,6 +37,7 @@
use CheckoutCom\Magento2\Gateway\Config\Config;
use CheckoutCom\Magento2\Helper\Logger;
use CheckoutCom\Magento2\Helper\Utilities;
+use CheckoutCom\Magento2\Model\Config\Backend\Source\ConfigRegion;
use CheckoutCom\Magento2\Model\Config\Backend\Source\ConfigService;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\ProductMetadataInterface;
@@ -172,6 +173,8 @@ public function init(
string $secretKey = null,
string $publicKey = null
): ApiHandlerService {
+ $region = $this->config->getValue('region', null, $storeCode, $scope);
+
if (!$secretKey) {
$secretKey = $this->config->getValue('secret_key', null, $storeCode, $scope);
}
@@ -181,7 +184,7 @@ public function init(
}
$service = $this->scopeConfig->getValue(ConfigService::SERVICE_CONFIG_PATH, $scope, $storeCode);
- $environment = $this->config->getEnvironment((int)$storeCode, $scope);
+ $environment = $this->config->getEnvironment((string)$storeCode, $scope);
$api = CheckoutSdk::builder();
if ($service === ConfigService::SERVICE_ABC) {
@@ -190,7 +193,34 @@ public function init(
$api = $api->staticKeys();
}
+ $sdkBuilder = $api
+ ->publicKey($publicKey)
+ ->secretKey($secretKey)
+ ->environment($environment);
+
+ // Do not set subdomain when global region is used
+ if ($region !== ConfigRegion::REGION_GLOBAL) {
+ $sdkBuilder->environmentSubdomain($region);
+ }
+
+ $this->checkoutApi = $sdkBuilder->build();
+
+ return $this;
+ }
+
+ public function initAbcForRefund(
+ $storeCode = null,
+ string $scope = ScopeInterface::SCOPE_WEBSITE
+ ): ApiHandlerService
+ {
+ $secretKey = $this->config->getValue('abc_refund_secret_key', null, $storeCode, $scope);
+ $publicKey = $this->config->getValue('abc_refund_public_key', null, $storeCode, $scope);
+
+ $api = CheckoutSdk::builder();
+ $environment = $this->config->getEnvironment((string)$storeCode, $scope);
+
$this->checkoutApi = $api
+ ->previous()->staticKeys()
->publicKey($publicKey)
->secretKey($secretKey)
->environment($environment)
@@ -458,10 +488,7 @@ public function createItems(CartInterface $entity): array
$product->name = $shipping->getShippingDescription();
$product->quantity = 1;
$product->unit_price = $shipping->getShippingInclTax() * 100;
- $product->tax_rate = $shipping->getTaxPercent() * 100;
$product->total_amount = $shipping->getShippingAmount() * 100;
- $product->total_tax_amount = $shipping->getTaxAmount() * 100;
- $product->type = 'shipping_fee';
$items[] = $product;
}
diff --git a/Model/Service/OrderHandlerService.php b/Model/Service/OrderHandlerService.php
index 75607649..c43479f0 100644
--- a/Model/Service/OrderHandlerService.php
+++ b/Model/Service/OrderHandlerService.php
@@ -29,10 +29,12 @@
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\Registry;
use Magento\Quote\Api\Data\CartInterface;
use Magento\Quote\Model\Quote;
use Magento\Quote\Model\QuoteManagement;
use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderManagementInterface;
use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\Order\Status\History as OrderStatusHistory;
@@ -108,6 +110,20 @@ class OrderHandlerService
*/
private $transactionHandler;
+ /**
+ * $orderManagement field
+ *
+ * @var OrderManagementInterface $orderManagement
+ */
+ private $orderManagement;
+
+ /**
+ * $registry field
+ *
+ * @var Registry $registry
+ */
+ private $registry;
+
/**
* OrderHandlerService constructor
*
@@ -121,6 +137,7 @@ class OrderHandlerService
* @param Logger $logger
* @param TransactionHandlerService $transactionHandler
* @param SortOrderBuilderFactory $sortOrderBuilderFactory
+ * @param OrderManagementInterface $orderManagement
*/
public function __construct(
Session $checkoutSession,
@@ -132,7 +149,9 @@ public function __construct(
StoreManagerInterface $storeManager,
Logger $logger,
TransactionHandlerService $transactionHandler,
- SortOrderBuilderFactory $sortOrderBuilderFactory
+ SortOrderBuilderFactory $sortOrderBuilderFactory,
+ OrderManagementInterface $orderManagement,
+ Registry $registry
) {
$this->checkoutSession = $checkoutSession;
$this->quoteManagement = $quoteManagement;
@@ -144,6 +163,8 @@ public function __construct(
$this->logger = $logger;
$this->transactionHandler = $transactionHandler;
$this->sortOrderBuilderFactory = $sortOrderBuilderFactory;
+ $this->orderManagement = $orderManagement;
+ $this->registry = $registry;
}
/**
@@ -386,4 +407,18 @@ public function getOrderDetails(OrderInterface $order): array
'transactions' => $this->transactionHandler->getTransactionDetails($order),
];
}
+
+ /**
+ * Delete order if order processing is Payment first.
+ * Temporary function before removing completely the feature.
+ */
+ public function deleteOrder(OrderInterface $order): void
+ {
+ if ($this->config->isPaymentWithPaymentFirst()) {
+ $this->orderManagement->cancel($order->getEntityId());
+ $this->registry->register('isSecureArea', true);
+ $this->orderRepository->delete($order);
+ $this->registry->unregister('isSecureArea');
+ }
+ }
}
diff --git a/Model/Service/OrderStatusHandlerService.php b/Model/Service/OrderStatusHandlerService.php
index 3e5b9490..d926d02e 100644
--- a/Model/Service/OrderStatusHandlerService.php
+++ b/Model/Service/OrderStatusHandlerService.php
@@ -26,7 +26,6 @@
use Magento\Sales\Api\OrderManagementInterface;
use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\Order;
-use Magento\Store\Model\ScopeInterface;
use Magento\Store\Model\StoreManagerInterface;
/**
@@ -159,9 +158,12 @@ public function setOrderStatus(OrderInterface $order, array $webhook): void
case 'payment_expired':
$this->paymentExpired();
break;
+ case 'payment_declined':
+ $this->declined();
+ break;
case 'payment_authentication_failed':
$this->paymentAuthenticationFailed();
- break;
+ break;
}
if ($this->state) {
@@ -297,6 +299,9 @@ protected function refund(array $webhook): void
protected function capturePending(array $webhook): void
{
$payload = json_decode($webhook['event_data']);
+ if (!isset($payload->data->metadata)) {
+ return;
+ }
$methodId = $payload->data->metadata->methodId ?? $payload->data->metadata->method_id;
if ($methodId === 'checkoutcom_apm') {
$this->state = Order::STATE_PENDING_PAYMENT;
@@ -317,7 +322,6 @@ protected function paymentExpired(): void
$this->handleFailedPayment($this->order);
}
-
/**
* Set the order status for a payment authentication failed webhook.
*
@@ -331,4 +335,18 @@ protected function paymentAuthenticationFailed(): void
$this->order->addStatusHistoryComment(__('3DS authentication failed/expired.'));
$this->handleFailedPayment($this->order);
}
+
+ /**
+ * Set the order status for a payment authorization failed webhook.
+ *
+ * @return void
+ * @throws NoSuchEntityException
+ */
+ protected function declined(): void
+ {
+ $this->state = Order::STATE_CANCELED;
+ $this->status = $this->order->getConfig()->getStateDefaultStatus($this->state);
+ $this->order->addStatusHistoryComment(__('Failed payment authorization'));
+ $this->handleFailedPayment($this->order);
+ }
}
diff --git a/Model/Service/PaymentContextRequestService.php b/Model/Service/PaymentContextRequestService.php
new file mode 100644
index 00000000..1b1665a1
--- /dev/null
+++ b/Model/Service/PaymentContextRequestService.php
@@ -0,0 +1,333 @@
+
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
+ */
+
+declare(strict_types=1);
+
+namespace CheckoutCom\Magento2\Model\Service;
+
+use Checkout\Payments\AuthorizationType;
+use Checkout\Payments\Contexts\PaymentContextsItems;
+use Checkout\Payments\Contexts\PaymentContextsRequest;
+use Checkout\Payments\PaymentType;
+use Checkout\Payments\ProcessingSettings;
+use Checkout\Payments\Request\Source\AbstractRequestSource;
+use CheckoutCom\Magento2\Gateway\Config\Config;
+use CheckoutCom\Magento2\Helper\Logger as MagentoLoggerHelper;
+use CheckoutCom\Magento2\Helper\Utilities;
+use Exception;
+use Magento\Checkout\Model\Session;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory as RegionCollectionFactory;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+class PaymentContextRequestService
+{
+ protected StoreManagerInterface $storeManager;
+ protected ApiHandlerService $apiHandlerService;
+ protected Session $checkoutSession;
+ protected Config $checkoutConfigProvider;
+ protected UrlInterface $urlBuilder;
+ protected MagentoLoggerHelper $ckoLogger;
+ protected Utilities $utilities;
+ protected AddressInterfaceFactory $addressInterfaceFactory;
+ protected CartRepositoryInterface $cartRepository;
+ protected RegionCollectionFactory $regionCollectionFactory;
+ protected ShopperHandlerService $shopperHandlerService;
+ /**
+ * Should we set the shipping fils as an item line (if no it's used on "processing" request part)
+ */
+ protected bool $setShippingFeesAsItem = false;
+ /**
+ * Should we substract the dicount amount from the unit price of each item ?
+ */
+ protected bool $collectDiscountAmountOnItemUnitPrice = true;
+ /**
+ * Should we force authorise mode instead of capture for this context
+ */
+ protected bool $forceAuthorize = false;
+ /**
+ * The payment type for this context (default Regular)
+ *
+ * @see PaymentType
+ */
+ protected ?string $paymentType = null;
+ /**
+ * The Authorize type type for this context (Default Final)
+ *
+ * @see AuthorizationType
+ */
+ protected ?string $authorizeType = null;
+
+ public function __construct(
+ StoreManagerInterface $storeManager,
+ ApiHandlerService $apiHandler,
+ Session $checkoutSession,
+ Config $checkoutConfigProvider,
+ UrlInterface $urlBuilder,
+ ApiHandlerService $apiHandlerService,
+ MagentoLoggerHelper $ckoLogger,
+ Utilities $utilities,
+ AddressInterfaceFactory $addressInterfaceFactory,
+ RegionCollectionFactory $regionCollectionFactory,
+ CartRepositoryInterface $cartRepository,
+ ShopperHandlerService $shopperHandlerService
+ ) {
+ $this->storeManager = $storeManager;
+ $this->apiHandlerService = $apiHandler;
+ $this->checkoutConfigProvider = $checkoutConfigProvider;
+ $this->checkoutSession = $checkoutSession;
+ $this->urlBuilder = $urlBuilder;
+ $this->ckoLogger = $ckoLogger;
+ $this->utilities = $utilities;
+ $this->addressInterfaceFactory = $addressInterfaceFactory;
+ $this->cartRepository = $cartRepository;
+ $this->regionCollectionFactory = $regionCollectionFactory;
+ $this->shopperHandlerService = $shopperHandlerService;
+ }
+
+ public function makePaymentContextRequests(
+ AbstractRequestSource $source
+ ): array {
+ $quote = $this->getQuote();
+ if (!$quote->getId() || ($quote->getId() && !$quote->getItemsQty())) {
+ return [];
+ }
+
+ $request = $this->getContextRequest($quote, $source);
+
+ $this->ckoLogger->additional($this->utilities->objectToArray($request), 'payment');
+
+ $storeCode = $this->storeManager->getStore($quote->getStoreId())->getCode();
+ $api = $this->apiHandlerService->init($storeCode, ScopeInterface::SCOPE_STORE);
+
+ return $api->getCheckoutApi()
+ ->getPaymentContextsClient()
+ ->createPaymentContexts($request);
+ }
+
+ public function getPaymentContextById(string $paymentContextId, int $storeId, ?bool $refreshQuote = false, ?PaymentInterface $paymentMethod = null): array
+ {
+ $storeCode = $this->storeManager->getStore($storeId)->getCode();
+ $api = $this->apiHandlerService->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $contextDatas = $api->getCheckoutApi()->getPaymentContextsClient()->getPaymentContextDetails($paymentContextId);
+ if ($refreshQuote) {
+ $this->refreshQuoteWithPaymentContext($contextDatas, $paymentMethod);
+ }
+
+ return $contextDatas;
+ } catch (Exception $e) {
+ return [];
+ }
+ }
+
+ public function refreshQuoteWithPaymentContext(array $contextDatas, ?PaymentInterface $paymentMethod = null): void
+ {
+ if (empty($contextDatas)) {
+ return;
+ }
+
+ $quote = $this->getQuote();
+ $paymentRequestsDatas = $contextDatas['payment_request'];
+ $name = $paymentRequestsDatas['customer']['name'] ? explode(' ', $paymentRequestsDatas['customer']['name'], 2) : [];
+ $quote->setCustomerFirstname($name[0] ?? $quote->getCustomerFirstname());
+ $quote->setCustomerLastname($name[1] ?? $quote->getCustomerLastname());
+ $quote->setCustomerEmail($paymentRequestsDatas['customer']['email'] ?? $quote->getCustomerEmail());
+
+ /** @var AddressInterface $quoteAddress */
+ $quoteAddress = $this->addressInterfaceFactory->create();
+ $shippingAddressRequesDatas = $paymentRequestsDatas['shipping']['address'];
+ $shippingName = $paymentRequestsDatas['shipping']['first_name'] ? explode(' ', $paymentRequestsDatas['shipping']['first_name'], 2) : [];
+ $quoteAddress->setFirstname($shippingName[0] ?? $quoteAddress->getFirstname());
+ $quoteAddress->setLastname($shippingName[1] ?? $quoteAddress->getLastname());
+ $quoteAddress->setCity($shippingAddressRequesDatas['city'] ?? $quoteAddress->getCity());
+ $quoteAddress->setCountryId($shippingAddressRequesDatas['country'] ?? $quoteAddress->getCountry());
+ $quoteAddress->setPostcode($shippingAddressRequesDatas['zip'] ?? $quoteAddress->getPostcode());
+
+ $streets = [];
+ $i = 1;
+ while ($i < 4) {
+ if (!empty($shippingAddressRequesDatas['address_line' . $i])) {
+ $streets[] = $shippingAddressRequesDatas['address_line' . $i];
+ }
+ $i++;
+ }
+ $quoteAddress->setStreet($streets);
+
+ // Manage region
+ $stateName = $shippingAddressRequesDatas['state'] ?? null;
+ if ($stateName) {
+ $regionCollection = $this->regionCollectionFactory->create();
+ $region = $regionCollection->addFieldToFilter('default_name', ['eq' => $stateName])->getFirstItem();
+ if ($region->getId()) {
+ $quoteAddress->setRegionCode($region->getCode());
+ $quoteAddress->setRegionId($region->getRegionId());
+ }
+ }
+
+ // Set Payment method if given
+ if ($paymentMethod) {
+ $quote->setPayment($paymentMethod);
+ }
+
+ //Assign addresse and save quote
+ $quote->setBillingAddress($quoteAddress)->setShippingAddress($quoteAddress);
+ $this->cartRepository->save($quote);
+ }
+
+ private function getContextRequest(
+ CartInterface $quote,
+ AbstractRequestSource $source
+ ): PaymentContextsRequest {
+ $capture = $this->forceAuthorize ? false : $this->checkoutConfigProvider->needsAutoCapture();
+
+ // Global informations
+ $request = new PaymentContextsRequest();
+ $request->amount = $this->utilities->formatDecimals($quote->getGrandTotal() * 100);
+ $request->payment_type = $this->getPaymentType();
+ $request->currency = $quote->getCurrency()->getQuoteCurrencyCode();
+ $request->capture = $capture;
+ $request->processing_channel_id = $this->checkoutConfigProvider->getValue('channel_id');
+ $request->authorizationType = $this->getAuthorizeType();
+
+ $processing = new ProcessingSettings();
+ $processing->locale = str_replace('_', '-', $this->shopperHandlerService->getCustomerLocale());
+
+ $shipping = $quote->getShippingAddress();
+ if ($shipping->getShippingDescription() && $shipping->getShippingInclTax() > 0) {
+ if (!$this->setShippingFeesAsItem) {
+ $processing->shipping_amount = $this->utilities->formatDecimals($shipping->getShippingInclTax() * 100);
+ }
+ }
+ $request->processing = $processing;
+
+ // Source
+ $request->source = $source;
+
+ // Items
+ $request->items = $this->getRequestItems($quote);
+
+ // Urls
+ $request->success_url = $this->urlBuilder->getUrl('checkout/onepage/success');
+ $request->failure_url = $this->urlBuilder->getUrl('checkout/onepage/failure');
+
+ return $request;
+ }
+
+ public function getRequestItems(CartInterface $quote): array
+ {
+ $items = [];
+ /** @var Quote\Item $item */
+ foreach ($quote->getAllVisibleItems() as $item) {
+ $discount = $discountOnUnitPrice = $this->utilities->formatDecimals($item->getDiscountAmount()) * 100;
+ if (!$this->collectDiscountAmountOnItemUnitPrice) {
+ $discountOnUnitPrice = 0;
+ }
+ $rowAmount = ($this->utilities->formatDecimals($item->getRowTotalInclTax()) * 100) -
+ ($this->utilities->formatDecimals($discount));
+ $unitPrice = ($this->utilities->formatDecimals($item->getRowTotalInclTax() / $item->getQty()) * 100) -
+ ($this->utilities->formatDecimals($discountOnUnitPrice / $item->getQty()));
+ // Api does not accept 0 prices
+ if (!$unitPrice) {
+ continue;
+ }
+
+ $contextItem = new PaymentContextsItems();
+ $contextItem->reference = $item->getSku();
+ $contextItem->quantity = $item->getQty();
+ $contextItem->name = $item->getName();
+ $contextItem->discount_amount = $discount;
+ $contextItem->unit_price = $unitPrice;
+ $contextItem->total_amount = $rowAmount;
+
+ $items[] = $contextItem;
+ }
+
+ // Shipping fee
+ $shipping = $quote->getShippingAddress();
+
+ if ($this->setShippingFeesAsItem && $shipping->getShippingDescription() && $shipping->getShippingInclTax() > 0) {
+ $product = new PaymentContextsItems();
+ $product->name = $shipping->getShippingDescription();
+ $product->quantity = 1;
+ $product->unit_price = $shipping->getShippingInclTax() * 100;
+ $product->total_amount = $shipping->getShippingInclTax() * 100;
+
+ $items[] = $product;
+ }
+
+ return $items;
+ }
+
+ private function getQuote(): CartInterface
+ {
+ return $this->checkoutSession->getQuote();
+ }
+
+ public function setShippingFeesAsItem(bool $value): self
+ {
+ $this->setShippingFeesAsItem = $value;
+
+ return $this;
+ }
+
+ public function setForceAuthorizeMode(bool $value): self
+ {
+ $this->forceAuthorize = $value;
+
+ return $this;
+ }
+
+ public function collectDiscountAmountOnItemUnitPrice(bool $value): self
+ {
+ $this->collectDiscountAmountOnItemUnitPrice = $value;
+
+ return $this;
+ }
+
+ public function setPaymentType(string $paymentType): self
+ {
+ $this->paymentType = $paymentType;
+
+ return $this;
+ }
+
+ private function getPaymentType(): string
+ {
+ if (!$this->paymentType) {
+ return PaymentType::$regular;
+ }
+
+ return $this->paymentType;
+ }
+
+ private function getAuthorizeType(): string
+ {
+ if (!$this->authorizeType) {
+ return AuthorizationType::$final;
+ }
+
+ return $this->authorizeType;
+ }
+}
diff --git a/Model/Service/PaymentErrorHandlerService.php b/Model/Service/PaymentErrorHandlerService.php
index 993d0293..a3a5e673 100755
--- a/Model/Service/PaymentErrorHandlerService.php
+++ b/Model/Service/PaymentErrorHandlerService.php
@@ -44,6 +44,13 @@ class PaymentErrorHandlerService
'payment_refund_declined' => 'Failed payment refund',
'payment_pending' => 'Failed payment request',
];
+
+ /**
+ * TRANSACTION_SUCCESS_DIGITS const
+ *
+ * @var string TRANSACTION_SUCCESS_DIGITS
+ */
+ const TRANSACTION_SUCCESS_DIGITS = '10';
/**
* $transactionHandler field
*
diff --git a/Model/Service/TransactionHandlerService.php b/Model/Service/TransactionHandlerService.php
index 6a254b61..5dd286d7 100755
--- a/Model/Service/TransactionHandlerService.php
+++ b/Model/Service/TransactionHandlerService.php
@@ -737,7 +737,11 @@ public function processEmail($payload): void
&& $this->transaction->getTxnType() === TransactionInterface::TYPE_CAPTURE
&& $emailSent == 0;
- $methodId = $payload->data->metadata->methodId ?? $payload->data->metadata->method_id;
+ $methodId = '';
+ if (isset($payload->data->metadata)) {
+ $methodId = $payload->data->metadata->methodId ?? $payload->data->metadata->method_id;
+ }
+
$condition3 = $this->config->getValue('order_email') === 'authorize'
&& $this->transaction->getTxnType() === TransactionInterface::TYPE_CAPTURE
&& $methodId === 'checkoutcom_apm'
diff --git a/Model/Service/WebhookHandlerService.php b/Model/Service/WebhookHandlerService.php
index 661382b2..f7b083b1 100644
--- a/Model/Service/WebhookHandlerService.php
+++ b/Model/Service/WebhookHandlerService.php
@@ -140,9 +140,10 @@ public function processSingleWebhook(OrderInterface $order, array $payload): voi
}
} else {
// Handle missing action ID
- $msg = __(
- 'Missing action ID for webhook with payment ID %',
- $payload['data']['id']
+ $msg = sprintf(
+ 'Missing action ID for webhook with payment ID %s. Payload was: %s',
+ $payload['data']['id'],
+ $this->json->serialize($payload)
);
$this->logger->write($msg);
}
diff --git a/Model/Ui/ConfigProvider.php b/Model/Ui/ConfigProvider.php
index a1914f8b..ce3ff58b 100644
--- a/Model/Ui/ConfigProvider.php
+++ b/Model/Ui/ConfigProvider.php
@@ -20,6 +20,7 @@
use CheckoutCom\Magento2\Gateway\Config\Config;
use CheckoutCom\Magento2\Gateway\Config\Loader;
+use CheckoutCom\Magento2\Model\Methods\PaypalMethod;
use CheckoutCom\Magento2\Model\Service\CardHandlerService;
use CheckoutCom\Magento2\Model\Service\MethodHandlerService;
use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
@@ -70,16 +71,22 @@ class ConfigProvider implements ConfigProviderInterface
* @var VaultHandlerService $vaultHandler
*/
private $vaultHandler;
+ /**
+ * $paypalMethod
+ *
+ * @var PaypalMethod $paypalMethod
+ */
+ private $paypalMethod;
/**
* ConfigProvider constructor
*
- * @param Config $config
+ * @param Config $config
* @param ShopperHandlerService $shopperHandler
- * @param QuoteHandlerService $quoteHandler
- * @param VaultHandlerService $vaultHandler
- * @param CardHandlerService $cardHandler
- * @param MethodHandlerService $methodHandler
+ * @param QuoteHandlerService $quoteHandler
+ * @param VaultHandlerService $vaultHandler
+ * @param CardHandlerService $cardHandler
+ * @param MethodHandlerService $methodHandler
*/
public function __construct(
Config $config,
@@ -87,14 +94,16 @@ public function __construct(
QuoteHandlerService $quoteHandler,
VaultHandlerService $vaultHandler,
CardHandlerService $cardHandler,
- MethodHandlerService $methodHandler
+ MethodHandlerService $methodHandler,
+ PaypalMethod $paypalMethod
) {
- $this->config = $config;
+ $this->config = $config;
$this->shopperHandler = $shopperHandler;
- $this->quoteHandler = $quoteHandler;
- $this->vaultHandler = $vaultHandler;
- $this->cardHandler = $cardHandler;
- $this->methodHandler = $methodHandler;
+ $this->quoteHandler = $quoteHandler;
+ $this->vaultHandler = $vaultHandler;
+ $this->cardHandler = $cardHandler;
+ $this->methodHandler = $methodHandler;
+ $this->paypalMethod = $paypalMethod;
}
/**
@@ -123,25 +132,26 @@ public function getConfig(): array
public function getConfigArray(): array
{
return array_merge($this->config->getModuleConfig(), $this->config->getMethodsConfig(), [
- 'checkoutcom_data' => [
- 'quote' => $this->quoteHandler->getQuoteData(),
- 'store' => [
- 'name' => $this->config->getStoreName(),
- 'language' => $this->config->getStoreLanguage(),
- 'code' => $this->config->getStoreCode(),
- 'country' => $this->config->getStoreCountry()
- ],
- 'user' => [
- 'has_cards' => $this->vaultHandler->userHasCards(),
- 'language_fallback' => $this->shopperHandler->getLanguageFallback(),
- 'previous_method' => $this->methodHandler->getPreviousMethod(),
- 'previous_source' => $this->methodHandler->getPreviousSource()
- ],
- 'cards' => $this->cardHandler->getCardIcons(),
- 'images_path' => $this->config->getImagesPath(),
- 'css_path' => $this->config->getCssPath(),
- 'use_minified_css' => $this->config->getCoreValue('dev/css/minify_files')
+ 'checkoutcom_data' => [
+ 'quote' => $this->quoteHandler->getQuoteData(),
+ 'store' => [
+ 'name' => $this->config->getStoreName(),
+ 'language' => $this->config->getStoreLanguage(),
+ 'code' => $this->config->getStoreCode(),
+ 'country' => $this->config->getStoreCountry()
],
- ]);
+ 'user' => [
+ 'has_cards' => $this->vaultHandler->userHasCards(),
+ 'language_fallback' => $this->shopperHandler->getLanguageFallback(),
+ 'previous_method' => $this->methodHandler->getPreviousMethod(),
+ 'previous_source' => $this->methodHandler->getPreviousSource()
+ ],
+ 'cards' => $this->cardHandler->getCardIcons(),
+ 'images_path' => $this->config->getImagesPath(),
+ 'css_path' => $this->config->getCssPath(),
+ 'use_minified_css' => $this->config->getCoreValue('dev/css/minify_files'),
+ 'paypal_allowed_currencies' => array_filter(explode(',', $this->paypalMethod->getConfigData('specificcurrencies') ?? ''))
+ ],
+ ]);
}
}
diff --git a/Plugin/Api/RefundInvoice.php b/Plugin/Api/RefundInvoice.php
index 9804d64d..11c875f0 100644
--- a/Plugin/Api/RefundInvoice.php
+++ b/Plugin/Api/RefundInvoice.php
@@ -18,6 +18,7 @@
namespace CheckoutCom\Magento2\Plugin\Api;
+use Checkout\CheckoutArgumentException;
use CheckoutCom\Magento2\Gateway\Config\Config;
use CheckoutCom\Magento2\Model\Service\ApiHandlerService;
use CheckoutCom\Magento2\Model\Service\MethodHandlerService;
@@ -113,7 +114,14 @@ public function beforeRefund(
$storeCode = $this->storeManager->getStore()->getCode();
// Initialize the API handler
- $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ try {
+ $api = $this->apiHandler->init($storeCode, ScopeInterface::SCOPE_STORE);
+ } catch (CheckoutArgumentException $e) {
+ if (!$this->config->isAbcRefundAfterNasMigrationActive($storeCode)) {
+ throw new LocalizedException(__($e->getMessage()));
+ }
+ $api = $this->apiHandler->initAbcForRefund($storeCode, ScopeInterface::SCOPE_STORE);
+ }
// Get the method and method id
$methodId = $order->getPayment()->getMethodInstance()->getCode();
diff --git a/README.md b/README.md
index 51f946b8..cd90e9df 100755
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The Frames.js payment form is cross-browser and cross-device compatible, and can
* Alternative Payments
Users can place orders with the following alternative and local payment options used around the world:
-Alipay, Bancontact, Boleto, EPS, Fawry, Giropay, Ideal, Klarna, KNet, Poli, Sepa, Sofort.
+Alipay, Bancontact, Boleto, EPS, Fawry, Ideal, Klarna, KNet, Poli, Sepa, Sofort.
* Apple Pay Payments
Users can place orders with an Apple Pay wallet.
diff --git a/composer.json b/composer.json
index 7dcf15ed..ae858e3e 100755
--- a/composer.json
+++ b/composer.json
@@ -2,12 +2,12 @@
"name": "checkoutcom/magento2",
"description": "Checkout.com Payment Gateway for Magento 2",
"require": {
- "checkout/checkout-sdk-php": "3.0.6",
- "php": "~7.3.0||~7.4.0||~8.1.0||~8.2.0",
+ "checkout/checkout-sdk-php": "3.2.4",
+ "php": "~7.4.0||~8.1.0||~8.2.0||~8.3.0",
"magento/framework": ">=100.0.1"
},
"type": "magento2-module",
- "version": "5.5.0",
+ "version": "6.4.1",
"autoload": {
"files": [
"registration.php"
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index d30a7290..2be5d8bf 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -16,7 +16,6 @@
-
+
+
+ CheckoutCom\Magento2\Model\Config\Backend\Source\ConfigRegion
+ settings/checkoutcom_configuration/region
+ required-entry
+ CheckoutCom\Magento2\Model\Config\Backend\Source\ConfigService
@@ -276,6 +281,29 @@
settings/checkoutcom_configuration/gateway_responses
+
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+ settings/checkoutcom_configuration/abc_refund_enable
+
+
+
+
+
+
+
+
+ Magento\Config\Model\Config\Backend\Encrypted
+ settings/checkoutcom_configuration/abc_refund_secret_key
+
+
+
+
+ settings/checkoutcom_configuration/abc_refund_public_key
+
+
@@ -358,9 +386,62 @@
payment/checkoutcom_card_payment/payment_form_styles
- Add add CSS styles in JSON format for the payment form (See Frames.js docs for more information). Ex: {"base":{"color":"blue","fontSize":"18px"}}
+ Frames.js docs in the "style" node of javascript example for more information). Ex: {"base":{"color":"blue","fontSize":"18px"}}]]>
+
+
+
+ payment/checkoutcom_card_payment/card_number_label
+
+ multi
+
+
+ On multi form layout only
+
+
+
+
+
+ payment/checkoutcom_card_payment/card_number_placeholder
+
+
+
+
+ payment/checkoutcom_card_payment/expiration_date_label
+
+ multi
+
+
+ On multi form layout only
+
+
+
+
+
+ payment/checkoutcom_card_payment/expiration_date_month_placeholder
+
+
+
+
+ payment/checkoutcom_card_payment/expiration_date_year_placeholder
+
+
+
+
+ payment/checkoutcom_card_payment/cvv_label
+
+ multi
+
+
+ On multi form layout only
+
+
+
+
+
+ payment/checkoutcom_card_payment/cvv_placeholder
+
@@ -552,6 +633,88 @@
Select the Google Pay supported cards
+
+
+
+
+ payment/checkoutcom_klarna/title
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+ payment/checkoutcom_klarna/active
+
+
+
+ validate-number
+ payment/checkoutcom_klarna/sort_order
+
+
+ NAS
+
+
+
+
+
+
+ payment/checkoutcom_paypal/title
+
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+ payment/checkoutcom_paypal/active
+
+
+
+
+
+
+
+
+ payment/checkoutcom_paypal/merchant_id
+ Provided by Checkout.com during integration. Your PayPal Merchant ID is generated when you create your test and live PayPal Business accounts; it consists of 13 randomly generated alphanumeric characters
+
+
+
+
+ payment/checkoutcom_paypal/checkout_client_id
+ sdk documentation]]>
+
+
+
+
+ payment/checkoutcom_paypal/checkout_partner_attribution_id
+ sdk documentation]]>
+
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+ payment/checkoutcom_paypal/express_cart
+
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+ payment/checkoutcom_paypal/express_minicart
+
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+ payment/checkoutcom_paypal/express_auto_method
+
+
+
+
+ validate-number
+ payment/checkoutcom_paypal/sort_order
+
+
+ NAS
+
+
diff --git a/etc/apm.xml b/etc/apm.xml
index 9e235be0..a40be41d 100755
--- a/etc/apm.xml
+++ b/etc/apm.xml
@@ -26,12 +26,6 @@
BRL,USDBR
-
- giropay
- Giropay
- EUR
- DE
- idealiDEAL
diff --git a/etc/config.xml b/etc/config.xml
index e2e79fdf..7b02ff57 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -20,13 +20,14 @@
secret_key,private_shared_key1
- payment_first
+ order_first00001
+ globalABC
@@ -54,6 +55,8 @@
BHD,LYD,JOD,KWD,OMR,TNDcheckoutcom_card_paymenthttps://api.github.com/repos/checkout/checkout-magento2-plugin/releases
+ 0
+
@@ -171,6 +174,51 @@
TESTwhite
+
+ CheckoutCom\Magento2\Model\Methods\KlarnaMethod
+ Klarna with Checkout.com
+ 0
+ 0
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 0
+ 1
+ 1
+ 0
+
+
+ CheckoutCom\Magento2\Model\Methods\PaypalMethod
+ Paypal with Checkout.com
+ 0
+ 0
+ 0
+ 0
+ 1
+ ASLqLf4pnWuBshW8Qh8z_DRUbIv2Cgs3Ft8aauLm9Z-MO9FZx1INSo38nW109o_Xvu88P3tly88XbJMR
+ CheckoutLtd_PSP
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 0
+ 1
+ 1
+ 1
+ AF,AX,AL,DZ,AS,AD,AO,AI,AQ,AG,AR,AM,AW,AU,AT,AZ,BS,BH,BD,BB,BY,BE,BZ,BJ,BM,BT,BO,BA,BW,BV,BR,IO,VG,BN,BG,BF,BI,KH,CM,CA,CV,KY,CF,TD,CL,CN,CX,CC,CO,KM,CG,CD,CK,CR,CI,HR,CU,CY,CZ,DK,DJ,DM,DO,EC,EG,SV,GQ,ER,EE,ET,FK,FO,FJ,FI,FR,GF,PF,TF,GA,GM,GE,DE,GH,GI,GR,GL,GD,GP,GU,GT,GG,GN,GW,GY,HT,HM,HN,HK,HU,IS,IN,ID,IR,IQ,IE,IM,IL,IT,JM,JP,JE,JO,KZ,KE,KI,KW,KG,LA,LV,LB,LS,LR,LY,LI,LT,LU,MO,MK,MG,MW,MY,MV,ML,MT,MH,MQ,MR,MU,YT,MX,FM,MD,MC,MN,ME,MS,MA,MZ,MM,NA,NR,NP,NL,AN,NC,NZ,NI,NE,NG,NU,NF,MP,KP,NO,OM,PK,PW,PS,PA,PG,PY,PE,PH,PN,PL,PT,QA,RE,RO,RU,RW,WS,SM,ST,SA,SN,RS,SC,SL,SG,SK,SI,SB,SO,ZA,GS,KR,ES,LK,BL,SH,KN,LC,MF,PM,VC,SD,SR,SJ,SZ,SE,CH,SY,TW,TJ,TZ,TH,TL,TG,TK,TO,TT,TN,TR,TM,TC,TV,UG,UA,AE,GB,US,UY,UM,VI,UZ,VU,VA,VE,VN,WF,EH,YE,ZM,ZW
+ AUD,BRL,CAD,CNY,CZK,DKK,EUR,HKD,HUF,INR,ILS,JPY,MXN,TWD,NZD,NOK,PHP,PLN,GBP,RUB,SGD,SEK,CHF,THB,USD
+ CheckoutCom\Magento2\Model\Methods\ApplePayMethodApple Pay with Checkout.com
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index aa7f7d6c..bcaf333a 100644
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -27,7 +27,7 @@
- https://cdn.checkout.com
+ https://*.checkout.com*.klarnacdn.net
@@ -49,4 +49,4 @@
-
\ No newline at end of file
+
diff --git a/etc/di.xml b/etc/di.xml
index 3bac7ff9..7dce885f 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -41,6 +41,8 @@
CheckoutCom\Magento2\Model\Methods\AlternativePaymentMethodCheckoutCom\Magento2\Model\Methods\ApplePayMethodCheckoutCom\Magento2\Model\Methods\GooglePayMethod
+ CheckoutCom\Magento2\Model\Methods\PaypalMethod
+ CheckoutCom\Magento2\Model\Methods\KlarnaMethodCheckoutCom\Magento2\Model\Methods\VaultMethod
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 929031e2..f563d089 100755
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -50,20 +50,6 @@
-
-
-
-
-
- \Magento\Framework\View\Element\Message\Renderer\BlockRenderer::CODE
-
- CheckoutCom_Magento2::ui/knetInfo.phtml
-
-
-
-
-
-
diff --git a/etc/payment.xml b/etc/payment.xml
index 47d9b592..01f7769c 100644
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -26,6 +26,9 @@
0
+
+ 0
+ 0
diff --git a/i18n/en_GB.csv b/i18n/en_GB.csv
index 7e43c6ec..bd713ff6 100644
--- a/i18n/en_GB.csv
+++ b/i18n/en_GB.csv
@@ -1,163 +1,38 @@
-"Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . ').
- Update now to get the latest features and security updates.
- See https://github.com/checkout/checkout-magento2-plugin for detailed instructions.","Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . ').
- Update now to get the latest features and security updates.
- See https://github.com/checkout/checkout-magento2-plugin for detailed instructions."
-Configure,Configure
-Close,Close
-"Learn More","Learn More"
-"View Demo","View Demo"
-"The payment card has been stored successfully.","The payment card has been stored successfully."
-"The card could not be saved.","The card could not be saved."
-"The payment request was declined by the gateway.","The payment request was declined by the gateway."
-"The order could not be created.","The order could not be created."
-"The request is invalid.","The request is invalid."
-"No quote was found with the provided ID.","No quote was found with the provided ID."
-"The quote ID is missing or invalid.","The quote ID is missing or invalid."
-"The payment token is missing or invalid.","The payment token is missing or invalid."
-"The public key is invalid.","The public key is invalid."
-"No quote found with the provided ID","No quote found with the provided ID"
-"Payment token provided is not a string","Payment token provided is not a string"
-"Payment token provided is empty string","Payment token provided is empty string"
-"Payment token is missing from request body","Payment token is missing from request body"
-"Quote ID provided must be a positive integer","Quote ID provided must be a positive integer"
-"Quote ID is missing from request body","Quote ID is missing from request body"
-"Card BIN is empty string","Card BIN is empty string"
-"Success URL provided is not a string","Success URL provided is not a string"
-"Success URL is empty string","Success URL is empty string"
-"Failure URL provided is not a string","Failure URL provided is not a string"
-"Failure URL is empty string","Failure URL is empty string"
-"An error occurred and the order could not be created.","An error occurred and the order could not be created."
-"Your order number %1 has been created successfully.","Your order number %1 has been created successfully."
-"The transaction could not be processed.","The transaction could not be processed."
-"The order could not be processed.","The order could not be processed."
-"The request is invalid or there was no quote found.","The request is invalid or there was no quote found."
-"Please enter valid card details.","Please enter valid card details."
-"The transaction could not be processed or has been cancelled.","The transaction could not be processed or has been cancelled."
-"Invalid request. No order found.","Invalid request. No order found."
-"Invalid request. No session ID found.","Invalid request. No session ID found."
-"Webhook and order successfully processed.","Webhook and order successfully processed."
-"The order creation failed. Please check the error logs.","The order creation failed. Please check the error logs."
-"The webhook response is invalid.","The webhook response is invalid."
-"The webhook payment response is invalid.","The webhook payment response is invalid."
-"Unauthorized request. No matching private shared key.","Unauthorized request. No matching private shared key."
-Black,Black
-White,White
-"White with line","White with line"
-"Credit cards","Credit cards"
-"Debit cards","Debit cards"
-Visa,Visa
-Mastercard,Mastercard
-"American Express","American Express"
-None,None
-title,title
-Test,Test
-Production,Production
-Standard,Standard
-Simple,Simple
-JCB,JCB
-Discover,Discover
-English,English
-Spanish,Spanish
-German,German
-Korean,Korean
-French,French
-Italian,Italian
-Dutch,Dutch
-"Cancel the order","Cancel the order"
-"Delete the order","Delete the order"
-"Do nothing","Do nothing"
-Processing,Processing
-Pending,Pending
-Authorize,Authorize
-"Authorize and Capture","Authorize and Capture"
-"Single iframe","Single iframe"
-"Multiple iframes","Multiple iframes"
-Webhook,Webhook
-"Cron Job","Cron Job"
-"Payment request from %1","Payment request from %1"
-"The capture action is not available.","The capture action is not available."
-"The capture request could not be processed.","The capture request could not be processed."
-"The void action is not available.","The void action is not available."
-"The void request could not be processed.","The void request could not be processed."
-"The refund action is not available.","The refund action is not available."
-"The refund request could not be processed.","The refund request could not be processed."
-"The CVV value is required.","The CVV value is required."
-"There is no quote available to place an order.","There is no quote available to place an order."
-"A payment method ID is required to place an order.","A payment method ID is required to place an order."
+"--","Others"
" for an amount of %1. Action ID: %2. Event ID: %3. Payment ID: %4. Error: %5 %6"," for an amount of %1. Action ID: %2. Event ID: %3. Payment ID: %4. Error: %5 %6"
-"The payment was declined, please try again. If the problem persists, try another card or payment method.","The payment was declined, please try again. If the problem persists, try another card or payment method."
-"You have reached the limit allowed for this card/account, please try again with another card or payment method.","You have reached the limit allowed for this card/account, please try again with another card or payment method."
-"Something went wrong, please try again later","Something went wrong, please try again later"
-"It looks like your card is invalid or blocked, please try with another card","It looks like your card is invalid or blocked, please try with another card"
-"It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method","It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method"
+"3DS authorization code","3DS authorization code"
"3DS has expired or authentication failed, please try again","3DS has expired or authentication failed, please try again"
-"The transaction could not be processed","The transaction could not be processed"
-"Payment capture initiated, awaiting capture confirmation.","Payment capture initiated, awaiting capture confirmation."
"3DS payment expired.","3DS payment expired."
-"This card is already saved.","This card is already saved."
-ending,ending
-expires,expires
-"Missing action ID for webhook with payment ID %","Missing action ID for webhook with payment ID %"
-"The payment request was successfully processed.","The payment request was successfully processed."
-"The transaction could not be processed. Please check the payment details.","The transaction could not be processed. Please check the payment details."
-"Please provide the required card information for the MOTO payment.","Please provide the required card information for the MOTO payment."
-"Missing required card information for the MOTO payment.","Missing required card information for the MOTO payment."
-CVV,CVV
-"Get your credentials here.","Get your credentials here."
-"Add a card","Add a card"
-"Save the card","Save the card"
-"Card Number","Card Number"
-"Expiration Date","Expiration Date"
-Type,Type
-Actions,Actions
-Delete,Delete
-"The card ending with %1 will be deleted.","The card ending with %1 will be deleted."
-"Delete a card","Delete a card"
-Name,Name
-"Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica","Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica"
-"Birth date (YYYY-MM-DD)","Birth date (YYYY-MM-DD)"
-BIC,BIC
-Description,Description
-"Could not load the Klarna script.","Could not load the Klarna script."
-"Account IBAN","Account IBAN"
-Continue,Continue
-"SEPA Direct Debit Mandate for single payment","SEPA Direct Debit Mandate for single payment"
-Creditor,Creditor
-"Creditor ID","Creditor ID"
-Debitor,Debitor
-"By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH.","By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH."
-"As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.","As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited."
-"I accept the mandate for a single payment","I accept the mandate for a single payment"
-"Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.","Your rights regarding the above mandate are explained in a statement that you can obtain from your bank."
-"Place Order","Place Order"
-"Card number","Card number"
-"Save this card for later use.","Save this card for later use."
-"Set Webhooks","Set Webhooks"
-"Attention, webhook not properly configured!","Attention, webhook not properly configured!"
-"Your webhook is all set!","Your webhook is all set!"
-"Error! Could not set webhooks. Please check your secret key.","Error! Could not set webhooks. Please check your secret key."
-"Attention, secret key incorrect!","Attention, secret key incorrect!"
-"Use Risk Rules For MOTO","Use Risk Rules For MOTO"
-"3DS authorization code","3DS authorization code"
-"Payment Method refunded","Payment Method refunded"
-"Mismatched Address (fraud check)","Mismatched Address (fraud check)"
-"Alternative payment method","Alternative payment method"
-"Transaction Id","Transaction Id"
-"Card Country","Card Country"
-"Card Bank","Card Bank"
-"Card expiry year","Card expiry year"
-"Card expiry month","Card expiry month"
-"Card 4 last numbers","Card 4 last numbers"
-"Card type","Card type"
-"Payment Additional Information","Payment Additional Information"
"5 Digit Postal Match","5 Digit Postal Match"
+"A payment method ID is required to place an order.","A payment method ID is required to place an order."
"AVS Not Available","AVS Not Available"
+"Account IBAN","Account IBAN"
+"Add a card","Add a card"
+"Alternative payment method","Alternative payment method"
+"American Express","American Express"
+"An error occurred and the order could not be created.","An error occurred and the order could not be created."
+"As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.","As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited."
"Attempt at processing performed. Not authenticated or verified, but a proof of attempted authentication/verification is provided.","Attempt at processing performed. Not authenticated or verified, but a proof of attempted authentication/verification is provided."
+"Attention, secret key incorrect!","Attention, secret key incorrect!"
+"Attention, webhook not properly configured!","Attention, webhook not properly configured!"
"Authentication or account verification could not be performed. This is due to a technical problem, or another problem as indicated in ARes or RReq.","Authentication or account verification could not be performed. This is due to a technical problem, or another problem as indicated in ARes or RReq."
"Authentication or account verification rejected. Issuer is rejecting and requests that authorization not be attempted.","Authentication or account verification rejected. Issuer is rejecting and requests that authorization not be attempted."
"Authentication verification successful.","Authentication verification successful."
+"Authorize and Capture","Authorize and Capture"
"Authorizing entity has not attempted card verification or could not verify the CVD due to a security device error","Authorizing entity has not attempted card verification or could not verify the CVD due to a security device error"
+"Birth date (YYYY-MM-DD)","Birth date (YYYY-MM-DD)"
+"By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH.","By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH."
+"Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica","Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica"
+"Cancel the order","Cancel the order"
+"Card 4 last numbers","Card 4 last numbers"
+"Card BIN is empty string","Card BIN is empty string"
+"Card Bank","Card Bank"
+"Card Country","Card Country"
+"Card Number","Card Number"
+"Card expiry month","Card expiry month"
+"Card expiry year","Card expiry year"
+"Card number","Card number"
+"Card type","Card type"
"Card verification not performed, CVD was not on the card. Not all cards have a CVD value encoded","Card verification not performed, CVD was not on the card. Not all cards have a CVD value encoded"
"Card verification performed, and CVD was invalid","Card verification performed, and CVD was invalid"
"Card verification performed, and CVD was valid","Card verification performed, and CVD was valid"
@@ -170,17 +45,142 @@ Debitor,Debitor
"Cardholder Name, Street and Postal/ZIP Match","Cardholder Name, Street and Postal/ZIP Match"
"Challenge required. Additional authentication is required using the CReq or CRes.","Challenge required. Additional authentication is required using the CReq or CRes."
"Challenge required. Decoupled authentication confirmed.","Challenge required. Decoupled authentication confirmed."
+"Could not load the Klarna script.","Could not load the Klarna script."
+"Credit cards","Credit cards"
+"Creditor ID","Creditor ID"
+"Cron Job","Cron Job"
+"Debit cards","Debit cards"
+"Delete a card","Delete a card"
+"Delete the order","Delete the order"
+"Do nothing","Do nothing"
+"Error! Could not set webhooks. Please check your secret key.","Error! Could not set webhooks. Please check your secret key."
+"Expiration Date","Expiration Date"
+"Failure URL is empty string","Failure URL is empty string"
+"Failure URL provided is not a string","Failure URL provided is not a string"
+"Get your credentials here.","Get your credentials here."
+"I accept the mandate for a single payment","I accept the mandate for a single payment"
"Informational only. 3DS requestor challenge preference acknowledged.","Informational only. 3DS requestor challenge preference acknowledged."
+"Invalid request. No order found.","Invalid request. No order found."
+"Invalid request. No session ID found.","Invalid request. No session ID found."
+"It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method","It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method"
+"It looks like your card is invalid or blocked, please try with another card","It looks like your card is invalid or blocked, please try with another card"
+"KSA","KSA"
+"Learn More","Learn More"
"Match Not Capable","Match Not Capable"
+"Mismatched Address (fraud check)","Mismatched Address (fraud check)"
+"Missing action ID for webhook with payment ID %","Missing action ID for webhook with payment ID %"
+"Missing required card information for the MOTO payment.","Missing required card information for the MOTO payment."
+"Multiple iframes","Multiple iframes"
"No Address Match","No Address Match"
"No CVV2 information is available",,"No CVV2 information is available"
+"No quote found with the provided ID","No quote found with the provided ID"
+"No quote was found with the provided ID.","No quote was found with the provided ID."
"Not Verified or Not Supported","Not Verified or Not Supported"
"Not authenticated or account not verified. This means the transaction was denied.","Not authenticated or account not verified. This means the transaction was denied."
"Not supported","Not supported"
+"Payment Additional Information","Payment Additional Information"
+"Payment Method refunded","Payment Method refunded"
+"Payment capture initiated, awaiting capture confirmation.","Payment capture initiated, awaiting capture confirmation."
+"Payment request from %1","Payment request from %1"
+"Payment token is missing from request body","Payment token is missing from request body"
+"Payment token provided is empty string","Payment token provided is empty string"
+"Payment token provided is not a string","Payment token provided is not a string"
+"Place Order","Place Order"
+"Please enter valid card details.","Please enter valid card details."
+"Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . '). Update now to get the latest features and security updates. See https://github.com/checkout/checkout-magento2-plugin for detailed instructions.","Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . '). Update now to get the latest features and security updates. See https://github.com/checkout/checkout-magento2-plugin for detailed instructions."
+"Please provide the required card information for the MOTO payment.","Please provide the required card information for the MOTO payment."
+"Quote ID is missing from request body","Quote ID is missing from request body"
+"Quote ID provided must be a positive integer","Quote ID provided must be a positive integer"
+"SEPA Direct Debit Mandate for single payment","SEPA Direct Debit Mandate for single payment"
+"Save the card","Save the card"
+"Save this card for later use.","Save this card for later use."
+"Set Webhooks","Set Webhooks"
+"Single iframe","Single iframe"
+"Something went wrong with paypal method. Please choose another method.","Something went wrong with paypal method. Please choose another method."
+"Something went wrong, please try again later","Something went wrong, please try again later"
"Street Match Postal Not Verified","Street Match Postal Not Verified"
"Street Match","Street Match"
"Street Not Verified Postal Match","Street Not Verified Postal Match"
"Street and 5 Digit Postal Match","Street and 5 Digit Postal Match"
"Street and Postal Match","Street and Postal Match"
"Street and Postal Not Verified","Street and Postal Not Verified"
+"Success URL is empty string","Success URL is empty string"
+"Success URL provided is not a string","Success URL provided is not a string"
+"The CVV value is required.","The CVV value is required."
+"The capture action is not available.","The capture action is not available."
+"The capture request could not be processed.","The capture request could not be processed."
+"The card could not be saved.","The card could not be saved."
+"The card ending with %1 will be deleted.","The card ending with %1 will be deleted."
"The issuer has not certified or has not provided the encryption keys to the interchange","The issuer has not certified or has not provided the encryption keys to the interchange"
+"The order could not be created.","The order could not be created."
+"The order could not be processed.","The order could not be processed."
+"The order creation failed. Please check the error logs.","The order creation failed. Please check the error logs."
+"The payment card has been stored successfully.","The payment card has been stored successfully."
+"The payment request was declined by the gateway.","The payment request was declined by the gateway."
+"The payment request was successfully processed.","The payment request was successfully processed."
+"The payment token is missing or invalid.","The payment token is missing or invalid."
+"The payment was declined, please try again. If the problem persists, try another card or payment method.","The payment was declined, please try again. If the problem persists, try another card or payment method."
+"The public key is invalid.","The public key is invalid."
+"The quote ID is missing or invalid.","The quote ID is missing or invalid."
+"The refund action is not available.","The refund action is not available."
+"The refund request could not be processed.","The refund request could not be processed."
+"The request is invalid or there was no quote found.","The request is invalid or there was no quote found."
+"The request is invalid.","The request is invalid."
+"The transaction could not be processed or has been cancelled.","The transaction could not be processed or has been cancelled."
+"The transaction could not be processed","The transaction could not be processed"
+"The transaction could not be processed. Please check the payment details.","The transaction could not be processed. Please check the payment details."
+"The transaction could not be processed.","The transaction could not be processed."
+"The void action is not available.","The void action is not available."
+"The void request could not be processed.","The void request could not be processed."
+"The webhook payment response is invalid.","The webhook payment response is invalid."
+"The webhook response is invalid.","The webhook response is invalid."
+"There is no quote available to place an order.","There is no quote available to place an order."
+"This card is already saved.","This card is already saved."
+"Transaction Id","Transaction Id"
+"Unauthorized request. No matching private shared key.","Unauthorized request. No matching private shared key."
+"Use Risk Rules For MOTO","Use Risk Rules For MOTO"
+"View Demo","View Demo"
+"Webhook and order successfully processed.","Webhook and order successfully processed."
+"White with line","White with line"
+"You have reached the limit allowed for this card/account, please try again with another card or payment method.","You have reached the limit allowed for this card/account, please try again with another card or payment method."
+"Your browser is not compatible with the Apple Pay version. Please use the most updated OS system and browsers.","Your browser is not compatible with the Apple Pay version. Please use the most updated OS system and browsers."
+"Your order number %1 has been created successfully.","Your order number %1 has been created successfully."
+"Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.","Your rights regarding the above mandate are explained in a statement that you can obtain from your bank."
+"Your webhook is all set!","Your webhook is all set!"
+Actions,Actions
+Authorize,Authorize
+BIC,BIC
+Black,Black
+CVV,CVV
+Close,Close
+Configure,Configure
+Continue,Continue
+Creditor,Creditor
+Debitor,Debitor
+Delete,Delete
+Description,Description
+Discover,Discover
+Dutch,Dutch
+English,English
+French,French
+German,German
+Italian,Italian
+JCB,JCB
+Korean,Korean
+Mastercard,Mastercard
+Name,Name
+None,None
+Pending,Pending
+Processing,Processing
+Production,Production
+Simple,Simple
+Spanish,Spanish
+Standard,Standard
+Test,Test
+Type,Type
+Visa,Visa
+Webhook,Webhook
+White,White
+ending,ending
+expires,expires
+title,title
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index 7e43c6ec..bd713ff6 100644
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -1,163 +1,38 @@
-"Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . ').
- Update now to get the latest features and security updates.
- See https://github.com/checkout/checkout-magento2-plugin for detailed instructions.","Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . ').
- Update now to get the latest features and security updates.
- See https://github.com/checkout/checkout-magento2-plugin for detailed instructions."
-Configure,Configure
-Close,Close
-"Learn More","Learn More"
-"View Demo","View Demo"
-"The payment card has been stored successfully.","The payment card has been stored successfully."
-"The card could not be saved.","The card could not be saved."
-"The payment request was declined by the gateway.","The payment request was declined by the gateway."
-"The order could not be created.","The order could not be created."
-"The request is invalid.","The request is invalid."
-"No quote was found with the provided ID.","No quote was found with the provided ID."
-"The quote ID is missing or invalid.","The quote ID is missing or invalid."
-"The payment token is missing or invalid.","The payment token is missing or invalid."
-"The public key is invalid.","The public key is invalid."
-"No quote found with the provided ID","No quote found with the provided ID"
-"Payment token provided is not a string","Payment token provided is not a string"
-"Payment token provided is empty string","Payment token provided is empty string"
-"Payment token is missing from request body","Payment token is missing from request body"
-"Quote ID provided must be a positive integer","Quote ID provided must be a positive integer"
-"Quote ID is missing from request body","Quote ID is missing from request body"
-"Card BIN is empty string","Card BIN is empty string"
-"Success URL provided is not a string","Success URL provided is not a string"
-"Success URL is empty string","Success URL is empty string"
-"Failure URL provided is not a string","Failure URL provided is not a string"
-"Failure URL is empty string","Failure URL is empty string"
-"An error occurred and the order could not be created.","An error occurred and the order could not be created."
-"Your order number %1 has been created successfully.","Your order number %1 has been created successfully."
-"The transaction could not be processed.","The transaction could not be processed."
-"The order could not be processed.","The order could not be processed."
-"The request is invalid or there was no quote found.","The request is invalid or there was no quote found."
-"Please enter valid card details.","Please enter valid card details."
-"The transaction could not be processed or has been cancelled.","The transaction could not be processed or has been cancelled."
-"Invalid request. No order found.","Invalid request. No order found."
-"Invalid request. No session ID found.","Invalid request. No session ID found."
-"Webhook and order successfully processed.","Webhook and order successfully processed."
-"The order creation failed. Please check the error logs.","The order creation failed. Please check the error logs."
-"The webhook response is invalid.","The webhook response is invalid."
-"The webhook payment response is invalid.","The webhook payment response is invalid."
-"Unauthorized request. No matching private shared key.","Unauthorized request. No matching private shared key."
-Black,Black
-White,White
-"White with line","White with line"
-"Credit cards","Credit cards"
-"Debit cards","Debit cards"
-Visa,Visa
-Mastercard,Mastercard
-"American Express","American Express"
-None,None
-title,title
-Test,Test
-Production,Production
-Standard,Standard
-Simple,Simple
-JCB,JCB
-Discover,Discover
-English,English
-Spanish,Spanish
-German,German
-Korean,Korean
-French,French
-Italian,Italian
-Dutch,Dutch
-"Cancel the order","Cancel the order"
-"Delete the order","Delete the order"
-"Do nothing","Do nothing"
-Processing,Processing
-Pending,Pending
-Authorize,Authorize
-"Authorize and Capture","Authorize and Capture"
-"Single iframe","Single iframe"
-"Multiple iframes","Multiple iframes"
-Webhook,Webhook
-"Cron Job","Cron Job"
-"Payment request from %1","Payment request from %1"
-"The capture action is not available.","The capture action is not available."
-"The capture request could not be processed.","The capture request could not be processed."
-"The void action is not available.","The void action is not available."
-"The void request could not be processed.","The void request could not be processed."
-"The refund action is not available.","The refund action is not available."
-"The refund request could not be processed.","The refund request could not be processed."
-"The CVV value is required.","The CVV value is required."
-"There is no quote available to place an order.","There is no quote available to place an order."
-"A payment method ID is required to place an order.","A payment method ID is required to place an order."
+"--","Others"
" for an amount of %1. Action ID: %2. Event ID: %3. Payment ID: %4. Error: %5 %6"," for an amount of %1. Action ID: %2. Event ID: %3. Payment ID: %4. Error: %5 %6"
-"The payment was declined, please try again. If the problem persists, try another card or payment method.","The payment was declined, please try again. If the problem persists, try another card or payment method."
-"You have reached the limit allowed for this card/account, please try again with another card or payment method.","You have reached the limit allowed for this card/account, please try again with another card or payment method."
-"Something went wrong, please try again later","Something went wrong, please try again later"
-"It looks like your card is invalid or blocked, please try with another card","It looks like your card is invalid or blocked, please try with another card"
-"It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method","It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method"
+"3DS authorization code","3DS authorization code"
"3DS has expired or authentication failed, please try again","3DS has expired or authentication failed, please try again"
-"The transaction could not be processed","The transaction could not be processed"
-"Payment capture initiated, awaiting capture confirmation.","Payment capture initiated, awaiting capture confirmation."
"3DS payment expired.","3DS payment expired."
-"This card is already saved.","This card is already saved."
-ending,ending
-expires,expires
-"Missing action ID for webhook with payment ID %","Missing action ID for webhook with payment ID %"
-"The payment request was successfully processed.","The payment request was successfully processed."
-"The transaction could not be processed. Please check the payment details.","The transaction could not be processed. Please check the payment details."
-"Please provide the required card information for the MOTO payment.","Please provide the required card information for the MOTO payment."
-"Missing required card information for the MOTO payment.","Missing required card information for the MOTO payment."
-CVV,CVV
-"Get your credentials here.","Get your credentials here."
-"Add a card","Add a card"
-"Save the card","Save the card"
-"Card Number","Card Number"
-"Expiration Date","Expiration Date"
-Type,Type
-Actions,Actions
-Delete,Delete
-"The card ending with %1 will be deleted.","The card ending with %1 will be deleted."
-"Delete a card","Delete a card"
-Name,Name
-"Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica","Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica"
-"Birth date (YYYY-MM-DD)","Birth date (YYYY-MM-DD)"
-BIC,BIC
-Description,Description
-"Could not load the Klarna script.","Could not load the Klarna script."
-"Account IBAN","Account IBAN"
-Continue,Continue
-"SEPA Direct Debit Mandate for single payment","SEPA Direct Debit Mandate for single payment"
-Creditor,Creditor
-"Creditor ID","Creditor ID"
-Debitor,Debitor
-"By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH.","By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH."
-"As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.","As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited."
-"I accept the mandate for a single payment","I accept the mandate for a single payment"
-"Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.","Your rights regarding the above mandate are explained in a statement that you can obtain from your bank."
-"Place Order","Place Order"
-"Card number","Card number"
-"Save this card for later use.","Save this card for later use."
-"Set Webhooks","Set Webhooks"
-"Attention, webhook not properly configured!","Attention, webhook not properly configured!"
-"Your webhook is all set!","Your webhook is all set!"
-"Error! Could not set webhooks. Please check your secret key.","Error! Could not set webhooks. Please check your secret key."
-"Attention, secret key incorrect!","Attention, secret key incorrect!"
-"Use Risk Rules For MOTO","Use Risk Rules For MOTO"
-"3DS authorization code","3DS authorization code"
-"Payment Method refunded","Payment Method refunded"
-"Mismatched Address (fraud check)","Mismatched Address (fraud check)"
-"Alternative payment method","Alternative payment method"
-"Transaction Id","Transaction Id"
-"Card Country","Card Country"
-"Card Bank","Card Bank"
-"Card expiry year","Card expiry year"
-"Card expiry month","Card expiry month"
-"Card 4 last numbers","Card 4 last numbers"
-"Card type","Card type"
-"Payment Additional Information","Payment Additional Information"
"5 Digit Postal Match","5 Digit Postal Match"
+"A payment method ID is required to place an order.","A payment method ID is required to place an order."
"AVS Not Available","AVS Not Available"
+"Account IBAN","Account IBAN"
+"Add a card","Add a card"
+"Alternative payment method","Alternative payment method"
+"American Express","American Express"
+"An error occurred and the order could not be created.","An error occurred and the order could not be created."
+"As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited.","As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited."
"Attempt at processing performed. Not authenticated or verified, but a proof of attempted authentication/verification is provided.","Attempt at processing performed. Not authenticated or verified, but a proof of attempted authentication/verification is provided."
+"Attention, secret key incorrect!","Attention, secret key incorrect!"
+"Attention, webhook not properly configured!","Attention, webhook not properly configured!"
"Authentication or account verification could not be performed. This is due to a technical problem, or another problem as indicated in ARes or RReq.","Authentication or account verification could not be performed. This is due to a technical problem, or another problem as indicated in ARes or RReq."
"Authentication or account verification rejected. Issuer is rejecting and requests that authorization not be attempted.","Authentication or account verification rejected. Issuer is rejecting and requests that authorization not be attempted."
"Authentication verification successful.","Authentication verification successful."
+"Authorize and Capture","Authorize and Capture"
"Authorizing entity has not attempted card verification or could not verify the CVD due to a security device error","Authorizing entity has not attempted card verification or could not verify the CVD due to a security device error"
+"Birth date (YYYY-MM-DD)","Birth date (YYYY-MM-DD)"
+"By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH.","By accepting this mandate form, you authorise (A) b4payment GmbH to send instructions to your bank to debit your account (B) your bank to debit your account in accordance with the instructions from b4payment GmbH."
+"Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica","Cadastro de Pessoas FÃsicas or Cadastro Nacional da Pessoa JurÃdica"
+"Cancel the order","Cancel the order"
+"Card 4 last numbers","Card 4 last numbers"
+"Card BIN is empty string","Card BIN is empty string"
+"Card Bank","Card Bank"
+"Card Country","Card Country"
+"Card Number","Card Number"
+"Card expiry month","Card expiry month"
+"Card expiry year","Card expiry year"
+"Card number","Card number"
+"Card type","Card type"
"Card verification not performed, CVD was not on the card. Not all cards have a CVD value encoded","Card verification not performed, CVD was not on the card. Not all cards have a CVD value encoded"
"Card verification performed, and CVD was invalid","Card verification performed, and CVD was invalid"
"Card verification performed, and CVD was valid","Card verification performed, and CVD was valid"
@@ -170,17 +45,142 @@ Debitor,Debitor
"Cardholder Name, Street and Postal/ZIP Match","Cardholder Name, Street and Postal/ZIP Match"
"Challenge required. Additional authentication is required using the CReq or CRes.","Challenge required. Additional authentication is required using the CReq or CRes."
"Challenge required. Decoupled authentication confirmed.","Challenge required. Decoupled authentication confirmed."
+"Could not load the Klarna script.","Could not load the Klarna script."
+"Credit cards","Credit cards"
+"Creditor ID","Creditor ID"
+"Cron Job","Cron Job"
+"Debit cards","Debit cards"
+"Delete a card","Delete a card"
+"Delete the order","Delete the order"
+"Do nothing","Do nothing"
+"Error! Could not set webhooks. Please check your secret key.","Error! Could not set webhooks. Please check your secret key."
+"Expiration Date","Expiration Date"
+"Failure URL is empty string","Failure URL is empty string"
+"Failure URL provided is not a string","Failure URL provided is not a string"
+"Get your credentials here.","Get your credentials here."
+"I accept the mandate for a single payment","I accept the mandate for a single payment"
"Informational only. 3DS requestor challenge preference acknowledged.","Informational only. 3DS requestor challenge preference acknowledged."
+"Invalid request. No order found.","Invalid request. No order found."
+"Invalid request. No session ID found.","Invalid request. No session ID found."
+"It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method","It looks like this transaction has been blocked due to account holder action, please contact your bank or use another card or payment method"
+"It looks like your card is invalid or blocked, please try with another card","It looks like your card is invalid or blocked, please try with another card"
+"KSA","KSA"
+"Learn More","Learn More"
"Match Not Capable","Match Not Capable"
+"Mismatched Address (fraud check)","Mismatched Address (fraud check)"
+"Missing action ID for webhook with payment ID %","Missing action ID for webhook with payment ID %"
+"Missing required card information for the MOTO payment.","Missing required card information for the MOTO payment."
+"Multiple iframes","Multiple iframes"
"No Address Match","No Address Match"
"No CVV2 information is available",,"No CVV2 information is available"
+"No quote found with the provided ID","No quote found with the provided ID"
+"No quote was found with the provided ID.","No quote was found with the provided ID."
"Not Verified or Not Supported","Not Verified or Not Supported"
"Not authenticated or account not verified. This means the transaction was denied.","Not authenticated or account not verified. This means the transaction was denied."
"Not supported","Not supported"
+"Payment Additional Information","Payment Additional Information"
+"Payment Method refunded","Payment Method refunded"
+"Payment capture initiated, awaiting capture confirmation.","Payment capture initiated, awaiting capture confirmation."
+"Payment request from %1","Payment request from %1"
+"Payment token is missing from request body","Payment token is missing from request body"
+"Payment token provided is empty string","Payment token provided is empty string"
+"Payment token provided is not a string","Payment token provided is not a string"
+"Place Order","Place Order"
+"Please enter valid card details.","Please enter valid card details."
+"Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . '). Update now to get the latest features and security updates. See https://github.com/checkout/checkout-magento2-plugin for detailed instructions.","Please keep your website safe! Your checkout plugin (v' . . ') is not the latest version (v' . . '). Update now to get the latest features and security updates. See https://github.com/checkout/checkout-magento2-plugin for detailed instructions."
+"Please provide the required card information for the MOTO payment.","Please provide the required card information for the MOTO payment."
+"Quote ID is missing from request body","Quote ID is missing from request body"
+"Quote ID provided must be a positive integer","Quote ID provided must be a positive integer"
+"SEPA Direct Debit Mandate for single payment","SEPA Direct Debit Mandate for single payment"
+"Save the card","Save the card"
+"Save this card for later use.","Save this card for later use."
+"Set Webhooks","Set Webhooks"
+"Single iframe","Single iframe"
+"Something went wrong with paypal method. Please choose another method.","Something went wrong with paypal method. Please choose another method."
+"Something went wrong, please try again later","Something went wrong, please try again later"
"Street Match Postal Not Verified","Street Match Postal Not Verified"
"Street Match","Street Match"
"Street Not Verified Postal Match","Street Not Verified Postal Match"
"Street and 5 Digit Postal Match","Street and 5 Digit Postal Match"
"Street and Postal Match","Street and Postal Match"
"Street and Postal Not Verified","Street and Postal Not Verified"
+"Success URL is empty string","Success URL is empty string"
+"Success URL provided is not a string","Success URL provided is not a string"
+"The CVV value is required.","The CVV value is required."
+"The capture action is not available.","The capture action is not available."
+"The capture request could not be processed.","The capture request could not be processed."
+"The card could not be saved.","The card could not be saved."
+"The card ending with %1 will be deleted.","The card ending with %1 will be deleted."
"The issuer has not certified or has not provided the encryption keys to the interchange","The issuer has not certified or has not provided the encryption keys to the interchange"
+"The order could not be created.","The order could not be created."
+"The order could not be processed.","The order could not be processed."
+"The order creation failed. Please check the error logs.","The order creation failed. Please check the error logs."
+"The payment card has been stored successfully.","The payment card has been stored successfully."
+"The payment request was declined by the gateway.","The payment request was declined by the gateway."
+"The payment request was successfully processed.","The payment request was successfully processed."
+"The payment token is missing or invalid.","The payment token is missing or invalid."
+"The payment was declined, please try again. If the problem persists, try another card or payment method.","The payment was declined, please try again. If the problem persists, try another card or payment method."
+"The public key is invalid.","The public key is invalid."
+"The quote ID is missing or invalid.","The quote ID is missing or invalid."
+"The refund action is not available.","The refund action is not available."
+"The refund request could not be processed.","The refund request could not be processed."
+"The request is invalid or there was no quote found.","The request is invalid or there was no quote found."
+"The request is invalid.","The request is invalid."
+"The transaction could not be processed or has been cancelled.","The transaction could not be processed or has been cancelled."
+"The transaction could not be processed","The transaction could not be processed"
+"The transaction could not be processed. Please check the payment details.","The transaction could not be processed. Please check the payment details."
+"The transaction could not be processed.","The transaction could not be processed."
+"The void action is not available.","The void action is not available."
+"The void request could not be processed.","The void request could not be processed."
+"The webhook payment response is invalid.","The webhook payment response is invalid."
+"The webhook response is invalid.","The webhook response is invalid."
+"There is no quote available to place an order.","There is no quote available to place an order."
+"This card is already saved.","This card is already saved."
+"Transaction Id","Transaction Id"
+"Unauthorized request. No matching private shared key.","Unauthorized request. No matching private shared key."
+"Use Risk Rules For MOTO","Use Risk Rules For MOTO"
+"View Demo","View Demo"
+"Webhook and order successfully processed.","Webhook and order successfully processed."
+"White with line","White with line"
+"You have reached the limit allowed for this card/account, please try again with another card or payment method.","You have reached the limit allowed for this card/account, please try again with another card or payment method."
+"Your browser is not compatible with the Apple Pay version. Please use the most updated OS system and browsers.","Your browser is not compatible with the Apple Pay version. Please use the most updated OS system and browsers."
+"Your order number %1 has been created successfully.","Your order number %1 has been created successfully."
+"Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.","Your rights regarding the above mandate are explained in a statement that you can obtain from your bank."
+"Your webhook is all set!","Your webhook is all set!"
+Actions,Actions
+Authorize,Authorize
+BIC,BIC
+Black,Black
+CVV,CVV
+Close,Close
+Configure,Configure
+Continue,Continue
+Creditor,Creditor
+Debitor,Debitor
+Delete,Delete
+Description,Description
+Discover,Discover
+Dutch,Dutch
+English,English
+French,French
+German,German
+Italian,Italian
+JCB,JCB
+Korean,Korean
+Mastercard,Mastercard
+Name,Name
+None,None
+Pending,Pending
+Processing,Processing
+Production,Production
+Simple,Simple
+Spanish,Spanish
+Standard,Standard
+Test,Test
+Type,Type
+Visa,Visa
+Webhook,Webhook
+White,White
+ending,ending
+expires,expires
+title,title
diff --git a/view/base/templates/ui/knetInfo.phtml b/view/base/templates/ui/knetInfo.phtml
deleted file mode 100644
index 027d9a4a..00000000
--- a/view/base/templates/ui/knetInfo.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-
- * @copyright 2010-present Checkout.com
- * @license https://opensource.org/licenses/mit-license.html MIT License
- * @link https://docs.checkout.com/
- */
-?>
-
-%1 ; ', $block->escapeHtml($block->getData('postDate'))) ?>
-%1 ; ', $block->escapeHtml($block->getData('amount'))) ?>
-%1 ; ', $block->escapeHtml($block->getData('resultCode'))) ?>
-%1 ; ', $block->escapeHtml($block->getData('paymentId'))) ?>
-%1 ; ', $block->escapeHtml($block->getData('transactionId'))) ?>
-%1 ; ', $block->escapeHtml($block->getData('authCode'))) ?>
-%1 ; ', $block->escapeHtml($block->getData('reference'))) ?>
diff --git a/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml
index dea6da35..a761e5be 100644
--- a/view/frontend/layout/checkout_cart_index.xml
+++ b/view/frontend/layout/checkout_cart_index.xml
@@ -6,8 +6,51 @@
+
+
+
+
+
+ CheckoutCom_Magento2/js/view/payment/method-renderer/checkoutcom_paypal_express
+
+ CheckoutCom_Magento2/payment/checkoutcom_paypal_express
+ express_cart
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+ cart
+
+
+
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index fec3e168..478838d6 100755
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -19,6 +19,19 @@
+
+
+
+
+
+ checkout
+ checkout
+
+
+
@@ -38,6 +51,12 @@
CheckoutCom_Magento2/js/view/payment/method-renderer
+
+ true
+
+
+ true
+ true
diff --git a/view/frontend/layout/checkoutcom_paypal_review.xml b/view/frontend/layout/checkoutcom_paypal_review.xml
new file mode 100644
index 00000000..3dca2021
--- /dev/null
+++ b/view/frontend/layout/checkoutcom_paypal_review.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+ Review Order
+
+
+
+
+
+
+
+
+
+
+
+
+ Magento\Customer\Block\DataProviders\AddressAttributeData
+ Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData
+ Magento\Customer\ViewModel\Address
+ Magento\Customer\ViewModel\Address\RegionProvider
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 5d705221..23743293 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -25,6 +25,13 @@
CheckoutCom_Magento2/checkout/minicart/applepaybutton
+
+ CheckoutCom_Magento2/js/view/payment/method-renderer/checkoutcom_paypal_express
+
+ CheckoutCom_Magento2/payment/checkoutcom_paypal_express
+ express_minicart
+
+
@@ -33,9 +40,22 @@
-
+
-
+
+
+
+
+
+
+ express
+ mini-cart
+
+
+
diff --git a/view/frontend/templates/cart/minicart-config.phtml b/view/frontend/templates/cart/minicart-config.phtml
index 2c43de4f..a7b09700 100644
--- a/view/frontend/templates/cart/minicart-config.phtml
+++ b/view/frontend/templates/cart/minicart-config.phtml
@@ -1,13 +1,26 @@
- * @copyright 2004-present Agence Dn'D
- * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- * @link https://www.dnd.fr/
+ * Checkout.com
+ * Authorized and regulated as an electronic money institution
+ * by the UK Financial Conduct Authority (FCA) under number 900816.
+ *
+ * PHP version 7
+ *
+ * @category Magento2
+ * @package Checkout.com
+ * @author Platforms Development Team
+ * @copyright 2010-present Checkout.com
+ * @license https://opensource.org/licenses/mit-license.html MIT License
+ * @link https://docs.checkout.com/
*/
-/** @var \CheckoutCom\Magento2\Block\Cart\ApplePay $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+use CheckoutCom\Magento2\Block\Cart\CheckoutConfig;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+/** @var CheckoutConfig $block */
+/** @var SecureHtmlRenderer $secureRenderer */
+if ($block->isPaypalOrApplePayEnabled()):
?>
getProductCount() > 0 ? $block->getSerializedCheckoutConfig() : $block->getSerializedCheckoutComConfig();
$scriptString = <<
+