diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml index aad12a079..d71cf4adc 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/icons.yml @@ -22,7 +22,7 @@ jobs: - name: Copy payment method icons run: | cd "${{ github.workspace }}/Media/Payment methods/SVG/" - rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg pos-nfc.svg + rm -f ideal-qr.svg knaken.svg paylink.svg paybybank.svg pos-nfc.svg giropay.svg sofort.svg cd ${{ github.workspace }}/Media cp -R "Payment methods/SVG/." ${{ github.workspace }}/view/base/web/images/svg/ - name: Copy creditcards icons @@ -35,7 +35,7 @@ jobs: rm -f vvvlekkerweg.svg vvvshopchill.svg cd ${{ github.workspace }}/Media cp -R "Giftcards/SVG/." ${{ github.workspace }}/view/base/web/images/giftcards/ - + - name: Copy payment issuers icons run: | cd Media diff --git a/Block/Adminhtml/Sales/Totals.php b/Block/Adminhtml/Sales/Totals.php index ec4787963..b8e8926bd 100644 --- a/Block/Adminhtml/Sales/Totals.php +++ b/Block/Adminhtml/Sales/Totals.php @@ -55,15 +55,9 @@ public function __construct( public function initTotals() { $parent = $this->getParentBlock(); - /** - * @noinspection PhpUndefinedMethodInspection - */ $source = $parent->getSource(); $totals = $this->getTotalsForCreditmemo($source); foreach ($totals as $total) { - /** - * @noinspection PhpUndefinedMethodInspection - */ $this->getParentBlock()->addTotalBefore(new \Magento\Framework\DataObject($total), 'grand_total'); } return $this; @@ -72,12 +66,9 @@ public function initTotals() public function getTotals() { $parent = $this->getParentBlock(); - /** - * @noinspection PhpUndefinedMethodInspection - */ $source = $parent->getSource(); - + return $this->getTotalsForCreditmemo($source); } @@ -92,7 +83,7 @@ public function getCurrentCurrencySymbol() } /** - * For credit memo display the fees from invoice/order, + * For credit memo display the fees from invoice/order, * check if invoice has that fee and set selected * * @param mixed $source @@ -107,7 +98,7 @@ protected function getTotalsForCreditmemo($source) $invoice = $source->getInvoice(); $salesModel = ($invoice != null? $invoice : $order); $saleTotals = $this->helper->getTotals($salesModel); - + $saleTotals = array_map(function($saleTotal) use($creditTotals) { if (in_array($saleTotal['code'],['buckaroo_fee', 'buckaroo_fee_excl'] )) { $saleTotal['block_name'] = "buckaroo_fee"; @@ -116,12 +107,12 @@ protected function getTotalsForCreditmemo($source) return $saleTotal; }, $saleTotals); - + return array_merge( $this->getTotalsByCode($creditTotals, 'buckaroo_already_paid'), $this->getTotalsExceptCode($saleTotals, 'buckaroo_already_paid') ); - + } return $this->helper->getTotals($source); } diff --git a/Block/Cart/BuckarooConfig.php b/Block/Cart/BuckarooConfig.php index 20be07519..89c3eae1a 100644 --- a/Block/Cart/BuckarooConfig.php +++ b/Block/Cart/BuckarooConfig.php @@ -1,11 +1,32 @@ configProviderFactory->get('buckaroo_fee'); - return $this->jsonEncoder->encode($configProvider->getConfig()); + return $this->jsonEncoder->serialize($configProvider->getConfig()); + } + + /** + * Get CSP nonce + * + * @return string + */ + public function getCspNonce() + { + return $this->getData('cspNonce') ?: ''; } } diff --git a/Block/Catalog/Product/View/Applepay.php b/Block/Catalog/Product/View/Applepay.php index 5c7bbae2c..450a70ab0 100644 --- a/Block/Catalog/Product/View/Applepay.php +++ b/Block/Catalog/Product/View/Applepay.php @@ -21,6 +21,7 @@ use Magento\Checkout\Model\Cart; use Magento\Checkout\Model\CompositeConfigProvider; +use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\View\Element\Template; use Magento\Framework\View\Element\Template\Context; use Buckaroo\Magento2\Model\ConfigProvider\Method\Applepay as ApplepayConfig; @@ -58,13 +59,22 @@ public function __construct( } /** + * @param $page * @return bool + * @throws NoSuchEntityException */ - public function canShowButton($page) + public function canShowButton($page): bool { - return $this->isModuleActive() && - in_array($page, $this->applepayConfigProvider->getAvailableButtons()) && - $this->applepayConfigProvider->isApplePayEnabled($this->_storeManager->getStore()); + if (!$this->isModuleActive()) { + return false; + } + + $availableButtons = $this->applepayConfigProvider->getAvailableButtons(); + if (!in_array($page, $availableButtons, true)) { + return false; + } + + return $this->applepayConfigProvider->isApplePayEnabled($this->_storeManager->getStore()); } /** diff --git a/Block/Checkout/Success.php b/Block/Checkout/Success.php index 75f5d81f5..25ae1a0d0 100644 --- a/Block/Checkout/Success.php +++ b/Block/Checkout/Success.php @@ -28,7 +28,7 @@ class Success extends \Magento\Checkout\Block\Onepage\Success protected $currentCustomer; /** - * @param Template\Context $context + * @param \Magento\Framework\View\Element\Template\Context $context * @param \Magento\Checkout\Model\Session $checkoutSession * @param \Magento\Sales\Model\Order\Config $orderConfig * @param \Magento\Framework\App\Http\Context $httpContext @@ -52,4 +52,14 @@ public function __construct( ); $this->currentCustomer = $currentCustomer; } + + /** + * Get CSP nonce + * + * @return string + */ + public function getCspNonce() + { + return $this->getData('cspNonce') ?: ''; + } } diff --git a/Block/Info.php b/Block/Info.php index 5a2f0e08f..ed2e03f71 100644 --- a/Block/Info.php +++ b/Block/Info.php @@ -107,7 +107,6 @@ public function getPaymentLogo(string $method): string "mrcash" => "svg/bancontact.svg", "p24" => "svg/przelewy24.svg", "sepadirectdebit" => "svg/sepa-directdebit.svg", - "sofortbanking" => "svg/sofort.svg", "emandate" => "emandate.png", "pospayment" => "pos.png", "transfer" => "svg/sepa-credittransfer.svg", diff --git a/Block/Widget/Button/Toolbar.php b/Block/Widget/Button/Toolbar.php index 058ddb6f3..93bc406d5 100644 --- a/Block/Widget/Button/Toolbar.php +++ b/Block/Widget/Button/Toolbar.php @@ -45,11 +45,9 @@ class Toolbar 'buckaroo_magento2_paypal', 'buckaroo_magento2_payconiq', 'buckaroo_magento2_sepadirectdebit', - 'buckaroo_magento2_sofortbanking', 'buckaroo_magento2_belfius', 'buckaroo_magento2_transfer', 'buckaroo_magento2_eps', - 'buckaroo_magento2_giropay', 'buckaroo_magento2_kbc', 'buckaroo_magento2_klarna', 'buckaroo_magento2_klarnakp', diff --git a/Controller/Applepay/SaveOrder.php b/Controller/Applepay/SaveOrder.php index 6b6ca60a8..89ee30f18 100644 --- a/Controller/Applepay/SaveOrder.php +++ b/Controller/Applepay/SaveOrder.php @@ -20,6 +20,8 @@ namespace Buckaroo\Magento2\Controller\Applepay; use Buckaroo\Magento2\Logging\Log; +use Buckaroo\Magento2\Model\Config\Source\InvoiceHandlingOptions; +use Buckaroo\Magento2\Model\ConfigProvider\Account; use Magento\Framework\App\Action\Action; use Magento\Framework\App\Action\Context; use Magento\Framework\View\Result\Page; @@ -35,6 +37,7 @@ class SaveOrder extends Common protected $order; protected $checkoutSession; protected $accountConfig; + private $configAccount; /** * @param Context $context @@ -47,6 +50,7 @@ public function __construct( \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory, Log $logger, \Magento\Checkout\Model\Cart $cart, + Account $configAccount, \Magento\Quote\Model\QuoteManagement $quoteManagement, \Magento\Customer\Model\Session $customer, \Magento\Framework\DataObjectFactory $objectFactory, @@ -69,7 +73,7 @@ public function __construct( $converter, $customerSession ); - + $this->configAccount = $configAccount; $this->quoteManagement = $quoteManagement; $this->customer = $customer; $this->objectFactory = $objectFactory; @@ -126,6 +130,14 @@ public function execute() $payment->setMethod(Applepay::PAYMENT_METHOD_CODE); $quote->setPayment($payment); + + $invoiceHandlingConfig = $this->configAccount->getInvoiceHandling($this->order->getStore()); + + if ($invoiceHandlingConfig == InvoiceHandlingOptions::SHIPMENT) { + $payment->setAdditionalInformation(InvoiceHandlingOptions::INVOICE_HANDLING, $invoiceHandlingConfig); + $payment->save(); + $quote->setPayment($payment); + } $quote->collectTotals()->save(); $obj = $this->objectFactory->create(); diff --git a/Controller/Redirect/Process.php b/Controller/Redirect/Process.php index a78c6f241..40f80f07b 100755 --- a/Controller/Redirect/Process.php +++ b/Controller/Redirect/Process.php @@ -20,17 +20,41 @@ namespace Buckaroo\Magento2\Controller\Redirect; +use Buckaroo\Magento2\Exception; +use Buckaroo\Magento2\Helper\Data; use Buckaroo\Magento2\Logging\Log; use Buckaroo\Magento2\Model\Config\Source\InvoiceHandlingOptions; +use Buckaroo\Magento2\Model\ConfigProvider\Factory; +use Buckaroo\Magento2\Model\OrderStatusFactory; +use Buckaroo\Magento2\Service\Sales\Quote\Recreate; +use Magento\Checkout\Model\Cart; +use Magento\Checkout\Model\ConfigProviderInterface; +use Magento\Checkout\Model\Session; +use Magento\Customer\Model\Session as CustomerSession; +use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Customer\Model\Customer; +use Magento\Customer\Model\ResourceModel\CustomerFactory; +use Magento\Customer\Model\SessionFactory; +use Magento\Framework\App\Action\Action; +use Magento\Framework\App\Action\Context; use Magento\Framework\App\Request\Http as Http; +use Magento\Framework\App\ResponseInterface; +use Magento\Framework\Event\ManagerInterface; +use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Quote\Model\Quote; +use Magento\Sales\Api\Data\OrderInterface; use Magento\Sales\Api\Data\TransactionInterface; use Magento\Sales\Api\Data\OrderPaymentInterface; use Buckaroo\Magento2\Model\Method\AbstractMethod; use Buckaroo\Magento2\Model\Service\Order as OrderService; use Buckaroo\Magento2\Model\LockManagerWrapper; +use Magento\Sales\Model\Order; +use Magento\Sales\Model\Order\Email\Sender\OrderSender; +use Magento\SalesRule\Model\CouponFactory; +use Magento\SalesRule\Model\Spi\CouponResourceInterface; -class Process extends \Magento\Framework\App\Action\Action +class Process extends Action { /** * @var array @@ -38,12 +62,12 @@ class Process extends \Magento\Framework\App\Action\Action protected $response; /** - * @var \Magento\Sales\Model\Order $order + * @var Order $order */ protected $order; /** - * @var \Magento\Quote\Model\Quote $quote + * @var Quote $quote */ protected $quote; @@ -51,27 +75,27 @@ class Process extends \Magento\Framework\App\Action\Action private $transaction; /** - * @var \Buckaroo\Magento2\Helper\Data $helper + * @var Data $helper */ protected $helper; /** - * @var \Magento\Checkout\Model\Cart + * @var Cart */ protected $cart; /** - * @var \Magento\Checkout\Model\ConfigProviderInterface + * @var ConfigProviderInterface */ protected $accountConfig; /** - * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender + * @var OrderSender */ protected $orderSender; /** - * @var \Buckaroo\Magento2\Model\OrderStatusFactory + * @var OrderStatusFactory */ protected $orderStatusFactory; @@ -81,12 +105,12 @@ class Process extends \Magento\Framework\App\Action\Action protected $logger; /** - * @var \Magento\Checkout\Model\Session + * @var Session */ protected $checkoutSession; /** - * @var \Magento\Customer\Model\Session + * @var CustomerSession */ public $customerSession; protected $customerRepository; @@ -98,7 +122,7 @@ class Process extends \Magento\Framework\App\Action\Action protected $orderService; /** - * @var EventManager + * @var ManagerInterface */ private $eventManager; @@ -110,66 +134,66 @@ class Process extends \Magento\Framework\App\Action\Action protected LockManagerWrapper $lockManager; /** - * @param \Magento\Framework\App\Action\Context $context - * @param \Buckaroo\Magento2\Helper\Data $helper - * @param \Magento\Checkout\Model\Cart $cart - * @param \Magento\Sales\Model\Order $order - * @param \Magento\Quote\Model\Quote $quote + * @param Context $context + * @param Data $helper + * @param Cart $cart + * @param Order $order + * @param Quote $quote * @param TransactionInterface $transaction * @param Log $logger - * @param \Buckaroo\Magento2\Model\ConfigProvider\Factory $configProviderFactory - * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender - * @param \Buckaroo\Magento2\Model\OrderStatusFactory $orderStatusFactory - * @param \Magento\Checkout\Model\Session $checkoutSession, - * @param \Magento\Customer\Model\Session $customerSession, - * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository, - * @param \Magento\Customer\Model\SessionFactory $sessionFactory, - * @param \Magento\Customer\Model\Customer $customerModel, - * @param \Magento\Customer\Model\ResourceModel\CustomerFactory $customerFactory, - * @param OrderService $orderService, - * @param \Magento\Framework\Event\ManagerInterface $eventManager, - * @param \Buckaroo\Magento2\Service\Sales\Quote\Recreate $quoteRecreate, + * @param Factory $configProviderFactory + * @param OrderSender $orderSender + * @param OrderStatusFactory $orderStatusFactory + * @param Session $checkoutSession + * @param CustomerSession $customerSession + * @param CustomerRepositoryInterface $customerRepository + * @param SessionFactory $sessionFactory + * @param Customer $customerModel + * @param CustomerFactory $customerFactory + * @param OrderService $orderService + * @param ManagerInterface $eventManager + * @param Recreate $quoteRecreate * @param LockManagerWrapper $lockManager - * - * @throws \Buckaroo\Magento2\Exception + * @throws Exception */ public function __construct( - \Magento\Framework\App\Action\Context $context, - \Buckaroo\Magento2\Helper\Data $helper, - \Magento\Checkout\Model\Cart $cart, - \Magento\Sales\Model\Order $order, - \Magento\Quote\Model\Quote $quote, - TransactionInterface $transaction, - Log $logger, - \Buckaroo\Magento2\Model\ConfigProvider\Factory $configProviderFactory, - \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender, - \Buckaroo\Magento2\Model\OrderStatusFactory $orderStatusFactory, - \Magento\Checkout\Model\Session $checkoutSession, - \Magento\Customer\Model\Session $customerSession, - \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository, - \Magento\Customer\Model\SessionFactory $sessionFactory, - \Magento\Customer\Model\Customer $customerModel, - \Magento\Customer\Model\ResourceModel\CustomerFactory $customerFactory, - OrderService $orderService, - \Magento\Framework\Event\ManagerInterface $eventManager, - \Buckaroo\Magento2\Service\Sales\Quote\Recreate $quoteRecreate, - LockManagerWrapper $lockManager - ) { + Context $context, + Data $helper, + Cart $cart, + Order $order, + Quote $quote, + TransactionInterface $transaction, + Log $logger, + Factory $configProviderFactory, + OrderSender $orderSender, + OrderStatusFactory $orderStatusFactory, + Session $checkoutSession, + CustomerSession $customerSession, + CustomerRepositoryInterface $customerRepository, + SessionFactory $sessionFactory, + Customer $customerModel, + CustomerFactory $customerFactory, + OrderService $orderService, + ManagerInterface $eventManager, + Recreate $quoteRecreate, + LockManagerWrapper $lockManager + ) + { parent::__construct($context); - $this->helper = $helper; - $this->cart = $cart; - $this->order = $order; - $this->quote = $quote; - $this->transaction = $transaction; - $this->logger = $logger; - $this->orderSender = $orderSender; + $this->helper = $helper; + $this->cart = $cart; + $this->order = $order; + $this->quote = $quote; + $this->transaction = $transaction; + $this->logger = $logger; + $this->orderSender = $orderSender; $this->orderStatusFactory = $orderStatusFactory; - $this->checkoutSession = $checkoutSession; - $this->customerSession = $customerSession; + $this->checkoutSession = $checkoutSession; + $this->customerSession = $customerSession; $this->customerRepository = $customerRepository; - $this->_sessionFactory = $sessionFactory; + $this->_sessionFactory = $sessionFactory; - $this->customerModel = $customerModel; + $this->customerModel = $customerModel; $this->customerResourceFactory = $customerFactory; $this->accountConfig = $configProviderFactory->get('account'); @@ -193,40 +217,52 @@ public function __construct( /** * Process action * - * @return \Magento\Framework\App\ResponseInterface + * @return ResponseInterface * @throws \Exception */ public function execute() { - $this->logger->addDebug(__METHOD__ . '|' . var_export($this->getRequest()->getParams(), true)); + $lockAcquired = false; + try { + $this->logger->addDebug(__METHOD__ . '|' . var_export($this->getRequest()->getParams(), true)); - $this->response = $this->getRequest()->getParams(); - $this->response = array_change_key_case($this->response, CASE_LOWER); + $this->response = $this->getRequest()->getParams(); + $this->response = array_change_key_case($this->response, CASE_LOWER); - $orderIncrementID = $this->getOrderIncrementId(); - $this->logger->addDebug(__METHOD__ . '|Lock Name| - ' . var_export($orderIncrementID, true)); - $lockAcquired = $this->lockManager->lockOrder($orderIncrementID, 5); + $orderIncrementID = $this->getOrderIncrementId(); + if (empty($orderIncrementID)) { + $this->logger->addError(__METHOD__ . '|Order Increment ID is empty'); + return $this->handleProcessedResponse('/'); + } + $this->logger->addDebug(__METHOD__ . '|Lock Name| - ' . var_export($orderIncrementID, true)); + $lockAcquired = $this->lockManager->lockOrder($orderIncrementID, 5); - if (!$lockAcquired) { - $this->logger->addError(__METHOD__ . '|lock not acquired|'); - return $this->handleProcessedResponse('/'); - } + if (!$lockAcquired) { + $this->logger->addError(__METHOD__ . '|lock not acquired|'); + return $this->handleProcessedResponse('/'); + } - try { return $this->redirectProcess(); } catch (\Exception $e) { - $this->addErrorMessage('Could not process the request.'); + $this->addErrorMessage(__('Could not process the request.')); $this->logger->addError(__METHOD__ . '|Exception|' . $e->getMessage()); + return $this->_redirect('/'); } finally { - $this->lockManager->unlockOrder($orderIncrementID); - $this->logger->addDebug(__METHOD__ . '|Lock released|'); + if ($lockAcquired && isset($orderIncrementID)) { + $this->lockManager->unlockOrder($orderIncrementID); + $this->logger->addDebug(__METHOD__ . '|Lock released|'); + } } - - $this->logger->addDebug(__METHOD__ . '|9|'); - return $this->_response; } - private function redirectProcess() { + /** + * @throws NoSuchEntityException + * @throws Exception + * @throws LocalizedException + * @throws \Exception + */ + private function redirectProcess() + { /** * Check if there is a valid response. If not, redirect to home. */ @@ -263,6 +299,9 @@ private function redirectProcess() { if ($payment) { $this->setPaymentOutOfTransit($payment); + } else { + $this->logger->addError(__METHOD__ . '|Payment object is null'); + return $this->handleProcessedResponse('/'); } if (!method_exists($payment->getMethodInstance(), 'canProcessPostData')) { @@ -317,7 +356,6 @@ private function redirectProcess() { $payment->getMethodInstance()->processCustomPostData($payment, $this->response); - /** @var \Magento\Payment\Model\MethodInterface $paymentMethod */ $paymentMethod = $this->order->getPayment()->getMethodInstance(); $store = $this->order->getStore(); @@ -346,9 +384,7 @@ private function redirectProcess() { } $pendingCode = $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_PENDING_PROCESSING'); - if (($statusCode == $pendingCode) - && !$this->hasPostData('brq_payment_method', 'sofortueberweisung') - ) { + if ($statusCode == $pendingCode) { $this->addErrorMessage( __( 'Unfortunately an error occurred while processing your payment.' . @@ -373,36 +409,36 @@ private function redirectProcess() { $this->order->getIncrementId(), ], true)); - if (!$this->checkoutSession->getLastSuccessQuoteId() && $this->order->getQuoteId()) { - $this->logger->addDebug(__METHOD__ . '|52|'); - $this->checkoutSession->setLastSuccessQuoteId($this->order->getQuoteId()); + if ($this->order && $this->order->getId()) { + $this->checkoutSession->setLastOrderId($this->order->getId()); } - if (!$this->checkoutSession->getLastQuoteId() && $this->order->getQuoteId()) { - $this->logger->addDebug(__METHOD__ . '|53|'); + + if ($this->order && $this->order->getQuoteId()) { $this->checkoutSession->setLastQuoteId($this->order->getQuoteId()); + $this->checkoutSession->setLastSuccessQuoteId($this->order->getQuoteId()); } - if (!$this->checkoutSession->getLastOrderId() && $this->order->getId()) { - $this->logger->addDebug(__METHOD__ . '|54|'); - $this->checkoutSession->setLastOrderId($this->order->getId()); - } - if (!$this->checkoutSession->getLastRealOrderId() && $this->order->getIncrementId()) { - $this->logger->addDebug(__METHOD__ . '|55|'); + + if ($this->order && $this->order->getIncrementId()) { $this->checkoutSession->setLastRealOrderId($this->order->getIncrementId()); } + + if ($this->order && $this->order->getStatus()) { + $this->checkoutSession->setLastOrderStatus($this->order->getStatus()); + } + $this->logger->addDebug(__METHOD__ . '|6|'); - // Redirect to success page return $this->redirectSuccess(); case $this->helper->getStatusCode('BUCKAROO_MAGENTO2_ORDER_FAILED'): case $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_FAILED'): case $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_REJECTED'): case $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER'): return $this->handleFailed($statusCode); - break; - //no default + default: + $this->addErrorMessage(__('An unexpected error occurred.')); + return $this->handleProcessedResponse('/'); } - - return $this->response; } + /** * Handle final response * @@ -416,15 +452,17 @@ public function handleProcessedResponse($path, $arguments = []) $this->logger->addDebug(__METHOD__ . '|15|'); return $this->_redirect($path, $arguments); } + /** * Get order * - * @return \Magento\Sales\Api\Data\OrderInterface + * @return OrderInterface */ public function getOrder() { return $this->order; } + /** * Add error message to be displayed to the user * @@ -436,6 +474,7 @@ public function addErrorMessage(string $message) { $this->messageManager->addErrorMessage($message); } + /** * Add success message to be displayed to the user * @@ -448,31 +487,24 @@ public function addSuccessMessage(string $message) $this->messageManager->addSuccessMessage($message); } - /** - * Get response parameters - * - * @return array - */ - public function getResponseParameters() - { - return $this->response; - } /** * Set flag if user is on the payment provider page * * @param OrderPaymentInterface $payment * * @return void + * @throws \Exception */ protected function setPaymentOutOfTransit(OrderPaymentInterface $payment) { $payment - ->setAdditionalInformation(AbstractMethod::BUCKAROO_PAYMENT_IN_TRANSIT, false) - ->save(); + ->setAdditionalInformation(AbstractMethod::BUCKAROO_PAYMENT_IN_TRANSIT, false) + ->save(); } /** - * @throws NoSuchEntityException + * @param $statusCode + * @return ResponseInterface */ protected function handleFailed($statusCode) { @@ -485,7 +517,7 @@ protected function handleFailed($statusCode) if (!$this->getSkipHandleFailedRecreate()) { if (!$this->quoteRecreate->recreate($this->quote, $this->response)) { - $this->logging->addError('Could not recreate the quote.'); + $this->logger->addError('Could not recreate the quote.'); } } @@ -521,7 +553,7 @@ protected function handleFailed($statusCode) } /** - * @throws \Buckaroo\Magento2\Exception + * @throws NoSuchEntityException */ private function loadOrder() { @@ -531,7 +563,12 @@ private function loadOrder() if (!$this->order->getId()) { $this->logger->addDebug('Order could not be loaded by brq_invoicenumber or brq_ordernumber'); - $this->order = $this->getOrderByTransactionKey(); + try { + $this->order = $this->getOrderByTransactionKey(); + } catch (\Exception $e) { + $this->logger->addError('Could not load order by transaction key: ' . $e->getMessage()); + throw $e; + } } } @@ -542,7 +579,7 @@ private function loadOrder() */ protected function getOrderIncrementId(): ?string { - $brqOrderId = false; + $brqOrderId = null; if (isset($this->response['brq_invoicenumber']) && !empty($this->response['brq_invoicenumber'])) { $brqOrderId = $this->response['brq_invoicenumber']; @@ -556,8 +593,8 @@ protected function getOrderIncrementId(): ?string } /** - * @return bool - * @throws \Buckaroo\Magento2\Exception + * @return Order\Payment + * @throws NoSuchEntityException */ private function getOrderByTransactionKey() { @@ -575,7 +612,7 @@ private function getOrderByTransactionKey() $order = $this->transaction->getOrder(); if (!$order) { - throw new \Buckaroo\Magento2\Exception(__('There was no order found by transaction Id')); + throw new NoSuchEntityException(__('There was no order found by transaction Id')); } return $order; @@ -588,7 +625,7 @@ private function getOrderByTransactionKey() * * @return bool */ - protected function cancelOrder($statusCode) + protected function cancelOrder($statusCode): bool { return $this->orderService->cancel($this->order, $statusCode); } @@ -596,7 +633,7 @@ protected function cancelOrder($statusCode) /** * Redirect to Success url, which means everything seems to be going fine * - * @return \Magento\Framework\App\ResponseInterface + * @return ResponseInterface */ protected function redirectSuccess() { @@ -650,7 +687,7 @@ protected function redirectSuccessApplePay() /** * Redirect to Failure url, which means we've got a problem * - * @return \Magento\Framework\App\ResponseInterface + * @return ResponseInterface */ protected function redirectFailure() { @@ -675,7 +712,6 @@ protected function redirectFailure() $this->logger->addDebug(__METHOD__ . '|restoreQuote|'); } } - $this->setSkipHandleFailedRecreate(false); } catch (\Exception $e) { $this->logger->addError('Could not load customer'); } @@ -689,7 +725,6 @@ protected function redirectFailure() protected function redirectToCheckout() { - $store = $this->order->getStore(); $this->logger->addDebug('start redirectToCheckout'); if (!$this->customerSession->isLoggedIn()) { $this->logger->addDebug('not isLoggedIn'); @@ -769,11 +804,6 @@ public function getSkipHandleFailedRecreate() return false; } - public function setSkipHandleFailedRecreate($value) - { - return true; - } - /** * Remove coupon from failed order if magento enterprise * @@ -781,20 +811,20 @@ public function setSkipHandleFailedRecreate($value) */ protected function removeCoupon() { - if (method_exists($this->order,'getCouponCode')) { + if (method_exists($this->order, 'getCouponCode')) { $couponCode = $this->order->getCouponCode(); - $couponFactory = $this->_objectManager->get(\Magento\SalesRule\Model\CouponFactory::class); + $couponFactory = $this->_objectManager->get(CouponFactory::class); if (!(is_object($couponFactory) && method_exists($couponFactory, 'load'))) { return; } $coupon = $couponFactory->load($couponCode, 'code'); - $resourceModel = $this->_objectManager->get(\Magento\SalesRule\Model\Spi\CouponResourceInterface::class); + $resourceModel = $this->_objectManager->get(CouponResourceInterface::class); if (!(is_object($resourceModel) && method_exists($resourceModel, 'delete'))) { return; } - if (is_int($coupon->getCouponId())) { + if ($coupon && is_int($coupon->getCouponId())) { $resourceModel->delete($coupon); } } diff --git a/Factory/CspNonceProviderFactory.php b/Factory/CspNonceProviderFactory.php new file mode 100644 index 000000000..2f1b49f1d --- /dev/null +++ b/Factory/CspNonceProviderFactory.php @@ -0,0 +1,63 @@ +objectManager = $objectManager; + $this->logger = $logger; + } + + /** + * Create an instance of CspNonceProvider + * + * @return MagentoCspNonceProvider|CustomCspNonceProvider|null + */ + public function create() + { + // Attempt to use Magento's CspNonceProvider if it exists + if (class_exists(MagentoCspNonceProvider::class)) { + try { + return $this->objectManager->get(MagentoCspNonceProvider::class); + } catch (\Exception $e) { + $this->logger->error('Failed to instantiate Magento CspNonceProvider: ' . $e->getMessage()); + } + } + + // Fallback to custom CspNonceProvider + if (class_exists(CustomCspNonceProvider::class)) { + try { + return $this->objectManager->get(CustomCspNonceProvider::class); + } catch (\Exception $e) { + $this->logger->error('Failed to instantiate Custom CspNonceProvider: ' . $e->getMessage()); + } + } + + // If neither class is available, log a warning + $this->logger->warning('No CspNonceProvider available.'); + return null; + } +} diff --git a/Gateway/Http/TransactionBuilder/Refund.php b/Gateway/Http/TransactionBuilder/Refund.php index 32120f2b2..e10fd9b6f 100644 --- a/Gateway/Http/TransactionBuilder/Refund.php +++ b/Gateway/Http/TransactionBuilder/Refund.php @@ -21,24 +21,22 @@ namespace Buckaroo\Magento2\Gateway\Http\TransactionBuilder; -use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Framework\Data\Form\FormKey; -use Magento\Framework\UrlInterface; -use Magento\Framework\Encryption\Encryptor; -use Buckaroo\Magento2\Gateway\Http\Transaction; -use Buckaroo\Magento2\Model\ConfigProvider\Account; -use Buckaroo\Magento2\Model\ConfigProvider\Method\Factory; -use Buckaroo\Magento2\Service\Software\Data as SoftwareData; +use Buckaroo\Magento2\Exception; +use Buckaroo\Magento2\Model\Method\AbstractMethod; +use Magento\Framework\Exception\LocalizedException; class Refund extends AbstractTransactionBuilder { + /** - * @throws \Buckaroo\Magento2\Exception + * @return void + * @throws Exception + * @throws LocalizedException */ protected function setRefundCurrencyAndAmount() { /** - * @var \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance + * @var AbstractMethod $methodInstance */ $methodInstance = $this->order->getPayment()->getMethodInstance(); $method = $methodInstance->buckarooPaymentMethodCode; @@ -65,6 +63,8 @@ protected function setRefundCurrencyAndAmount() /** * @return array + * @throws Exception + * @throws LocalizedException */ public function getBody() { @@ -103,6 +103,12 @@ public function getBody() ], ]; + if ($this->order->getTotalRefunded() >= $this->order->getGrandTotal()) { + $this->order->setState(\Magento\Sales\Model\Order::STATE_CLOSED) + ->setStatus('closed'); + $this->order->save(); + } + return $body; } diff --git a/Gateway/Http/TransactionBuilder/RefundPartial.php b/Gateway/Http/TransactionBuilder/RefundPartial.php index 95491a4ae..50d7e33c8 100644 --- a/Gateway/Http/TransactionBuilder/RefundPartial.php +++ b/Gateway/Http/TransactionBuilder/RefundPartial.php @@ -21,31 +21,30 @@ namespace Buckaroo\Magento2\Gateway\Http\TransactionBuilder; +use Exception; use Magento\Store\Model\Store; use Magento\Framework\App\RequestInterface; use Buckaroo\Magento2\Model\GroupTransaction; use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress; - - class RefundPartial extends AbstractTransactionBuilder { /** - * @var \Magento\Framework\App\RequestInterface + * @var RequestInterface */ protected $httpRequest; /** - * @var \Magento\Store\Model\Store + * @var Store */ protected $store; /** * - * @var \Buckaroo\Magento2\Model\GroupTransaction + * @var GroupTransaction */ protected $groupTransaction; @@ -87,18 +86,19 @@ public function setStore(Store $store) $this->store = $store; return $this; } + /** * @return array + * @throws Exception */ public function getBody() { if (!$this->store instanceof Store) { - throw new \Exception("`store` must be instance of Magento\Store\Model\Store"); + throw new Exception("`store` must be instance of Magento\Store\Model\Store"); } - if (!$this->groupTransaction instanceof GroupTransaction) { - throw new \Exception("`groupTransaction` must be instance of Buckaroo\Magento2\Model\GroupTransaction"); + throw new Exception("`groupTransaction` must be instance of Buckaroo\Magento2\Model\GroupTransaction"); } $ip = $this->getUserIp($this->store); @@ -132,13 +132,20 @@ public function getBody() ], ]; + if ($this->groupTransaction->getRefundedAmount() >= $this->groupTransaction->getOrder()->getGrandTotal()) { + $this->groupTransaction->getOrder()->setState(\Magento\Sales\Model\Order::STATE_CLOSED) + ->setStatus('closed'); + $this->groupTransaction->getOrder()->save(); + } + return $body; } /** * Get merchant key for store * - * @return mixed + * @return string + * @throws Exception */ public function getMerchantKey() { @@ -146,6 +153,7 @@ public function getMerchantKey() $this->configProviderAccount->getMerchantKey($this->store) ); } + /** * @return array */ @@ -165,13 +173,12 @@ private function getAdditionalParameters() */ private function getParameterLine($name, $value) { - $line = [ + return [ '_' => $value, 'Name' => $name, ]; - - return $line; } + /** * {@inheritdoc} */ @@ -186,19 +193,20 @@ public function getReturnUrl() return $this->returnUrl; } + /** * Get user ip * * @param Store $store * * @return string - * @throws \Exception + * @throws Exception */ protected function getUserIp($store) { - + if (!$this->httpRequest instanceof RequestInterface) { - throw new \Exception("Required parameter `httpRequest` must be instance of Magento\Framework\App\RequestInterface"); + throw new Exception("Required parameter `httpRequest` must be instance of Magento\Framework\App\RequestInterface"); } $ipHeaders = $this->configProviderAccount->getIpHeader($store); diff --git a/Helper/CustomCspNonceProvider.php b/Helper/CustomCspNonceProvider.php new file mode 100644 index 000000000..246921d68 --- /dev/null +++ b/Helper/CustomCspNonceProvider.php @@ -0,0 +1,63 @@ +random = $random; + $this->dynamicCollector = $dynamicCollector; + } + + /** + * Generate nonce and add it to the CSP header + * + * @return string + * @throws LocalizedException + */ + public function generateNonce(): string + { + if (empty($this->nonce)) { + $this->nonce = $this->random->getRandomString( + self::NONCE_LENGTH, + Random::CHARS_DIGITS . Random::CHARS_LOWERS + ); + + $policy = new FetchPolicy( + 'script-src', + false, + [], + [], + false, + false, + false, + [$this->nonce], + [] + ); + + $this->dynamicCollector->add($policy); + } + + return base64_encode($this->nonce); + } +} diff --git a/Helper/Data.php b/Helper/Data.php index a620f52c0..b5410a56d 100644 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -261,6 +261,11 @@ public function getOriginalTransactionKey($orderId) return $this->groupTransaction->getGroupTransactionOriginalTransactionKey($orderId); } + public function getAlreadyPaid() + { + return $this->groupTransaction->getAlreadyPaid($this->getOrderId()); + } + public function getOrderId() { $orderId = $this->_checkoutSession->getQuote()->getReservedOrderId(); @@ -433,14 +438,13 @@ public function getPaymentMethodsList() ['value' => 'emandate', 'label' => __('Digital Debit Authorization')], ['value' => 'eps', 'label' => __('EPS')], ['value' => 'giftcards', 'label' => __('Giftcards')], - ['value' => 'giropay', 'label' => __('Giropay')], ['value' => 'ideal', 'label' => __('iDEAL')], ['value' => 'idealprocessing', 'label' => __('iDEAL Processing')], ['value' => 'kbc', 'label' => __('KBC')], ['value' => 'klarna', 'label' => __('Klarna Pay later (pay)')], ['value' => 'klarnain', 'label' => __('Klarna Slice it')], ['value' => 'klarnakp', 'label' => __('Klarna Pay later (authorize/capture)')], - ['value' => 'mrcash', 'label' => __('Bancontact / Mister Cash')], + ['value' => 'mrcash', 'label' => __('Bancontact')], ['value' => 'p24', 'label' => __('Przelewy24')], ['value' => 'payconiq', 'label' => __('Payconiq')], ['value' => 'paylink', 'label' => __('PayLink')], @@ -448,7 +452,6 @@ public function getPaymentMethodsList() ['value' => 'payperemail', 'label' => __('PayPerEmail')], ['value' => 'pospayment', 'label' => __('Point of Sale')], ['value' => 'sepadirectdebit', 'label' => __('SEPA direct debit')], - ['value' => 'sofortbanking', 'label' => __('SOFORT')], ['value' => 'belfius', 'label' => __('Belfius')], ['value' => 'transfer', 'label' => __('Bank Transfer')], ['value' => 'trustly', 'label' => __('Trustly')], diff --git a/Helper/PaymentFee.php b/Helper/PaymentFee.php index b6e266ffa..a72bd5631 100644 --- a/Helper/PaymentFee.php +++ b/Helper/PaymentFee.php @@ -1,5 +1,4 @@ configProviderAccount = $configProviderAccount; $this->configProviderBuckarooFee = $configProviderBuckarooFee; $this->configProviderMethodFactory = $configProviderMethodFactory; @@ -71,105 +82,97 @@ public function __construct( } /** - * Return totals of data object + * Retrieve totals array based on the data object. * - * @param \Magento\Framework\DataObject $dataObject + * @param DataObject $dataObject * @return array */ public function getTotals($dataObject) { $totals = []; - $displayBothPrices = false; - $displayIncludeTaxPrice = false; - - - if ( - $dataObject instanceof \Magento\Sales\Model\Order - || $dataObject instanceof \Magento\Sales\Model\Order\Invoice - || $dataObject instanceof \Magento\Sales\Model\Order\Creditmemo - ) { - $displayBothPrices = $this->displaySalesBothPrices(); - $displayIncludeTaxPrice = $this->displaySalesIncludeTaxPrice(); - } elseif ($dataObject instanceof \Magento\Quote\Model\Quote\Address\Total) { - $displayBothPrices = $this->displayCartBothPrices(); - $displayIncludeTaxPrice = $this->displayCartIncludeTaxPrice(); - } + $store = $this->getStoreFromDataObject($dataObject); + + $taxClassId = $this->configProviderBuckarooFee->getBuckarooFeeTaxClass($store); + $isIncludingTax = $this->isFeeDisplayTypeIncludingTax($taxClassId); $label = $this->getBuckarooPaymentFeeLabel($dataObject); + $fee = $dataObject->getBuckarooFee(); + $feeTaxAmount = $dataObject->getBuckarooFeeTaxAmount(); + $baseFee = $dataObject->getBaseBuckarooFee(); + $baseFeeTaxAmount = $dataObject->getBuckarooFeeBaseTaxAmount(); - /** - * Buckaroo fee for order totals - */ - if ($displayBothPrices || $displayIncludeTaxPrice) { - if ($displayBothPrices) { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $this->addTotalToTotals( - $totals, - 'buckaroo_fee_excl', - $dataObject->getBuckarooFee(), - $dataObject->getBaseBuckarooFee(), - $label . __(' (Excl. Tax)'), - false, - true - ); - } - /** - * @noinspection PhpUndefinedMethodInspection - */ + // Add the fee total line depending on the display type + if ($isIncludingTax) { $this->addTotalToTotals( $totals, - ($dataObject instanceof \Magento\Sales\Model\Order\Creditmemo) ? 'buckaroo_fee' : 'buckaroo_fee_incl', - $dataObject->getBuckarooFee() + $dataObject->getBuckarooFeeTaxAmount(), - $dataObject->getBaseBuckarooFee() + $dataObject->getBuckarooFeeBaseTaxAmount(), - $label . __(' (Incl. Tax)'), - ($dataObject instanceof \Magento\Sales\Model\Order\Creditmemo) ? 'buckaroo_fee' : false, - false, - [ - 'incl_tax' => true, - 'fee_with_tax' => $dataObject->getBuckarooFee() + $dataObject->getBuckarooFeeTaxAmount() - ] + 'buckaroo_fee_incl', + $fee + $feeTaxAmount, + $baseFee + $baseFeeTaxAmount, + $label . __(' (Incl. Tax)') ); } else { - /** - * @noinspection PhpUndefinedMethodInspection - */ $this->addTotalToTotals( $totals, 'buckaroo_fee', - $dataObject->getBuckarooFee(), - $dataObject->getBaseBuckarooFee(), - $label, - ($dataObject instanceof \Magento\Sales\Model\Order\Creditmemo) ? 'buckaroo_fee' : false, - false, - [ - 'incl_tax' => false, - 'fee_with_tax' => $dataObject->getBuckarooFee() + $dataObject->getBuckarooFeeTaxAmount() - ] + $fee, + $baseFee, + $label . __(' (Excl. Tax)') ); } $this->addAlreadyPayedTotals($dataObject, $totals); - //Set public object data - /** - * @noinspection PhpUndefinedMethodInspection - */ - $this->buckarooFee = $dataObject->getBuckarooFee(); - /** - * @noinspection PhpUndefinedMethodInspection - */ - $this->buckarooFeeTax = $dataObject->getBuckarooFeeTaxAmount(); + $this->buckarooFee = $fee; + $this->buckarooFeeTax = $feeTaxAmount; + return $totals; } - public function addAlreadyPayedTotals($dataObject, &$totals) + + /** + * Extract the store from the data object. + * + * @param DataObject $dataObject + * @return StoreInterface|null + */ + protected function getStoreFromDataObject($dataObject) + { + if ($dataObject instanceof Order) { + return $dataObject->getStore(); + } elseif ($dataObject instanceof Invoice || $dataObject instanceof Creditmemo) { + return $dataObject->getOrder()->getStore(); + } + + return null; + } + + /** + * Determine if the fee display type is set to "Including Tax". + * + * @param mixed $displayType + * @return bool + */ + protected function isFeeDisplayTypeIncludingTax($displayType) + { + return (int)$displayType === DisplayType::DISPLAY_TYPE_INCLUDING_TAX; + } + + /** + * Add "already paid" totals for giftcards or vouchers if applicable. + * + * @param DataObject $dataObject + * @param array &$totals + * @return void + */ + public function addAlreadyPayedTotals($dataObject, array &$totals) { - $order_id = $this->getOrderIncrementId($dataObject); - $alreadyPayed = $this->groupTransaction->getAlreadyPaid($order_id); - - if (!$dataObject instanceof \Magento\Sales\Model\Order\Creditmemo && $alreadyPayed > 0) { + $orderId = $this->getOrderIncrementId($dataObject); + $alreadyPayed = $this->groupTransaction->getAlreadyPaid($orderId); + + // For orders (not creditmemos), if there's an already paid amount, adjust totals accordingly + if (!$dataObject instanceof Creditmemo && $alreadyPayed > 0) { + // Remove the fee line if previously added unset($totals['buckaroo_fee']); + $this->addTotalToTotals( $totals, 'buckaroo_already_paid', @@ -178,12 +181,12 @@ public function addAlreadyPayedTotals($dataObject, &$totals) __('Paid with Giftcard / Voucher') ); return; - } - - if ($order_id !== null && $alreadyPayed > 0) { + } + // Handling creditmemo cases + if ($orderId !== null && $alreadyPayed > 0) { $requestParams = $this->_request->getParams(); - $items = $this->groupTransaction->getGroupTransactionItems($order_id); + $items = $this->groupTransaction->getGroupTransactionItems($orderId); $giftcards = []; if (isset($requestParams['creditmemo']['buckaroo_already_paid'])) { @@ -192,7 +195,8 @@ public function addAlreadyPayedTotals($dataObject, &$totals) $giftcards[$transaction[1]] = $value; } } - foreach ($items as $key => $giftcard) { + + foreach ($items as $giftcard) { $foundGiftcard = $this->giftcardCollection->getItemByColumnValue( 'servicecode', $giftcard['servicecode'] @@ -203,32 +207,36 @@ public function addAlreadyPayedTotals($dataObject, &$totals) $label = __('Paid with ' . $foundGiftcard['label']); } - $refundedAlreadyPaidSaved = $giftcard->getRefundedAmount() ?? 0; - $amountValue = $giftcard['amount']; - $amountBaseValue = $giftcard['amount']; + $refundedAlreadyPaidSaved = $giftcard->getRefundedAmount() ?? 0.0; + $amountValue = (float)$giftcard['amount']; + $amountBaseValue = $amountValue; + // Handle partially refundable giftcards if (!empty($foundGiftcard['is_partial_refundable'])) { - $residual = floatval($giftcard['amount']) - floatval($refundedAlreadyPaidSaved); + $residual = $amountValue - (float)$refundedAlreadyPaidSaved; + if ( - array_key_exists($foundGiftcard['servicecode'], $giftcards) - && floatval($giftcards[$foundGiftcard['servicecode']]) <= $residual + array_key_exists($foundGiftcard['servicecode'], $giftcards) && + (float)$giftcards[$foundGiftcard['servicecode']] <= $residual ) { - $amountValue = floatval($giftcards[$foundGiftcard['servicecode']]); - $amountBaseValue = floatval($giftcards[$foundGiftcard['servicecode']]); + $amountValue = (float)$giftcards[$foundGiftcard['servicecode']]; + $amountBaseValue = $amountValue; } else { - $amountBaseValue = $residual; $amountValue = $residual; + $amountBaseValue = $residual; } } else { - if ((!empty(floatval($refundedAlreadyPaidSaved)) - && floatval($refundedAlreadyPaidSaved) === floatval($amountValue))) { + // Non-partially refundable logic + if ((float)$refundedAlreadyPaidSaved === $amountValue) { + $amountValue = 0; $amountBaseValue = 0; + } elseif ( + is_array($foundGiftcard) && + array_key_exists($foundGiftcard['servicecode'], $giftcards) && + empty((float)$giftcards[$foundGiftcard['servicecode']]) + ) { $amountValue = 0; - } elseif (is_array($foundGiftcard) && array_key_exists($foundGiftcard['servicecode'], $giftcards)) { - if (empty(floatval($giftcards[$foundGiftcard['servicecode']]))) { - $amountBaseValue = 0; - $amountValue = 0; - } + $amountBaseValue = 0; } } @@ -246,25 +254,25 @@ public function addAlreadyPayedTotals($dataObject, &$totals) } /** - * Get order increment id from data object + * Get order increment ID from a data object (Order/Invoice/Creditmemo). * * @param mixed $dataObject - * * @return string|null */ public function getOrderIncrementId($dataObject) { - if ($dataObject instanceof \Magento\Sales\Model\Order) { + if ($dataObject instanceof Order) { return $dataObject->getIncrementId(); } - if ( - $dataObject instanceof \Magento\Sales\Model\Order\Invoice - || $dataObject instanceof \Magento\Sales\Model\Order\Creditmemo - ) { + if ($dataObject instanceof Invoice || $dataObject instanceof Creditmemo) { return $dataObject->getOrder()->getIncrementId(); } + return null; } + /** + * Get the Buckaroo fee amount. + * * @return mixed */ public function getBuckarooFee() @@ -273,6 +281,8 @@ public function getBuckarooFee() } /** + * Get the Buckaroo fee tax amount. + * * @return mixed */ public function getBuckarooFeeTax() @@ -281,51 +291,24 @@ public function getBuckarooFeeTax() } /** - * Return the correct label for the payment method - * - * @param $dataObject + * Retrieve the correct label for the Buckaroo payment fee. * + * @param mixed $dataObject * @return string */ public function getBuckarooPaymentFeeLabel($dataObject) { - $method = false; + $method = $this->extractPaymentMethodFromDataObject($dataObject); $label = false; - /** - * Parse data object for payment method - */ - if ($dataObject instanceof \Magento\Sales\Model\Order) { - $method = $dataObject->getPayment()->getMethod(); - } elseif ( - $dataObject instanceof \Magento\Sales\Model\Order\Invoice - || $dataObject instanceof \Magento\Sales\Model\Order\Creditmemo - ) { - $method = $dataObject->getOrder()->getPayment()->getMethod(); - } elseif (is_string($dataObject)) { - $method = $dataObject; - } - - /** - * If a method is found, and the method has a config provider, try to get the label from config - */ if ($method && $this->configProviderMethodFactory->has($method)) { - /** - * @noinspection PhpUndefinedMethodInspection - */ $label = $this->configProviderMethodFactory->get($method)->getPaymentFeeLabel(); } - /** - * If no label is set yet, get the default configurable label - */ if (!$label) { $label = $this->configProviderAccount->getPaymentFeeLabel(); } - /** - * If no label is set yet, return a default label - */ if (!$label) { $label = __('Buckaroo Fee'); } @@ -334,196 +317,67 @@ public function getBuckarooPaymentFeeLabel($dataObject) } /** - * @param \Magento\Framework\DataObject $dataObject - * - * @return array - */ - public function getBuckarooPaymentFeeTotal($dataObject) - { - $totals = []; - - /** - * @noinspection PhpUndefinedMethodInspection - */ - $this->addTotalToTotals( - $totals, - 'buckaroo_fee', - $dataObject->getBuckarooFee() + $dataObject->getBuckarooFeeTaxAmount(), - $dataObject->getBaseBuckarooFee() + $dataObject->getBuckarooFeeBaseTaxAmount(), - $this->getBuckarooPaymentFeeLabel($dataObject) - ); - - return $totals; - } - - /** - * Check if the fee calculation has to be done with taxes - * - * @param \Magento\Store\Model\Store|int|null $store + * Extract the payment method code from order, invoice, creditmemo, or direct string. * - * @return bool - */ - public function buckarooPaymentCalculationInclTax($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPaymentFeeTax($store); - - return $configValue == DisplayType::DISPLAY_TYPE_INCLUDING_TAX; - } - - /** - * Check if the fee calculation has to be done without taxes - * - * @param \Magento\Store\Model\Store|int|null $store - * - * @return bool - */ - public function buckarooPaymentFeeCalculationExclTax($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPaymentFeeTax($store); - - return $configValue == DisplayType::DISPLAY_TYPE_EXCLUDING_TAX; - } - - /** - * Check ability to display prices including tax for buckaroo fee in shopping cart - * - * @param \Magento\Store\Model\Store|int|null $store - * @return bool - */ - public function displayCartIncludeTaxPrice($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPriceDisplayCart($store); - - return $configValue == DisplayType::DISPLAY_TYPE_BOTH || - $configValue == DisplayType::DISPLAY_TYPE_INCLUDING_TAX; - } - - /** - * Check ability to display prices excluding tax for buckaroo fee in shopping cart - * - * @param \Magento\Store\Model\Store|int|null $store - * @return bool - */ - public function displayCartExcludeTaxPrice($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPriceDisplayCart($store); - - return $configValue == DisplayType::DISPLAY_TYPE_EXCLUDING_TAX; - } - - /** - * Check ability to display both prices for buckaroo fee in shopping cart - * - * @param \Magento\Store\Model\Store|int|null $store - * @return bool - */ - public function displayCartBothPrices($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPriceDisplayCart($store); - - return $configValue == DisplayType::DISPLAY_TYPE_BOTH; - } - - /** - * Check ability to display prices including tax for buckaroo fee in backend sales - * - * @param \Magento\Store\Model\Store|int|null $store - * @return bool - */ - public function displaySalesIncludeTaxPrice($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPriceDisplaySales($store); - - return $configValue == DisplayType::DISPLAY_TYPE_BOTH || - $configValue == DisplayType::DISPLAY_TYPE_INCLUDING_TAX; - } - - /** - * Check ability to display prices excluding tax for buckaroo fee in backend sales - * - * @param \Magento\Store\Model\Store|int|null $store - * @return bool - */ - public function displaySalesExcludeTaxPrice($store = null) - { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPriceDisplaySales($store); - - return $configValue == DisplayType::DISPLAY_TYPE_EXCLUDING_TAX; - } - - /** - * Check ability to display both prices for buckaroo fee in backend sales - * - * @param \Magento\Store\Model\Store|int|null $store - * @return bool + * @param mixed $dataObject + * @return string|false */ - public function displaySalesBothPrices($store = null) + protected function extractPaymentMethodFromDataObject($dataObject) { - /** - * @noinspection PhpUndefinedMethodInspection - */ - $configValue = $this->configProviderBuckarooFee->getPriceDisplaySales($store); + if ($dataObject instanceof Order) { + return $dataObject->getPayment()->getMethod(); + } elseif ($dataObject instanceof Invoice || $dataObject instanceof Creditmemo) { + return $dataObject->getOrder()->getPayment()->getMethod(); + } elseif (is_string($dataObject)) { + return $dataObject; + } - return $configValue == DisplayType::DISPLAY_TYPE_BOTH; + return false; } /** - * Add total into array totals + * Add a total entry into the provided totals array. * - * @param array &$totals - * @param string $code - * @param float $value - * @param float $baseValue - * @param string $label + * @param array &$totals + * @param string $code + * @param float $value + * @param float $baseValue + * @param string $label + * @param string $blockName + * @param string $transactionId + * @param array $extraInfo * @return void */ protected function addTotalToTotals( - &$totals, - $code, - $value, - $baseValue, - $label, - $block_name = false, - $transaction_id = false, - $extra_info = [] + array &$totals, + $code, + $value, + $baseValue, + $label, + $blockName = false, + $transactionId = false, + array $extraInfo = [] ) { + // Only add totals if values are non-zero if ($value == 0 && $baseValue == 0) { return; } + $total = [ - 'code' => $code, - 'value' => $value, + 'code' => $code, + 'value' => $value, 'base_value' => $baseValue, - 'label' => $label, - 'extra_info' => $extra_info + 'label' => $label, + 'extra_info' => $extraInfo ]; - if ($block_name) { - $total['block_name'] = $block_name; + + if ($blockName) { + $total['block_name'] = $blockName; } - if ($transaction_id) { - $total['transaction_id'] = $transaction_id; + if ($transactionId) { + $total['transaction_id'] = $transactionId; } + $totals[] = $total; } } diff --git a/Model/Applepay.php b/Model/Applepay.php index 0640f665c..d59a08818 100644 --- a/Model/Applepay.php +++ b/Model/Applepay.php @@ -31,4 +31,4 @@ public function processAddressFromWallet($wallet, $type = 'shipping') return $address; } -} \ No newline at end of file +} diff --git a/Model/Config/Backend/EmptyToDelete.php b/Model/Config/Backend/EmptyToDelete.php new file mode 100644 index 000000000..38d230fcc --- /dev/null +++ b/Model/Config/Backend/EmptyToDelete.php @@ -0,0 +1,74 @@ +resourceConnection = $resourceConnection; + parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data); + } + + /** + * Delete row from core_config_data if value is empty + * + * @return $this + */ + public function beforeSave() + { + try { + $value = $this->getValue(); + + // If the value is empty, delete the row + if (empty($value)) { + $connection = $this->resourceConnection->getConnection(); + $tableName = $this->resourceConnection->getTableName('core_config_data'); + + $connection->delete( + $tableName, + [ + 'path = ?' => $this->getPath(), + 'scope = ?' => $this->getScope(), + 'scope_id = ?' => $this->getScopeId() + ] + ); + + // Prevent saving an empty value + $this->setValue(null); + } + } catch (\Exception $e) { + $this->_logger->critical($e->getMessage()); + } + + return parent::beforeSave(); + } +} diff --git a/Model/Config/Source/PaymentMethods/AfterExpiry.php b/Model/Config/Source/PaymentMethods/AfterExpiry.php index 661e8016e..623fa1b76 100644 --- a/Model/Config/Source/PaymentMethods/AfterExpiry.php +++ b/Model/Config/Source/PaymentMethods/AfterExpiry.php @@ -37,7 +37,6 @@ public function toOptionArray() ['value' => 'dankort', 'label' => __('Dankort')], ['value' => 'eps', 'label' => __('EPS')], ['value' => 'giftcard', 'label' => __('Giftcards')], - ['value' => 'giropay', 'label' => __('Giropay')], ['value' => 'ideal', 'label' => __('iDEAL')], ['value' => 'idealprocessing', 'label' => __('iDEAL Processing')], ['value' => 'maestro', 'label' => __('Maestro')], @@ -45,7 +44,6 @@ public function toOptionArray() ['value' => 'nexi', 'label' => __('Nexi')], ['value' => 'postepay', 'label' => __('PostePay')], ['value' => 'paypal', 'label' => __('PayPal')], - ['value' => 'sofortueberweisung', 'label' => __('Sofort Banking')], ['value' => 'belfius', 'label' => __('Belfius')], ['value' => 'visa', 'label' => __('Visa')], ['value' => 'visaelectron', 'label' => __('Visa Electron')], diff --git a/Model/Config/Source/PaymentMethods/PayLink.php b/Model/Config/Source/PaymentMethods/PayLink.php index 7de64040d..1f615f65a 100644 --- a/Model/Config/Source/PaymentMethods/PayLink.php +++ b/Model/Config/Source/PaymentMethods/PayLink.php @@ -38,14 +38,12 @@ public function toOptionArray() ['value' => 'dankort', 'label' => __('Dankort')], ['value' => 'eps', 'label' => __('EPS')], ['value' => 'giftcard', 'label' => __('Giftcards')], - ['value' => 'giropay', 'label' => __('Giropay')], ['value' => 'ideal', 'label' => __('iDEAL')], ['value' => 'idealprocessing', 'label' => __('iDEAL Processing')], ['value' => 'maestro', 'label' => __('Maestro')], ['value' => 'mastercard', 'label' => __('Mastercard')], ['value' => 'paypal', 'label' => __('PayPal')], ['value' => 'sepadirectdebit', 'label' => __('SEPA Direct Debit')], - ['value' => 'sofortueberweisung', 'label' => __('Sofort Banking')], ['value' => 'belfius', 'label' => __('Belfius')], ['value' => 'visa', 'label' => __('Visa')], ['value' => 'visaelectron', 'label' => __('Visa Electron')], diff --git a/Model/Config/Source/PaymentMethods/PayPerEmail.php b/Model/Config/Source/PaymentMethods/PayPerEmail.php index f191f7d0a..ebd092174 100644 --- a/Model/Config/Source/PaymentMethods/PayPerEmail.php +++ b/Model/Config/Source/PaymentMethods/PayPerEmail.php @@ -70,11 +70,6 @@ public function toOptionArray() 'label' => __('Giftcards'), 'code' => 'buckaroo_magento2_giftcards' ], - [ - 'value' => 'giropay', - 'label' => __('Giropay'), - 'code' => 'buckaroo_magento2_giropay' - ], [ 'value' => 'ideal', 'label' => __('iDEAL'), @@ -105,11 +100,6 @@ public function toOptionArray() 'label' => __('SEPA Direct Debit'), 'code' => 'buckaroo_magento2_sepadirectdebit' ], - [ - 'value' => 'sofortueberweisung', - 'label' => __('Sofort Banking'), - 'code' => 'buckaroo_magento2_sofortbanking' - ], [ 'value' => 'belfius', 'label' => __('Belfius'), diff --git a/Model/ConfigProvider/Account.php b/Model/ConfigProvider/Account.php index b6cecaaa2..9ad470a2d 100644 --- a/Model/ConfigProvider/Account.php +++ b/Model/ConfigProvider/Account.php @@ -43,12 +43,12 @@ * @method mixed getDebugTypes() * @method mixed getDebugEmail() * @method mixed getLimitByIp() - * @method mixed getFeePercentageMode() * @method mixed getOrderStatusPending() * @method mixed getOrderStatusNew() * @method mixed getPaymentFeeLabel() * @method mixed getCreateOrderBeforeTransaction() * @method mixed getCustomerAdditionalInfo() + * @method mixed getBuckarooFeeTaxClass() */ class Account extends AbstractConfigProvider { @@ -73,7 +73,6 @@ class Account extends AbstractConfigProvider const XPATH_ACCOUNT_DEBUG_TYPES = 'buckaroo_magento2/account/debug_types'; const XPATH_ACCOUNT_DEBUG_EMAIL = 'buckaroo_magento2/account/debug_email'; const XPATH_ACCOUNT_LIMIT_BY_IP = 'buckaroo_magento2/account/limit_by_ip'; - const XPATH_ACCOUNT_FEE_PERCENTAGE_MODE = 'buckaroo_magento2/account/fee_percentage_mode'; const XPATH_ACCOUNT_PAYMENT_FEE_LABEL = 'buckaroo_magento2/account/payment_fee_label'; const XPATH_ACCOUNT_ORDER_STATUS_NEW = 'buckaroo_magento2/account/order_status_new'; const XPATH_ACCOUNT_ORDER_STATUS_PENDING = 'buckaroo_magento2/account/order_status_pending'; @@ -88,6 +87,7 @@ class Account extends AbstractConfigProvider const XPATH_ACCOUNT_IDIN_MODE = 'buckaroo_magento2/account/idin_mode'; const XPATH_ACCOUNT_IDIN_CATEGORY = 'buckaroo_magento2/account/idin_category'; const XPATH_ACCOUNT_ADVANCED_EXPORT_GIFTCARDS = 'buckaroo_magento2/account/advanced_export_giftcards'; + const XPATH_ACCOUNT_BUCKAROO_FEE_TAX_CLASS = 'buckaroo_magento2/account/buckaroo_fee_tax_class'; /** * @var MethodFactory @@ -135,7 +135,6 @@ public function getConfig($store = null) 'debug_types' => $this->getDebugTypes($store), 'debug_email' => $this->getDebugEmail($store), 'limit_by_ip' => $this->getLimitByIp($store), - 'fee_percentage_mode' => $this->getFeePercentageMode($store), 'payment_fee_label' => $this->getPaymentFeeLabel($store), 'order_status_new' => $this->getOrderStatusNew($store), 'order_status_pending' => $this->getOrderStatusPending($store), @@ -143,9 +142,10 @@ public function getConfig($store = null) 'order_status_failed' => $this->getOrderStatusFailed($store), 'create_order_before_transaction' => $this->getCreateOrderBeforeTransaction($store), 'ip_header' => $this->getIpHeader($store), - 'cart_keep_alive' => $this->getCartKeepAlive($store),//can be changed from cli/db only + 'cart_keep_alive' => true, 'selection_type' => $this->getSelectionType($store), 'customer_additional_info' => $this->getCustomerAdditionalInfo($store), + 'buckaroo_fee_tax_class' => $this->getBuckarooFeeTaxClass($store), 'idin' => $this->getIdin($store), 'idin_mode' => $this->getIdinMode($store), 'idin_category' => $this->getIdinCategory($store), diff --git a/Model/ConfigProvider/BuckarooFee.php b/Model/ConfigProvider/BuckarooFee.php index 1aebe86d5..1c88521cb 100644 --- a/Model/ConfigProvider/BuckarooFee.php +++ b/Model/ConfigProvider/BuckarooFee.php @@ -20,8 +20,6 @@ namespace Buckaroo\Magento2\Model\ConfigProvider; -use \Buckaroo\Magento2\Model\Config\Source\Display\Type as DisplayType; - /** * @method int getPriceDisplayCart() * @method int getPriceDisplaySales() @@ -33,22 +31,18 @@ class BuckarooFee extends AbstractConfigProvider /** * Buckaroo fee tax class */ - const XPATH_BUCKAROOFEE_TAX_CLASS = 'tax/classes/buckaroo_fee_tax_class'; - - /** - * Calculation fee tax settings - */ - const XPATH_BUCKAROOFEE_PAYMENT_FEE_TAX = 'tax/calculation/buckaroo_fee'; + const XPATH_ACCOUNT_BUCKAROO_FEE_TAX_CLASS = 'buckaroo_magento2/account/buckaroo_fee_tax_class'; /** - * Shopping cart display settings - */ - const XPATH_BUCKAROOFEE_PRICE_DISPLAY_CART = 'tax/cart_display/buckaroo_fee'; - - /** - * Sales display settings + * Retrieve the tax class for Buckaroo fee + * + * @param null $store + * @return int|string */ - const XPATH_BUCKAROOFEE_PRICE_DISPLAY_SALES = 'tax/sales_display/buckaroo_fee'; + public function getBuckarooFeeTaxClass($store = null) + { + return $this->scopeConfig->getValue(self::XPATH_ACCOUNT_BUCKAROO_FEE_TAX_CLASS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store); + } /** * Retrieve associated array of checkout configuration @@ -61,20 +55,7 @@ public function getConfig($store = null) { return [ 'buckarooFee' => [ - 'calculation' => [ - 'buckarooPaymentFeeInclTax' => - $this->getPaymentFeeTax() == DisplayType::DISPLAY_TYPE_INCLUDING_TAX, - ], - 'cart' => [ - 'displayBuckarooFeeBothPrices' => $this->getPriceDisplayCart() == DisplayType::DISPLAY_TYPE_BOTH, - 'displayBuckarooFeeInclTax' => $this->getPriceDisplayCart() == DisplayType::DISPLAY_TYPE_BOTH - || $this->getPriceDisplayCart() == DisplayType::DISPLAY_TYPE_INCLUDING_TAX, - ], - 'sales' => [ - 'displayBuckarooFeeBothPrices' => $this->getPriceDisplaySales() == DisplayType::DISPLAY_TYPE_BOTH, - 'displayBuckarooFeeInclTax' => $this->getPriceDisplaySales() == DisplayType::DISPLAY_TYPE_BOTH - || $this->getPriceDisplaySales() == DisplayType::DISPLAY_TYPE_INCLUDING_TAX, - ], + 'tax_class_id' => $this->getBuckarooFeeTaxClass($store), ], ]; } diff --git a/Model/ConfigProvider/Method/Afterpay.php b/Model/ConfigProvider/Method/Afterpay.php index 2343c8450..2bae83735 100644 --- a/Model/ConfigProvider/Method/Afterpay.php +++ b/Model/ConfigProvider/Method/Afterpay.php @@ -58,8 +58,6 @@ class Afterpay extends AbstractConfigProvider const XPATH_SPECIFIC_CUSTOMER_GROUP = 'payment/buckaroo_magento2_afterpay/specificcustomergroup'; const XPATH_SPECIFIC_CUSTOMER_GROUP_B2B = 'payment/buckaroo_magento2_afterpay/specificcustomergroupb2b'; - const XPATH_FINANCIAL_WARNING = 'payment/buckaroo_magento2_afterpay/financial_warning'; - /** * @return array */ @@ -87,8 +85,7 @@ public function getConfig() 'subtext_color' => $this->getSubtextColor(), 'allowedCurrencies' => $this->getAllowedCurrencies(), 'businessMethod' => $this->getBusiness(), - 'paymentMethod' => $this->getPaymentMethod(), - 'showFinancialWarning' => $this->canShowFinancialWarning(self::XPATH_FINANCIAL_WARNING) + 'paymentMethod' => $this->getPaymentMethod() ], 'response' => [], ], diff --git a/Model/ConfigProvider/Method/Afterpay2.php b/Model/ConfigProvider/Method/Afterpay2.php index a5b1fe20d..6bf36db72 100644 --- a/Model/ConfigProvider/Method/Afterpay2.php +++ b/Model/ConfigProvider/Method/Afterpay2.php @@ -58,8 +58,6 @@ class Afterpay2 extends AbstractConfigProvider const XPATH_SPECIFIC_CUSTOMER_GROUP = 'payment/buckaroo_magento2_afterpay2/specificcustomergroup'; const XPATH_SPECIFIC_CUSTOMER_GROUP_B2B = 'payment/buckaroo_magento2_afterpay2/specificcustomergroupb2b'; - const XPATH_FINANCIAL_WARNING = 'payment/buckaroo_magento2_afterpay2/financial_warning'; - /** * @return array */ @@ -87,8 +85,7 @@ public function getConfig() 'subtext_color' => $this->getSubtextColor(), 'allowedCurrencies' => $this->getAllowedCurrencies(), 'businessMethod' => $this->getBusiness(), - 'paymentMethod' => $this->getPaymentMethod(), - 'showFinancialWarning' => $this->canShowFinancialWarning(self::XPATH_FINANCIAL_WARNING) + 'paymentMethod' => $this->getPaymentMethod() ], 'response' => [], ], diff --git a/Model/ConfigProvider/Method/Afterpay20.php b/Model/ConfigProvider/Method/Afterpay20.php index ee6b4f119..31623bdc3 100644 --- a/Model/ConfigProvider/Method/Afterpay20.php +++ b/Model/ConfigProvider/Method/Afterpay20.php @@ -49,14 +49,13 @@ class Afterpay20 extends AbstractConfigProvider const XPATH_AFTERPAY20_ALLOWED_CURRENCIES = 'payment/buckaroo_magento2_afterpay20/allowed_currencies'; const XPATH_AFTERPAY20_CREATE_INVOICE_BY_SHIP = 'payment/buckaroo_magento2_afterpay20/create_invoice_after_shipment'; - + const XPATH_AFTERPAY20_CUSTOMER_TYPE = 'payment/buckaroo_magento2_afterpay20/customer_type'; const XPATH_AFTERPAY20_MIN_AMOUNT_B2B = 'payment/buckaroo_magento2_afterpay20/min_amount_b2b'; const XPATH_AFTERPAY20_MAX_AMOUNT_B2B = 'payment/buckaroo_magento2_afterpay20/max_amount_b2b'; - + const XPATH_SPECIFIC_CUSTOMER_GROUP = 'payment/buckaroo_magento2_afterpay20/specificcustomergroup'; - const XPATH_FINANCIAL_WARNING = 'payment/buckaroo_magento2_afterpay20/financial_warning'; /** * @return array @@ -83,7 +82,6 @@ public function getConfig() 'subtext_color' => $this->getSubtextColor(), 'allowedCurrencies' => $this->getAllowedCurrencies(), 'is_b2b' => $this->getCustomerType() !== AfterpayCustomerType::CUSTOMER_TYPE_B2C, - 'showFinancialWarning' => $this->canShowFinancialWarning(self::XPATH_FINANCIAL_WARNING) ], 'response' => [], ], diff --git a/Model/ConfigProvider/Method/Applepay.php b/Model/ConfigProvider/Method/Applepay.php index b5b686a5a..c9a69ce88 100644 --- a/Model/ConfigProvider/Method/Applepay.php +++ b/Model/ConfigProvider/Method/Applepay.php @@ -132,19 +132,21 @@ public function getConfig() ]; } - public function getAvailableButtons() + + /** + * @return array + */ + public function getAvailableButtons(): array { - $availableButtons = $this->scopeConfig->getValue( + $availableButtonsConfig = $this->scopeConfig->getValue( static::XPATH_APPLEPAY_AVAILABLE_BUTTONS, ScopeInterface::SCOPE_STORE ); - if ($availableButtons) { - $availableButtons = explode(',', (string)$availableButtons); - } else { - $availableButtons = false; - } - return $availableButtons; + if (!$availableButtonsConfig) { + return []; + } + return array_map('trim', explode(',', (string)$availableButtonsConfig)); } /** diff --git a/Model/ConfigProvider/Method/Giropay.php b/Model/ConfigProvider/Method/Giropay.php deleted file mode 100644 index 7ebedd842..000000000 --- a/Model/ConfigProvider/Method/Giropay.php +++ /dev/null @@ -1,81 +0,0 @@ -getBuckarooPaymentFeeLabel( - \Buckaroo\Magento2\Model\Method\Giropay::PAYMENT_METHOD_CODE - ); - - return [ - 'payment' => [ - 'buckaroo' => [ - 'giropay' => [ - 'paymentFeeLabel' => $paymentFeeLabel, - 'subtext' => $this->getSubtext(), - 'subtext_style' => $this->getSubtextStyle(), - 'subtext_color' => $this->getSubtextColor(), - 'allowedCurrencies' => $this->getAllowedCurrencies(), - ], - ], - ], - ]; - } - - /** - * @param null|int $storeId - * - * @return float - */ - public function getPaymentFee($storeId = null) - { - $paymentFee = $this->scopeConfig->getValue( - self::XPATH_GIROPAY_PAYMENT_FEE, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $storeId - ); - - return $paymentFee ? $paymentFee : false; - } -} diff --git a/Model/ConfigProvider/Method/P24.php b/Model/ConfigProvider/Method/P24.php index c314be063..483f2b092 100644 --- a/Model/ConfigProvider/Method/P24.php +++ b/Model/ConfigProvider/Method/P24.php @@ -85,7 +85,8 @@ public function getPaymentFee($storeId = null) public function getBaseAllowedCurrencies() { return [ - 'PLN' + 'PLN', + 'EUR' ]; } } diff --git a/Model/ConfigProvider/Method/Sofortbanking.php b/Model/ConfigProvider/Method/Sofortbanking.php deleted file mode 100644 index 975c0d0d0..000000000 --- a/Model/ConfigProvider/Method/Sofortbanking.php +++ /dev/null @@ -1,81 +0,0 @@ -getBuckarooPaymentFeeLabel( - \Buckaroo\Magento2\Model\Method\Sofortbanking::PAYMENT_METHOD_CODE - ); - - return [ - 'payment' => [ - 'buckaroo' => [ - 'sofortbanking' => [ - 'paymentFeeLabel' => $paymentFeeLabel, - 'subtext' => $this->getSubtext(), - 'subtext_style' => $this->getSubtextStyle(), - 'subtext_color' => $this->getSubtextColor(), - 'allowedCurrencies' => $this->getAllowedCurrencies(), - ], - ], - ], - ]; - } - - /** - * @param null|int $storeId - * - * @return float - */ - public function getPaymentFee($storeId = null) - { - $paymentFee = $this->scopeConfig->getValue( - self::XPATH_SOFORTBANKING_PAYMENT_FEE, - \Magento\Store\Model\ScopeInterface::SCOPE_STORE, - $storeId - ); - - return $paymentFee ? $paymentFee : false; - } -} diff --git a/Model/Ideal/QuoteBuilder.php b/Model/Ideal/QuoteBuilder.php index e1975deb3..18464a5aa 100644 --- a/Model/Ideal/QuoteBuilder.php +++ b/Model/Ideal/QuoteBuilder.php @@ -17,6 +17,7 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ + namespace Buckaroo\Magento2\Model\Ideal; use Magento\Customer\Model\Group; @@ -64,11 +65,12 @@ class QuoteBuilder implements QuoteBuilderInterface protected $quote; public function __construct( - QuoteFactory $quoteFactory, + QuoteFactory $quoteFactory, ProductRepositoryInterface $productRepository, - DataObjectFactory $dataObjectFactory, - CustomerSession $customer - ) { + DataObjectFactory $dataObjectFactory, + CustomerSession $customer + ) + { $this->quoteFactory = $quoteFactory; $this->productRepository = $productRepository; $this->dataObjectFactory = $dataObjectFactory; @@ -80,6 +82,7 @@ public function setFormData(string $formData) { $this->formData = $this->formatFormData($formData); } + /** * Build quote from form data and session without persisting it * @@ -88,6 +91,7 @@ public function setFormData(string $formData) public function build() { $this->quote = $this->quoteFactory->create(); + $this->quote->setIsCheckoutCart(true); $this->addProduct(); $this->setUser(); return $this->quote; @@ -111,6 +115,7 @@ protected function setUser() ->setCustomerGroupId(Group::NOT_LOGGED_IN_ID); } } + /** * Add product to quote * @@ -134,7 +139,8 @@ protected function addProduct() throw new IdealException($exceptionMessage, 1); } } -/** + + /** * Format form data * * @param string $form_data diff --git a/Model/Ideal/QuoteCreate.php b/Model/Ideal/QuoteCreate.php index 926065dd9..2fcba3147 100644 --- a/Model/Ideal/QuoteCreate.php +++ b/Model/Ideal/QuoteCreate.php @@ -36,6 +36,7 @@ use Buckaroo\Magento2\Api\Data\QuoteCreateResponseInterfaceFactory; use Magento\Customer\Api\Data\CustomerInterface; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Store\Model\StoreManagerInterface; class QuoteCreate implements IdealQuoteCreateInterface { @@ -49,6 +50,7 @@ class QuoteCreate implements IdealQuoteCreateInterface protected $shipmentEstimation; protected $logger; protected $quote; + protected $storeManager; public function __construct( QuoteCreateResponseInterfaceFactory $responseFactory, @@ -59,7 +61,8 @@ public function __construct( CheckoutSession $checkoutSession, QuoteRepository $quoteRepository, ShipmentEstimationInterface $shipmentEstimation, - Log $logger + Log $logger, + StoreManagerInterface $storeManager ) { $this->responseFactory = $responseFactory; $this->quoteBuilderInterfaceFactory = $quoteBuilderInterfaceFactory; @@ -70,6 +73,7 @@ public function __construct( $this->quoteRepository = $quoteRepository; $this->shipmentEstimation = $shipmentEstimation; $this->logger = $logger; + $this->storeManager = $storeManager; } /** @@ -101,13 +105,27 @@ public function execute(string $page, string $form_data = null) $this->setPaymentMethod(); } catch (\Throwable $th) { + $this->logger->debug('Error during quote creation: ' . $th->getMessage()); throw new IdealException("Failed to create quote"); } + $this->restoreStoreContext(); $this->calculateQuoteTotals(); return $this->responseFactory->create(["quote" => $this->quote]); } + /** + * Restore store context for the quote + */ + protected function restoreStoreContext() + { + if ($this->quote && $this->quote->getStoreId()) { + $this->storeManager->setCurrentStore($this->quote->getStoreId()); + } else { + $this->logger->debug('Store ID not set on quote.'); + } + } + /** * Get a customer's address by address ID * @@ -220,7 +238,7 @@ protected function setPlaceholderAddress(Address $address) */ protected function calculateQuoteTotals() { - $this->quote->setStoreId($this->quote->getStore()->getId()); + $this->restoreStoreContext(); if ($this->quote->getCustomerEmail() === null) { $this->quote->setCustomerEmail('no-reply@example.com'); diff --git a/Model/Method/AbstractMethod.php b/Model/Method/AbstractMethod.php index 5427c5bca..722bd9567 100644 --- a/Model/Method/AbstractMethod.php +++ b/Model/Method/AbstractMethod.php @@ -21,7 +21,27 @@ namespace Buckaroo\Magento2\Model\Method; +use Buckaroo\Magento2\Gateway\GatewayInterface; +use Buckaroo\Magento2\Gateway\Http\TransactionBuilderFactory; +use Buckaroo\Magento2\Model\ConfigProvider\BuckarooFee; +use Buckaroo\Magento2\Model\ConfigProvider\Factory; use Buckaroo\Magento2\Model\ConfigProvider\Refund as RefundConfigProvider; +use Buckaroo\Magento2\Model\RefundFieldsFactory; +use Buckaroo\Magento2\Model\ValidatorFactory; +use Magento\Framework\Api\AttributeValueFactory; +use Magento\Framework\Api\ExtensionAttributesFactory; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\App\RequestInterface; +use Magento\Framework\Data\Collection\AbstractDb; +use Magento\Framework\Event\ManagerInterface; +use Magento\Framework\Exception\LocalizedException; +use Magento\Framework\Model\Context; +use Magento\Framework\Model\ResourceModel\AbstractResource; +use Magento\Framework\ObjectManagerInterface; +use Magento\Framework\Registry; +use Magento\Payment\Helper\Data; +use Magento\Payment\Model\Method\Logger; +use Magento\Quote\Model\QuoteFactory; use Magento\Tax\Model\Config; use Magento\Sales\Model\Order; use Magento\Framework\Phrase; @@ -226,37 +246,41 @@ abstract class AbstractMethod extends \Magento\Payment\Model\Method\AbstractMeth protected $_code; /** - * @var EventManager + * @var ManagerInterface */ private $eventManager; /** - * @param \Magento\Framework\ObjectManagerInterface $objectManager - * @param \Magento\Framework\Model\Context $context - * @param \Magento\Framework\Registry $registry - * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory - * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory - * @param \Magento\Payment\Helper\Data $paymentData - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig - * @param \Magento\Payment\Model\Method\Logger $logger + * @param ObjectManagerInterface $objectManager + * @param Context $context + * @param Registry $registry + * @param ExtensionAttributesFactory $extensionFactory + * @param AttributeValueFactory $customAttributeFactory + * @param Data $paymentData + * @param ScopeConfigInterface $scopeConfig + * @param Logger $logger * @param \Magento\Developer\Helper\Data $developmentHelper - * @param \Magento\Quote\Model\QuoteFactory $quoteFactory - * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource - * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection - * @param \Buckaroo\Magento2\Gateway\GatewayInterface $gateway - * @param \Buckaroo\Magento2\Gateway\Http\TransactionBuilderFactory $transactionBuilderFactory - * @param \Buckaroo\Magento2\Model\ValidatorFactory $validatorFactory - * @param \Buckaroo\Magento2\Helper\Data $helper - * @param \Magento\Framework\App\RequestInterface $request - * @param \Buckaroo\Magento2\Model\RefundFieldsFactory $refundFieldsFactory - * @param \Buckaroo\Magento2\Model\ConfigProvider\Factory $configProviderFactory - * @param \Buckaroo\Magento2\Model\ConfigProvider\Method\Factory $configProviderMethodFactory - * @param \Magento\Framework\Pricing\Helper\Data $priceHelper + * @param QuoteFactory $quoteFactory + * @param Config $taxConfig + * @param Calculation $taxCalculation + * @param BuckarooFee $configProviderBuckarooFee + * @param BuckarooLog $buckarooLog + * @param SoftwareData $softwareData + * @param AddressFactory $addressFactory + * @param ManagerInterface $eventManager + * @param AbstractResource|null $resource + * @param AbstractDb|null $resourceCollection + * @param GatewayInterface|null $gateway + * @param TransactionBuilderFactory|null $transactionBuilderFactory + * @param ValidatorFactory|null $validatorFactory + * @param \Buckaroo\Magento2\Helper\Data|null $helper + * @param RequestInterface|null $request + * @param RefundFieldsFactory|null $refundFieldsFactory + * @param Factory|null $configProviderFactory + * @param \Buckaroo\Magento2\Model\ConfigProvider\Method\Factory|null $configProviderMethodFactory + * @param \Magento\Framework\Pricing\Helper\Data|null $priceHelper * @param array $data * - * @param GroupTransaction $groupTransaction - * - * @throws \Buckaroo\Magento2\Exception */ public function __construct( \Magento\Framework\ObjectManagerInterface $objectManager, @@ -275,7 +299,7 @@ public function __construct( BuckarooLog $buckarooLog, SoftwareData $softwareData, AddressFactory $addressFactory, - \Magento\Framework\Event\ManagerInterface $eventManager, + ManagerInterface $eventManager, \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, \Buckaroo\Magento2\Gateway\GatewayInterface $gateway = null, @@ -666,6 +690,7 @@ public function getRemoteAddress($ipToLong = false, $alternativeHeaders = []) /** * @return string * @throws \Buckaroo\Magento2\Exception + * @throws LocalizedException */ public function getTitle() { @@ -685,19 +710,24 @@ public function getTitle() } $paymentFee = trim($this->configProviderMethodFactory->get($this->buckarooPaymentMethodCode)->getPaymentFee()); - if (!$paymentFee || (float) $paymentFee < 0.01) { - return $title; - } - if (strpos($paymentFee, '%') === false) { - $title .= ' + ' . $this->priceHelper->currency(number_format($paymentFee, 2), true, false); - } else { - $title .= ' + ' . $paymentFee; + if(!$this->helper->getAlreadyPaid()){ + if (!$paymentFee || (float) $paymentFee < 0.01) { + return $title; + } + + if (strpos($paymentFee, '%') === false) { + $title .= ' + ' . $this->priceHelper->currency(number_format($paymentFee, 2), true, false); + } else { + $title .= ' + ' . $paymentFee; + } } return $title; } + + /** * @return bool|string */ @@ -2128,7 +2158,7 @@ protected function getTaxCategory($order) $billingAddress = $order->getBillingAddress(); $customerTaxClassId = $order->getCustomerTaxClassId(); $storeId = $order->getStoreId(); - $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); + $taxClassId = $this->configProviderBuckarooFee->getBuckarooFeeTaxClass($order->getStore()); $request = $this->taxCalculation->getRateRequest( $shippingAddress, @@ -2138,6 +2168,7 @@ protected function getTaxCategory($order) ); $request->setProductClassId($taxClassId); $percent = $this->taxCalculation->getRate($request); + return $percent; } @@ -2605,7 +2636,7 @@ protected function getShippingCostsLine($order, $count, &$itemsTotalAmount = 0) 'GroupID' => $count, ], [ - '_' => $this->formatShippingCostsLineVatPercentage($percent), + '_' => $percent, 'Name' => 'VatPercentage', 'Group' => 'Article', 'GroupID' => $count, @@ -2639,11 +2670,6 @@ protected function formatPrice($price) return $price; } - protected function formatShippingCostsLineVatPercentage($percent) - { - return $percent; - } - /** * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Payment\Model\InfoInterface $payment * @@ -2743,8 +2769,8 @@ public function checkTotalGrossAmount($requestData, $payment) } return $requestData; - } + public function canUseForCountry($country) { if ($this->getConfigData('allowspecific') != 1) { diff --git a/Model/Method/Afterpay.php b/Model/Method/Afterpay.php index 5c1b856a0..89b41794c 100644 --- a/Model/Method/Afterpay.php +++ b/Model/Method/Afterpay.php @@ -771,18 +771,15 @@ public function getArticleArrayLine( protected function getTaxCategory($order) { $storeId = (int) $order->getStoreId(); - $taxClassId = $this->configProviderBuckarooFee->getTaxClass($storeId); + $taxClassId = $this->configProviderBuckarooFee->getBuckarooFeeTaxClass($order->getStore()); $taxCategory = 4; if (!$taxClassId) { return $taxCategory; } - /** - * @var \Buckaroo\Magento2\Model\ConfigProvider\Method\Afterpay $afterPayConfig - */ - $afterPayConfig = $this->configProviderMethodFactory - ->get($this->_code); + + $afterPayConfig = $this->configProviderMethodFactory->get($this->_code); $highClasses = explode(',', (string)$afterPayConfig->getHighTaxClasses($storeId)); $middleClasses = explode(',', (string)$afterPayConfig->getMiddleTaxClasses($storeId)); @@ -798,7 +795,6 @@ protected function getTaxCategory($order) } elseif (in_array($taxClassId, $zeroClasses)) { $taxCategory = 3; } else { - // No classes == 4 $taxCategory = 4; } diff --git a/Model/Method/Billink.php b/Model/Method/Billink.php index 456259017..7c01156b5 100644 --- a/Model/Method/Billink.php +++ b/Model/Method/Billink.php @@ -525,63 +525,6 @@ public function getCreditmemoArticleData($payment) return $articles; } - /** - * @param \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Invoice|\Magento\Sales\Model\Order\Creditmemo $order - * - * @param $count - * @return array - */ - protected function getShippingCostsLine333($order, $count, &$itemsTotalAmount = 0) - { - $shippingCostsArticle = []; - - $shippingAmount = $this->getShippingAmount($order); - if ($shippingAmount <= 0) { - return $shippingCostsArticle; - } - - $request = $this->taxCalculation->getRateRequest(null, null, null); - $taxClassId = $this->taxConfig->getShippingTaxClass(); - $percent = $this->taxCalculation->getRate($request->setProductClassId($taxClassId)); - - $shippingCostsArticle = [ - [ - '_' => 'Shipping fee', - 'Name' => 'Description', - 'Group' => 'Article', - 'GroupID' => $count, - ], - [ - '_' => number_format($shippingAmount, 4, '.', ''), - 'Name' => 'GrossUnitPriceIncl', - 'Group' => 'Article', - 'GroupID' => $count, - ], - [ - '_' => (int)$percent, - 'Name' => 'VatPercentage', - 'Group' => 'Article', - 'GroupID' => $count, - ], - [ - '_' => '1', - 'Name' => 'Quantity', - 'Group' => 'Article', - 'GroupID' => $count, - ], - [ - '_' => '1', - 'Name' => 'Identifier', - 'Group' => 'Article', - 'GroupID' => $count, - ] - ]; - - $itemsTotalAmount += $shippingAmount; - - return $shippingCostsArticle; - } - /** * @param $latestKey * @param $articleDescription @@ -635,7 +578,7 @@ public function getArticleArrayLine( return $article; } - + /** * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Payment\Model\InfoInterface $payment * @@ -644,7 +587,7 @@ public function getArticleArrayLine( private function getBirthDate($payment) { $birth = $payment->getAdditionalInformation('customer_DoB'); - + if(!is_string($birth) || strlen(trim($birth)) === 0) { return null; } @@ -957,11 +900,6 @@ protected function formatPrice($price) return number_format($price, 4, '.', ''); } - protected function formatShippingCostsLineVatPercentage($price) - { - return (int)$price; - } - protected function isAvailableBasedOnAmount(\Magento\Quote\Api\Data\CartInterface $quote = null) { if ($quote && $quote->getId()) { diff --git a/Model/Method/Giropay.php b/Model/Method/Giropay.php deleted file mode 100644 index 69a7318ab..000000000 --- a/Model/Method/Giropay.php +++ /dev/null @@ -1,109 +0,0 @@ -transactionBuilderFactory->get('order'); - - $services = [ - 'Name' => 'giropay', - 'Action' => 'Pay', - 'Version' => 2, - ]; - - /** - * @noinspection PhpUndefinedMethodInspection - */ - $transactionBuilder->setOrder($payment->getOrder()) - ->setServices($services) - ->setMethod('TransactionRequest'); - - return $transactionBuilder; - } - - /** - * {@inheritdoc} - */ - public function getCaptureTransactionBuilder($payment) - { - return false; - } - - /** - * {@inheritdoc} - */ - public function getAuthorizeTransactionBuilder($payment) - { - return false; - } - - protected function getRefundTransactionBuilderVersion() - { - return 2; - } - - /** - * {@inheritdoc} - */ - public function getVoidTransactionBuilder($payment) - { - return true; - } - - /** - * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Payment\Model\InfoInterface $payment - * - * @return bool|string - */ - public function getPaymentMethodName($payment) - { - return $this->buckarooPaymentMethodCode; - } - - protected function getRefundTransactionBuilderChannel() - { - return 'Web'; - } -} diff --git a/Model/Method/Ideal.php b/Model/Method/Ideal.php index bc10eb8d3..ab9208747 100644 --- a/Model/Method/Ideal.php +++ b/Model/Method/Ideal.php @@ -57,7 +57,8 @@ public function assignData(\Magento\Framework\DataObject $data) $quote = $payment->getQuote(); if ($quote) { - $shippingCost = $quote->getShippingAddress()->getShippingAmount(); + $shippingCost = $quote->getShippingAddress()->getShippingInclTax(); + $this->getInfoInstance()->setAdditionalInformation('shippingCost', $shippingCost); } diff --git a/Model/Method/Klarnakp.php b/Model/Method/Klarnakp.php index b5432f2ba..15ff8dac7 100644 --- a/Model/Method/Klarnakp.php +++ b/Model/Method/Klarnakp.php @@ -213,6 +213,7 @@ public function canCapture() if ($this->getConfigData('payment_action') == 'order') { return false; } + return $this->_canCapture; } @@ -365,7 +366,7 @@ public function getRequestShippingData($payment) } else { $shippingSameAsBilling = $this->isAddressDataDifferent($payment) ? "false" : "true"; } - + $streetFormat = $this->addressFormatter->formatStreet($shippingAddress->getStreet()); $shippingData = [ @@ -668,95 +669,62 @@ public function getRequestArticlesData($payment) $cartData = $quote->getAllItems(); $articles = []; - $group = 1; - $max = 99; - $i = 1; + $count = 1; + /** @var \Magento\Sales\Model\Order\Item $item */ foreach ($cartData as $item) { - if (empty($item) || $item->hasParentItemId()) { + if (empty($item) + || $item->hasParentItemId() + || $item->getRowTotalInclTax() == 0 + ) { continue; } - $article = [ - [ - '_' => $item->getName(), - 'Group' => 'Article', - 'GroupID' => $group, - 'Name' => 'ArticleTitle', - ], - [ - '_' => $item->getSku(), - 'Group' => 'Article', - 'GroupID' => $group, - 'Name' => 'ArticleNumber', - ], - [ - '_' => self::KLARNAKP_ARTICLE_TYPE_GENERAL, - 'Group' => 'Article', - 'GroupID' => $group, - 'Name' => 'ArticleType', - ], - [ - '_' => $this->calculateProductPrice($item, $includesTax), - 'Group' => 'Article', - 'GroupID' => $group, - 'Name' => 'ArticlePrice', - ], - [ - '_' => $item->getQty(), - 'Group' => 'Article', - 'GroupID' => $group, - 'Name' => 'ArticleQuantity', - ], - [ - '_' => $item->getTaxPercent() ?? 0, - 'Group' => 'Article', - 'GroupID' => $group, - 'Name' => 'ArticleVat', - ] - ]; + $article = $this->getArticleArrayLine( + $count, + $item->getName(), + $item->getSku(), + $item->getQty(), + $this->calculateProductPrice($item, $includesTax), + $item->getTaxPercent() ?? 0 + ); // @codingStandardsIgnoreStart $articles = array_merge($articles, $article); - // @codingStandardsIgnoreEnd - $group++; - - if ($i > $max) { - break; + if ($count < 99) { + $count++; + continue; } - } - $requestData = $articles; - - $serviceLine = $this->getServiceCostLine($group, $payment->getOrder()); + break; + } + $serviceLine = $this->getServiceCostLine($count, $payment->getOrder()); if (!empty($serviceLine)) { - $requestData = array_merge($articles, $serviceLine); - $group++; + $articles = array_merge($articles, $serviceLine); + $count++; } - // Add aditional shippin costs. - $shippingCosts = $this->getShippingCostsLine($payment->getOrder(), $group); + // Add additional shipping costs. + $shippingCosts = $this->getShippingCostsLine($payment->getOrder(), $count); if (!empty($shippingCosts)) { - $requestData = array_merge($requestData, $shippingCosts); - $group++; + $articles = array_merge($articles, $shippingCosts); + $count++; } + $discountLine = $this->getDiscountLine($payment, $count); - $discountline = $this->getDiscountLine($payment, $group); - - if (!empty($discountline)) { - $requestData = array_merge($requestData, $discountline); + if (!empty($discountLine)) { + $articles = array_merge($articles, $discountLine); } - $group++; - $reward = $this->getRewardLine($quote, $group); + $reward = $this->getRewardLine($quote, $count); if (!empty($reward)) { - $requestData = array_merge($requestData, $reward); + $articles = array_merge($articles, $reward); } - return $requestData; + return $articles; } /** @@ -878,7 +846,7 @@ public function getShippingFee() : Phrase /** * @param OrderInterface $order * @param $group - * + * @param int $itemsTotalAmount * @return array */ protected function getShippingCostsLine($order, $group, &$itemsTotalAmount = 0) @@ -986,14 +954,6 @@ public function getArticleArrayLine( return $article; } - protected function getTaxCategory($order) - { - $items = $order->getItems(); - - foreach ($items as $data) { - return $this->getTaxPercent($data); - } - } /** * @param $data diff --git a/Model/Method/Paypal.php b/Model/Method/Paypal.php index a6c68240e..907f4c805 100644 --- a/Model/Method/Paypal.php +++ b/Model/Method/Paypal.php @@ -39,6 +39,16 @@ class Paypal extends AbstractMethod */ protected $_code = self::PAYMENT_METHOD_CODE; + /** + * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Payment\Model\InfoInterface $payment + * + * @return bool|string + */ + public function getPaymentMethodName($payment) + { + return $this->buckarooPaymentMethodCode; + } + /** * {@inheritdoc} */ @@ -59,9 +69,9 @@ public function getOrderTransactionBuilder($payment) "Name" => "PayPalOrderId", "_" => $expressOrderId ]; + $payment->setAdditionalInformation('skip_push', 1); } - /** @noinspection PhpUndefinedMethodInspection */ $transactionBuilder->setOrder($payment->getOrder()) ->setServices($services) @@ -93,14 +103,4 @@ public function getVoidTransactionBuilder($payment) { return true; } - - /** - * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Payment\Model\InfoInterface $payment - * - * @return bool|string - */ - public function getPaymentMethodName($payment) - { - return $this->buckarooPaymentMethodCode; - } } diff --git a/Model/Method/Sofortbanking.php b/Model/Method/Sofortbanking.php deleted file mode 100644 index 1a2d32b82..000000000 --- a/Model/Method/Sofortbanking.php +++ /dev/null @@ -1,98 +0,0 @@ -transactionBuilderFactory->get('order'); - - $services = [ - 'Name' => 'Sofortueberweisung', - 'Action' => 'Pay', - 'Version' => 1, - ]; - - /** - * @noinspection PhpUndefinedMethodInspection - */ - $transactionBuilder->setOrder($payment->getOrder()) - ->setServices($services) - ->setMethod('TransactionRequest'); - - return $transactionBuilder; - } - - /** - * {@inheritdoc} - */ - public function getCaptureTransactionBuilder($payment) - { - return false; - } - - /** - * {@inheritdoc} - */ - public function getAuthorizeTransactionBuilder($payment) - { - return false; - } - - /** - * {@inheritdoc} - */ - public function getVoidTransactionBuilder($payment) - { - return true; - } - - /** - * @param \Magento\Sales\Api\Data\OrderPaymentInterface|\Magento\Payment\Model\InfoInterface $payment - * - * @return bool|string - */ - public function getPaymentMethodName($payment) - { - return 'sofortueberweisung'; - } -} diff --git a/Model/Push.php b/Model/Push.php index 140777368..e730779be 100644 --- a/Model/Push.php +++ b/Model/Push.php @@ -28,9 +28,9 @@ use Buckaroo\Magento2\Model\Config\Source\InvoiceHandlingOptions; use Buckaroo\Magento2\Model\ConfigProvider\Account; use Buckaroo\Magento2\Model\ConfigProvider\Method\Factory; +use Buckaroo\Magento2\Model\LockManagerWrapper; use Buckaroo\Magento2\Model\Method\AbstractMethod; use Buckaroo\Magento2\Model\Method\Afterpay; -use Buckaroo\Magento2\Model\LockManagerWrapper; use Buckaroo\Magento2\Model\Method\Afterpay2; use Buckaroo\Magento2\Model\Method\Afterpay20; use Buckaroo\Magento2\Model\Method\Creditcard; @@ -39,7 +39,6 @@ use Buckaroo\Magento2\Model\Method\Paypal; use Buckaroo\Magento2\Model\Method\PayPerEmail; use Buckaroo\Magento2\Model\Method\SepaDirectDebit; -use Buckaroo\Magento2\Model\Method\Sofortbanking; use Buckaroo\Magento2\Model\Method\Transfer; use Buckaroo\Magento2\Model\Method\Voucher; use Buckaroo\Magento2\Model\Refund\Push as RefundPush; @@ -49,6 +48,9 @@ use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Webapi\Rest\Request; use Magento\Sales\Api\Data\TransactionInterface; +use Magento\Sales\Api\TransactionRepositoryInterface; +use Magento\Framework\Api\SearchCriteriaBuilder; +use Magento\Framework\Api\FilterBuilder; use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Email\Sender\InvoiceSender; use Magento\Sales\Model\Order\Email\Sender\OrderSender; @@ -166,7 +168,14 @@ class Push implements PushInterface */ protected LockManagerWrapper $lockManager; + protected TransactionRepositoryInterface $transactionRepository; + protected SearchCriteriaBuilder $searchCriteriaBuilder; + protected FilterBuilder $filterBuilder; + /** + * @param TransactionRepositoryInterface $transactionRepository + * @param SearchCriteriaBuilder $searchCriteriaBuilder + * @param FilterBuilder $filterBuilder * @param Order $order * @param TransactionInterface $transaction * @param Request $request @@ -189,6 +198,9 @@ class Push implements PushInterface * @param LockManagerWrapper $lockManager */ public function __construct( + TransactionRepositoryInterface $transactionRepository, + SearchCriteriaBuilder $searchCriteriaBuilder, + FilterBuilder $filterBuilder, Order $order, TransactionInterface $transaction, Request $request, @@ -210,6 +222,9 @@ public function __construct( File $fileSystemDriver, LockManagerWrapper $lockManager ) { + $this->transactionRepository = $transactionRepository; + $this->searchCriteriaBuilder = $searchCriteriaBuilder; + $this->filterBuilder = $filterBuilder; $this->order = $order; $this->transaction = $transaction; $this->request = $request; @@ -1054,7 +1069,7 @@ private function sendCm3ConfirmationMail() /** @var \Magento\Payment\Model\MethodInterface $paymentMethod */ $paymentMethod = $this->order->getPayment()->getMethodInstance(); $configOrderMail = $this->configAccount->getOrderConfirmationEmail($store) - || $paymentMethod->getConfigData('order_email', $store); + || $paymentMethod->getConfigData('order_email', $store); if (!$this->order->getEmailSent() && $cm3StatusCode == 10 && $configOrderMail) { $this->orderSender->send($this->order); @@ -1248,10 +1263,11 @@ protected function canUpdateOrderStatus($response) /** * Types of statusses */ - $completedStateAndStatus = [Order::STATE_COMPLETE, Order::STATE_COMPLETE]; - $cancelledStateAndStatus = [Order::STATE_CANCELED, Order::STATE_CANCELED]; - $holdedStateAndStatus = [Order::STATE_HOLDED, Order::STATE_HOLDED]; - $closedStateAndStatus = [Order::STATE_CLOSED, Order::STATE_CLOSED]; + $completedStateAndStatus = [Order::STATE_COMPLETE, Order::STATE_COMPLETE]; + $cancelledStateAndStatus = [Order::STATE_CANCELED, Order::STATE_CANCELED]; + $holdedStateAndStatus = [Order::STATE_HOLDED, Order::STATE_HOLDED]; + $closedStateAndStatus = [Order::STATE_CLOSED, Order::STATE_CLOSED]; + $processingStateAndStatus = [Order::STATE_PROCESSING, Order::STATE_PROCESSING]; /** * Get current state and status of order */ @@ -1261,10 +1277,11 @@ protected function canUpdateOrderStatus($response) /** * If the types are not the same and the order can receive an invoice the order can be udpated by BPE. */ - if ($completedStateAndStatus != $currentStateAndStatus + if ($completedStateAndStatus[0] != $currentStateAndStatus[0] && $cancelledStateAndStatus != $currentStateAndStatus && $holdedStateAndStatus != $currentStateAndStatus && $closedStateAndStatus != $currentStateAndStatus + && $processingStateAndStatus[0] != $currentStateAndStatus[0] ) { return true; } @@ -1397,6 +1414,10 @@ public function processSucceededPush($newStatus, $message) $this->order->save(); } + if (isset($this->postData['brq_service_klarnakp_reservationnumber'])){ + $this->updateTransactionIsClosed($this->order); + } + $store = $this->order->getStore(); $payment = $this->order->getPayment(); @@ -1590,6 +1611,52 @@ public function processSucceededPush($newStatus, $message) return true; } + protected function updateTransactionIsClosed(Order $order) + { + // 1) Re-open the order + $this->logging->addDebug(__METHOD__ . '| Re-opening canceled order ID: ' . $order->getId()); + + // 2) Switch to "processing" (or "pending") and reset canceled item quantities + $order->setState(Order::STATE_PROCESSING)->setStatus(Order::STATE_PROCESSING); + foreach ($order->getAllItems() as $item) { + if ($item->getQtyCanceled() > 0) { + $item->setQtyCanceled(0); + } + } + $order->addStatusHistoryComment( + __('Order was re-opened from canceled state after a successful Klarna push.') + ); + $order->save(); + + // 3) Re-open the payment object + $payment = $order->getPayment(); + if ($payment) { + // Force Magento to see the parent transaction as still "open" + $payment->setIsTransactionClosed(false); + $payment->setShouldCloseParentTransaction(false); + $payment->save(); + } + + // 4) Load all transactions for this order and set is_closed=0 + // (You can do it for just the lastTransId if you know there's only one.) + try { + $searchCriteria = $this->searchCriteriaBuilder + ->addFilter('order_id', $order->getId()) + ->create(); + $transactionList = $this->transactionRepository->getList($searchCriteria); + + foreach ($transactionList->getItems() as $txn) { + if ($txn->getIsClosed()) { + $txn->setIsClosed(0); + $this->transactionRepository->save($txn); + $this->logging->addDebug(__METHOD__ . '|Re-open transaction ' . $txn->getTxnId()); + } + } + } catch (\Exception $e) { + $this->logging->addError(__METHOD__ . '|Could not re-open transactions: ' . $e->getMessage()); + } + } + /** * @param $newStatus * @param $message @@ -1610,7 +1677,6 @@ public function processPendingPaymentPush($newStatus, $message) if (!$this->order->getEmailSent() && in_array($payment->getMethod(), [Transfer::PAYMENT_METHOD_CODE, SepaDirectDebit::PAYMENT_METHOD_CODE, - Sofortbanking::PAYMENT_METHOD_CODE, PayPerEmail::PAYMENT_METHOD_CODE, ]) && ($this->configAccount->getOrderConfirmationEmail($store) @@ -1713,7 +1779,7 @@ protected function saveInvoice() * @var \Magento\Sales\Model\Order\Payment $payment */ $payment = $this->order->getPayment(); - $invoiceHandlingConfig = $this->configAccount->getInvoiceHandling(); + $invoiceHandlingConfig = $this->configAccount->getInvoiceHandling($this->order->getStore()); if ($invoiceHandlingConfig == InvoiceHandlingOptions::SHIPMENT) { $payment->setAdditionalInformation(InvoiceHandlingOptions::INVOICE_HANDLING, $invoiceHandlingConfig); @@ -2113,13 +2179,13 @@ protected function handleGroupTransactionFailed() protected function isFailedGroupTransaction() { return $this->hasPostData( - 'brq_transaction_type', - self::BUCK_PUSH_GROUPTRANSACTION_TYPE - ) && - $this->hasPostData( - 'brq_statuscode', - $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_FAILED') - ); + 'brq_transaction_type', + self::BUCK_PUSH_GROUPTRANSACTION_TYPE + ) && + $this->hasPostData( + 'brq_statuscode', + $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_FAILED') + ); } @@ -2217,9 +2283,9 @@ protected function cancelOrder(string $reservedOrderId, $historyComment = 'Giftc $order->addCommentToStatusHistory( __($historyComment) ) - ->setIsCustomerNotified(false) - ->setEntityName('invoice') - ->save(); + ->setIsCustomerNotified(false) + ->setEntityName('invoice') + ->save(); } } @@ -2284,12 +2350,12 @@ public function cancelGroupTransactionOrder() public function isCanceledGroupTransaction() { return $this->hasPostData( - 'brq_transaction_type', - self::BUCK_PUSH_GROUPTRANSACTION_TYPE - ) && - $this->hasPostData( - 'brq_statuscode', - $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER') - ); + 'brq_transaction_type', + self::BUCK_PUSH_GROUPTRANSACTION_TYPE + ) && + $this->hasPostData( + 'brq_statuscode', + $this->helper->getStatusCode('BUCKAROO_MAGENTO2_STATUSCODE_CANCELLED_BY_USER') + ); } } diff --git a/Model/Service/Order.php b/Model/Service/Order.php index 889dde04d..26912dc69 100644 --- a/Model/Service/Order.php +++ b/Model/Service/Order.php @@ -29,6 +29,7 @@ use Magento\Sales\Model\ResourceModel\Order\CollectionFactory; use Buckaroo\Magento2\Helper\Data; use Magento\Framework\App\ResourceConnection; +use Laminas\Db\Sql\Expression; class Order { @@ -43,16 +44,17 @@ class Order private Factory $configProviderFactory; public function __construct( - Account $accountConfig, - MethodFactory $configProviderMethodFactory, - Factory $configProviderFactory, + Account $accountConfig, + MethodFactory $configProviderMethodFactory, + Factory $configProviderFactory, StoreRepositoryInterface $storeRepository, - CollectionFactory $orderFactory, - OrderStatusFactory $orderStatusFactory, - Data $helper, - Log $logging, - ResourceConnection $resourceConnection - ) { + CollectionFactory $orderFactory, + OrderStatusFactory $orderStatusFactory, + Data $helper, + Log $logging, + ResourceConnection $resourceConnection + ) + { $this->accountConfig = $accountConfig; $this->configProviderMethodFactory = $configProviderMethodFactory; $this->configProviderFactory = $configProviderFactory; @@ -94,11 +96,11 @@ protected function cancelExpiredTransferOrdersPerStore($store) ) ->addFieldToFilter( 'created_at', - ['lt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . $dueDays . ' DAY')] + ['lt' => new Expression('NOW() - INTERVAL ' . $dueDays . ' DAY')] ) ->addFieldToFilter( 'created_at', - ['gt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] + ['gt' => new Expression('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] ); $orderCollection->getSelect() @@ -154,11 +156,11 @@ protected function cancelExpiredPPEOrdersPerStore($store) ) ->addFieldToFilter( 'created_at', - ['lt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . $dueDays . ' DAY')] + ['lt' => new Expression('NOW() - INTERVAL ' . $dueDays . ' DAY')] ) ->addFieldToFilter( 'created_at', - ['gt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] + ['gt' => new Expression('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')] ); $orderCollection->getSelect() @@ -216,7 +218,7 @@ public function cancel($order, $statusCode) $this->logging->addDebug(__METHOD__ . '|20|'); if (in_array($order->getPayment()->getMethodInstance()->buckarooPaymentMethodCode, ['klarnakp'])) { - $methodInstanceClass = get_class($order->getPayment()->getMethodInstance()); + $methodInstanceClass = get_class($order->getPayment()->getMethodInstance()); $methodInstanceClass::$requestOnVoid = false; } diff --git a/Model/Total/Quote/BuckarooAlreadyPay.php b/Model/Total/Quote/BuckarooAlreadyPay.php index 9efb45f73..b11157117 100644 --- a/Model/Total/Quote/BuckarooAlreadyPay.php +++ b/Model/Total/Quote/BuckarooAlreadyPay.php @@ -104,7 +104,6 @@ public function fetch(Quote $quote, Total $total) } } } catch (\Exception $e) { - // $this->logger->error($e->getMessage()); } } diff --git a/Model/Total/Quote/BuckarooFee.php b/Model/Total/Quote/BuckarooFee.php old mode 100644 new mode 100755 index 294fb4fce..88cfa8f21 --- a/Model/Total/Quote/BuckarooFee.php +++ b/Model/Total/Quote/BuckarooFee.php @@ -17,109 +17,77 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ + namespace Buckaroo\Magento2\Model\Total\Quote; -use Magento\Catalog\Helper\Data; -use Buckaroo\Magento2\Logging\Log; use Buckaroo\Magento2\Helper\PaymentGroupTransaction; +use Buckaroo\Magento2\Service\BuckarooFee\Calculate; +use Magento\Framework\Phrase; use Magento\Framework\Pricing\PriceCurrencyInterface; -use Magento\Tax\Model\Calculation as TaxModelCalculation; -use Buckaroo\Magento2\Model\ConfigProvider\Method\Factory; -use Buckaroo\Magento2\Model\Config\Source\TaxClass\Calculation; -use Buckaroo\Magento2\Model\ConfigProvider\Account as ConfigProviderAccount; -use Buckaroo\Magento2\Model\ConfigProvider\BuckarooFee as ConfigProviderBuckarooFee; +use Magento\Quote\Api\Data\ShippingAssignmentInterface; +use Magento\Quote\Model\Quote; +use Magento\Quote\Model\Quote\Address\Total; +use Magento\Quote\Model\Quote\Address\Total\AbstractTotal; +use Psr\Log\LoggerInterface; -class BuckarooFee extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal +class BuckarooFee extends AbstractTotal { - /** @var ConfigProviderAccount */ - protected $configProviderAccount; - - /** @var ConfigProviderBuckarooFee */ - protected $configProviderBuckarooFee; - - /** - * @var Factory - */ - protected $configProviderMethodFactory; - /** * @var PriceCurrencyInterface */ public $priceCurrency; /** - * @var Data - */ - public $catalogHelper; - - /** - * @var \Buckaroo\Magento2\Helper\PaymentGroupTransaction + * @var PaymentGroupTransaction */ public $groupTransaction; /** - * @var Calculation + * @var Calculate */ - protected $taxCalculation; + protected $calculate; - /** - * @var Log $logging - */ - protected $logging; + protected $logger; /** - * @param ConfigProviderAccount $configProviderAccount - * @param ConfigProviderBuckarooFee $configProviderBuckarooFee - * @param Factory $configProviderMethodFactory * @param PriceCurrencyInterface $priceCurrency - * @param Data $catalogHelper * @param PaymentGroupTransaction $groupTransaction - * @param Log $logging - * @param TaxModelCalculation $taxCalculation + * @param Calculate $calculate */ public function __construct( - ConfigProviderAccount $configProviderAccount, - ConfigProviderBuckarooFee $configProviderBuckarooFee, - Factory $configProviderMethodFactory, PriceCurrencyInterface $priceCurrency, - Data $catalogHelper, PaymentGroupTransaction $groupTransaction, - Log $logging, - TaxModelCalculation $taxCalculation + Calculate $calculate, + LoggerInterface $logger ) { $this->setCode('buckaroo_fee'); - $this->configProviderAccount = $configProviderAccount; - $this->configProviderBuckarooFee = $configProviderBuckarooFee; - $this->configProviderMethodFactory = $configProviderMethodFactory; $this->priceCurrency = $priceCurrency; - $this->catalogHelper = $catalogHelper; - $this->groupTransaction = $groupTransaction; - $this->logging = $logging; - $this->taxCalculation = $taxCalculation; + $this->calculate = $calculate; + $this->logger = $logger; } /** * Collect grand total address amount * - * @param \Magento\Quote\Model\Quote $quote - * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment - * @param \Magento\Quote\Model\Quote\Address\Total $total - * @return $this + * @param Quote $quote + * @param ShippingAssignmentInterface $shippingAssignment + * @param Total $total * - * @throws \LogicException + * @return $this */ public function collect( - \Magento\Quote\Model\Quote $quote, - \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment, - \Magento\Quote\Model\Quote\Address\Total $total + Quote $quote, + ShippingAssignmentInterface $shippingAssignment, + Total $total ) { parent::collect($quote, $shippingAssignment, $total); if (!$shippingAssignment->getItems()) { return $this; } + /** * @noinspection PhpUndefinedMethodInspection */ @@ -136,51 +104,39 @@ public function collect( return $this; } - // Ensure payment method is set correctly - $paymentMethod = $quote->getPayment()->getMethod(); - if (!$paymentMethod || strpos($paymentMethod, 'buckaroo_magento2_') !== 0) { - return $this; - } + $result = $this->calculate->calculatePaymentFee($quote, $total); - $methodInstance = $quote->getPayment()->getMethodInstance(); - if (!$methodInstance instanceof \Buckaroo\Magento2\Model\Method\AbstractMethod) { + if ($result === null || $result->getAmount() < 0.01){ return $this; } - - // Calculate the base payment fee using the getBaseFee method - $basePaymentFee = $this->getBaseFee($methodInstance, $quote); - if ($basePaymentFee < 0.01) { - return $this; - } - - $paymentFee = $this->priceCurrency->convert($basePaymentFee, $quote->getStore()); + $amount = $this->priceCurrency->convert($result->getRoundedAmount()); /** * @noinspection PhpUndefinedMethodInspection */ - $quote->setBuckarooFee($paymentFee); + $quote->setBuckarooFee($amount); /** * @noinspection PhpUndefinedMethodInspection */ - $quote->setBaseBuckarooFee($basePaymentFee); - + $quote->setBaseBuckarooFee($result->getRoundedAmount()); /** * @noinspection PhpUndefinedMethodInspection */ - $total->setBuckarooFee($paymentFee); + $total->setBuckarooFee($amount); /** * @noinspection PhpUndefinedMethodInspection */ - $total->setBaseBuckarooFee($basePaymentFee); + $total->setBaseBuckarooFee($result->getRoundedAmount()); /** * @noinspection PhpUndefinedMethodInspection */ - $total->setBaseGrandTotal($total->getBaseGrandTotal() + $basePaymentFee); + $total->setGrandTotal($total->getGrandTotal() + $amount); + /** * @noinspection PhpUndefinedMethodInspection */ - $total->setGrandTotal($total->getGrandTotal() + $paymentFee); + $total->setBaseGrandTotal($total->getBaseGrandTotal() + $result->getRoundedAmount()); return $this; } @@ -188,16 +144,16 @@ public function collect( /** * Add buckaroo fee information to address * - * @param \Magento\Quote\Model\Quote $quote - * @param \Magento\Quote\Model\Quote\Address\Total $total - * @return $this + * @param Quote $quote + * @param Total $total + * @return array */ - public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total) + public function fetch(Quote $quote, Total $total) { /** * @noinspection PhpUndefinedMethodInspection */ - $totals = [ + return [ 'code' => $this->getCode(), 'title' => $this->getLabel(), 'buckaroo_fee' => $total->getBuckarooFee(), @@ -207,159 +163,15 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu 'buckaroo_fee_tax_amount' => $total->getBuckarooFeeTaxAmount(), 'buckaroo_fee_base_tax_amount' => $total->getBuckarooFeeBaseTaxAmount(), ]; - - return $totals; - } - - /** - * @param \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance - * @param \Magento\Quote\Model\Quote $quote - * @param bool $inclTax - * - * @return bool|false|float - * @throws \Buckaroo\Magento2\Exception - */ - public function getBaseFee( - \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance, - \Magento\Quote\Model\Quote $quote, - $inclTax = false - ) { - $buckarooPaymentMethodCode = $methodInstance->buckarooPaymentMethodCode; - if (!$this->configProviderMethodFactory->has($buckarooPaymentMethodCode)) { - return false; - } - - $configProvider = $this->configProviderMethodFactory->get($buckarooPaymentMethodCode); - $basePaymentFee = trim($configProvider->getPaymentFee($quote->getStore())); - $inclTax = $this->configProviderBuckarooFee->getPaymentFeeTax() == - Calculation::DISPLAY_TYPE_INCLUDING_TAX; - - $shippingAddress = $quote->getShippingAddress(); - $billingAddress = $quote->getBillingAddress(); - $customerTaxClassId = $quote->getCustomerTaxClassId(); - $storeId = $quote->getStoreId(); - $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); - - $request = $this->taxCalculation->getRateRequest( - $shippingAddress, - $billingAddress, - $customerTaxClassId, - $storeId - ); - $request->setProductClassId($taxClassId); - $percent = $this->taxCalculation->getRate($request); - - if (is_numeric($basePaymentFee)) { - if (in_array($buckarooPaymentMethodCode, ['billink','afterpay20','afterpay','paypal'])) { - if ($inclTax) { - if ($percent > 0) { - return $basePaymentFee / (1 + ($percent / 100)); - } - } - return $basePaymentFee; - } else { - if ($inclTax){ - return $basePaymentFee / (1 + ($percent / 100)); - } - /** - * Payment fee is a number - */ - return $this->getFeePrice($basePaymentFee); - } - - } elseif (strpos($basePaymentFee, '%') === false) { - /** - * Payment fee is invalid - */ - return false; - } - - /** - * Payment fee is a percentage - */ - $percentage = floatval($basePaymentFee); - if ($quote->getShippingAddress()) { - $address = $quote->getShippingAddress(); - } else { - $address = $quote->getBillingAddress(); - } - - $total = 0; - - $feePercentageMode = $this->configProviderAccount->getFeePercentageMode($quote->getStore()); - - switch ($feePercentageMode) { - case 'subtotal': - $total = $address->getBaseSubtotal(); - break; - case 'subtotal_incl_tax': - $total = $address->getBaseSubtotalTotalInclTax(); - break; - } - $percentageFee = ($percentage / 100) * $total; - - if($inclTax){ - if($percent > 0){ - return $percentageFee / (1 + ($percent / 100)); - } - } else{ - return $percentageFee; - } - - return $basePaymentFee; - } - - /** - * Get payment fee price with correct tax - * - * @param float $price - * @param null $priceIncl - * - * @param \Magento\Framework\DataObject|null $pseudoProduct - * - * @return float - * @throws \Buckaroo\Magento2\Exception - */ - public function getFeePrice($price, $priceIncl = null, \Magento\Framework\DataObject $pseudoProduct = null) - { - if ($pseudoProduct === null) { - $pseudoProduct = new \Magento\Framework\DataObject(); - } - - $pseudoProduct->setTaxClassId($this->configProviderBuckarooFee->getTaxClass()); - - /** - * @noinspection PhpUndefinedMethodInspection - */ - if ($priceIncl === null - && $this->configProviderBuckarooFee->getPaymentFeeTax() == Calculation::DISPLAY_TYPE_INCLUDING_TAX - ) { - $priceIncl = true; - } else { - $priceIncl = false; - } - - $price = $this->catalogHelper->getTaxPrice( - $pseudoProduct, - $price, - false, - null, - null, - null, - null, - $priceIncl - ); - - return $price; } /** * Get Buckaroo label * - * @return \Magento\Framework\Phrase + * @return Phrase */ public function getLabel() { - return __('Fee'); + return __('Payment Fee'); } } diff --git a/Model/Total/Quote/BuckarooFeeHyva.php b/Model/Total/Quote/BuckarooFeeHyva.php index 9e04a3a2d..f407ef911 100644 --- a/Model/Total/Quote/BuckarooFeeHyva.php +++ b/Model/Total/Quote/BuckarooFeeHyva.php @@ -19,56 +19,33 @@ */ namespace Buckaroo\Magento2\Model\Total\Quote; +use Buckaroo\Magento2\Exception; use Buckaroo\Magento2\Helper\PaymentGroupTransaction; -use Buckaroo\Magento2\Logging\Log; -use Buckaroo\Magento2\Model\Config\Source\TaxClass\Calculation; -use Buckaroo\Magento2\Model\ConfigProvider\Account as ConfigProviderAccount; -use Buckaroo\Magento2\Model\ConfigProvider\BuckarooFee as ConfigProviderBuckarooFee; -use Buckaroo\Magento2\Model\ConfigProvider\Method\Factory; +use Buckaroo\Magento2\Service\BuckarooFee\Calculate; use Buckaroo\Magento2\Service\HyvaCheckoutConfig; -use Magento\Catalog\Helper\Data; +use Magento\Framework\Phrase; use Magento\Framework\Pricing\PriceCurrencyInterface; +use Magento\Quote\Api\Data\ShippingAssignmentInterface; use Magento\Quote\Model\Quote; use Magento\Quote\Model\Quote\Address\Total; -use Magento\Tax\Model\Calculation as TaxModelCalculation; +use Magento\Quote\Model\Quote\Address\Total\AbstractTotal; -class BuckarooFeeHyva extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal +class BuckarooFeeHyva extends AbstractTotal { - /** @var ConfigProviderAccount */ - protected $configProviderAccount; - - /** @var ConfigProviderBuckarooFee */ - protected $configProviderBuckarooFee; - - /** - * @var Factory - */ - protected $configProviderMethodFactory; - /** * @var PriceCurrencyInterface */ public $priceCurrency; - /** - * @var Data - */ - public $catalogHelper; - /** * @var PaymentGroupTransaction */ public $groupTransaction; /** - * @var Calculation + * @var Calculate */ - protected $taxCalculation; - - /** - * @var Log $logging - */ - protected $logging; + protected $calculate; /** * @var HyvaCheckoutConfig @@ -76,55 +53,39 @@ class BuckarooFeeHyva extends \Magento\Quote\Model\Quote\Address\Total\AbstractT protected $configProvider; /** - * @param ConfigProviderAccount $configProviderAccount - * @param ConfigProviderBuckarooFee $configProviderBuckarooFee - * @param Factory $configProviderMethodFactory * @param PriceCurrencyInterface $priceCurrency - * @param Data $catalogHelper * @param PaymentGroupTransaction $groupTransaction - * @param Log $logging - * @param TaxModelCalculation $taxCalculation * @param HyvaCheckoutConfig $configProvider + * @param Calculate $calculate */ public function __construct( - ConfigProviderAccount $configProviderAccount, - ConfigProviderBuckarooFee $configProviderBuckarooFee, - Factory $configProviderMethodFactory, PriceCurrencyInterface $priceCurrency, - Data $catalogHelper, PaymentGroupTransaction $groupTransaction, - Log $logging, - TaxModelCalculation $taxCalculation, HyvaCheckoutConfig $configProvider, + Calculate $calculate ) { $this->setCode('buckaroo_fee_hyva'); - $this->configProviderAccount = $configProviderAccount; - $this->configProviderBuckarooFee = $configProviderBuckarooFee; - $this->configProviderMethodFactory = $configProviderMethodFactory; $this->priceCurrency = $priceCurrency; - $this->catalogHelper = $catalogHelper; - $this->groupTransaction = $groupTransaction; - $this->logging = $logging; - $this->taxCalculation = $taxCalculation; $this->configProvider = $configProvider; + $this->calculate = $calculate; } /** * Collect grand total address amount * - * @param \Magento\Quote\Model\Quote $quote - * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment - * @param \Magento\Quote\Model\Quote\Address\Total $total + * @param Quote $quote + * @param ShippingAssignmentInterface $shippingAssignment + * @param Total $total * @return $this * - * @throws \LogicException + * @throws Exception */ public function collect( - \Magento\Quote\Model\Quote $quote, - \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment, - \Magento\Quote\Model\Quote\Address\Total $total + Quote $quote, + ShippingAssignmentInterface $shippingAssignment, + Total $total ) { if (!$this->configProvider->isHyvaCheckoutEnabled()) { return $this; @@ -137,6 +98,15 @@ public function collect( return $this; } + /** + * @noinspection PhpUndefinedMethodInspection + */ + $total->setBuckarooFee(0); + /** + * @noinspection PhpUndefinedMethodInspection + */ + $total->setBaseBuckarooFee(0); + $orderId = $quote->getReservedOrderId(); // Check if already paid amount is affecting the calculation @@ -144,33 +114,26 @@ public function collect( return $this; } - // Ensure payment method is set correctly - $paymentMethod = $quote->getPayment()->getMethod(); - if (!$paymentMethod || strpos($paymentMethod, 'buckaroo_magento2_') !== 0) { - return $this; - } - - $methodInstance = $quote->getPayment()->getMethodInstance(); - if (!$methodInstance instanceof \Buckaroo\Magento2\Model\Method\AbstractMethod) { - return $this; - } + $result = $this->calculate->calculatePaymentFee($quote, $total); - // Calculate the base payment fee using the getBaseFee method - $basePaymentFee = $this->getBaseFee($methodInstance, $quote); - if ($basePaymentFee < 0.01) { + if ($result === null || $result->getAmount() < 0.01){ return $this; } - // Convert the fee to the store's currency - $paymentFee = $this->priceCurrency->convert($basePaymentFee, $quote->getStore()); + $amount = $this->priceCurrency->convert($result->getRoundedAmount()); // Add fee amounts using addTotalAmount to ensure proper accumulation with other totals - $total->addTotalAmount('buckaroo_fee_hyva', $paymentFee); - $total->addBaseTotalAmount('buckaroo_fee_hyva', $basePaymentFee); + $total->addTotalAmount('buckaroo_fee_hyva', $amount); + $total->addBaseTotalAmount('buckaroo_fee_hyva', $result->getRoundedAmount()); - // Set the fee on the total object for further calculations - $total->setBuckarooFee($paymentFee); - $total->setBaseBuckarooFee($basePaymentFee); + /** + * @noinspection PhpUndefinedMethodInspection + */ + $total->setBuckarooFee($amount); + /** + * @noinspection PhpUndefinedMethodInspection + */ + $total->setBaseBuckarooFee($result->getRoundedAmount()); return $this; } @@ -182,170 +145,22 @@ public function collect( * @param Total $total * @return array */ - public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total) + public function fetch(Quote $quote, Total $total) { - // Determine whether to include tax in the fee value based on your configuration settings - $includeTax = $this->configProviderBuckarooFee->getPaymentFeeTax() == \Buckaroo\Magento2\Model\Config\Source\TaxClass\Calculation::DISPLAY_TYPE_INCLUDING_TAX; - - // Calculate the value based on the settings (either including or excluding tax) - $value = $includeTax ? $total->getBuckarooFeeInclTax() : $total->getBuckarooFee(); - return [ 'code' => $this->getCode(), 'title' => $this->getLabel(), - 'value' => $value + 'value' => $total->getBuckarooFee() ]; } - /** - * @param \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance - * @param \Magento\Quote\Model\Quote $quote - * @param bool $inclTax - * - * @return bool|false|float - * @throws \Buckaroo\Magento2\Exception - */ - public function getBaseFee( - \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance, - \Magento\Quote\Model\Quote $quote, - $inclTax = false - ) { - $buckarooPaymentMethodCode = $methodInstance->buckarooPaymentMethodCode; - if (!$this->configProviderMethodFactory->has($buckarooPaymentMethodCode)) { - return false; - } - - $configProvider = $this->configProviderMethodFactory->get($buckarooPaymentMethodCode); - $basePaymentFee = trim($configProvider->getPaymentFee($quote->getStore())); - $inclTax = $this->configProviderBuckarooFee->getPaymentFeeTax() == - Calculation::DISPLAY_TYPE_INCLUDING_TAX; - - $shippingAddress = $quote->getShippingAddress(); - $billingAddress = $quote->getBillingAddress(); - $customerTaxClassId = $quote->getCustomerTaxClassId(); - $storeId = $quote->getStoreId(); - $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); - - $request = $this->taxCalculation->getRateRequest( - $shippingAddress, - $billingAddress, - $customerTaxClassId, - $storeId - ); - $request->setProductClassId($taxClassId); - $percent = $this->taxCalculation->getRate($request); - - if (is_numeric($basePaymentFee)) { - if (in_array($buckarooPaymentMethodCode, ['billink','afterpay20','afterpay','paypal'])) { - if ($inclTax) { - if ($percent > 0) { - return $basePaymentFee / (1 + ($percent / 100)); - } - } - return $basePaymentFee; - } else { - if ($inclTax) { - return $basePaymentFee / (1 + ($percent / 100)); - } - /** - * Payment fee is a number - */ - return $this->getFeePrice($basePaymentFee); - } - - } elseif (strpos($basePaymentFee, '%') === false) { - /** - * Payment fee is invalid - */ - return false; - } - - /** - * Payment fee is a percentage - */ - $percentage = floatval($basePaymentFee); - if ($quote->getShippingAddress()) { - $address = $quote->getShippingAddress(); - } else { - $address = $quote->getBillingAddress(); - } - - $total = 0; - - $feePercentageMode = $this->configProviderAccount->getFeePercentageMode($quote->getStore()); - - switch ($feePercentageMode) { - case 'subtotal': - $total = $address->getBaseSubtotal(); - break; - case 'subtotal_incl_tax': - $total = $address->getBaseSubtotalTotalInclTax(); - break; - } - $percentageFee = ($percentage / 100) * $total; - - if($inclTax){ - if($percent > 0){ - return $percentageFee / (1 + ($percent / 100)); - } - } else{ - return $percentageFee; - } - - return $basePaymentFee; - } - - /** - * Get payment fee price with correct tax - * - * @param float $price - * @param null $priceIncl - * - * @param \Magento\Framework\DataObject|null $pseudoProduct - * - * @return float - * @throws \Buckaroo\Magento2\Exception - */ - public function getFeePrice($price, $priceIncl = null, \Magento\Framework\DataObject $pseudoProduct = null) - { - if ($pseudoProduct === null) { - $pseudoProduct = new \Magento\Framework\DataObject(); - } - - $pseudoProduct->setTaxClassId($this->configProviderBuckarooFee->getTaxClass()); - - /** - * @noinspection PhpUndefinedMethodInspection - */ - if ($priceIncl === null - && $this->configProviderBuckarooFee->getPaymentFeeTax() == Calculation::DISPLAY_TYPE_INCLUDING_TAX - ) { - $priceIncl = true; - } else { - $priceIncl = false; - } - - $price = $this->catalogHelper->getTaxPrice( - $pseudoProduct, - $price, - false, - null, - null, - null, - null, - $priceIncl - ); - - return $price; - } - /** * Get Buckaroo label * - * @return \Magento\Framework\Phrase + * @return Phrase */ public function getLabel() { - return __('Fee'); + return __('Payment Fee'); } } diff --git a/Model/Total/Quote/BuckarooRemainingAmount.php b/Model/Total/Quote/BuckarooRemainingAmount.php index bc6eff67a..2f21a31c4 100644 --- a/Model/Total/Quote/BuckarooRemainingAmount.php +++ b/Model/Total/Quote/BuckarooRemainingAmount.php @@ -59,7 +59,7 @@ public function fetch(Quote $quote, Total $total) return [ 'code' => $this->getCode(), - 'title' => __('Remaining Amount'), + 'title' => $this->getLabel(), 'value' => $remainingAmount ]; } @@ -71,6 +71,6 @@ public function fetch(Quote $quote, Total $total) */ public function getLabel() { - return __('Fee'); + return __('Remaining Amount'); } } diff --git a/Model/Total/Quote/Tax/BuckarooFee.php b/Model/Total/Quote/Tax/BuckarooFee.php old mode 100644 new mode 100755 index 06bf8d86f..a3094d61f --- a/Model/Total/Quote/Tax/BuckarooFee.php +++ b/Model/Total/Quote/Tax/BuckarooFee.php @@ -1,5 +1,4 @@ getConstructor(); + + // The parent call fails when running setup:di:compile in 2.4.3 and lower due to an extra parameter. + if ($parentConstructor->getNumberOfParameters() == 9) { + // @phpstan-ignore-next-line + parent::__construct( + $taxConfig, + $taxCalculationService, + $quoteDetailsDataObjectFactory, + $quoteDetailsItemDataObjectFactory, + $taxClassKeyDataObjectFactory, + $customerAddressFactory, + $customerAddressRegionFactory, + $taxHelper, + $quoteDetailsItemExtensionInterfaceFactory + ); + } else { + // @phpstan-ignore-next-line + parent::__construct( + $taxConfig, + $taxCalculationService, + $quoteDetailsDataObjectFactory, + $quoteDetailsItemDataObjectFactory, + $taxClassKeyDataObjectFactory, + $customerAddressFactory, + $customerAddressRegionFactory, + $taxHelper, + $quoteDetailsItemExtensionInterfaceFactory, + $customerAccountManagement + ); + } + + $this->priceCurrency = $priceCurrency; + $this->groupTransaction = $groupTransaction; + $this->calculate = $calculate; + $this->configProviderBuckarooFee = $configProviderBuckarooFee; + $this->taxHelper = $taxHelper; $this->setCode('pretax_buckaroo_fee'); } /** - * Collect buckaroo fee related items and add them to tax calculation + * Collect Buckaroo fee related items and add them to tax calculation * - * @param \Magento\Quote\Model\Quote $quote - * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment - * @param \Magento\Quote\Model\Quote\Address\Total $total + * @param Quote $quote + * @param ShippingAssignmentInterface $shippingAssignment + * @param Total $total * @return $this */ public function collect( - \Magento\Quote\Model\Quote $quote, - \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment, - \Magento\Quote\Model\Quote\Address\Total $total + Quote $quote, + ShippingAssignmentInterface $shippingAssignment, + Total $total ) { if (!$shippingAssignment->getItems()) { + parent::collect($quote, $shippingAssignment, $total); return $this; } - - $paymentMethod = $quote->getPayment()->getMethod(); - if (!$paymentMethod || strpos($paymentMethod, 'buckaroo_magento2_') !== 0) { - return $this; - } - - $methodInstance = $quote->getPayment()->getMethodInstance(); - if (!$methodInstance instanceof \Buckaroo\Magento2\Model\Method\AbstractMethod) { - return $this; - } - $orderId = $quote->getReservedOrderId(); + // Check if already paid amount is affecting the calculation if ($this->groupTransaction->getAlreadyPaid($orderId) > 0) { return $this; } - $basePaymentFee = $this->getBaseFee($methodInstance, $quote, true); + $result = $this->calculate->calculatePaymentFee($quote, $total); - if ($basePaymentFee < 0.01) { + if ($result === null){ return $this; } - $paymentFee = $this->priceCurrency->convert($basePaymentFee, $quote->getStore()); + $this->addAssociatedTaxable($shippingAssignment, $result, $quote); + + parent::collect($quote, $shippingAssignment, $total); - $productTaxClassId = $this->configProviderBuckarooFee->getTaxClass($quote->getStore()); + return $this; + } + + /** + * Add associated taxable for Buckaroo fee + * + * @param ShippingAssignmentInterface $shippingAssignment + * @param Result $result + * @param Quote $quote + * @return void + */ + private function addAssociatedTaxable(ShippingAssignmentInterface $shippingAssignment, Result $result, Quote $quote) + { + $fullAmount = $this->priceCurrency->convert($result->getRoundedAmount()); $address = $shippingAssignment->getShipping()->getAddress(); /** @@ -118,23 +203,25 @@ public function collect( $associatedTaxables = []; } + // Retrieve the store from the quote + $store = $quote->getStore(); + + // Retrieve the Buckaroo fee tax class ID from BuckarooFeeConfigProvider using the store + $taxClassId = $this->configProviderBuckarooFee->getBuckarooFeeTaxClass($store); $associatedTaxables[] = [ CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_TYPE => self::QUOTE_TYPE, CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_CODE => self::CODE_QUOTE_GW, - CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_UNIT_PRICE => $paymentFee, - CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_BASE_UNIT_PRICE => $basePaymentFee, + CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_UNIT_PRICE => $fullAmount, + CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_BASE_UNIT_PRICE => $result->getRoundedAmount(), CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_QUANTITY => 1, - CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_TAX_CLASS_ID => $productTaxClassId, - CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_PRICE_INCLUDES_TAX => true, - CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_ASSOCIATION_ITEM_CODE - => CommonTaxCollector::ASSOCIATION_ITEM_CODE_FOR_QUOTE, + CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_TAX_CLASS_ID => $taxClassId, + CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_PRICE_INCLUDES_TAX => false, + CommonTaxCollector::KEY_ASSOCIATED_TAXABLE_ASSOCIATION_ITEM_CODE => CommonTaxCollector::ASSOCIATION_ITEM_CODE_FOR_QUOTE, ]; /** * @noinspection PhpUndefinedMethodInspection */ $address->setAssociatedTaxables($associatedTaxables); - - return $this; } } diff --git a/Model/Total/Quote/Tax/BuckarooFeeAfterTax.php b/Model/Total/Quote/Tax/BuckarooFeeAfterTax.php index e61ae0af6..37322724c 100644 --- a/Model/Total/Quote/Tax/BuckarooFeeAfterTax.php +++ b/Model/Total/Quote/Tax/BuckarooFeeAfterTax.php @@ -74,11 +74,13 @@ public function collect( if (empty($extraTaxableDetails[BuckarooFee::QUOTE_TYPE])) { return $this; } + $itemTaxDetails = $extraTaxableDetails[BuckarooFee::QUOTE_TYPE]; if (empty($itemTaxDetails[CommonTaxCollector::ASSOCIATION_ITEM_CODE_FOR_QUOTE][0])) { return $this; } + $buckarooFeeTaxDetails = $itemTaxDetails[CommonTaxCollector::ASSOCIATION_ITEM_CODE_FOR_QUOTE][0]; $buckarooFeeBaseTaxAmount = $buckarooFeeTaxDetails['base_row_tax']; diff --git a/Observer/AddCspNonce.php b/Observer/AddCspNonce.php new file mode 100644 index 000000000..b399e557a --- /dev/null +++ b/Observer/AddCspNonce.php @@ -0,0 +1,46 @@ +cspNonceProvider = $cspNonceProviderFactory->create(); + } + + public function execute(Observer $observer) + { + /** @var Template $block */ + $block = $observer->getEvent()->getBlock(); + if (false === $block instanceof Template) { + return; + } + + // Retrieve the block name + $nameInLayout = $block->getNameInLayout(); + // Check if $nameInLayout is a non-empty string + if (!is_string($nameInLayout) || strpos($nameInLayout, 'buckaroo_magento2') === false) { + return; + } + + if ($this->cspNonceProvider) { + try { + $nonce = $this->cspNonceProvider->generateNonce(); + $block->assign('cspNonce', $nonce); + } catch (\Exception $e) { + } + } + } +} diff --git a/Observer/HtmlTransactionIdObserver.php b/Observer/HtmlTransactionIdObserver.php index 57e08bde3..e26bc9300 100644 --- a/Observer/HtmlTransactionIdObserver.php +++ b/Observer/HtmlTransactionIdObserver.php @@ -37,19 +37,33 @@ public function execute(Observer $observer) /** @var \Magento\Sales\Model\Order\Payment\Transaction $transaction */ $transaction = $observer->getDataObject(); $order = $transaction->getOrder(); - $txnIdArray =explode("-",$transaction->getTxnId()); + + $txnIdArray = explode("-", $transaction->getTxnId()); $txnId = reset($txnIdArray); - if ($this->isBuckarooPayment($order->getPayment()) && $txnId !== false) { - $transaction->setData('html_txn_id', - sprintf( - '%s', - $txnId, - $transaction->getTxnId() - ) - ); - } + + if ($this->isBuckarooPayment($order->getPayment()) && $txnId !== false) { + if($transaction->getTxnType() == 'authorization'){ + $transaction->setData('html_txn_id', + sprintf( + '%s', + $txnId, + $transaction->getTxnId() + ) + ); + return; + } + $transaction->setData('html_txn_id', + sprintf( + '%s', + $txnId, + $transaction->getTxnId() + ) + ); + + } } - /** + + /** * Is one of our payment methods * * @param OrderPaymentInterface|null $payment @@ -59,8 +73,8 @@ public function execute(Observer $observer) public function isBuckarooPayment($payment) { if (!$payment instanceof OrderPaymentInterface) { - return false; + return false; } return strpos($payment->getMethod(), 'buckaroo_magento2') !== false; } -} \ No newline at end of file +} diff --git a/Observer/SetTransactionOnInvoiceObserver.php b/Observer/SetTransactionOnInvoiceObserver.php index 276efc315..abf3550a1 100644 --- a/Observer/SetTransactionOnInvoiceObserver.php +++ b/Observer/SetTransactionOnInvoiceObserver.php @@ -61,7 +61,7 @@ public function __construct( } /** - * Set transaction id on invoiced for invoice after shippment + * Set transaction id on invoiced for invoice after shipment * * @param Observer $observer * @return $this diff --git a/README.md b/README.md index c42cfd001..a819bb16c 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ But if you still have some unanswered questions, then please contact our [techni | [Second chance
module](https://github.com/buckaroo-it/Magento2_SecondChance) | [Google Analytics
module](https://github.com/buckaroo-it/Magento2_Analytics) | [Hyvä React Checkout
module](https://github.com/buckaroo-it/Magento2_Hyva) | [Hyvä Checkout
module](https://github.com/buckaroo-it/Magento2_Hyva_Checkout) | [GraphQL
module](https://github.com/buckaroo-it/Magento2_GraphQL) | :-------------------------:|:-------------------------:|:-------------------------:|:-------------------------:|:-------------------------:| -[Second-chance](https://github.com/buckaroo-it/Magento2_SecondChance)| [Google-analytics](https://github.com/buckaroo-it/Magento2_Analytics)| [Hyva-react-checkout](https://github.com/buckaroo-it/Magento2_Hyva) | [Hyva-checkout](https://github.com/buckaroo-it/Magento2_Hyva_Checkout) | [GraphQL](https://github.com/buckaroo-it/Magento2_GraphQL) | +[Second-chance](https://github.com/buckaroo-it/Magento2_SecondChance)| [Google-analytics](https://github.com/buckaroo-it/Magento2_Analytics)| [Hyva-react-checkout](https://github.com/buckaroo-it/Magento2_Hyva) | [Hyva-checkout](https://github.com/buckaroo-it/Magento2_Hyva_Checkout) | [GraphQL](https://github.com/buckaroo-it/Magento2_GraphQL) |
## Contribute diff --git a/Service/Applepay/Add.php b/Service/Applepay/Add.php index f9fa4263a..3010433ac 100644 --- a/Service/Applepay/Add.php +++ b/Service/Applepay/Add.php @@ -80,7 +80,7 @@ class Add * @param ShippingAddressManagementInterface $shippingAddressManagement * @param QuoteRepository|null $quoteRepository * @param ShippingMethod $appleShippingMethod - */ + */ public function __construct( CartRepositoryInterface $cartRepository, CartInterface $cart, @@ -105,16 +105,16 @@ public function __construct( $this->quoteRepository = $quoteRepository ?? ObjectManager::getInstance()->get(QuoteRepository::class); $this->appleShippingMethod = $appleShippingMethod; - } public function process($request) { $cart_hash = $request->getParam('id'); - if($cart_hash) { + if ($cart_hash) { $cartId = $this->maskedQuoteIdToQuoteId->execute($cart_hash); $cart = $this->cartRepository->get($cartId); + } else { $checkoutSession = ObjectManager::getInstance()->get(\Magento\Checkout\Model\Session::class); $cart = $checkoutSession->getQuote(); @@ -127,7 +127,6 @@ public function process($request) throw new \Exception('Product data is missing or invalid.'); } - $cart->removeAllItems(); try { @@ -141,7 +140,7 @@ public function process($request) $product['qty'] ); - if(isset($product['selected_options'])) { + if (isset($product['selected_options'])) { $cartItem->setSelectedOptions($product['selected_options']); } @@ -154,6 +153,9 @@ public function process($request) if (!$cart->getIsVirtual()) { $shippingAddressData = $this->applepayModel->processAddressFromWallet($wallet, 'shipping'); + $cart->getShippingAddress()->addData($shippingAddressData); + + $cart->setShippingAddress($cart->getShippingAddress()); $shippingAddress = $this->quoteAddressFactory->create(); $shippingAddress->addData($shippingAddressData); @@ -168,27 +170,26 @@ public function process($request) } $this->quoteRepository->save($cart); //this delivery address is already assigned to the cart - try { $shippingMethods = $this->appleShippingMethod->getAvailableMethods($cart); } catch (\Exception $e) { throw new \Exception(__('Unable to retrieve shipping methods.')); } + if (count($shippingMethods) == 0) { + return []; - foreach ($shippingMethods as $method) { - $shippingMethodsResult[] = [ - 'carrier_title' => $method['carrier_title'], - 'price_incl_tax' => round($method['amount']['value'], 2), - 'method_code' => $method['carrier_code'] . '__SPLIT__' . $method['method_code'], - 'method_title' => $method['method_title'], - ]; - } + } else { + + foreach ($shippingMethods as $shippingMethod) { + $shippingMethodsResult[] = [ + 'carrier_title' => $shippingMethod->getCarrierTitle(), + 'price_incl_tax' => round($shippingMethod->getAmount(), 2), + 'method_code' => $shippingMethod->getCarrierCode() . '_' . $shippingMethod->getMethodCode(), + 'method_title' => $shippingMethod->getMethodTitle(), + ]; + } - if (!empty($shippingMethodsResult)) { - // Set the first available shipping method $cart->getShippingAddress()->setShippingMethod($shippingMethodsResult[0]['method_code']); - } else { - throw new \Exception(__('No shipping methods are available for the provided address.')); } } $cart->setTotalsCollectedFlag(false); @@ -198,13 +199,17 @@ public function process($request) $totals['discount'] = round($cart->getSubtotalWithDiscount() - $cart->getSubtotal(), 2); } - - - return [ + $data = [ 'shipping_methods' => $shippingMethodsResult, 'totals' => $totals ]; + + $this->quoteRepository->save($cart); + $this->cart->save(); + + return $data; } + public function gatherTotals($address, $quoteTotals) { $shippingTotalInclTax = 0; diff --git a/Service/Applepay/ShippingMethod.php b/Service/Applepay/ShippingMethod.php index 2f15061ab..7a33a38bd 100644 --- a/Service/Applepay/ShippingMethod.php +++ b/Service/Applepay/ShippingMethod.php @@ -36,36 +36,32 @@ public function __construct( ExtensibleDataObjectConverter $dataObjectConverter, ShippingMethodConverter $shippingMethodConverter, TotalsCollector $totalsCollector + ) { $this->dataObjectConverter = $dataObjectConverter; $this->shippingMethodConverter = $shippingMethodConverter; $this->totalsCollector = $totalsCollector; + } public function getAvailableMethods($cart) { $address = $cart->getShippingAddress(); - $address->setLimitCarrier(null); + $address->setQuote($cart); $address->setCollectShippingRates(true); $this->totalsCollector->collectAddressTotals($cart, $address); - $methods = []; + $methods = []; $shippingRates = $address->getGroupedAllShippingRates(); + foreach ($shippingRates as $carrierRates) { foreach ($carrierRates as $rate) { - $methodData = $this->dataObjectConverter->toFlatArray( - $this->shippingMethodConverter->modelToDataObject($rate, $cart->getQuoteCurrencyCode()), - [], - ShippingMethodInterface::class - ); - $methods[] = $this->processMoneyTypeData( - $methodData, - $cart->getQuoteCurrencyCode() - ); + $methods[] = $this->shippingMethodConverter->modelToDataObject($rate, $cart->getQuoteCurrencyCode()); } } + return $methods; } private function processMoneyTypeData(array $data, string $quoteCurrencyCode): array @@ -86,4 +82,4 @@ private function processMoneyTypeData(array $data, string $quoteCurrencyCode): a } return $data; } -} \ No newline at end of file +} diff --git a/Service/BuckarooFee/Calculate.php b/Service/BuckarooFee/Calculate.php new file mode 100755 index 000000000..1e5a259bc --- /dev/null +++ b/Service/BuckarooFee/Calculate.php @@ -0,0 +1,94 @@ +configProviderMethodFactory = $configProviderMethodFactory; + $this->fixedAmount = $fixedAmount; + $this->percentage = $percentage; + } + + public function calculatePaymentFee(Quote $quote, Total $total) + { + $paymentFee = $this->getPaymentFee($quote); + + if ($paymentFee === null){ + return null; + } + if(strpos($paymentFee, '%') !== false){ + return $this->percentage->calculate($quote, $total, $paymentFee); + } + + return $this->fixedAmount->calculate($quote, $total, (float)$paymentFee); + } + + public function getPaymentFee(Quote $quote) + { + $paymentMethod = $quote->getPayment()->getMethod(); + + if (!$paymentMethod || strpos($paymentMethod, 'buckaroo_magento2_') !== 0) { + return null; + } + + $methodInstance = $quote->getPayment()->getMethodInstance(); + if (!$methodInstance instanceof AbstractMethod) { + return null; + } + + $buckarooPaymentMethodCode = $methodInstance->buckarooPaymentMethodCode; + if (!$this->configProviderMethodFactory->has($buckarooPaymentMethodCode)) { + return null; + } + + $configProvider = $this->configProviderMethodFactory->get($buckarooPaymentMethodCode); + return trim($configProvider->getPaymentFee($quote->getStore())); + } +} diff --git a/Service/BuckarooFee/Result.php b/Service/BuckarooFee/Result.php new file mode 100755 index 000000000..417ee1d94 --- /dev/null +++ b/Service/BuckarooFee/Result.php @@ -0,0 +1,90 @@ +amount; + } + + /** + * @return float + */ + public function getRoundedAmount() + { + return round($this->amount, 2); + } + + /** + * @param float $amount + */ + public function setAmount($amount) + { + $this->amount = $amount; + } + + /** + * @return float + */ + public function getTaxAmount() + { + return $this->taxAmount; + } + + /** + * @return float + */ + public function getRoundedTaxAmount() + { + return round($this->taxAmount, 2); + } + + /** + * @param float $taxAmount + */ + public function setTaxAmount(float $taxAmount) + { + $this->taxAmount = $taxAmount; + } + + /** + * @return float + */ + public function getAmountIncludingTax() + { + return $this->amount + $this->taxAmount; + } +} diff --git a/Service/BuckarooFee/Types/FixedAmount.php b/Service/BuckarooFee/Types/FixedAmount.php new file mode 100755 index 000000000..51953fb2d --- /dev/null +++ b/Service/BuckarooFee/Types/FixedAmount.php @@ -0,0 +1,60 @@ +resultFactory = $resultFactory; + $this->taxCalculate = $taxCalculate; + } + + public function calculate(CartInterface $cart, Total $total, float $amount){ + + $tax = $this->taxCalculate->getTaxFromAmountIncludingTax($cart, $amount); + /** @var Result $result */ + $result = $this->resultFactory->create(); + $result->setAmount($amount - $tax); + $result->setTaxAmount($tax); + + return $result; + } +} diff --git a/Service/BuckarooFee/Types/Percentage.php b/Service/BuckarooFee/Types/Percentage.php new file mode 100755 index 000000000..5ed18ed17 --- /dev/null +++ b/Service/BuckarooFee/Types/Percentage.php @@ -0,0 +1,74 @@ +resultFactory = $resultFactory; + $this->taxCalculate = $taxCalculate; + } + + + public function calculate(CartInterface $cart, Total $total, $percentage){ + $percentage = (float) rtrim($percentage, '%'); + if ($percentage <= 0) { + return null; + } + $subtotal = $total->getData('base_subtotal_incl_tax'); + if (!$subtotal) { + $subtotal = $total->getTotalAmount('subtotal'); + } + if ($subtotal <= 0) { + return null; + } + + $calculatedResult = ($subtotal / 100) * $percentage; + $tax = $this->taxCalculate->getTaxFromAmountIncludingTax($cart, $calculatedResult); + + /** @var Result $result */ + $result = $this->resultFactory->create(); + $result->setAmount($calculatedResult - $tax); + $result->setTaxAmount($tax); + + return $result; + } +} diff --git a/Service/Formatter/Address/PhoneFormatter.php b/Service/Formatter/Address/PhoneFormatter.php index 1644ab9af..8401e084e 100644 --- a/Service/Formatter/Address/PhoneFormatter.php +++ b/Service/Formatter/Address/PhoneFormatter.php @@ -23,169 +23,159 @@ class PhoneFormatter { - private $validMobile = [ + private const VALID_MOBILE = [ 'NL' => ['00316'], 'BE' => ['003246', '003247', '003248', '003249'], 'DE' => ['004915', '004916', '004917'], 'AT' => ['0049650', '0049660', '0049664','0049676', '0049680', '0049677','0049681', '0049688', '0049699'], ]; - private $invalidNotation = [ + private const INVALID_NOTATION = [ 'NL' => ['00310', '0310', '310', '31'], 'BE' => ['00320', '0320', '320', '32'], ]; - private $startingNotation = [ - 'NL' => ['0', '0', '3', '1'], - 'BE' => ['0', '0', '3', '2'], - 'DE' => ['0', '0', '4', '9'], - 'AT' => ['0', '0', '4', '3'], + private const STARTING_NOTATION = [ + 'NL' => '0031', + 'BE' => '0032', + 'DE' => '0049', + 'AT' => '0043', ]; + private Log $logger; - public function __construct( - Log $logger - ) { + public function __construct(Log $logger) + { $this->logger = $logger; } /** - * @param $phoneNumber - * @param $country + * Formats a phone number for a given country. * + * @param string|null $phoneNumber + * @param string $country * @return array */ - public function format($phoneNumber, $country) + public function format(?string $phoneNumber, string $country): array { - $this->logger->addDebug(__METHOD__ . '|1|'); - $this->logger->addDebug(var_export([$phoneNumber, $country], true)); - - $return = ["orginal" => $phoneNumber, "clean" => false, "mobile" => false, "valid" => false]; + $this->logger->addDebug(__METHOD__ . ' - Starting format process', [ + 'phoneNumber' => $phoneNumber, + 'country' => $country, + ]); + + $return = [ + 'original' => $phoneNumber, + 'clean' => false, + 'mobile' => false, + 'valid' => false, + ]; + + // If phone number is null or empty, return default + if (empty($phoneNumber)) { + return $return; + } - $match = preg_replace('/[^0-9]/Uis', '', $phoneNumber); - if ($match) { - $phoneNumber = $match; + // If country is unsupported, return the original phone number as clean + if (!isset(self::STARTING_NOTATION[$country])) { + $return['clean'] = $phoneNumber; + return $return; } - $return['clean'] = $this->formatPhoneNumber($phoneNumber, $country); - $return['mobile'] = $this->isMobileNumber($return['clean'], $country); + // Clean and format the phone number + $cleanedNumber = $this->cleanPhoneNumber($phoneNumber); + $formattedNumber = $this->formatPhoneNumber($cleanedNumber, $country); - if (strlen((string)$return['clean']) == 13) { - $return['valid'] = true; - } + // Check if the phone number is mobile and valid + $return['clean'] = $formattedNumber; + $return['mobile'] = $this->isMobileNumber($formattedNumber, $country); + $return['valid'] = strlen($formattedNumber) === 13; - $this->logger->addDebug(__METHOD__ . '|2|'); - $this->logger->addDebug(var_export($return, true)); + $this->logger->addDebug(__METHOD__ . ' - Format process complete', $return); return $return; } /** - * @param $phoneNumber - * @param $country + * Removes all non-numeric characters from the phone number. + * + * @param string $phoneNumber + * @return string + */ + private function cleanPhoneNumber(string $phoneNumber): string + { + return preg_replace('/\D+/', '', $phoneNumber) ?? ''; + } + + /** + * Formats the phone number based on the country rules. * + * @param string $phoneNumber + * @param string $country * @return string */ - private function formatPhoneNumber($phoneNumber, $country) + private function formatPhoneNumber(string $phoneNumber, string $country): string { - $phoneLength = strlen((string)$phoneNumber); + $startingNotation = self::STARTING_NOTATION[$country]; + $phoneLength = strlen($phoneNumber); - if ($phoneLength > 10 && $phoneLength != 13) { - $phoneNumber = $this->isValidNotation($phoneNumber, $country); + // Apply invalid notation correction + if ($phoneLength > 10 && $phoneLength !== 13) { + $phoneNumber = $this->applyInvalidNotationCorrection($phoneNumber, $country); } - if ((in_array($country, ['NL', 'BE']) && ($phoneLength == 10)) - || - (in_array($country, ['AT', 'DE'])) - ) { - if (isset($this->startingNotation[$country])) { - $notationStart = implode($this->startingNotation[$country]); - $phoneNumber = $notationStart . substr($phoneNumber, 1); - } + // Prepend starting notation for supported local numbers + if ($phoneLength === 10 && strpos($phoneNumber, $startingNotation) !== 0) { + $phoneNumber = $startingNotation . substr($phoneNumber, 1); } return $phoneNumber; } /** - * @param $phoneNumber - * @param $country + * Checks if the phone number is mobile based on country rules. * + * @param string $phoneNumber + * @param string $country * @return bool */ - private function isMobileNumber($phoneNumber, $country) + private function isMobileNumber(string $phoneNumber, string $country): bool { - $isMobile = false; - - if (isset($this->validMobile[$country])) { - array_walk( - $this->validMobile[$country], - function ($value) use (&$isMobile, $phoneNumber) { - $phoneNumberPart = substr($phoneNumber, 0, strlen($value)); - $phoneNumberHasValue = strpos($phoneNumberPart, $value); - - if ($phoneNumberHasValue !== false) { - $isMobile = true; - } - } - ); + foreach (self::VALID_MOBILE[$country] ?? [] as $prefix) { + if (strpos($phoneNumber, $prefix) === 0) { + return true; + } } - - return $isMobile; + return false; } /** - * @param $phoneNumber - * @param $country + * Corrects invalid notations in the phone number. * + * @param string $phoneNumber + * @param string $country * @return string */ - private function isValidNotation($phoneNumber, $country) + private function applyInvalidNotationCorrection(string $phoneNumber, string $country): string { - if (isset($this->invalidNotation[$country])) { - array_walk( - $this->invalidNotation[$country], - function ($invalid) use (&$phoneNumber, $country) { - $phoneNumberPart = substr($phoneNumber, 0, strlen($invalid)); - - if (strpos($phoneNumberPart, $invalid) !== false) { - $phoneNumber = $this->formatNotation($phoneNumber, $invalid, $country); - } - } - ); + foreach (self::INVALID_NOTATION[$country] ?? [] as $invalidPrefix) { + if (strpos($phoneNumber, $invalidPrefix) === 0) { + $phoneNumber = $this->replaceInvalidNotation($phoneNumber, $invalidPrefix, $country); + } } - return $phoneNumber; } /** - * @param $phoneNumber - * @param $invalid - * @param $country + * Replaces invalid notation with a valid prefix. * + * @param string $phoneNumber + * @param string $invalidPrefix + * @param string $country * @return string */ - private function formatNotation($phoneNumber, $invalid, $country) + private function replaceInvalidNotation(string $phoneNumber, string $invalidPrefix, string $country): string { - if (isset($this->startingNotation[$country])) { - $valid = substr($invalid, 0, -1); - $countryNotation = $this->startingNotation[$country]; - - if (substr($valid, 0, 2) == $countryNotation[2] . $countryNotation[3]) { - $valid = $countryNotation[0] . $countryNotation[1] . $valid; - } - - if (substr($valid, 0, 2) == $countryNotation[1] . $countryNotation[2]) { - $valid = $countryNotation[0] . $valid; - } - - if ($valid == $countryNotation[2]) { - $valid = $countryNotation[1] . $valid . $countryNotation[3]; - } - - $phoneNumber = substr_replace($phoneNumber, $valid, 0, strlen($invalid)); - } - - return $phoneNumber; + $validPrefix = self::STARTING_NOTATION[$country]; + return preg_replace('/^' . preg_quote($invalidPrefix, '/') . '/', $validPrefix, $phoneNumber) ?? $phoneNumber; } } diff --git a/Service/Formatter/AddressFormatter.php b/Service/Formatter/AddressFormatter.php index 26224470f..2c33e43b7 100644 --- a/Service/Formatter/AddressFormatter.php +++ b/Service/Formatter/AddressFormatter.php @@ -46,37 +46,38 @@ public function __construct( } /** - * @param OrderAddressInterface $address + * Formats the address into a structured array. * + * @param OrderAddressInterface $address * @return array */ - public function format($address) + public function format(OrderAddressInterface $address): array { - $formattedAddress = [ + return [ 'street' => $this->formatStreet($address->getStreet()), - 'telephone' => $this->formatTelephone($address->getTelephone(), $address->getCountryId()) + 'telephone' => $this->formatTelephone($address->getTelephone(), $address->getCountryId()), ]; - - return $formattedAddress; } /** - * @param $street + * Formats the street address. * + * @param array|string|null $street * @return array */ - public function formatStreet($street) + public function formatStreet($street): array { return $this->streetFormatter->format($street); } /** - * @param $phoneNumber - * @param $country + * Formats the phone number based on the country. * + * @param string|null $phoneNumber + * @param string $country * @return array */ - public function formatTelephone($phoneNumber, $country) + public function formatTelephone(?string $phoneNumber, string $country): array { return $this->phoneFormatter->format($phoneNumber, $country); } diff --git a/Service/Sales/Pdf/BuckarooFee.php b/Service/Sales/Pdf/BuckarooFee.php index a7e03a008..a12ac0a90 100644 --- a/Service/Sales/Pdf/BuckarooFee.php +++ b/Service/Sales/Pdf/BuckarooFee.php @@ -19,41 +19,52 @@ */ namespace Buckaroo\Magento2\Service\Sales\Pdf; -use Magento\Framework\App\Config\ScopeConfigInterface; +use Buckaroo\Magento2\Model\Config\Source\Display\Type as DisplayType; +use Buckaroo\Magento2\Model\ConfigProvider\Account; use Magento\Sales\Model\Order\Pdf\Total\DefaultTotal; use Magento\Store\Model\ScopeInterface; use Magento\Tax\Helper\Data; use Magento\Tax\Model\Calculation; use Magento\Tax\Model\ResourceModel\Sales\Order\Tax\CollectionFactory; use Buckaroo\Magento2\Helper\PaymentFee; -use Buckaroo\Magento2\Model\Config\Source\Display\Type; use Buckaroo\Magento2\Model\ConfigProvider\BuckarooFee as ConfigProviderBuckarooFee; class BuckarooFee extends DefaultTotal { - /** @var ScopeConfigInterface */ - private $scopeConfig; - /** @var PaymentFee */ private $paymentFee; /** - * {@inheritdoc} - * - * @param ScopeInterface $scopeConfig - * @param PaymentFee $paymentFee + * @var Account + */ + protected $configProviderAccount; + + /** + * @var ConfigProviderBuckarooFee + */ + protected $configProviderBuckarooFee; + + /** + * @param Data $taxHelper + * @param Calculation $taxCalculation + * @param CollectionFactory $ordersFactory + * @param PaymentFee $paymentFee + * @param Account $configProviderAccount + * @param ConfigProviderBuckarooFee $configProviderBuckarooFee + * @param array $data */ public function __construct( Data $taxHelper, Calculation $taxCalculation, CollectionFactory $ordersFactory, - ScopeConfigInterface $scopeConfig, PaymentFee $paymentFee, + Account $configProviderAccount, + ConfigProviderBuckarooFee $configProviderBuckarooFee, array $data = [] ) { - $this->scopeConfig = $scopeConfig; $this->paymentFee = $paymentFee; - + $this->configProviderAccount = $configProviderAccount; + $this->configProviderBuckarooFee = $configProviderBuckarooFee; parent::__construct($taxHelper, $taxCalculation, $ordersFactory, $data); } @@ -67,6 +78,8 @@ public function getTotalsForDisplay() $label = $this->paymentFee->getBuckarooPaymentFeeLabel($this->getOrder()); $fontSize = $this->getFontSize() ? $this->getFontSize() : 7; + $isFeeInclusiveOfTax = $this->configProviderBuckarooFee->getBuckarooFeeTaxClass($store); + $amountInclTax = $this->getSource()->getBuckarooFeeInclTax(); if (!$amountInclTax) { @@ -75,45 +88,22 @@ public function getTotalsForDisplay() $amountInclTax = $this->getOrder()->formatPriceTxt($amountInclTax); - $displaySalesBuckarooFee = $this->scopeConfig->getValue( - ConfigProviderBuckarooFee::XPATH_BUCKAROOFEE_PRICE_DISPLAY_SALES, - ScopeInterface::SCOPE_STORE, - $store - ); - - switch ($displaySalesBuckarooFee) { - case Type::DISPLAY_TYPE_BOTH: - $totals = [ - [ - 'amount' => $this->getAmountPrefix() . $amount, - 'label' => __($label . ' (Excl. Tax)') . ':', - 'font_size' => $fontSize, - ], - [ - 'amount' => $this->getAmountPrefix() . $amountInclTax, - 'label' => __($label . ' (Incl. Tax)') . ':', - 'font_size' => $fontSize - ], - ]; - break; - case Type::DISPLAY_TYPE_INCLUDING_TAX: - $totals = [ - [ - 'amount' => $this->getAmountPrefix() . $amountInclTax, - 'label' => __($label) . ':', - 'font_size' => $fontSize, - ], - ]; - break; - default: - $totals = [ - [ - 'amount' => $this->getAmountPrefix() . $amount, - 'label' => __($label) . ':', - 'font_size' => $fontSize, - ], - ]; - break; + if ($isFeeInclusiveOfTax == DisplayType::DISPLAY_TYPE_INCLUDING_TAX) { + $totals = [ + [ + 'amount' => $this->getAmountPrefix() . $amountInclTax, + 'label' => __($label) . ':', + 'font_size' => $fontSize, + ], + ]; + } else { + $totals = [ + [ + 'amount' => $this->getAmountPrefix() . $amount, + 'label' => __($label) . ':', + 'font_size' => $fontSize, + ], + ]; } return $totals; diff --git a/Service/Sales/Quote/Recreate.php b/Service/Sales/Quote/Recreate.php index 31685868f..333a21d9a 100644 --- a/Service/Sales/Quote/Recreate.php +++ b/Service/Sales/Quote/Recreate.php @@ -48,9 +48,9 @@ public function recreate($quote, $response = []) { // @codingStandardsIgnoreStart try { - $quote->setIsActive(true); -// $quote->setTriggerRecollect('1'); + $quote->setIsActive(1); $quote->setReservedOrderId(null); + $quote->setBuckarooFee(null); $quote->setBaseBuckarooFee(null); $quote->setBuckarooFeeTaxAmount(null); @@ -58,20 +58,19 @@ public function recreate($quote, $response = []) $quote->setBuckarooFeeInclTax(null); $quote->setBaseBuckarooFeeInclTax(null); - if (isset($response['add_service_action_from_magento']) && $response['add_service_action_from_magento'] === 'payfastcheckout') { + if (isset($response['add_service_action_from_magento']) + && $response['add_service_action_from_magento'] === 'payfastcheckout' + ) { $this->logger->addDebug(__METHOD__ . '|Handling payfastcheckout specific logic.'); $quote->setCustomerEmail(null); - // Remove existing addresses if they exist if ($billingAddress = $quote->getBillingAddress()) { $quote->removeAddress($billingAddress->getId()); - $billingAddress->addData([]); // Optionally clear address data } if ($shippingAddress = $quote->getShippingAddress()) { $quote->removeAddress($shippingAddress->getId()); - $shippingAddress->addData([]); // Optionally clear address data } } diff --git a/Service/Software/Data.php b/Service/Software/Data.php index a2923ff13..325cb76c8 100644 --- a/Service/Software/Data.php +++ b/Service/Software/Data.php @@ -36,7 +36,7 @@ class Data const MODULE_CODE = 'Buckaroo_Magento2'; /** Version of Module */ - const BUCKAROO_VERSION = '1.50.2'; + const BUCKAROO_VERSION = '1.51.0'; /** @var ProductMetadataInterface */ private $productMetadata; diff --git a/Service/Tax/TaxCalculate.php b/Service/Tax/TaxCalculate.php new file mode 100755 index 000000000..c39568036 --- /dev/null +++ b/Service/Tax/TaxCalculate.php @@ -0,0 +1,91 @@ +taxCalculation = $taxCalculation; + $this->configProviderBuckarooFee = $configProviderBuckarooFee; + } + + /** + * Calculate tax amount from an amount that includes tax. + * + * @param CartInterface $cart + * @param float $amount Amount including tax + * @return float Tax amount + */ + public function getTaxFromAmountIncludingTax(CartInterface $cart, float $amount): float + { + $shippingAddress = $cart->getShippingAddress(); + $billingAddress = $cart->getBillingAddress(); + $customerTaxClassId = $cart->getCustomerTaxClassId(); + $storeId = $cart->getStoreId(); + + $taxClassId = $this->configProviderBuckarooFee->getBuckarooFeeTaxClass($cart->getStore()); + + if (empty($taxClassId) || !is_numeric($taxClassId)) { + return 0.0; + } + + $request = $this->taxCalculation->getRateRequest( + $shippingAddress, + $billingAddress, + $customerTaxClassId, + $storeId + ); + + $request->setProductClassId($taxClassId); + + $rate = $this->taxCalculation->getRate($request); + + return $this->taxCalculation->calcTaxAmount( + $amount, + $rate, + true, + false + ); + } +} diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index 60bc4bc03..52cdbd124 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -568,8 +568,24 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $this->addCustomerLastPayByBankIssuer($setup); } + if (version_compare($context->getVersion(), '1.51.0', '<')) { + // Update buckaroo_magento2_mrcash title to 'Bancontact' + $setup->getConnection()->update( + $setup->getTable('core_config_data'), + ['value' => 'Bancontact'], + ['path = ?' => 'payment/buckaroo_magento2_mrcash/title'] + ); + + // Update buckaroo_magento2_billink title to 'Billink' + $setup->getConnection()->update( + $setup->getTable('core_config_data'), + ['value' => 'Billink'], + ['path = ?' => 'payment/buckaroo_magento2_billink/title'] + ); + } + $this->setCustomerIDIN($setup); - + $this->setCustomerIsEighteenOrOlder($setup); $this->setProductIDIN($setup); diff --git a/Test/Fixtures/buckaroo-magento2-fixture.sql b/Test/Fixtures/buckaroo-magento2-fixture.sql index cc45c782f..82830c7f0 100644 --- a/Test/Fixtures/buckaroo-magento2-fixture.sql +++ b/Test/Fixtures/buckaroo-magento2-fixture.sql @@ -105,7 +105,7 @@ CREATE TABLE `admin_user` ( LOCK TABLES `admin_user` WRITE; /*!40000 ALTER TABLE `admin_user` DISABLE KEYS */; -INSERT INTO `admin_user` VALUES (1,'a','a','support@buckaroo.nl','a','e4a2e09527334efad0ab5ac95c7848a25a38606e1540988479753571af429512:ehfP8C4APW1COFJ3Tqwdiw0U7flaLPtY:1','2015-12-08 10:48:47','2016-01-20 10:20:32','2016-01-20 10:20:32',28,0,1,'a:1:{s:11:\"configState\";a:164:{s:44:\"payment_us_buckaroo_magento2_section_buckaroo_magento2\";s:1:\"1\";s:38:\"payment_us_braintree_section_braintree\";s:1:\"0\";s:18:\"payment_us_checkmo\";s:1:\"0\";s:25:\"payment_us_cashondelivery\";s:1:\"0\";s:23:\"payment_us_banktransfer\";s:1:\"0\";s:15:\"payment_us_free\";s:1:\"0\";s:24:\"payment_us_purchaseorder\";s:1:\"0\";s:34:\"payment_us_authorizenet_directpost\";s:1:\"0\";s:18:\"payment_us_account\";s:1:\"1\";s:31:\"payment_us_buckaroo_magento2_section\";s:1:\"1\";s:28:\"payment_us_braintree_section\";s:1:\"0\";s:57:\"payment_us_braintree_section_braintree_braintree_required\";s:1:\"1\";s:57:\"payment_us_braintree_section_braintree_braintree_advanced\";s:1:\"0\";s:65:\"payment_us_braintree_section_braintree_braintree_country_specific\";s:1:\"0\";s:55:\"payment_us_braintree_section_braintree_braintree_paypal\";s:1:\"0\";s:57:\"payment_us_braintree_section_braintree_braintree_3dsecure\";s:1:\"0\";s:31:\"payment_us_braintreetwo_section\";s:1:\"0\";s:44:\"payment_us_braintreetwo_section_braintreetwo\";s:1:\"0\";s:66:\"payment_us_braintreetwo_section_braintreetwo_braintreetwo_required\";s:1:\"1\";s:66:\"payment_us_braintreetwo_section_braintreetwo_braintreetwo_advanced\";s:1:\"0\";s:74:\"payment_us_braintreetwo_section_braintreetwo_braintreetwo_country_specific\";s:1:\"0\";s:34:\"payment_us_paypal_group_all_in_one\";s:1:\"0\";s:51:\"payment_us_paypal_group_all_in_one_payflow_advanced\";s:1:\"0\";s:69:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings\";s:1:\"1\";s:87:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced\";s:1:\"1\";s:92:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml\";s:1:\"0\";s:123:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_homepage\";s:1:\"0\";s:127:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_categorypage\";s:1:\"0\";s:126:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_productpage\";s:1:\"0\";s:123:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_checkout\";s:1:\"0\";s:78:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced\";s:1:\"1\";s:114:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced_settings_payments_advanced_advanced\";s:1:\"0\";s:132:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced_settings_payments_advanced_advanced_settlement_report\";s:1:\"0\";s:123:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced_settings_payments_advanced_advanced_frontend\";s:1:\"0\";s:77:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_express_checkout\";s:1:\"1\";s:112:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_express_checkout_settings_express_checkout_advanced\";s:1:\"0\";s:43:\"payment_us_paypal_group_all_in_one_wpp_usuk\";s:1:\"0\";s:67:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required\";s:1:\"1\";s:95:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_settings\";s:1:\"1\";s:96:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml\";s:1:\"0\";s:133:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_homepage\";s:1:\"0\";s:137:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_categorypage\";s:1:\"0\";s:136:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_productpage\";s:1:\"0\";s:133:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_checkout\";s:1:\"0\";s:67:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow\";s:1:\"1\";s:100:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced\";s:1:\"0\";s:125:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_avs_check\";s:1:\"0\";s:133:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_settlement_report\";s:1:\"0\";s:124:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_frontend\";s:1:\"0\";s:75:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_express_checkout\";s:1:\"1\";s:116:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_express_checkout_paypal_payflow_express_checkout_advanced\";s:1:\"0\";s:46:\"payment_us_paypal_group_all_in_one_wps_express\";s:1:\"0\";s:72:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required\";s:1:\"1\";s:115:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout\";s:1:\"1\";s:86:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml\";s:1:\"0\";s:108:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_homepage\";s:1:\"0\";s:112:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_categorypage\";s:1:\"0\";s:111:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_productpage\";s:1:\"0\";s:108:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_checkout\";s:1:\"0\";s:58:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec\";s:1:\"1\";s:79:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced\";s:1:\"0\";s:114:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced_express_checkout_billing_agreement\";s:1:\"0\";s:114:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced_express_checkout_settlement_report\";s:1:\"0\";s:105:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced_express_checkout_frontend\";s:1:\"0\";s:34:\"payment_us_paypal_payment_gateways\";s:1:\"0\";s:74:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout\";s:1:\"0\";s:98:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required\";s:1:\"1\";s:126:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings\";s:1:\"1\";s:127:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml\";s:1:\"0\";s:164:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_homepage\";s:1:\"0\";s:168:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_categorypage\";s:1:\"0\";s:167:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_productpage\";s:1:\"0\";s:164:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_checkout\";s:1:\"0\";s:98:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow\";s:1:\"1\";s:131:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced\";s:1:\"1\";s:156:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_avs_check\";s:1:\"0\";s:164:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_settlement_report\";s:1:\"0\";s:155:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_frontend\";s:1:\"0\";s:106:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_express_checkout\";s:1:\"1\";s:147:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_express_checkout_paypal_payflow_express_checkout_advanced\";s:1:\"0\";s:50:\"payment_us_paypal_payment_gateways_payflow_link_us\";s:1:\"0\";s:72:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required\";s:1:\"1\";s:98:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_link\";s:1:\"1\";s:99:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml\";s:1:\"1\";s:134:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_homepage\";s:1:\"0\";s:138:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_categorypage\";s:1:\"0\";s:137:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_productpage\";s:1:\"0\";s:134:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_checkout\";s:1:\"0\";s:72:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link\";s:1:\"1\";s:103:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_settings_payflow_link_advanced\";s:1:\"1\";s:134:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_settings_payflow_link_advanced_payflow_link_settlement_report\";s:1:\"0\";s:125:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_settings_payflow_link_advanced_payflow_link_frontend\";s:1:\"0\";s:89:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_express_checkout\";s:1:\"1\";s:137:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_express_checkout_settings_payflow_link_express_checkout_advanced\";s:1:\"1\";s:45:\"payment_us_paypal_alternative_payment_methods\";s:1:\"0\";s:65:\"payment_us_paypal_alternative_payment_methods_express_checkout_us\";s:1:\"0\";s:91:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required\";s:1:\"1\";s:134:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout\";s:1:\"1\";s:105:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml\";s:1:\"1\";s:127:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_homepage\";s:1:\"1\";s:131:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_categorypage\";s:1:\"1\";s:130:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_productpage\";s:1:\"1\";s:127:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_checkout\";s:1:\"1\";s:77:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec\";s:1:\"1\";s:98:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced\";s:1:\"1\";s:133:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_billing_agreement\";s:1:\"1\";s:133:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_settlement_report\";s:1:\"1\";s:124:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend\";s:1:\"1\";s:25:\"general_single_store_mode\";s:1:\"1\";s:25:\"general_store_information\";s:1:\"1\";s:14:\"general_locale\";s:1:\"1\";s:14:\"general_region\";s:1:\"1\";s:15:\"general_country\";s:1:\"1\";s:41:\"buckaroo_magento2_buckaroo_magento2_account_section\";s:1:\"1\";s:41:\"buckaroo_magento2_buckaroo_magento2_payment_section\";s:1:\"1\";s:41:\"buckaroo_magento2_buckaroo_magento2_support_section\";s:1:\"1\";s:63:\"buckaroo_magento2_buckaroo_magento2_account_section_buckaroo_magento2_advanced\";s:1:\"1\";s:60:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_ideal\";s:1:\"1\";s:82:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_ideal_buckaroo_magento2_advanced\";s:1:\"1\";s:66:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcards\";s:1:\"0\";s:88:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcards_buckaroo_magento2_advanced\";s:1:\"0\";s:61:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_paypal\";s:1:\"0\";s:83:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_paypal_buckaroo_magento2_advanced\";s:1:\"1\";s:68:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bank_transfer\";s:1:\"0\";s:90:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bank_transfer_buckaroo_magento2_advanced\";s:1:\"0\";s:66:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_directdebit\";s:1:\"0\";s:88:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_directdebit_buckaroo_magento2_advanced\";s:1:\"0\";s:71:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bancontactmrcash\";s:1:\"0\";s:93:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bancontactmrcash_buckaroo_magento2_advanced\";s:1:\"0\";s:65:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcard\";s:1:\"0\";s:87:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcard_buckaroo_magento2_advanced\";s:1:\"1\";s:63:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_transfer\";s:1:\"0\";s:85:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_transfer_buckaroo_magento2_advanced\";s:1:\"1\";s:70:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_sepadirectdebit\";s:1:\"0\";s:92:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_sepadirectdebit_buckaroo_magento2_advanced\";s:1:\"1\";s:61:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_mrcash\";s:1:\"0\";s:83:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_mrcash_buckaroo_magento2_advanced\";s:1:\"1\";s:68:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_sofortbanking\";s:1:\"0\";s:90:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_sofortbanking_buckaroo_magento2_advanced\";s:1:\"0\";s:62:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_giropay\";s:1:\"0\";s:84:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_giropay_buckaroo_magento2_advanced\";s:1:\"0\";s:40:\"buckaroo_magento2_buckaroo_magento2_refund_section\";s:1:\"0\";s:14:\"admin_security\";s:1:\"1\";s:15:\"admin_dashboard\";s:1:\"1\";s:13:\"admin_captcha\";s:1:\"1\";s:9:\"admin_url\";s:1:\"1\";s:13:\"admin_startup\";s:1:\"1\";s:12:\"admin_emails\";s:1:\"1\";s:34:\"system_media_storage_configuration\";s:1:\"0\";s:11:\"system_smtp\";s:1:\"0\";s:11:\"system_cron\";s:1:\"0\";s:19:\"system_cron_default\";s:1:\"0\";s:12:\"dev_restrict\";s:1:\"1\";s:34:\"dev_front_end_development_workflow\";s:1:\"0\";s:9:\"dev_debug\";s:1:\"0\";s:12:\"dev_template\";s:1:\"0\";s:20:\"dev_translate_inline\";s:1:\"0\";s:6:\"dev_js\";s:1:\"0\";s:7:\"dev_css\";s:1:\"0\";s:9:\"dev_image\";s:1:\"0\";s:10:\"dev_static\";s:1:\"0\";s:8:\"dev_grid\";s:1:\"0\";s:15:\"tax_calculation\";s:1:\"1\";s:12:\"tax_defaults\";s:1:\"0\";}}',NULL,NULL,'en_US',0,NULL,NULL); +INSERT INTO `admin_user` VALUES (1,'a','a','support@buckaroo.nl','a','e4a2e09527334efad0ab5ac95c7848a25a38606e1540988479753571af429512:ehfP8C4APW1COFJ3Tqwdiw0U7flaLPtY:1','2015-12-08 10:48:47','2016-01-20 10:20:32','2016-01-20 10:20:32',28,0,1,'a:1:{s:11:\"configState\";a:164:{s:44:\"payment_us_buckaroo_magento2_section_buckaroo_magento2\";s:1:\"1\";s:38:\"payment_us_braintree_section_braintree\";s:1:\"0\";s:18:\"payment_us_checkmo\";s:1:\"0\";s:25:\"payment_us_cashondelivery\";s:1:\"0\";s:23:\"payment_us_banktransfer\";s:1:\"0\";s:15:\"payment_us_free\";s:1:\"0\";s:24:\"payment_us_purchaseorder\";s:1:\"0\";s:34:\"payment_us_authorizenet_directpost\";s:1:\"0\";s:18:\"payment_us_account\";s:1:\"1\";s:31:\"payment_us_buckaroo_magento2_section\";s:1:\"1\";s:28:\"payment_us_braintree_section\";s:1:\"0\";s:57:\"payment_us_braintree_section_braintree_braintree_required\";s:1:\"1\";s:57:\"payment_us_braintree_section_braintree_braintree_advanced\";s:1:\"0\";s:65:\"payment_us_braintree_section_braintree_braintree_country_specific\";s:1:\"0\";s:55:\"payment_us_braintree_section_braintree_braintree_paypal\";s:1:\"0\";s:57:\"payment_us_braintree_section_braintree_braintree_3dsecure\";s:1:\"0\";s:31:\"payment_us_braintreetwo_section\";s:1:\"0\";s:44:\"payment_us_braintreetwo_section_braintreetwo\";s:1:\"0\";s:66:\"payment_us_braintreetwo_section_braintreetwo_braintreetwo_required\";s:1:\"1\";s:66:\"payment_us_braintreetwo_section_braintreetwo_braintreetwo_advanced\";s:1:\"0\";s:74:\"payment_us_braintreetwo_section_braintreetwo_braintreetwo_country_specific\";s:1:\"0\";s:34:\"payment_us_paypal_group_all_in_one\";s:1:\"0\";s:51:\"payment_us_paypal_group_all_in_one_payflow_advanced\";s:1:\"0\";s:69:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings\";s:1:\"1\";s:87:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced\";s:1:\"1\";s:92:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml\";s:1:\"0\";s:123:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_homepage\";s:1:\"0\";s:127:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_categorypage\";s:1:\"0\";s:126:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_productpage\";s:1:\"0\";s:123:\"payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_advanced_advertise_bml_advanced_settings_bml_checkout\";s:1:\"0\";s:78:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced\";s:1:\"1\";s:114:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced_settings_payments_advanced_advanced\";s:1:\"0\";s:132:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced_settings_payments_advanced_advanced_settlement_report\";s:1:\"0\";s:123:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_payments_advanced_settings_payments_advanced_advanced_frontend\";s:1:\"0\";s:77:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_express_checkout\";s:1:\"1\";s:112:\"payment_us_paypal_group_all_in_one_payflow_advanced_settings_express_checkout_settings_express_checkout_advanced\";s:1:\"0\";s:43:\"payment_us_paypal_group_all_in_one_wpp_usuk\";s:1:\"0\";s:67:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required\";s:1:\"1\";s:95:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_settings\";s:1:\"1\";s:96:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml\";s:1:\"0\";s:133:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_homepage\";s:1:\"0\";s:137:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_categorypage\";s:1:\"0\";s:136:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_productpage\";s:1:\"0\";s:133:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_checkout\";s:1:\"0\";s:67:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow\";s:1:\"1\";s:100:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced\";s:1:\"0\";s:125:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_avs_check\";s:1:\"0\";s:133:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_settlement_report\";s:1:\"0\";s:124:\"payment_us_paypal_group_all_in_one_wpp_usuk_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_frontend\";s:1:\"0\";s:75:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_express_checkout\";s:1:\"1\";s:116:\"payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_express_checkout_paypal_payflow_express_checkout_advanced\";s:1:\"0\";s:46:\"payment_us_paypal_group_all_in_one_wps_express\";s:1:\"0\";s:72:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required\";s:1:\"1\";s:115:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_express_checkout_required_express_checkout\";s:1:\"1\";s:86:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml\";s:1:\"0\";s:108:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_homepage\";s:1:\"0\";s:112:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_categorypage\";s:1:\"0\";s:111:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_productpage\";s:1:\"0\";s:108:\"payment_us_paypal_group_all_in_one_wps_express_express_checkout_required_advertise_bml_settings_bml_checkout\";s:1:\"0\";s:58:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec\";s:1:\"1\";s:79:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced\";s:1:\"0\";s:114:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced_express_checkout_billing_agreement\";s:1:\"0\";s:114:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced_express_checkout_settlement_report\";s:1:\"0\";s:105:\"payment_us_paypal_group_all_in_one_wps_express_settings_ec_settings_ec_advanced_express_checkout_frontend\";s:1:\"0\";s:34:\"payment_us_paypal_payment_gateways\";s:1:\"0\";s:74:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout\";s:1:\"0\";s:98:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required\";s:1:\"1\";s:126:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings\";s:1:\"1\";s:127:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml\";s:1:\"0\";s:164:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_homepage\";s:1:\"0\";s:168:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_categorypage\";s:1:\"0\";s:167:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_productpage\";s:1:\"0\";s:164:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_required_paypal_payflow_advertise_bml_paypal_payflow_settings_bml_checkout\";s:1:\"0\";s:98:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow\";s:1:\"1\";s:131:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced\";s:1:\"1\";s:156:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_avs_check\";s:1:\"0\";s:164:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_settlement_report\";s:1:\"0\";s:155:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_settings_paypal_payflow_settings_paypal_payflow_advanced_paypal_payflow_frontend\";s:1:\"0\";s:106:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_express_checkout\";s:1:\"1\";s:147:\"payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_express_checkout_paypal_payflow_express_checkout_advanced\";s:1:\"0\";s:50:\"payment_us_paypal_payment_gateways_payflow_link_us\";s:1:\"0\";s:72:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required\";s:1:\"1\";s:98:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_link\";s:1:\"1\";s:99:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml\";s:1:\"1\";s:134:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_homepage\";s:1:\"0\";s:138:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_categorypage\";s:1:\"0\";s:137:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_productpage\";s:1:\"0\";s:134:\"payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_advertise_bml_payflow_link_settings_bml_checkout\";s:1:\"0\";s:72:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link\";s:1:\"1\";s:103:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_settings_payflow_link_advanced\";s:1:\"1\";s:134:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_settings_payflow_link_advanced_payflow_link_settlement_report\";s:1:\"0\";s:125:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_settings_payflow_link_advanced_payflow_link_frontend\";s:1:\"0\";s:89:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_express_checkout\";s:1:\"1\";s:137:\"payment_us_paypal_payment_gateways_payflow_link_us_settings_payflow_link_express_checkout_settings_payflow_link_express_checkout_advanced\";s:1:\"1\";s:45:\"payment_us_paypal_alternative_payment_methods\";s:1:\"0\";s:65:\"payment_us_paypal_alternative_payment_methods_express_checkout_us\";s:1:\"0\";s:91:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required\";s:1:\"1\";s:134:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout\";s:1:\"1\";s:105:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml\";s:1:\"1\";s:127:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_homepage\";s:1:\"1\";s:131:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_categorypage\";s:1:\"1\";s:130:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_productpage\";s:1:\"1\";s:127:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_advertise_bml_settings_bml_checkout\";s:1:\"1\";s:77:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec\";s:1:\"1\";s:98:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced\";s:1:\"1\";s:133:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_billing_agreement\";s:1:\"1\";s:133:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_settlement_report\";s:1:\"1\";s:124:\"payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend\";s:1:\"1\";s:25:\"general_single_store_mode\";s:1:\"1\";s:25:\"general_store_information\";s:1:\"1\";s:14:\"general_locale\";s:1:\"1\";s:14:\"general_region\";s:1:\"1\";s:15:\"general_country\";s:1:\"1\";s:41:\"buckaroo_magento2_buckaroo_magento2_account_section\";s:1:\"1\";s:41:\"buckaroo_magento2_buckaroo_magento2_payment_section\";s:1:\"1\";s:41:\"buckaroo_magento2_buckaroo_magento2_support_section\";s:1:\"1\";s:63:\"buckaroo_magento2_buckaroo_magento2_account_section_buckaroo_magento2_advanced\";s:1:\"1\";s:60:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_ideal\";s:1:\"1\";s:82:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_ideal_buckaroo_magento2_advanced\";s:1:\"1\";s:66:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcards\";s:1:\"0\";s:88:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcards_buckaroo_magento2_advanced\";s:1:\"0\";s:61:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_paypal\";s:1:\"0\";s:83:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_paypal_buckaroo_magento2_advanced\";s:1:\"1\";s:68:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bank_transfer\";s:1:\"0\";s:90:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bank_transfer_buckaroo_magento2_advanced\";s:1:\"0\";s:66:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_directdebit\";s:1:\"0\";s:88:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_directdebit_buckaroo_magento2_advanced\";s:1:\"0\";s:71:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bancontactmrcash\";s:1:\"0\";s:93:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_bancontactmrcash_buckaroo_magento2_advanced\";s:1:\"0\";s:65:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcard\";s:1:\"0\";s:87:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_creditcard_buckaroo_magento2_advanced\";s:1:\"1\";s:63:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_transfer\";s:1:\"0\";s:85:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_transfer_buckaroo_magento2_advanced\";s:1:\"1\";s:70:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_sepadirectdebit\";s:1:\"0\";s:92:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_sepadirectdebit_buckaroo_magento2_advanced\";s:1:\"1\";s:61:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_mrcash\";s:1:\"0\";s:83:\"buckaroo_magento2_buckaroo_magento2_payment_section_buckaroo_magento2_mrcash_buckaroo_magento2_advanced\";s:1:\"1\";s:1:\"0\";s:1:\"0\";s:1:\"0\";s:1:\"0\";s:40:\"buckaroo_magento2_buckaroo_magento2_refund_section\";s:1:\"0\";s:14:\"admin_security\";s:1:\"1\";s:15:\"admin_dashboard\";s:1:\"1\";s:13:\"admin_captcha\";s:1:\"1\";s:9:\"admin_url\";s:1:\"1\";s:13:\"admin_startup\";s:1:\"1\";s:12:\"admin_emails\";s:1:\"1\";s:34:\"system_media_storage_configuration\";s:1:\"0\";s:11:\"system_smtp\";s:1:\"0\";s:11:\"system_cron\";s:1:\"0\";s:19:\"system_cron_default\";s:1:\"0\";s:12:\"dev_restrict\";s:1:\"1\";s:34:\"dev_front_end_development_workflow\";s:1:\"0\";s:9:\"dev_debug\";s:1:\"0\";s:12:\"dev_template\";s:1:\"0\";s:20:\"dev_translate_inline\";s:1:\"0\";s:6:\"dev_js\";s:1:\"0\";s:7:\"dev_css\";s:1:\"0\";s:9:\"dev_image\";s:1:\"0\";s:10:\"dev_static\";s:1:\"0\";s:8:\"dev_grid\";s:1:\"0\";s:15:\"tax_calculation\";s:1:\"1\";s:12:\"tax_defaults\";s:1:\"0\";}}',NULL,NULL,'en_US',0,NULL,NULL); /*!40000 ALTER TABLE `admin_user` ENABLE KEYS */; UNLOCK TABLES; @@ -3156,7 +3156,7 @@ CREATE TABLE `core_config_data` ( LOCK TABLES `core_config_data` WRITE; /*!40000 ALTER TABLE `core_config_data` DISABLE KEYS */; -INSERT INTO `core_config_data` VALUES (1,'default',0,'web/seo/use_rewrites','1'),(2,'default',0,'web/unsecure/base_url','http://buckaroo.jenkins/'),(3,'default',0,'web/secure/base_url','https://buckaroo.jenkins/'),(4,'default',0,'general/locale/code','nl-NL'),(5,'default',0,'web/secure/use_in_frontend',NULL),(6,'default',0,'web/secure/use_in_adminhtml',NULL),(7,'default',0,'general/locale/timezone','Europe/Amsterdam'),(8,'default',0,'currency/options/base','EUR'),(9,'default',0,'currency/options/default','EUR'),(10,'default',0,'currency/options/allow','EUR'),(11,'default',0,'general/region/display_all','1'),(12,'default',0,'general/region/state_required','AT,BR,CA,CH,DE,EE,ES,FI,FR,LT,LV,RO,US'),(13,'default',0,'catalog/category/root_id',NULL),(14,'default',0,'paypal/general/merchant_country','NL'),(15,'default',0,'payment/buckaroo_magento2_ideal/active','1'),(16,'default',0,'payment/braintree/active','0'),(17,'default',0,'payment/braintree_paypal/active','1'),(18,'default',0,'payment/braintree/title','Credit Card (Braintree)'),(19,'default',0,'payment/braintree/environment','sandbox'),(20,'default',0,'payment/braintree/payment_action','authorize'),(21,'default',0,'payment/braintree/merchant_account_id','bart.buckaroo'),(22,'default',0,'payment/braintree/merchant_id','4qzzt63rc7krn522'),(23,'default',0,'payment/braintree/debug','0'),(24,'default',0,'payment/braintree/capture_action','invoice'),(25,'default',0,'payment/braintree/order_status','processing'),(26,'default',0,'payment/braintree/use_vault','0'),(27,'default',0,'payment/braintree/duplicate_card','0'),(28,'default',0,'payment/braintree/useccv','1'),(29,'default',0,'payment/braintree/cctypes','AE,VI,MC,DI,JCB'),(30,'default',0,'payment/braintree/enable_cc_detection','1'),(31,'default',0,'payment/braintree/fraudprotection','0'),(32,'default',0,'payment/braintree/kount_id',NULL),(33,'default',0,'payment/braintree/usecache','0'),(34,'default',0,'payment/braintree/sort_order',NULL),(35,'default',0,'payment/braintree/allowspecific','0'),(36,'default',0,'payment/braintree/specificcountry',NULL),(37,'default',0,'payment/braintree/countrycreditcard','a:0:{}'),(38,'default',0,'payment/braintree_paypal/title','PayPal (Braintree)'),(39,'default',0,'payment/braintree_paypal/sort_order',NULL),(40,'default',0,'payment/braintree_paypal/merchant_name_override',NULL),(41,'default',0,'payment/braintree_paypal/payment_action','authorize'),(42,'default',0,'payment/braintree_paypal/order_status','processing'),(43,'default',0,'payment/braintree_paypal/allowspecific','0'),(44,'default',0,'payment/braintree_paypal/specificcountry',NULL),(45,'default',0,'payment/braintree_paypal/require_billing_address','0'),(46,'default',0,'payment/braintree_paypal/display_on_shopping_cart','0'),(47,'default',0,'payment/braintree_paypal/allow_shipping_address_override','0'),(48,'default',0,'payment/braintree_paypal/debug','0'),(49,'default',0,'payment/braintree/verify_3dsecure','0'),(50,'default',0,'payment/braintreetwo/active','0'),(51,'default',0,'payment/braintreetwo/title','Credit Card (BraintreeTwo)'),(52,'default',0,'payment/braintreetwo/environment','sandbox'),(53,'default',0,'payment/braintreetwo/payment_action','authorize'),(54,'default',0,'payment/braintreetwo/merchant_id',NULL),(55,'default',0,'payment/braintreetwo/merchant_account_id',NULL),(56,'default',0,'payment/braintreetwo/debug','0'),(57,'default',0,'payment/braintreetwo/useccv','1'),(58,'default',0,'payment/braintreetwo/cctypes','CUP,AE,VI,MC,DI,JCB,DN,MI'),(59,'default',0,'payment/braintreetwo/sort_order',NULL),(60,'default',0,'payment/braintreetwo/allowspecific','0'),(61,'default',0,'payment/braintreetwo/specificcountry',NULL),(62,'default',0,'payment/braintreetwo/countrycreditcard','a:0:{}'),(63,'default',0,'payment/payflow_express/active','0'),(64,'default',0,'payment/payflow_advanced/active','0'),(65,'default',0,'payment/payflow_express_bml/active','0'),(66,'default',0,'paypal/general/business_account',NULL),(67,'default',0,'payment/payflow_advanced/partner','PayPal'),(68,'default',0,'payment/payflow_advanced/vendor','PayPal'),(69,'default',0,'payment/payflow_advanced/sandbox_flag','0'),(70,'default',0,'payment/payflow_advanced/use_proxy','0'),(71,'default',0,'payment/paypal_express_bml/publisher_id',NULL),(72,'default',0,'payment/paypal_express_bml/homepage_display','0'),(73,'default',0,'payment/paypal_express_bml/homepage_position','0'),(74,'default',0,'payment/paypal_express_bml/homepage_size','190x100'),(75,'default',0,'payment/paypal_express_bml/categorypage_display','0'),(76,'default',0,'payment/paypal_express_bml/categorypage_position','0'),(77,'default',0,'payment/paypal_express_bml/categorypage_size','190x100'),(78,'default',0,'payment/paypal_express_bml/productpage_display','0'),(79,'default',0,'payment/paypal_express_bml/productpage_position','0'),(80,'default',0,'payment/paypal_express_bml/productpage_size','190x100'),(81,'default',0,'payment/paypal_express_bml/checkout_display','0'),(82,'default',0,'payment/paypal_express_bml/checkout_position','0'),(83,'default',0,'payment/paypal_express_bml/checkout_size','234x60'),(84,'default',0,'payment/payflow_advanced/title','Credit Card'),(85,'default',0,'payment/payflow_advanced/sort_order',NULL),(86,'default',0,'payment/payflow_advanced/payment_action','Authorization'),(87,'default',0,'payment/payflow_advanced/allowspecific','0'),(88,'default',0,'payment/payflow_advanced/debug','0'),(89,'default',0,'payment/payflow_advanced/verify_peer','1'),(90,'default',0,'payment/payflow_advanced/csc_editable','1'),(91,'default',0,'payment/payflow_advanced/csc_required','1'),(92,'default',0,'payment/payflow_advanced/email_confirmation','0'),(93,'default',0,'payment/payflow_advanced/url_method','GET'),(94,'default',0,'paypal/fetch_reports/ftp_sandbox','0'),(95,'default',0,'paypal/fetch_reports/ftp_ip',NULL),(96,'default',0,'paypal/fetch_reports/ftp_path',NULL),(97,'default',0,'paypal/fetch_reports/active','0'),(98,'default',0,'paypal/fetch_reports/schedule','1'),(99,'default',0,'paypal/fetch_reports/time','00,00,00'),(100,'default',0,'paypal/style/logo',NULL),(101,'default',0,'paypal/style/page_style',NULL),(102,'default',0,'paypal/style/paypal_hdrimg',NULL),(103,'default',0,'paypal/style/paypal_hdrbackcolor',NULL),(104,'default',0,'paypal/style/paypal_hdrbordercolor',NULL),(105,'default',0,'paypal/style/paypal_payflowcolor',NULL),(106,'default',0,'payment/payflow_express/title','PayPal Express Checkout Payflow Edition'),(107,'default',0,'payment/payflow_express/sort_order',NULL),(108,'default',0,'payment/payflow_express/payment_action','Authorization'),(109,'default',0,'payment/payflow_express/visible_on_product','1'),(110,'default',0,'payment/payflow_express/visible_on_cart','1'),(111,'default',0,'payment/payflow_express/allowspecific','0'),(112,'default',0,'payment/payflow_express/debug','0'),(113,'default',0,'payment/payflow_express/verify_peer','1'),(114,'default',0,'payment/payflow_express/line_items_enabled','1'),(115,'default',0,'payment/paypal_express/skip_order_review_step','1'),(116,'default',0,'payment/paypal_payment_pro/active','0'),(117,'default',0,'payment/payflowpro/partner',NULL),(118,'default',0,'payment/payflowpro/vendor',NULL),(119,'default',0,'payment/payflowpro/sandbox_flag','0'),(120,'default',0,'payment/payflowpro/use_proxy','0'),(121,'default',0,'payment/payflowpro/title','Credit Card'),(122,'default',0,'payment/payflowpro/sort_order',NULL),(123,'default',0,'payment/payflowpro/payment_action','Authorization'),(124,'default',0,'payment/payflowpro/cctypes','AE,VI'),(125,'default',0,'payment/payflowpro/allowspecific','0'),(126,'default',0,'payment/payflowpro/debug','0'),(127,'default',0,'payment/payflowpro/verify_peer','1'),(128,'default',0,'payment/payflowpro/useccv','1'),(129,'default',0,'payment/payflowpro/avs_street','0'),(130,'default',0,'payment/payflowpro/avs_zip','0'),(131,'default',0,'payment/payflowpro/avs_international','0'),(132,'default',0,'payment/payflowpro/avs_security_code','1'),(133,'default',0,'payment/wps_express/active','0'),(134,'default',0,'payment/wps_express_bml/active','0'),(135,'default',0,'paypal/wpp/api_authentication','0'),(136,'default',0,'paypal/wpp/sandbox_flag','0'),(137,'default',0,'paypal/wpp/use_proxy','0'),(138,'default',0,'payment/paypal_express/title','PayPal Express Checkout'),(139,'default',0,'payment/paypal_express/sort_order',NULL),(140,'default',0,'payment/paypal_express/payment_action','Authorization'),(141,'default',0,'payment/paypal_express/visible_on_product','1'),(142,'default',0,'payment/paypal_express/visible_on_cart','1'),(143,'default',0,'payment/paypal_express/allowspecific','0'),(144,'default',0,'payment/paypal_express/debug','0'),(145,'default',0,'payment/paypal_express/verify_peer','1'),(146,'default',0,'payment/paypal_express/line_items_enabled','1'),(147,'default',0,'payment/paypal_express/transfer_shipping_options','0'),(148,'default',0,'paypal/wpp/button_flavor','dynamic'),(149,'default',0,'payment/paypal_express/solution_type','Mark'),(150,'default',0,'payment/paypal_express/require_billing_address','0'),(151,'default',0,'payment/paypal_express/allow_ba_signup','never'),(152,'default',0,'payment/paypal_billing_agreement/active','1'),(153,'default',0,'payment/paypal_billing_agreement/title','PayPal Billing Agreement'),(154,'default',0,'payment/paypal_billing_agreement/sort_order',NULL),(155,'default',0,'payment/paypal_billing_agreement/payment_action','Authorization'),(156,'default',0,'payment/paypal_billing_agreement/allowspecific','0'),(157,'default',0,'payment/paypal_billing_agreement/debug','0'),(158,'default',0,'payment/paypal_billing_agreement/verify_peer','1'),(159,'default',0,'payment/paypal_billing_agreement/line_items_enabled','0'),(160,'default',0,'payment/paypal_billing_agreement/allow_billing_agreement_wizard','1'),(161,'default',0,'payment/payflowpro/active','0'),(162,'default',0,'payment/payflow_link/active','0'),(163,'default',0,'payment/payflow_link/partner','PayPal'),(164,'default',0,'payment/payflow_link/vendor',NULL),(165,'default',0,'payment/payflow_link/sandbox_flag','0'),(166,'default',0,'payment/payflow_link/use_proxy','0'),(167,'default',0,'payment/payflow_link/title','Credit Card'),(168,'default',0,'payment/payflow_link/sort_order',NULL),(169,'default',0,'payment/payflow_link/payment_action','Authorization'),(170,'default',0,'payment/payflow_link/allowspecific','0'),(171,'default',0,'payment/payflow_link/debug','0'),(172,'default',0,'payment/payflow_link/verify_peer','1'),(173,'default',0,'payment/payflow_link/csc_editable','1'),(174,'default',0,'payment/payflow_link/csc_required','1'),(175,'default',0,'payment/payflow_link/email_confirmation','0'),(176,'default',0,'payment/payflow_link/url_method','GET'),(177,'default',0,'payment/paypal_express/active','0'),(178,'default',0,'payment/paypal_express_bml/active','0'),(179,'default',0,'payment/checkmo/active','1'),(180,'default',0,'payment/checkmo/title','Check / Money order'),(181,'default',0,'payment/checkmo/order_status','pending'),(182,'default',0,'payment/checkmo/allowspecific','0'),(183,'default',0,'payment/checkmo/specificcountry',NULL),(184,'default',0,'payment/checkmo/payable_to',NULL),(185,'default',0,'payment/checkmo/mailing_address',NULL),(186,'default',0,'payment/checkmo/min_order_total',NULL),(187,'default',0,'payment/checkmo/max_order_total',NULL),(188,'default',0,'payment/checkmo/sort_order',NULL),(189,'default',0,'payment/cashondelivery/active','1'),(190,'default',0,'payment/cashondelivery/title','Cash On Delivery'),(191,'default',0,'payment/cashondelivery/order_status','pending'),(192,'default',0,'payment/cashondelivery/allowspecific','0'),(193,'default',0,'payment/cashondelivery/specificcountry',NULL),(194,'default',0,'payment/cashondelivery/instructions',NULL),(195,'default',0,'payment/cashondelivery/min_order_total',NULL),(196,'default',0,'payment/cashondelivery/max_order_total',NULL),(197,'default',0,'payment/cashondelivery/sort_order',NULL),(198,'default',0,'payment/banktransfer/active','1'),(199,'default',0,'payment/banktransfer/title','Bank Transfer Payment'),(200,'default',0,'payment/banktransfer/order_status','pending'),(201,'default',0,'payment/banktransfer/allowspecific','0'),(202,'default',0,'payment/banktransfer/specificcountry',NULL),(203,'default',0,'payment/banktransfer/instructions',NULL),(204,'default',0,'payment/banktransfer/min_order_total',NULL),(205,'default',0,'payment/banktransfer/max_order_total',NULL),(206,'default',0,'payment/banktransfer/sort_order',NULL),(207,'default',0,'payment/free/title','No Payment Information Required'),(208,'default',0,'payment/free/active','1'),(209,'default',0,'payment/free/order_status','pending'),(210,'default',0,'payment/free/allowspecific','0'),(211,'default',0,'payment/free/specificcountry',NULL),(212,'default',0,'payment/free/sort_order','1'),(213,'default',0,'payment/purchaseorder/active','1'),(214,'default',0,'payment/purchaseorder/title','Purchase Order'),(215,'default',0,'payment/purchaseorder/order_status','pending'),(216,'default',0,'payment/purchaseorder/allowspecific','0'),(217,'default',0,'payment/purchaseorder/specificcountry',NULL),(218,'default',0,'payment/purchaseorder/min_order_total',NULL),(219,'default',0,'payment/purchaseorder/max_order_total',NULL),(220,'default',0,'payment/purchaseorder/sort_order',NULL),(221,'default',0,'payment/authorizenet_directpost/active','1'),(222,'default',0,'payment/authorizenet_directpost/payment_action','authorize'),(223,'default',0,'payment/authorizenet_directpost/title','Credit Card Direct Post (Authorize.net)'),(224,'default',0,'payment/authorizenet_directpost/order_status','processing'),(225,'default',0,'payment/authorizenet_directpost/test','1'),(226,'default',0,'payment/authorizenet_directpost/cgi_url','https://secure.authorize.net/gateway/transact.dll'),(227,'default',0,'payment/authorizenet_directpost/cgi_url_td','https://api2.authorize.net/xml/v1/request.api'),(228,'default',0,'payment/authorizenet_directpost/currency','USD'),(229,'default',0,'payment/authorizenet_directpost/debug','0'),(230,'default',0,'payment/authorizenet_directpost/email_customer','0'),(231,'default',0,'payment/authorizenet_directpost/merchant_email',NULL),(232,'default',0,'payment/authorizenet_directpost/cctypes','AE,VI,MC,DI'),(233,'default',0,'payment/authorizenet_directpost/useccv','0'),(234,'default',0,'payment/authorizenet_directpost/allowspecific','0'),(235,'default',0,'payment/authorizenet_directpost/min_order_total',NULL),(236,'default',0,'payment/authorizenet_directpost/max_order_total',NULL),(237,'default',0,'payment/authorizenet_directpost/sort_order',NULL),(238,'default',0,'payment/braintree/public_key','0:2:N0QO0UMZO2fsUYqjGHCgiPxapsDxdfQR:YS66eAz1MQA12iu/ErWE0C1U1qK7fWvo+bmGA+PWY2k='),(239,'default',0,'payment/braintree/private_key','0:2:xvVh7LV0QeKEvUa3mhb1FchXFE1LlIGI:ri1BZsG4nOF1SsM23YLFojAwNPxu9IWFeh/SI/2Tkdw='),(240,'default',0,'payment/buckaroo_magento2_account/active','1'),(241,'default',0,'payment/buckaroo_magento2_account/secret_key',NULL),(242,'default',0,'payment/buckaroo_magento2_account/merchant_key',NULL),(243,'default',0,'payment/buckaroo_magento2_account/transaction_label',NULL),(244,'default',0,'payment/buckaroo_magento2_account/certificate_file','1'),(245,'default',0,'payment/buckaroo_magento2_account/advanced',NULL),(246,'default',0,'payment/buckaroo_magento2_ideal/title','Buckaroo iDEAL'),(247,'default',0,'payment/buckaroo_magento2_ideal/sort_order','1'),(248,'default',0,'payment/buckaroo_magento2_ideal/order_email','0'),(249,'default',0,'payment/buckaroo_magento2_ideal/payment_fee',NULL),(250,'default',0,'payment/buckaroo_magento2_ideal/payment_fee_label',NULL),(251,'default',0,'payment/buckaroo_magento2_ideal/max_amount',NULL),(252,'default',0,'payment/buckaroo_magento2_ideal/min_amount',NULL),(253,'default',0,'payment/buckaroo_magento2_ideal/active_status','0'),(254,'default',0,'payment/buckaroo_magento2_ideal/allowspecific','0'),(255,'default',0,'payment/buckaroo_magento2_ideal/limit_by_ip','0'),(256,'default',0,'payment/buckaroo_magento2_creditcards/active','0'),(257,'default',0,'payment/buckaroo_magento2_creditcards/title',NULL),(258,'default',0,'payment/buckaroo_magento2_creditcards/sort_order',NULL),(259,'default',0,'payment/buckaroo_magento2_creditcards/max_amount',NULL),(260,'default',0,'payment/buckaroo_magento2_creditcards/min_amount',NULL),(261,'default',0,'payment/buckaroo_magento2_creditcards/active_status','0'),(262,'default',0,'payment/buckaroo_magento2_creditcards/allowspecific','0'),(263,'default',0,'payment/buckaroo_magento2_creditcards/limit_by_ip','0'),(264,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee',NULL),(265,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee_label',NULL),(266,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee',NULL),(267,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee_label',NULL),(268,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_status_processing',NULL),(269,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_hold','0'),(270,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee',NULL),(271,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee_label',NULL),(272,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_status_processing',NULL),(273,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_hold','0'),(274,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee',NULL),(275,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee_label',NULL),(276,'default',0,'payment/buckaroo_magento2_paypal/active','1'),(277,'default',0,'payment/buckaroo_magento2_paypal/title','Buckaroo PayPal'),(278,'default',0,'payment/buckaroo_magento2_paypal/sort_order','1'),(279,'default',0,'payment/buckaroo_magento2_paypal/sellers_protection','0'),(280,'default',0,'payment/buckaroo_magento2_paypal/order_email','0'),(281,'default',0,'payment/buckaroo_magento2_paypal/payment_fee',NULL),(282,'default',0,'payment/buckaroo_magento2_paypal/payment_fee_label',NULL),(283,'default',0,'payment/buckaroo_magento2_paypal/max_amount',NULL),(284,'default',0,'payment/buckaroo_magento2_paypal/min_amount',NULL),(285,'default',0,'payment/buckaroo_magento2_paypal/active_status','0'),(286,'default',0,'payment/buckaroo_magento2_paypal/allowspecific','0'),(287,'default',0,'payment/buckaroo_magento2_paypal/limit_by_ip','0'),(288,'default',0,'payment/buckaroo_magento2_bank_transfer/active','0'),(289,'default',0,'payment/buckaroo_magento2_bank_transfer/title',NULL),(290,'default',0,'payment/buckaroo_magento2_bank_transfer/sort_order',NULL),(291,'default',0,'payment/buckaroo_magento2_bank_transfer/send_email','0'),(292,'default',0,'payment/buckaroo_magento2_bank_transfer/due_date',NULL),(293,'default',0,'payment/buckaroo_magento2_bank_transfer/use_creditmanagement','0'),(294,'default',0,'payment/buckaroo_magento2_bank_transfer/order_email','0'),(295,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee',NULL),(296,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee_label',NULL),(297,'default',0,'payment/buckaroo_magento2_bank_transfer/max_amount',NULL),(298,'default',0,'payment/buckaroo_magento2_bank_transfer/min_amount',NULL),(299,'default',0,'payment/buckaroo_magento2_bank_transfer/active_status','0'),(300,'default',0,'payment/buckaroo_magento2_bank_transfer/allowspecific','0'),(301,'default',0,'payment/buckaroo_magento2_bank_transfer/limit_by_ip','0'),(302,'default',0,'payment/buckaroo_magento2_directdebit/active','0'),(303,'default',0,'payment/buckaroo_magento2_directdebit/title',NULL),(304,'default',0,'payment/buckaroo_magento2_directdebit/sort_order',NULL),(305,'default',0,'payment/buckaroo_magento2_directdebit/send_email','0'),(306,'default',0,'payment/buckaroo_magento2_directdebit/use_creditmanagement','0'),(307,'default',0,'payment/buckaroo_magento2_directdebit/order_email','0'),(308,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee',NULL),(309,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee_label',NULL),(310,'default',0,'payment/buckaroo_magento2_directdebit/max_amount',NULL),(311,'default',0,'payment/buckaroo_magento2_directdebit/min_amount',NULL),(312,'default',0,'payment/buckaroo_magento2_directdebit/active_status','0'),(313,'default',0,'payment/buckaroo_magento2_directdebit/allowspecific','0'),(314,'default',0,'payment/buckaroo_magento2_directdebit/limit_by_ip','0'),(315,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active','0'),(316,'default',0,'payment/buckaroo_magento2_bancontactmrcash/title',NULL),(317,'default',0,'payment/buckaroo_magento2_bancontactmrcash/sort_order',NULL),(318,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee',NULL),(319,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee_label',NULL),(320,'default',0,'payment/buckaroo_magento2_bancontactmrcash/max_amount',NULL),(321,'default',0,'payment/buckaroo_magento2_bancontactmrcash/min_amount',NULL),(322,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active_status','0'),(323,'default',0,'payment/buckaroo_magento2_bancontactmrcash/allowspecific','0'),(324,'default',0,'payment/buckaroo_magento2_bancontactmrcash/limit_by_ip','0'),(325,'default',0,'buckaroo_magento2/account/active','1'),(326,'default',0,'buckaroo_magento2/account/secret_key',NULL),(327,'default',0,'buckaroo_magento2/account/merchant_key',NULL),(328,'default',0,'buckaroo_magento2/account/transaction_label','Magento Buckaroo'),(329,'default',0,'buckaroo_magento2/account/certificate_file','1'),(330,'default',0,'buckaroo_magento2/account/order_state_new',NULL),(331,'default',0,'buckaroo_magento2/account/order_state_pending',NULL),(332,'default',0,'buckaroo_magento2/account/order_state_success',NULL),(333,'default',0,'buckaroo_magento2/account/order_state_failed',NULL),(334,'default',0,'buckaroo_magento2/account/invoice_email','1'),(335,'default',0,'buckaroo_magento2/account/auto_invoice','1'),(336,'default',0,'buckaroo_magento2/account/auto_invoice_status','pending'),(337,'default',0,'buckaroo_magento2/account/success_redirect','checkout/onepage/success'),(338,'default',0,'buckaroo_magento2/account/failure_redirect','checkout/onepage'),(339,'default',0,'buckaroo_magento2/account/cancel_on_failed','1'),(340,'default',0,'buckaroo_magento2/account/debug_mode',NULL),(341,'default',0,'buckaroo_magento2/account/debug_email',NULL),(342,'default',0,'buckaroo_magento2/account/limit_by_ip','0'),(343,'default',0,'buckaroo_magento2/account/fee_percentage_mode','subtotal'),(344,'default',0,'payment/buckaroo_magento2_creditcard/active','1'),(345,'default',0,'payment/buckaroo_magento2_creditcard/title','Buckaroo Creditcard and Debit Card'),(346,'default',0,'payment/buckaroo_magento2_creditcard/sort_order','30'),(347,'default',0,'payment/buckaroo_magento2_creditcard/max_amount',NULL),(348,'default',0,'payment/buckaroo_magento2_creditcard/min_amount',NULL),(349,'default',0,'payment/buckaroo_magento2_creditcard/active_status','0'),(350,'default',0,'payment/buckaroo_magento2_creditcard/allowspecific','0'),(351,'default',0,'payment/buckaroo_magento2_creditcard/limit_by_ip','0'),(352,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee',NULL),(353,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee_label','Fee'),(354,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee',NULL),(355,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee_label','Fee'),(356,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_status_processing',NULL),(357,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_hold','0'),(358,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee',NULL),(359,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee_label','Fee'),(360,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_status_processing',NULL),(361,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_hold','0'),(362,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee',NULL),(363,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee_label','Fee'),(364,'default',0,'payment/buckaroo_magento2_transfer/active','1'),(365,'default',0,'payment/buckaroo_magento2_transfer/title','Buckaroo Transfer'),(366,'default',0,'payment/buckaroo_magento2_transfer/sort_order','100'),(367,'default',0,'payment/buckaroo_magento2_transfer/send_email','0'),(368,'default',0,'payment/buckaroo_magento2_transfer/due_date','7'),(369,'default',0,'payment/buckaroo_magento2_transfer/use_creditmanagement','0'),(370,'default',0,'payment/buckaroo_magento2_transfer/order_email','1'),(371,'default',0,'payment/buckaroo_magento2_transfer/payment_fee',NULL),(372,'default',0,'payment/buckaroo_magento2_transfer/payment_fee_label','Fee'),(373,'default',0,'payment/buckaroo_magento2_transfer/max_amount',NULL),(374,'default',0,'payment/buckaroo_magento2_transfer/min_amount',NULL),(375,'default',0,'payment/buckaroo_magento2_transfer/active_status','0'),(376,'default',0,'payment/buckaroo_magento2_transfer/allowspecific','0'),(377,'default',0,'payment/buckaroo_magento2_transfer/limit_by_ip','0'),(378,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active','1'),(379,'default',0,'payment/buckaroo_magento2_sepadirectdebit/title','Buckaroo SEPA Direct Debit'),(380,'default',0,'payment/buckaroo_magento2_sepadirectdebit/sort_order','110'),(381,'default',0,'payment/buckaroo_magento2_sepadirectdebit/send_email','1'),(382,'default',0,'payment/buckaroo_magento2_sepadirectdebit/use_creditmanagement','0'),(383,'default',0,'payment/buckaroo_magento2_sepadirectdebit/order_email','1'),(384,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee',NULL),(385,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee_label',NULL),(386,'default',0,'payment/buckaroo_magento2_sepadirectdebit/max_amount',NULL),(387,'default',0,'payment/buckaroo_magento2_sepadirectdebit/min_amount',NULL),(388,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active_status','0'),(389,'default',0,'payment/buckaroo_magento2_sepadirectdebit/allowspecific','0'),(390,'default',0,'payment/buckaroo_magento2_sepadirectdebit/limit_by_ip','0'),(391,'default',0,'payment/buckaroo_magento2_mrcash/active','1'),(392,'default',0,'payment/buckaroo_magento2_mrcash/title','Buckaroo Mrcash'),(393,'default',0,'payment/buckaroo_magento2_mrcash/sort_order','140'),(394,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee',NULL),(395,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee_label','Fee'),(396,'default',0,'payment/buckaroo_magento2_mrcash/max_amount',NULL),(397,'default',0,'payment/buckaroo_magento2_mrcash/min_amount',NULL),(398,'default',0,'payment/buckaroo_magento2_mrcash/active_status','0'),(399,'default',0,'payment/buckaroo_magento2_mrcash/allowspecific','0'),(400,'default',0,'payment/buckaroo_magento2_mrcash/limit_by_ip','0'),(401,'default',0,'payment/buckaroo_magento2_sofortbanking/active','1'),(402,'default',0,'payment/buckaroo_magento2_sofortbanking/title','Buckaroo Sofortbanking'),(403,'default',0,'payment/buckaroo_magento2_sofortbanking/sort_order','150'),(404,'default',0,'payment/buckaroo_magento2_sofortbanking/payment_fee',NULL),(405,'default',0,'payment/buckaroo_magento2_sofortbanking/payment_fee_label','Fee'),(406,'default',0,'payment/buckaroo_magento2_sofortbanking/max_amount',NULL),(407,'default',0,'payment/buckaroo_magento2_sofortbanking/min_amount',NULL),(408,'default',0,'payment/buckaroo_magento2_sofortbanking/active_status','0'),(409,'default',0,'payment/buckaroo_magento2_sofortbanking/allowspecific','0'),(410,'default',0,'payment/buckaroo_magento2_sofortbanking/limit_by_ip','0'),(411,'default',0,'payment/buckaroo_magento2_giropay/active','1'),(412,'default',0,'payment/buckaroo_magento2_giropay/title','Buckaroo Giropay'),(413,'default',0,'payment/buckaroo_magento2_giropay/sort_order','160'),(414,'default',0,'payment/buckaroo_magento2_giropay/payment_fee',NULL),(415,'default',0,'payment/buckaroo_magento2_giropay/payment_fee_label','Fee'),(416,'default',0,'payment/buckaroo_magento2_giropay/max_amount',NULL),(417,'default',0,'payment/buckaroo_magento2_giropay/min_amount',NULL),(418,'default',0,'payment/buckaroo_magento2_giropay/active_status','0'),(419,'default',0,'payment/buckaroo_magento2_giropay/allowspecific','0'),(420,'default',0,'payment/buckaroo_magento2_giropay/limit_by_ip','0'),(421,'default',0,'buckaroo_magento2/refund/active','0'),(422,'default',0,'system/full_page_cache/varnish/access_list','localhost'),(423,'default',0,'system/full_page_cache/varnish/backend_host','localhost'),(424,'default',0,'system/full_page_cache/varnish/backend_port','8080'),(425,'default',0,'dev/front_end_development_workflow/type','server_side_compilation'),(426,'default',0,'dev/restrict/allow_ips','127.0.0.2,::2'),(427,'default',0,'dev/debug/template_hints_storefront','0'),(428,'default',0,'dev/debug/template_hints_admin','0'),(429,'default',0,'dev/debug/template_hints_blocks','0'),(430,'default',0,'dev/template/allow_symlink','0'),(431,'default',0,'dev/template/minify_html','0'),(432,'default',0,'dev/translate_inline/active','0'),(433,'default',0,'dev/translate_inline/active_admin','0'),(434,'default',0,'dev/js/enable_js_bundling','0'),(435,'default',0,'dev/js/merge_files','0'),(436,'default',0,'dev/js/minify_files','0'),(437,'default',0,'dev/js/translate_strategy','dictionary'),(438,'default',0,'dev/js/session_storage_logging','0'),(439,'default',0,'dev/js/session_storage_key','collected_errors'),(440,'default',0,'dev/css/merge_css_files','0'),(441,'default',0,'dev/css/minify_files','0'),(442,'default',0,'dev/image/default_adapter','GD2'),(443,'default',0,'dev/static/sign','0'),(444,'default',0,'dev/grid/async_indexing','0'),(445,'default',0,'payment/buckaroo_magento2_creditcard/allowed_issuers','cartebleuevisa,maestro,mastercard,visa'),(446,'default',0,'admin/emails/forgot_email_template','admin_emails_forgot_email_template'),(447,'default',0,'admin/emails/forgot_email_identity','general'),(448,'default',0,'admin/emails/password_reset_link_expiration_period','1'),(449,'default',0,'admin/emails/reset_password_template','admin_emails_reset_password_template'),(450,'default',0,'admin/startup/menu_item_id','Magento_Backend::dashboard'),(451,'default',0,'admin/url/use_custom','0'),(452,'default',0,'admin/url/use_custom_path','0'),(453,'default',0,'admin/security/use_form_key','1'),(454,'default',0,'admin/security/use_case_sensitive_login','0'),(455,'default',0,'admin/security/session_lifetime','999999'),(456,'default',0,'admin/security/lockout_failures','6'),(457,'default',0,'admin/security/lockout_threshold','30'),(458,'default',0,'admin/security/password_lifetime','90'),(459,'default',0,'admin/security/password_is_forced','1'),(460,'default',0,'admin/dashboard/enable_charts','0'),(461,'default',0,'admin/captcha/enable','0'),(462,'default',0,'payment/buckaroo_magento2_ideal/specificcountry','AF'),(465,'default',0,'buckaroo_magento2/account/order_status_new',NULL),(466,'default',0,'buckaroo_magento2/account/order_status_pending',NULL),(467,'default',0,'buckaroo_magento2/account/order_status_success',NULL),(468,'default',0,'buckaroo_magento2/account/order_status_failed',NULL),(469,'default',0,'payment/buckaroo_magento2_ideal/allowed_currencies','ARS,AUD,BRL,CAD,CHF,CNY,CZK,DKK,EUR,GBP,HRK,LTL,LVL,MXN,MXP,NOK,PLN,SEK,TRL,TRY,USD'); +INSERT INTO `core_config_data` VALUES (1,'default',0,'web/seo/use_rewrites','1'),(2,'default',0,'web/unsecure/base_url','http://buckaroo.jenkins/'),(3,'default',0,'web/secure/base_url','https://buckaroo.jenkins/'),(4,'default',0,'general/locale/code','nl-NL'),(5,'default',0,'web/secure/use_in_frontend',NULL),(6,'default',0,'web/secure/use_in_adminhtml',NULL),(7,'default',0,'general/locale/timezone','Europe/Amsterdam'),(8,'default',0,'currency/options/base','EUR'),(9,'default',0,'currency/options/default','EUR'),(10,'default',0,'currency/options/allow','EUR'),(11,'default',0,'general/region/display_all','1'),(12,'default',0,'general/region/state_required','AT,BR,CA,CH,DE,EE,ES,FI,FR,LT,LV,RO,US'),(13,'default',0,'catalog/category/root_id',NULL),(14,'default',0,'paypal/general/merchant_country','NL'),(15,'default',0,'payment/buckaroo_magento2_ideal/active','1'),(16,'default',0,'payment/braintree/active','0'),(17,'default',0,'payment/braintree_paypal/active','1'),(18,'default',0,'payment/braintree/title','Credit Card (Braintree)'),(19,'default',0,'payment/braintree/environment','sandbox'),(20,'default',0,'payment/braintree/payment_action','authorize'),(21,'default',0,'payment/braintree/merchant_account_id','bart.buckaroo'),(22,'default',0,'payment/braintree/merchant_id','4qzzt63rc7krn522'),(23,'default',0,'payment/braintree/debug','0'),(24,'default',0,'payment/braintree/capture_action','invoice'),(25,'default',0,'payment/braintree/order_status','processing'),(26,'default',0,'payment/braintree/use_vault','0'),(27,'default',0,'payment/braintree/duplicate_card','0'),(28,'default',0,'payment/braintree/useccv','1'),(29,'default',0,'payment/braintree/cctypes','AE,VI,MC,DI,JCB'),(30,'default',0,'payment/braintree/enable_cc_detection','1'),(31,'default',0,'payment/braintree/fraudprotection','0'),(32,'default',0,'payment/braintree/kount_id',NULL),(33,'default',0,'payment/braintree/usecache','0'),(34,'default',0,'payment/braintree/sort_order',NULL),(35,'default',0,'payment/braintree/allowspecific','0'),(36,'default',0,'payment/braintree/specificcountry',NULL),(37,'default',0,'payment/braintree/countrycreditcard','a:0:{}'),(38,'default',0,'payment/braintree_paypal/title','PayPal (Braintree)'),(39,'default',0,'payment/braintree_paypal/sort_order',NULL),(40,'default',0,'payment/braintree_paypal/merchant_name_override',NULL),(41,'default',0,'payment/braintree_paypal/payment_action','authorize'),(42,'default',0,'payment/braintree_paypal/order_status','processing'),(43,'default',0,'payment/braintree_paypal/allowspecific','0'),(44,'default',0,'payment/braintree_paypal/specificcountry',NULL),(45,'default',0,'payment/braintree_paypal/require_billing_address','0'),(46,'default',0,'payment/braintree_paypal/display_on_shopping_cart','0'),(47,'default',0,'payment/braintree_paypal/allow_shipping_address_override','0'),(48,'default',0,'payment/braintree_paypal/debug','0'),(49,'default',0,'payment/braintree/verify_3dsecure','0'),(50,'default',0,'payment/braintreetwo/active','0'),(51,'default',0,'payment/braintreetwo/title','Credit Card (BraintreeTwo)'),(52,'default',0,'payment/braintreetwo/environment','sandbox'),(53,'default',0,'payment/braintreetwo/payment_action','authorize'),(54,'default',0,'payment/braintreetwo/merchant_id',NULL),(55,'default',0,'payment/braintreetwo/merchant_account_id',NULL),(56,'default',0,'payment/braintreetwo/debug','0'),(57,'default',0,'payment/braintreetwo/useccv','1'),(58,'default',0,'payment/braintreetwo/cctypes','CUP,AE,VI,MC,DI,JCB,DN,MI'),(59,'default',0,'payment/braintreetwo/sort_order',NULL),(60,'default',0,'payment/braintreetwo/allowspecific','0'),(61,'default',0,'payment/braintreetwo/specificcountry',NULL),(62,'default',0,'payment/braintreetwo/countrycreditcard','a:0:{}'),(63,'default',0,'payment/payflow_express/active','0'),(64,'default',0,'payment/payflow_advanced/active','0'),(65,'default',0,'payment/payflow_express_bml/active','0'),(66,'default',0,'paypal/general/business_account',NULL),(67,'default',0,'payment/payflow_advanced/partner','PayPal'),(68,'default',0,'payment/payflow_advanced/vendor','PayPal'),(69,'default',0,'payment/payflow_advanced/sandbox_flag','0'),(70,'default',0,'payment/payflow_advanced/use_proxy','0'),(71,'default',0,'payment/paypal_express_bml/publisher_id',NULL),(72,'default',0,'payment/paypal_express_bml/homepage_display','0'),(73,'default',0,'payment/paypal_express_bml/homepage_position','0'),(74,'default',0,'payment/paypal_express_bml/homepage_size','190x100'),(75,'default',0,'payment/paypal_express_bml/categorypage_display','0'),(76,'default',0,'payment/paypal_express_bml/categorypage_position','0'),(77,'default',0,'payment/paypal_express_bml/categorypage_size','190x100'),(78,'default',0,'payment/paypal_express_bml/productpage_display','0'),(79,'default',0,'payment/paypal_express_bml/productpage_position','0'),(80,'default',0,'payment/paypal_express_bml/productpage_size','190x100'),(81,'default',0,'payment/paypal_express_bml/checkout_display','0'),(82,'default',0,'payment/paypal_express_bml/checkout_position','0'),(83,'default',0,'payment/paypal_express_bml/checkout_size','234x60'),(84,'default',0,'payment/payflow_advanced/title','Credit Card'),(85,'default',0,'payment/payflow_advanced/sort_order',NULL),(86,'default',0,'payment/payflow_advanced/payment_action','Authorization'),(87,'default',0,'payment/payflow_advanced/allowspecific','0'),(88,'default',0,'payment/payflow_advanced/debug','0'),(89,'default',0,'payment/payflow_advanced/verify_peer','1'),(90,'default',0,'payment/payflow_advanced/csc_editable','1'),(91,'default',0,'payment/payflow_advanced/csc_required','1'),(92,'default',0,'payment/payflow_advanced/email_confirmation','0'),(93,'default',0,'payment/payflow_advanced/url_method','GET'),(94,'default',0,'paypal/fetch_reports/ftp_sandbox','0'),(95,'default',0,'paypal/fetch_reports/ftp_ip',NULL),(96,'default',0,'paypal/fetch_reports/ftp_path',NULL),(97,'default',0,'paypal/fetch_reports/active','0'),(98,'default',0,'paypal/fetch_reports/schedule','1'),(99,'default',0,'paypal/fetch_reports/time','00,00,00'),(100,'default',0,'paypal/style/logo',NULL),(101,'default',0,'paypal/style/page_style',NULL),(102,'default',0,'paypal/style/paypal_hdrimg',NULL),(103,'default',0,'paypal/style/paypal_hdrbackcolor',NULL),(104,'default',0,'paypal/style/paypal_hdrbordercolor',NULL),(105,'default',0,'paypal/style/paypal_payflowcolor',NULL),(106,'default',0,'payment/payflow_express/title','PayPal Express Checkout Payflow Edition'),(107,'default',0,'payment/payflow_express/sort_order',NULL),(108,'default',0,'payment/payflow_express/payment_action','Authorization'),(109,'default',0,'payment/payflow_express/visible_on_product','1'),(110,'default',0,'payment/payflow_express/visible_on_cart','1'),(111,'default',0,'payment/payflow_express/allowspecific','0'),(112,'default',0,'payment/payflow_express/debug','0'),(113,'default',0,'payment/payflow_express/verify_peer','1'),(114,'default',0,'payment/payflow_express/line_items_enabled','1'),(115,'default',0,'payment/paypal_express/skip_order_review_step','1'),(116,'default',0,'payment/paypal_payment_pro/active','0'),(117,'default',0,'payment/payflowpro/partner',NULL),(118,'default',0,'payment/payflowpro/vendor',NULL),(119,'default',0,'payment/payflowpro/sandbox_flag','0'),(120,'default',0,'payment/payflowpro/use_proxy','0'),(121,'default',0,'payment/payflowpro/title','Credit Card'),(122,'default',0,'payment/payflowpro/sort_order',NULL),(123,'default',0,'payment/payflowpro/payment_action','Authorization'),(124,'default',0,'payment/payflowpro/cctypes','AE,VI'),(125,'default',0,'payment/payflowpro/allowspecific','0'),(126,'default',0,'payment/payflowpro/debug','0'),(127,'default',0,'payment/payflowpro/verify_peer','1'),(128,'default',0,'payment/payflowpro/useccv','1'),(129,'default',0,'payment/payflowpro/avs_street','0'),(130,'default',0,'payment/payflowpro/avs_zip','0'),(131,'default',0,'payment/payflowpro/avs_international','0'),(132,'default',0,'payment/payflowpro/avs_security_code','1'),(133,'default',0,'payment/wps_express/active','0'),(134,'default',0,'payment/wps_express_bml/active','0'),(135,'default',0,'paypal/wpp/api_authentication','0'),(136,'default',0,'paypal/wpp/sandbox_flag','0'),(137,'default',0,'paypal/wpp/use_proxy','0'),(138,'default',0,'payment/paypal_express/title','PayPal Express Checkout'),(139,'default',0,'payment/paypal_express/sort_order',NULL),(140,'default',0,'payment/paypal_express/payment_action','Authorization'),(141,'default',0,'payment/paypal_express/visible_on_product','1'),(142,'default',0,'payment/paypal_express/visible_on_cart','1'),(143,'default',0,'payment/paypal_express/allowspecific','0'),(144,'default',0,'payment/paypal_express/debug','0'),(145,'default',0,'payment/paypal_express/verify_peer','1'),(146,'default',0,'payment/paypal_express/line_items_enabled','1'),(147,'default',0,'payment/paypal_express/transfer_shipping_options','0'),(148,'default',0,'paypal/wpp/button_flavor','dynamic'),(149,'default',0,'payment/paypal_express/solution_type','Mark'),(150,'default',0,'payment/paypal_express/require_billing_address','0'),(151,'default',0,'payment/paypal_express/allow_ba_signup','never'),(152,'default',0,'payment/paypal_billing_agreement/active','1'),(153,'default',0,'payment/paypal_billing_agreement/title','PayPal Billing Agreement'),(154,'default',0,'payment/paypal_billing_agreement/sort_order',NULL),(155,'default',0,'payment/paypal_billing_agreement/payment_action','Authorization'),(156,'default',0,'payment/paypal_billing_agreement/allowspecific','0'),(157,'default',0,'payment/paypal_billing_agreement/debug','0'),(158,'default',0,'payment/paypal_billing_agreement/verify_peer','1'),(159,'default',0,'payment/paypal_billing_agreement/line_items_enabled','0'),(160,'default',0,'payment/paypal_billing_agreement/allow_billing_agreement_wizard','1'),(161,'default',0,'payment/payflowpro/active','0'),(162,'default',0,'payment/payflow_link/active','0'),(163,'default',0,'payment/payflow_link/partner','PayPal'),(164,'default',0,'payment/payflow_link/vendor',NULL),(165,'default',0,'payment/payflow_link/sandbox_flag','0'),(166,'default',0,'payment/payflow_link/use_proxy','0'),(167,'default',0,'payment/payflow_link/title','Credit Card'),(168,'default',0,'payment/payflow_link/sort_order',NULL),(169,'default',0,'payment/payflow_link/payment_action','Authorization'),(170,'default',0,'payment/payflow_link/allowspecific','0'),(171,'default',0,'payment/payflow_link/debug','0'),(172,'default',0,'payment/payflow_link/verify_peer','1'),(173,'default',0,'payment/payflow_link/csc_editable','1'),(174,'default',0,'payment/payflow_link/csc_required','1'),(175,'default',0,'payment/payflow_link/email_confirmation','0'),(176,'default',0,'payment/payflow_link/url_method','GET'),(177,'default',0,'payment/paypal_express/active','0'),(178,'default',0,'payment/paypal_express_bml/active','0'),(179,'default',0,'payment/checkmo/active','1'),(180,'default',0,'payment/checkmo/title','Check / Money order'),(181,'default',0,'payment/checkmo/order_status','pending'),(182,'default',0,'payment/checkmo/allowspecific','0'),(183,'default',0,'payment/checkmo/specificcountry',NULL),(184,'default',0,'payment/checkmo/payable_to',NULL),(185,'default',0,'payment/checkmo/mailing_address',NULL),(186,'default',0,'payment/checkmo/min_order_total',NULL),(187,'default',0,'payment/checkmo/max_order_total',NULL),(188,'default',0,'payment/checkmo/sort_order',NULL),(189,'default',0,'payment/cashondelivery/active','1'),(190,'default',0,'payment/cashondelivery/title','Cash On Delivery'),(191,'default',0,'payment/cashondelivery/order_status','pending'),(192,'default',0,'payment/cashondelivery/allowspecific','0'),(193,'default',0,'payment/cashondelivery/specificcountry',NULL),(194,'default',0,'payment/cashondelivery/instructions',NULL),(195,'default',0,'payment/cashondelivery/min_order_total',NULL),(196,'default',0,'payment/cashondelivery/max_order_total',NULL),(197,'default',0,'payment/cashondelivery/sort_order',NULL),(198,'default',0,'payment/banktransfer/active','1'),(199,'default',0,'payment/banktransfer/title','Bank Transfer Payment'),(200,'default',0,'payment/banktransfer/order_status','pending'),(201,'default',0,'payment/banktransfer/allowspecific','0'),(202,'default',0,'payment/banktransfer/specificcountry',NULL),(203,'default',0,'payment/banktransfer/instructions',NULL),(204,'default',0,'payment/banktransfer/min_order_total',NULL),(205,'default',0,'payment/banktransfer/max_order_total',NULL),(206,'default',0,'payment/banktransfer/sort_order',NULL),(207,'default',0,'payment/free/title','No Payment Information Required'),(208,'default',0,'payment/free/active','1'),(209,'default',0,'payment/free/order_status','pending'),(210,'default',0,'payment/free/allowspecific','0'),(211,'default',0,'payment/free/specificcountry',NULL),(212,'default',0,'payment/free/sort_order','1'),(213,'default',0,'payment/purchaseorder/active','1'),(214,'default',0,'payment/purchaseorder/title','Purchase Order'),(215,'default',0,'payment/purchaseorder/order_status','pending'),(216,'default',0,'payment/purchaseorder/allowspecific','0'),(217,'default',0,'payment/purchaseorder/specificcountry',NULL),(218,'default',0,'payment/purchaseorder/min_order_total',NULL),(219,'default',0,'payment/purchaseorder/max_order_total',NULL),(220,'default',0,'payment/purchaseorder/sort_order',NULL),(221,'default',0,'payment/authorizenet_directpost/active','1'),(222,'default',0,'payment/authorizenet_directpost/payment_action','authorize'),(223,'default',0,'payment/authorizenet_directpost/title','Credit Card Direct Post (Authorize.net)'),(224,'default',0,'payment/authorizenet_directpost/order_status','processing'),(225,'default',0,'payment/authorizenet_directpost/test','1'),(226,'default',0,'payment/authorizenet_directpost/cgi_url','https://secure.authorize.net/gateway/transact.dll'),(227,'default',0,'payment/authorizenet_directpost/cgi_url_td','https://api2.authorize.net/xml/v1/request.api'),(228,'default',0,'payment/authorizenet_directpost/currency','USD'),(229,'default',0,'payment/authorizenet_directpost/debug','0'),(230,'default',0,'payment/authorizenet_directpost/email_customer','0'),(231,'default',0,'payment/authorizenet_directpost/merchant_email',NULL),(232,'default',0,'payment/authorizenet_directpost/cctypes','AE,VI,MC,DI'),(233,'default',0,'payment/authorizenet_directpost/useccv','0'),(234,'default',0,'payment/authorizenet_directpost/allowspecific','0'),(235,'default',0,'payment/authorizenet_directpost/min_order_total',NULL),(236,'default',0,'payment/authorizenet_directpost/max_order_total',NULL),(237,'default',0,'payment/authorizenet_directpost/sort_order',NULL),(238,'default',0,'payment/braintree/public_key','0:2:N0QO0UMZO2fsUYqjGHCgiPxapsDxdfQR:YS66eAz1MQA12iu/ErWE0C1U1qK7fWvo+bmGA+PWY2k='),(239,'default',0,'payment/braintree/private_key','0:2:xvVh7LV0QeKEvUa3mhb1FchXFE1LlIGI:ri1BZsG4nOF1SsM23YLFojAwNPxu9IWFeh/SI/2Tkdw='),(240,'default',0,'payment/buckaroo_magento2_account/active','1'),(241,'default',0,'payment/buckaroo_magento2_account/secret_key',NULL),(242,'default',0,'payment/buckaroo_magento2_account/merchant_key',NULL),(243,'default',0,'payment/buckaroo_magento2_account/transaction_label',NULL),(244,'default',0,'payment/buckaroo_magento2_account/certificate_file','1'),(245,'default',0,'payment/buckaroo_magento2_account/advanced',NULL),(246,'default',0,'payment/buckaroo_magento2_ideal/title','Buckaroo iDEAL'),(247,'default',0,'payment/buckaroo_magento2_ideal/sort_order','1'),(248,'default',0,'payment/buckaroo_magento2_ideal/order_email','0'),(249,'default',0,'payment/buckaroo_magento2_ideal/payment_fee',NULL),(250,'default',0,'payment/buckaroo_magento2_ideal/payment_fee_label',NULL),(251,'default',0,'payment/buckaroo_magento2_ideal/max_amount',NULL),(252,'default',0,'payment/buckaroo_magento2_ideal/min_amount',NULL),(253,'default',0,'payment/buckaroo_magento2_ideal/active_status','0'),(254,'default',0,'payment/buckaroo_magento2_ideal/allowspecific','0'),(255,'default',0,'payment/buckaroo_magento2_ideal/limit_by_ip','0'),(256,'default',0,'payment/buckaroo_magento2_creditcards/active','0'),(257,'default',0,'payment/buckaroo_magento2_creditcards/title',NULL),(258,'default',0,'payment/buckaroo_magento2_creditcards/sort_order',NULL),(259,'default',0,'payment/buckaroo_magento2_creditcards/max_amount',NULL),(260,'default',0,'payment/buckaroo_magento2_creditcards/min_amount',NULL),(261,'default',0,'payment/buckaroo_magento2_creditcards/active_status','0'),(262,'default',0,'payment/buckaroo_magento2_creditcards/allowspecific','0'),(263,'default',0,'payment/buckaroo_magento2_creditcards/limit_by_ip','0'),(264,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee',NULL),(265,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee_label',NULL),(266,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee',NULL),(267,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee_label',NULL),(268,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_status_processing',NULL),(269,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_hold','0'),(270,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee',NULL),(271,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee_label',NULL),(272,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_status_processing',NULL),(273,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_hold','0'),(274,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee',NULL),(275,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee_label',NULL),(276,'default',0,'payment/buckaroo_magento2_paypal/active','1'),(277,'default',0,'payment/buckaroo_magento2_paypal/title','Buckaroo PayPal'),(278,'default',0,'payment/buckaroo_magento2_paypal/sort_order','1'),(279,'default',0,'payment/buckaroo_magento2_paypal/sellers_protection','0'),(280,'default',0,'payment/buckaroo_magento2_paypal/order_email','0'),(281,'default',0,'payment/buckaroo_magento2_paypal/payment_fee',NULL),(282,'default',0,'payment/buckaroo_magento2_paypal/payment_fee_label',NULL),(283,'default',0,'payment/buckaroo_magento2_paypal/max_amount',NULL),(284,'default',0,'payment/buckaroo_magento2_paypal/min_amount',NULL),(285,'default',0,'payment/buckaroo_magento2_paypal/active_status','0'),(286,'default',0,'payment/buckaroo_magento2_paypal/allowspecific','0'),(287,'default',0,'payment/buckaroo_magento2_paypal/limit_by_ip','0'),(288,'default',0,'payment/buckaroo_magento2_bank_transfer/active','0'),(289,'default',0,'payment/buckaroo_magento2_bank_transfer/title',NULL),(290,'default',0,'payment/buckaroo_magento2_bank_transfer/sort_order',NULL),(291,'default',0,'payment/buckaroo_magento2_bank_transfer/send_email','0'),(292,'default',0,'payment/buckaroo_magento2_bank_transfer/due_date',NULL),(293,'default',0,'payment/buckaroo_magento2_bank_transfer/use_creditmanagement','0'),(294,'default',0,'payment/buckaroo_magento2_bank_transfer/order_email','0'),(295,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee',NULL),(296,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee_label',NULL),(297,'default',0,'payment/buckaroo_magento2_bank_transfer/max_amount',NULL),(298,'default',0,'payment/buckaroo_magento2_bank_transfer/min_amount',NULL),(299,'default',0,'payment/buckaroo_magento2_bank_transfer/active_status','0'),(300,'default',0,'payment/buckaroo_magento2_bank_transfer/allowspecific','0'),(301,'default',0,'payment/buckaroo_magento2_bank_transfer/limit_by_ip','0'),(302,'default',0,'payment/buckaroo_magento2_directdebit/active','0'),(303,'default',0,'payment/buckaroo_magento2_directdebit/title',NULL),(304,'default',0,'payment/buckaroo_magento2_directdebit/sort_order',NULL),(305,'default',0,'payment/buckaroo_magento2_directdebit/send_email','0'),(306,'default',0,'payment/buckaroo_magento2_directdebit/use_creditmanagement','0'),(307,'default',0,'payment/buckaroo_magento2_directdebit/order_email','0'),(308,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee',NULL),(309,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee_label',NULL),(310,'default',0,'payment/buckaroo_magento2_directdebit/max_amount',NULL),(311,'default',0,'payment/buckaroo_magento2_directdebit/min_amount',NULL),(312,'default',0,'payment/buckaroo_magento2_directdebit/active_status','0'),(313,'default',0,'payment/buckaroo_magento2_directdebit/allowspecific','0'),(314,'default',0,'payment/buckaroo_magento2_directdebit/limit_by_ip','0'),(315,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active','0'),(316,'default',0,'payment/buckaroo_magento2_bancontactmrcash/title',NULL),(317,'default',0,'payment/buckaroo_magento2_bancontactmrcash/sort_order',NULL),(318,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee',NULL),(319,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee_label',NULL),(320,'default',0,'payment/buckaroo_magento2_bancontactmrcash/max_amount',NULL),(321,'default',0,'payment/buckaroo_magento2_bancontactmrcash/min_amount',NULL),(322,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active_status','0'),(323,'default',0,'payment/buckaroo_magento2_bancontactmrcash/allowspecific','0'),(324,'default',0,'payment/buckaroo_magento2_bancontactmrcash/limit_by_ip','0'),(325,'default',0,'buckaroo_magento2/account/active','1'),(326,'default',0,'buckaroo_magento2/account/secret_key',NULL),(327,'default',0,'buckaroo_magento2/account/merchant_key',NULL),(328,'default',0,'buckaroo_magento2/account/transaction_label','Magento Buckaroo'),(329,'default',0,'buckaroo_magento2/account/certificate_file','1'),(330,'default',0,'buckaroo_magento2/account/order_state_new',NULL),(331,'default',0,'buckaroo_magento2/account/order_state_pending',NULL),(332,'default',0,'buckaroo_magento2/account/order_state_success',NULL),(333,'default',0,'buckaroo_magento2/account/order_state_failed',NULL),(334,'default',0,'buckaroo_magento2/account/invoice_email','1'),(335,'default',0,'buckaroo_magento2/account/auto_invoice','1'),(336,'default',0,'buckaroo_magento2/account/auto_invoice_status','pending'),(337,'default',0,'buckaroo_magento2/account/success_redirect','checkout/onepage/success'),(338,'default',0,'buckaroo_magento2/account/failure_redirect','checkout/onepage'),(339,'default',0,'buckaroo_magento2/account/cancel_on_failed','1'),(340,'default',0,'buckaroo_magento2/account/debug_mode',NULL),(341,'default',0,'buckaroo_magento2/account/debug_email',NULL),(342,'default',0,'buckaroo_magento2/account/limit_by_ip','0'),(344,'default',0,'payment/buckaroo_magento2_creditcard/active','1'),(345,'default',0,'payment/buckaroo_magento2_creditcard/title','Buckaroo Creditcard and Debit Card'),(346,'default',0,'payment/buckaroo_magento2_creditcard/sort_order','30'),(347,'default',0,'payment/buckaroo_magento2_creditcard/max_amount',NULL),(348,'default',0,'payment/buckaroo_magento2_creditcard/min_amount',NULL),(349,'default',0,'payment/buckaroo_magento2_creditcard/active_status','0'),(350,'default',0,'payment/buckaroo_magento2_creditcard/allowspecific','0'),(351,'default',0,'payment/buckaroo_magento2_creditcard/limit_by_ip','0'),(352,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee',NULL),(353,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee_label','Fee'),(354,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee',NULL),(355,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee_label','Fee'),(356,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_status_processing',NULL),(357,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_hold','0'),(358,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee',NULL),(359,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee_label','Fee'),(360,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_status_processing',NULL),(361,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_hold','0'),(362,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee',NULL),(363,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee_label','Fee'),(364,'default',0,'payment/buckaroo_magento2_transfer/active','1'),(365,'default',0,'payment/buckaroo_magento2_transfer/title','Buckaroo Transfer'),(366,'default',0,'payment/buckaroo_magento2_transfer/sort_order','100'),(367,'default',0,'payment/buckaroo_magento2_transfer/send_email','0'),(368,'default',0,'payment/buckaroo_magento2_transfer/due_date','7'),(369,'default',0,'payment/buckaroo_magento2_transfer/use_creditmanagement','0'),(370,'default',0,'payment/buckaroo_magento2_transfer/order_email','1'),(371,'default',0,'payment/buckaroo_magento2_transfer/payment_fee',NULL),(372,'default',0,'payment/buckaroo_magento2_transfer/payment_fee_label','Fee'),(373,'default',0,'payment/buckaroo_magento2_transfer/max_amount',NULL),(374,'default',0,'payment/buckaroo_magento2_transfer/min_amount',NULL),(375,'default',0,'payment/buckaroo_magento2_transfer/active_status','0'),(376,'default',0,'payment/buckaroo_magento2_transfer/allowspecific','0'),(377,'default',0,'payment/buckaroo_magento2_transfer/limit_by_ip','0'),(378,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active','1'),(379,'default',0,'payment/buckaroo_magento2_sepadirectdebit/title','Buckaroo SEPA Direct Debit'),(380,'default',0,'payment/buckaroo_magento2_sepadirectdebit/sort_order','110'),(381,'default',0,'payment/buckaroo_magento2_sepadirectdebit/send_email','1'),(382,'default',0,'payment/buckaroo_magento2_sepadirectdebit/use_creditmanagement','0'),(383,'default',0,'payment/buckaroo_magento2_sepadirectdebit/order_email','1'),(384,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee',NULL),(385,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee_label',NULL),(386,'default',0,'payment/buckaroo_magento2_sepadirectdebit/max_amount',NULL),(387,'default',0,'payment/buckaroo_magento2_sepadirectdebit/min_amount',NULL),(388,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active_status','0'),(389,'default',0,'payment/buckaroo_magento2_sepadirectdebit/allowspecific','0'),(390,'default',0,'payment/buckaroo_magento2_sepadirectdebit/limit_by_ip','0'),(391,'default',0,'payment/buckaroo_magento2_mrcash/active','1'),(392,'default',0,'payment/buckaroo_magento2_mrcash/title','Buckaroo Mrcash'),(393,'default',0,'payment/buckaroo_magento2_mrcash/sort_order','140'),(394,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee',NULL),(395,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee_label','Fee'),(396,'default',0,'payment/buckaroo_magento2_mrcash/max_amount',NULL),(397,'default',0,'payment/buckaroo_magento2_mrcash/min_amount',NULL),(398,'default',0,'payment/buckaroo_magento2_mrcash/active_status','0'),(399,'default',0,'payment/buckaroo_magento2_mrcash/allowspecific','0'),(400,'default',0,'payment/buckaroo_magento2_mrcash/limit_by_ip','0'),(421,'default',0,'buckaroo_magento2/refund/active','0'),(422,'default',0,'system/full_page_cache/varnish/access_list','localhost'),(423,'default',0,'system/full_page_cache/varnish/backend_host','localhost'),(424,'default',0,'system/full_page_cache/varnish/backend_port','8080'),(425,'default',0,'dev/front_end_development_workflow/type','server_side_compilation'),(426,'default',0,'dev/restrict/allow_ips','127.0.0.2,::2'),(427,'default',0,'dev/debug/template_hints_storefront','0'),(428,'default',0,'dev/debug/template_hints_admin','0'),(429,'default',0,'dev/debug/template_hints_blocks','0'),(430,'default',0,'dev/template/allow_symlink','0'),(431,'default',0,'dev/template/minify_html','0'),(432,'default',0,'dev/translate_inline/active','0'),(433,'default',0,'dev/translate_inline/active_admin','0'),(434,'default',0,'dev/js/enable_js_bundling','0'),(435,'default',0,'dev/js/merge_files','0'),(436,'default',0,'dev/js/minify_files','0'),(437,'default',0,'dev/js/translate_strategy','dictionary'),(438,'default',0,'dev/js/session_storage_logging','0'),(439,'default',0,'dev/js/session_storage_key','collected_errors'),(440,'default',0,'dev/css/merge_css_files','0'),(441,'default',0,'dev/css/minify_files','0'),(442,'default',0,'dev/image/default_adapter','GD2'),(443,'default',0,'dev/static/sign','0'),(444,'default',0,'dev/grid/async_indexing','0'),(445,'default',0,'payment/buckaroo_magento2_creditcard/allowed_issuers','cartebleuevisa,maestro,mastercard,visa'),(446,'default',0,'admin/emails/forgot_email_template','admin_emails_forgot_email_template'),(447,'default',0,'admin/emails/forgot_email_identity','general'),(448,'default',0,'admin/emails/password_reset_link_expiration_period','1'),(449,'default',0,'admin/emails/reset_password_template','admin_emails_reset_password_template'),(450,'default',0,'admin/startup/menu_item_id','Magento_Backend::dashboard'),(451,'default',0,'admin/url/use_custom','0'),(452,'default',0,'admin/url/use_custom_path','0'),(453,'default',0,'admin/security/use_form_key','1'),(454,'default',0,'admin/security/use_case_sensitive_login','0'),(455,'default',0,'admin/security/session_lifetime','999999'),(456,'default',0,'admin/security/lockout_failures','6'),(457,'default',0,'admin/security/lockout_threshold','30'),(458,'default',0,'admin/security/password_lifetime','90'),(459,'default',0,'admin/security/password_is_forced','1'),(460,'default',0,'admin/dashboard/enable_charts','0'),(461,'default',0,'admin/captcha/enable','0'),(462,'default',0,'payment/buckaroo_magento2_ideal/specificcountry','AF'),(465,'default',0,'buckaroo_magento2/account/order_status_new',NULL),(466,'default',0,'buckaroo_magento2/account/order_status_pending',NULL),(467,'default',0,'buckaroo_magento2/account/order_status_success',NULL),(468,'default',0,'buckaroo_magento2/account/order_status_failed',NULL),(469,'default',0,'payment/buckaroo_magento2_ideal/allowed_currencies','ARS,AUD,BRL,CAD,CHF,CNY,CZK,DKK,EUR,GBP,HRK,LTL,LVL,MXN,MXP,NOK,PLN,SEK,TRL,TRY,USD'); /*!40000 ALTER TABLE `core_config_data` ENABLE KEYS */; UNLOCK TABLES; @@ -6189,7 +6189,7 @@ CREATE TABLE `quote_payment` ( LOCK TABLES `quote_payment` WRITE; /*!40000 ALTER TABLE `quote_payment` DISABLE KEYS */; -INSERT INTO `quote_payment` VALUES (1,4,'2015-12-10 08:26:08','0000-00-00 00:00:00','buckaroo_magento2_giropay',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:6:\"232039\";}',NULL,NULL,NULL),(2,12,'2015-12-11 07:32:08','0000-00-00 00:00:00','buckaroo_magento2_giropay',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:23:\"een twee drie vier vijf\";}',NULL,NULL,NULL),(3,15,'2015-12-14 13:13:37','0000-00-00 00:00:00','buckaroo_magento2_giropay',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"ABNANL2A\";}',NULL,NULL,NULL),(4,27,'2015-12-14 15:15:56','0000-00-00 00:00:00','buckaroo_magento2_giropay',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"abcdef2a\";}',NULL,NULL,NULL),(5,28,'2015-12-14 15:23:55','0000-00-00 00:00:00','buckaroo_magento2_giropay',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"abcdef2a\";}',NULL,NULL,NULL),(6,29,'2015-12-16 10:58:40','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"SNSBNL2A\";}',NULL,NULL,NULL),(7,32,'2015-12-16 12:19:05','0000-00-00 00:00:00','buckaroo_magento2_giropay',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"abasde2d\";}',NULL,NULL,NULL),(8,33,'2015-12-16 12:48:12','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"RABONL2U\";}',NULL,NULL,NULL),(9,34,'2015-12-16 14:32:26','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"RABONL2U\";}',NULL,NULL,NULL),(10,35,'2015-12-16 14:52:56','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"RABONL2U\";}',NULL,NULL,NULL),(11,36,'2015-12-17 11:01:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,37,'2015-12-17 12:22:05','0000-00-00 00:00:00','buckaroo_magento2_sepadirectdebit',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:3:{s:12:\"customer_bic\";s:8:\"abcdef2a\";s:13:\"customer_iban\";s:0:\"\";s:21:\"customer_account_name\";s:9:\"piet henk\";}',NULL,NULL,NULL),(13,38,'2015-12-21 10:55:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,39,'2015-12-28 12:18:18','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:2:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";s:6:\"issuer\";N;}',NULL,NULL,NULL),(15,40,'2015-12-28 15:19:32','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,41,'2015-12-29 08:49:03','0000-00-00 00:00:00','buckaroo_magento2_creditcard',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:2:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";s:9:\"card_type\";N;}',NULL,NULL,NULL),(17,42,'2015-12-29 13:25:40','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,43,'2015-12-30 10:01:24','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:2:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";s:6:\"issuer\";N;}',NULL,NULL,NULL),(19,44,'2015-12-30 13:30:06','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,45,'2015-12-31 08:25:37','0000-00-00 00:00:00','buckaroo_magento2_transfer',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";}',NULL,NULL,NULL),(21,46,'2016-01-07 15:22:34','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,47,'2016-01-13 09:42:30','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,48,'2016-01-14 13:04:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,49,'2016-02-01 14:27:00','0000-00-00 00:00:00','buckaroo_magento2_paypal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:24:\"buckaroo_skip_validation\";N;}',NULL,NULL,NULL),(25,50,'2016-02-02 07:40:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,51,'2016-02-02 07:43:33','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,52,'2016-02-02 07:44:53','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,53,'2016-02-02 07:45:06','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,54,'2016-02-02 07:46:32','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,55,'2016-02-02 07:51:16','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,56,'2016-02-02 07:52:26','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,57,'2016-02-02 07:54:54','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,58,'2016-02-02 07:55:57','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `quote_payment` VALUES (1,4,'2015-12-10 08:26:08','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:6:\"232039\";}',NULL,NULL,NULL),(2,12,'2015-12-11 07:32:08','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:23:\"een twee drie vier vijf\";}',NULL,NULL,NULL),(3,15,'2015-12-14 13:13:37','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"ABNANL2A\";}',NULL,NULL,NULL),(4,27,'2015-12-14 15:15:56','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"abcdef2a\";}',NULL,NULL,NULL),(5,28,'2015-12-14 15:23:55','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"abcdef2a\";}',NULL,NULL,NULL),(6,29,'2015-12-16 10:58:40','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"SNSBNL2A\";}',NULL,NULL,NULL),(7,32,'2015-12-16 12:19:05','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:12:\"customer_bic\";s:8:\"abasde2d\";}',NULL,NULL,NULL),(8,33,'2015-12-16 12:48:12','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"RABONL2U\";}',NULL,NULL,NULL),(9,34,'2015-12-16 14:32:26','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"RABONL2U\";}',NULL,NULL,NULL),(10,35,'2015-12-16 14:52:56','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:6:\"issuer\";s:8:\"RABONL2U\";}',NULL,NULL,NULL),(11,36,'2015-12-17 11:01:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,37,'2015-12-17 12:22:05','0000-00-00 00:00:00','buckaroo_magento2_sepadirectdebit',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:3:{s:12:\"customer_bic\";s:8:\"abcdef2a\";s:13:\"customer_iban\";s:0:\"\";s:21:\"customer_account_name\";s:9:\"piet henk\";}',NULL,NULL,NULL),(13,38,'2015-12-21 10:55:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,39,'2015-12-28 12:18:18','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:2:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";s:6:\"issuer\";N;}',NULL,NULL,NULL),(15,40,'2015-12-28 15:19:32','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,41,'2015-12-29 08:49:03','0000-00-00 00:00:00','buckaroo_magento2_creditcard',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:2:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";s:9:\"card_type\";N;}',NULL,NULL,NULL),(17,42,'2015-12-29 13:25:40','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,43,'2015-12-30 10:01:24','0000-00-00 00:00:00','buckaroo_magento2_ideal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:2:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";s:6:\"issuer\";N;}',NULL,NULL,NULL),(19,44,'2015-12-30 13:30:06','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,45,'2015-12-31 08:25:37','0000-00-00 00:00:00','buckaroo_magento2_transfer',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:24:\"buckaroo_skip_validation\";s:1:\"1\";}',NULL,NULL,NULL),(21,46,'2016-01-07 15:22:34','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,47,'2016-01-13 09:42:30','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,48,'2016-01-14 13:04:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,49,'2016-02-01 14:27:00','0000-00-00 00:00:00','buckaroo_magento2_paypal',NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,'a:1:{s:24:\"buckaroo_skip_validation\";N;}',NULL,NULL,NULL),(25,50,'2016-02-02 07:40:50','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(26,51,'2016-02-02 07:43:33','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,52,'2016-02-02 07:44:53','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,53,'2016-02-02 07:45:06','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,54,'2016-02-02 07:46:32','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,55,'2016-02-02 07:51:16','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,56,'2016-02-02 07:52:26','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,57,'2016-02-02 07:54:54','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,58,'2016-02-02 07:55:57','0000-00-00 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `quote_payment` ENABLE KEYS */; UNLOCK TABLES; diff --git a/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php b/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php index 33bde4377..b6c021869 100644 --- a/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php +++ b/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php @@ -41,9 +41,6 @@ public function toOptionArrayProvider() [ ['value' => 'giftcard', 'label' => 'Giftcards'] ], - [ - ['value' => 'giropay', 'label' => 'Giropay'] - ], [ ['value' => 'ideal', 'label' => 'iDEAL'] ], @@ -56,9 +53,6 @@ public function toOptionArrayProvider() [ ['value' => 'paypal', 'label' => 'PayPal'] ], - [ - ['value' => 'sofortueberweisung', 'label' => 'Sofort Banking'] - ], [ ['value' => 'transfer', 'label' => 'Bank Transfer'] ], diff --git a/Test/Unit/Model/Config/Source/PaymentMethods/PayPerEmailTest.php b/Test/Unit/Model/Config/Source/PaymentMethods/PayPerEmailTest.php index b9964fd5a..aca28a612 100644 --- a/Test/Unit/Model/Config/Source/PaymentMethods/PayPerEmailTest.php +++ b/Test/Unit/Model/Config/Source/PaymentMethods/PayPerEmailTest.php @@ -44,9 +44,6 @@ public function toOptionArrayProvider() [ ['value' => 'giftcard', 'label' => 'Giftcards'] ], - [ - ['value' => 'giropay', 'label' => 'Giropay'] - ], [ ['value' => 'ideal', 'label' => 'iDEAL'] ], @@ -59,9 +56,6 @@ public function toOptionArrayProvider() [ ['value' => 'paypal', 'label' => 'PayPal'] ], - [ - ['value' => 'sofortueberweisung', 'label' => 'Sofort Banking'] - ], [ ['value' => 'transfer', 'label' => 'Bank Transfer'] ], diff --git a/Test/Unit/Model/ConfigProvider/AccountTest.php b/Test/Unit/Model/ConfigProvider/AccountTest.php index b0e472f0e..8844a7bcd 100644 --- a/Test/Unit/Model/ConfigProvider/AccountTest.php +++ b/Test/Unit/Model/ConfigProvider/AccountTest.php @@ -40,7 +40,7 @@ public function testGetConfig() $expectedKeys = [ 'active', 'secret_key', 'merchant_key', 'merchant_guid', 'transaction_label', 'certificate_file', 'order_confirmation_email', 'invoice_email', 'success_redirect', 'failure_redirect', 'cancel_on_failed', - 'digital_signature', 'debug_email', 'limit_by_ip', 'fee_percentage_mode', + 'digital_signature', 'debug_email', 'limit_by_ip', 'payment_fee_label', 'order_status_new', 'order_status_pending', 'order_status_success', 'order_status_failed', 'create_order_before_transaction' ]; diff --git a/Test/Unit/Model/ConfigProvider/Method/GiropayTest.php b/Test/Unit/Model/ConfigProvider/Method/GiropayTest.php deleted file mode 100644 index 0e3325832..000000000 --- a/Test/Unit/Model/ConfigProvider/Method/GiropayTest.php +++ /dev/null @@ -1,137 +0,0 @@ - [ - [ - 'payment' => [ - 'buckaroo' => [ - 'giropay' => [ - 'paymentFeeLabel' => 'Fee', - 'allowedCurrencies' => ['EUR'] - ] - ] - ] - ] - ] - ]; - } - - /** - * @param $expected - * - * @dataProvider getConfigProvider - */ - public function testGetConfig($expected) - { - $scopeConfigMock = $this->getFakeMock(ScopeConfigInterface::class) - ->setMethods(['getValue']) - ->getMockForAbstractClass(); - $scopeConfigMock->expects($this->atLeastOnce()) - ->method('getValue') - ->withConsecutive( - [Giropay::XPATH_ALLOWED_CURRENCIES, ScopeInterface::SCOPE_STORE, null] - ) - ->willReturnOnConsecutiveCalls('EUR'); - - $paymentFeeMock = $this->getFakeMock(PaymentFee::class)->setMethods(['getBuckarooPaymentFeeLabel'])->getMock(); - $paymentFeeMock->method('getBuckarooPaymentFeeLabel')->with(GiropayMethod::PAYMENT_METHOD_CODE)->willReturn('Fee'); - - $instance = $this->getInstance(['scopeConfig' => $scopeConfigMock, 'paymentFeeHelper' => $paymentFeeMock]); - $result = $instance->getConfig(); - - $this->assertEquals($expected, $result); - } - - public function getPaymentFeeProvider() - { - return [ - 'null value' => [ - null, - false - ], - 'false value' => [ - false, - false - ], - 'empty int value' => [ - 0, - false - ], - 'empty float value' => [ - 0.00, - false - ], - 'empty string value' => [ - '', - false - ], - 'int value' => [ - 1, - 1 - ], - 'float value' => [ - 2.34, - 2.34 - ], - 'string value' => [ - '5.67', - 5.67 - ], - ]; - } - - /** - * @param $value - * @param $expected - * - * @dataProvider getPaymentFeeProvider - */ - public function testGetPaymentFee($value, $expected) - { - $scopeConfigMock = $this->getFakeMock(ScopeConfigInterface::class) - ->setMethods(['getValue']) - ->getMockForAbstractClass(); - $scopeConfigMock->expects($this->once()) - ->method('getValue') - ->with(Giropay::XPATH_GIROPAY_PAYMENT_FEE, ScopeInterface::SCOPE_STORE) - ->willReturn($value); - - $instance = $this->getInstance(['scopeConfig' => $scopeConfigMock]); - $result = $instance->getPaymentFee(); - - $this->assertEquals($expected, $result); - } -} diff --git a/Test/Unit/Model/ConfigProvider/Method/SofortbankingTest.php b/Test/Unit/Model/ConfigProvider/Method/SofortbankingTest.php deleted file mode 100644 index 2aae8c45f..000000000 --- a/Test/Unit/Model/ConfigProvider/Method/SofortbankingTest.php +++ /dev/null @@ -1,137 +0,0 @@ - [ - [ - 'payment' => [ - 'buckaroo' => [ - 'sofortbanking' => [ - 'paymentFeeLabel' => 'Fee', - 'allowedCurrencies' => ['EUR'] - ] - ] - ] - ] - ] - ]; - } - - /** - * @param $expected - * - * @dataProvider getConfigProvider - */ - public function testGetConfig($expected) - { - $scopeConfigMock = $this->getFakeMock(ScopeConfigInterface::class) - ->setMethods(['getValue']) - ->getMockForAbstractClass(); - $scopeConfigMock->expects($this->atLeastOnce()) - ->method('getValue') - ->withConsecutive( - [Sofortbanking::XPATH_ALLOWED_CURRENCIES, ScopeInterface::SCOPE_STORE, null] - ) - ->willReturnOnConsecutiveCalls('EUR'); - - $paymentFeeMock = $this->getFakeMock(PaymentFee::class)->setMethods(['getBuckarooPaymentFeeLabel'])->getMock(); - $paymentFeeMock->method('getBuckarooPaymentFeeLabel')->with(SofortbankingMethod::PAYMENT_METHOD_CODE)->willReturn('Fee'); - - $instance = $this->getInstance(['scopeConfig' => $scopeConfigMock, 'paymentFeeHelper' => $paymentFeeMock]); - $result = $instance->getConfig(); - - $this->assertEquals($expected, $result); - } - - public function getPaymentFeeProvider() - { - return [ - 'null value' => [ - null, - false - ], - 'false value' => [ - false, - false - ], - 'empty int value' => [ - 0, - false - ], - 'empty float value' => [ - 0.00, - false - ], - 'empty string value' => [ - '', - false - ], - 'int value' => [ - 1, - 1 - ], - 'float value' => [ - 2.34, - 2.34 - ], - 'string value' => [ - '5.67', - 5.67 - ], - ]; - } - - /** - * @param $value - * @param $expected - * - * @dataProvider getPaymentFeeProvider - */ - public function testGetPaymentFee($value, $expected) - { - $scopeConfigMock = $this->getFakeMock(ScopeConfigInterface::class) - ->setMethods(['getValue']) - ->getMockForAbstractClass(); - $scopeConfigMock->expects($this->once()) - ->method('getValue') - ->with(Sofortbanking::XPATH_SOFORTBANKING_PAYMENT_FEE, ScopeInterface::SCOPE_STORE) - ->willReturn($value); - - $instance = $this->getInstance(['scopeConfig' => $scopeConfigMock]); - $result = $instance->getPaymentFee(); - - $this->assertEquals($expected, $result); - } -} diff --git a/Test/Unit/Model/Method/GiropayTest.php b/Test/Unit/Model/Method/GiropayTest.php deleted file mode 100644 index 34e5b533a..000000000 --- a/Test/Unit/Model/Method/GiropayTest.php +++ /dev/null @@ -1,241 +0,0 @@ -getObject(DataObject::class); - $data->setBuckarooSkipValidation(0); - $data->setAdditionalData([ - 'customer_bic' => 'NL32INGB' - ]); - - $infoInstanceMock = $this->getFakeMock(InfoInterface::class) - ->setMethods(['setAdditionalInformation']) - ->getMockForAbstractClass(); - $infoInstanceMock->expects($this->exactly(2))->method('setAdditionalInformation')->withConsecutive( - ['buckaroo_skip_validation', 0], - ['customer_bic', 'NL32INGB'] - ); - - $instance = $this->getInstance(); - $instance->setData('info_instance', $infoInstanceMock); - - $result = $instance->assignData($data); - $this->assertInstanceOf(Giropay::class, $result); - } - - /** - * Test the getOrderTransactionBuilder method. - */ - public function testGetOrderTransactionBuilder() - { - $fixture = [ - 'customer_bic' => 'biccib', - 'order' => 'orderrr!', - ]; - - $paymentMock = $this->getFakeMock(Payment::class) - ->setMethods(['getOrder', 'getAdditionalInformation']) - ->getMock(); - $paymentMock->expects($this->once())->method('getOrder')->willReturn($fixture['order']); - $paymentMock->expects($this->once()) - ->method('getAdditionalInformation') - ->with('customer_bic') - ->willReturn($fixture['customer_bic']); - - $orderMock =$this->getFakeMock(Order::class)->setMethods(['setOrder', 'setMethod', 'setServices'])->getMock(); - $orderMock->expects($this->once())->method('setOrder')->with($fixture['order'])->willReturnSelf(); - $orderMock->expects($this->once())->method('setMethod')->with('TransactionRequest')->willReturnSelf(); - $orderMock->expects($this->once())->method('setServices')->willReturnCallback( - function ($services) use ($fixture, $orderMock) { - $this->assertEquals('giropay', $services['Name']); - $this->assertEquals($fixture['customer_bic'], $services['RequestParameter'][0]['_']); - - return $orderMock; - } - ); - - $trxFactoryMock = $this->getFakeMock(TransactionBuilderFactory::class)->setMethods(['get'])->getMock(); - $trxFactoryMock->expects($this->once())->method('get')->with('order')->willReturn($orderMock); - - $infoInterface = $this->getFakeMock(InfoInterface::class)->getMockForAbstractClass(); - - $instance = $this->getInstance(['transactionBuilderFactory' => $trxFactoryMock]); - $instance->setData('info_instance', $infoInterface); - - $this->assertEquals($orderMock, $instance->getOrderTransactionBuilder($paymentMock)); - } - - /** - * Test the getCaptureTransactionBuilder method. - */ - public function testGetCaptureTransactionBuilder() - { - $instance = $this->getInstance(); - $this->assertFalse($instance->getCaptureTransactionBuilder('')); - } - - /** - * Test the getAuthorizeTransactionBuild method. - */ - public function testGetAuthorizeTransactionBuilder() - { - $instance = $this->getInstance(); - $this->assertFalse($instance->getAuthorizeTransactionBuilder('')); - } - - /** - * Test the getRefundTransactionBuilder method. - */ - public function testGetRefundTransactionBuilder() - { - $paymentMock = $this->getFakeMock(Payment::class) - ->setMethods(['getOrder', 'getAdditionalInformation']) - ->getMock(); - $paymentMock->expects($this->once())->method('getOrder')->willReturn('orderr'); - $paymentMock->expects($this->once()) - ->method('getAdditionalInformation') - ->with(Giropay::BUCKAROO_ORIGINAL_TRANSACTION_KEY_KEY) - ->willReturn('getAdditionalInformation'); - - $trxFactoryMock = $this->getFakeMock(TransactionBuilderFactory::class) - ->setMethods(['get', 'setOrder', 'setMethod', 'setChannel', 'setOriginalTransactionKey', 'setServices']) - ->getMock(); - $trxFactoryMock->expects($this->once())->method('get')->with('refund')->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setOrder')->with('orderr')->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setMethod')->with('TransactionRequest')->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setChannel')->with('CallCenter')->willReturnSelf(); - $trxFactoryMock->expects($this->once()) - ->method('setOriginalTransactionKey') - ->with('getAdditionalInformation') - ->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setServices')->willReturnCallback( - function ($services) use ($trxFactoryMock) { - $services['Name'] = 'giropay'; - $services['Action'] = 'Refund'; - - return $trxFactoryMock; - } - ); - - $instance = $this->getInstance(['transactionBuilderFactory' => $trxFactoryMock]); - - $this->assertEquals($trxFactoryMock, $instance->getRefundTransactionBuilder($paymentMock)); - } - - /** - * Test the getVoidTransactionBuild method. - */ - public function testGetVoidTransactionBuilder() - { - $instance = $this->getInstance(); - $this->assertTrue($instance->getVoidTransactionBuilder('')); - } - - /** - * Test the validation method happy path. - */ - public function testValidate() - { - $paymentInfoMock = $this->getFakeMock(InfoInterface::class) - ->setMethods(['getQuote', 'getBillingAddress', 'getCountryId', 'getAdditionalInformation']) - ->getMockForAbstractClass(); - $paymentInfoMock->expects($this->once())->method('getQuote')->willReturnSelf(); - $paymentInfoMock->expects($this->once())->method('getBillingAddress')->willReturnSelf(); - $paymentInfoMock->expects($this->once())->method('getCountryId')->willReturn(4); - $paymentInfoMock->expects($this->exactly(2)) - ->method('getAdditionalInformation') - ->withConsecutive(['buckaroo_skip_validation'], ['customer_bic']) - ->willReturnOnConsecutiveCalls(false, 'ABCDEF1E'); - - $instance = $this->getInstance(); - $instance->setData('info_instance', $paymentInfoMock); - $result = $instance->validate(); - - $this->assertInstanceOf(Giropay::class, $result); - } - - /** - * Test the validation method happy path. - */ - public function testValidateInvalidBic() - { - $paymentInfoMock = $this->getFakeMock(InfoInterface::class) - ->setMethods(['getQuote', 'getBillingAddress', 'getCountryId', 'getAdditionalInformation']) - ->getMockForAbstractClass(); - $paymentInfoMock->expects($this->once())->method('getQuote')->willReturnSelf(); - $paymentInfoMock->expects($this->once())->method('getBillingAddress')->willReturnSelf(); - $paymentInfoMock->expects($this->once())->method('getCountryId')->willReturn(4); - $paymentInfoMock->expects($this->exactly(2)) - ->method('getAdditionalInformation') - ->withConsecutive(['buckaroo_skip_validation'], ['customer_bic']) - ->willReturnOnConsecutiveCalls(false, 'wrong'); - - $instance = $this->getInstance(); - $instance->setData('info_instance', $paymentInfoMock); - - try { - $instance->validate(); - } catch (LocalizedException $e) { - $this->assertEquals('Please enter a valid BIC number', $e->getMessage()); - } - } - - /** - * Test the validation method happy path. - */ - public function testValidateSkipValidation() - { - $paymentInfoMock = $this->getFakeMock(InfoInterface::class) - ->setMethods(['getQuote', 'getBillingAddress', 'getCountryId', 'getAdditionalInformation']) - ->getMockForAbstractClass(); - $paymentInfoMock->expects($this->once())->method('getQuote')->willReturnSelf(); - $paymentInfoMock->expects($this->once())->method('getBillingAddress')->willReturnSelf(); - $paymentInfoMock->expects($this->once())->method('getCountryId')->willReturn(4); - $paymentInfoMock->expects($this->once()) - ->method('getAdditionalInformation') - ->with('buckaroo_skip_validation') - ->willReturn(true); - - $instance = $this->getInstance(); - $instance->setData('info_instance', $paymentInfoMock); - - $result = $instance->validate(); - - $this->assertInstanceOf(Giropay::class, $result); - } -} diff --git a/Test/Unit/Model/Method/SofortbankingTest.php b/Test/Unit/Model/Method/SofortbankingTest.php deleted file mode 100644 index 8c6891bc3..000000000 --- a/Test/Unit/Model/Method/SofortbankingTest.php +++ /dev/null @@ -1,142 +0,0 @@ - 'orderrr!', - ]; - - $paymentMock = $this->getFakeMock(Payment::class) - ->setMethods(['getOrder', 'setAdditionalInformation']) - ->getMock(); - $paymentMock->expects($this->once())->method('getOrder')->willReturn($fixture['order']); - - $orderMock = $this->getFakeMock(Order::class)->setMethods(['setOrder', 'setMethod', 'setServices'])->getMock(); - $orderMock->expects($this->once())->method('setOrder')->with($fixture['order'])->willReturnSelf(); - $orderMock->expects($this->once())->method('setMethod')->with('TransactionRequest')->willReturnSelf(); - $orderMock->expects($this->once())->method('setServices')->willReturnCallback( - function ($services) use ($fixture, $orderMock) { - $this->assertEquals('Sofortueberweisung', $services['Name']); - $this->assertEquals('Pay', $services['Action']); - - return $orderMock; - } - ); - - $trxFactoryMock = $this->getFakeMock(TransactionBuilderFactory::class)->setMethods(['get'])->getMock(); - $trxFactoryMock->expects($this->once())->method('get')->with('order')->willReturn($orderMock); - - $infoInterface = $this->getFakeMock(InfoInterface::class)->getMockForAbstractClass(); - - $instance = $this->getInstance(['transactionBuilderFactory' => $trxFactoryMock]); - - $instance->setData('info_instance', $infoInterface); - $this->assertEquals($orderMock, $instance->getOrderTransactionBuilder($paymentMock)); - } - - /** - * Test the getCaptureTransactionBuilder method. - */ - public function testGetCaptureTransactionBuilder() - { - $infoInterface = $this->getFakeMock(InfoInterface::class)->getMockForAbstractClass(); - $instance = $this->getInstance(); - $this->assertFalse($instance->getCaptureTransactionBuilder($infoInterface)); - } - - /** - * Test the getAuthorizeTransactionBuild method. - */ - public function testGetAuthorizeTransactionBuilder() - { - $infoInterface = $this->getFakeMock(InfoInterface::class)->getMockForAbstractClass(); - $instance = $this->getInstance(); - $this->assertFalse($instance->getAuthorizeTransactionBuilder($infoInterface)); - } - - /** - * Test the getRefundTransactionBuilder method. - */ - public function testGetRefundTransactionBuilder() - { - $fixture = [ - 'card_type' => 'fooname', - 'order' => 'orderrr!', - ]; - - $paymentMock = $this->getFakeMock(Payment::class) - ->setMethods(['getOrder', 'getAdditionalInformation']) - ->getMock(); - $paymentMock->expects($this->once())->method('getOrder')->willReturn($fixture['order']); - $paymentMock->expects($this->once()) - ->method('getAdditionalInformation') - ->with(Sofortbanking::BUCKAROO_ORIGINAL_TRANSACTION_KEY_KEY) - ->willReturn('getAdditionalInformation'); - - $trxFactoryMock = $this->getFakeMock(TransactionBuilderFactory::class) - ->setMethods(['get', 'setOrder', 'setMethod', 'setChannel', 'setOriginalTransactionKey', 'setServices']) - ->getMock(); - $trxFactoryMock->expects($this->once())->method('get')->with('refund')->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setOrder')->with($fixture['order'])->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setMethod')->with('TransactionRequest')->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setChannel')->with('CallCenter')->willReturnSelf(); - $trxFactoryMock->expects($this->once()) - ->method('setOriginalTransactionKey') - ->with('getAdditionalInformation') - ->willReturnSelf(); - $trxFactoryMock->expects($this->once())->method('setServices')->willReturnCallback( - function ($services) use ($trxFactoryMock) { - $services['Name'] = 'sofortbanking'; - $services['Action'] = 'Refund'; - - return $trxFactoryMock; - } - ); - - $instance = $this->getInstance(['transactionBuilderFactory' => $trxFactoryMock]); - - $this->assertEquals($trxFactoryMock, $instance->getRefundTransactionBuilder($paymentMock)); - } - - /** - * Test the getVoidTransactionBuild method. - */ - public function testGetVoidTransactionBuilder() - { - $instance = $this->getInstance(); - $this->assertTrue($instance->getVoidTransactionBuilder('')); - } -} diff --git a/Test/Unit/Model/Method/TransferTest.php b/Test/Unit/Model/Method/TransferTest.php index ca8d05d3d..afdd8f292 100644 --- a/Test/Unit/Model/Method/TransferTest.php +++ b/Test/Unit/Model/Method/TransferTest.php @@ -350,7 +350,6 @@ public function testGetRefundTransactionBuilder() ->willReturnSelf(); $trxFactoryMock->expects($this->once())->method('setServices')->willReturnCallback( function ($services) use ($trxFactoryMock) { - $services['Name'] = 'sofortbanking'; $services['Action'] = 'Refund'; return $trxFactoryMock; diff --git a/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php b/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php index f479a994f..2677a8588 100644 --- a/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php +++ b/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php @@ -18,7 +18,7 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ -namespace Buckaroo\Magento2\Test\Unit\Model\Quote\Total; +namespace Buckaroo\Magento2\Test\Unit\Model\Total\Quote; use Magento\Catalog\Helper\Data; use Magento\Framework\Pricing\PriceCurrencyInterface; @@ -48,9 +48,9 @@ public function testGetBaseFeeReturnsConfigValueIfIsNumber() $quoteMock = $this->getFakeMock(Quote::class)->getMock(); $configProviderFeeMock = $this->getFakeMock(ConfigProviderBuckarooFee::class) - ->setMethods(['getTaxClass', 'getPaymentFeeTax']) + ->setMethods(['getBuckarooFeeTaxClass', 'getPaymentFeeTax']) ->getMock(); - $configProviderFeeMock->expects($this->once())->method('getTaxClass')->willReturn(1); + $configProviderFeeMock->expects($this->once())->method('getBuckarooFeeTaxClass')->willReturn(1); $configProviderFeeMock->expects($this->once())->method('getPaymentFeeTax')->willReturn($taxIncl); $catalogHelper = $this->getFakeMock(Data::class)->setMethods(['getTaxPrice'])->getMock(); @@ -62,6 +62,10 @@ public function testGetBaseFeeReturnsConfigValueIfIsNumber() $configProviderFactoryMock->expects($this->once())->method('has')->with($paymentCode)->willReturn(true); $configProviderFactoryMock->expects($this->once())->method('get')->with($paymentCode)->willReturnSelf(); $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($expectedFee); + $totalMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Total::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseSubtotalInclTax', 'getTotalAmount', 'getBaseGrandTotal', 'setBaseGrandTotal', 'setGrandTotal']) + ->getMock(); $instance = $this->getInstance([ 'configProviderBuckarooFee' => $configProviderFeeMock, @@ -69,7 +73,7 @@ public function testGetBaseFeeReturnsConfigValueIfIsNumber() 'catalogHelper' => $catalogHelper ]); - $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); + $result = $instance->getBaseFee($paymentMethodMock, $quoteMock, $totalMock); $this->assertEquals($expectedFee, $result); } @@ -84,9 +88,13 @@ public function testGetBaseFeeReturnFalseForANonExistingConfigProvider() $configProviderFactoryMock = $this->getFakeMock(Factory::class)->setMethods(['has'])->getMock(); $configProviderFactoryMock->expects($this->once())->method('has')->with($paymentCode)->willReturn(false); + $totalMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Total::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseSubtotalInclTax', 'getTotalAmount', 'getBaseGrandTotal', 'setBaseGrandTotal', 'setGrandTotal']) + ->getMock(); $instance = $this->getInstance(['configProviderMethodFactory' => $configProviderFactoryMock]); - $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); + $result = $instance->getBaseFee($paymentMethodMock, $quoteMock, $totalMock); $this->assertFalse($result); } @@ -149,11 +157,8 @@ public function testGetBaseFeeCalculatesPercentageOnCorrectTotal( $configProviderFactoryMock->expects($this->once())->method('get')->with($paymentCode)->willReturnSelf(); $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($fee); - $configAccountMock = $this->getFakeMock(Account::class)->setMethods(['getFeePercentageMode'])->getMock(); - $configAccountMock->expects($this->once())->method('getFeePercentageMode')->willReturn($feeMode); $instance = $this->getInstance([ - 'configProviderAccount' => $configAccountMock, 'configProviderMethodFactory' => $configProviderFactoryMock ]); $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); @@ -222,11 +227,7 @@ public function testGetBaseFeeCalculatesPercentageOnCorrectTotalWithBillingAddre $configProviderFactoryMock->expects($this->once())->method('get')->with($paymentCode)->willReturnSelf(); $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($fee); - $configAccountMock = $this->getFakeMock(Account::class)->setMethods(['getFeePercentageMode'])->getMock(); - $configAccountMock->expects($this->once())->method('getFeePercentageMode')->willReturn($feeMode); - $instance = $this->getInstance([ - 'configProviderAccount' => $configAccountMock, 'configProviderMethodFactory' => $configProviderFactoryMock ]); $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); @@ -372,9 +373,9 @@ public function testCollectShouldReturnSelfIfFeeIsZero() $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($expectedFee); $configProviderFeeMock = $this->getFakeMock(ConfigProviderBuckarooFee::class) - ->setMethods(['getTaxClass','getPaymentFeeTax']) + ->setMethods(['getBuckarooFeeTaxClass','getPaymentFeeTax']) ->getMock(); - $configProviderFeeMock->expects($this->once())->method('getTaxClass')->willReturn(1); + $configProviderFeeMock->expects($this->once())->method('getBuckarooFeeTaxClass')->willReturn(1); $catalogHelperMock = $this->getFakeMock(Data::class)->setMethods(['getTaxPrice'])->getMock(); $catalogHelperMock->expects($this->once())->method('getTaxPrice')->willReturn($expectedFee); @@ -437,9 +438,9 @@ public function testCollectShouldSetTotalsOnQuote() $priceCurrencyMock->method('convert')->with($fee, $store)->willReturn($fee); $configProviderFeeMock = $this->getFakeMock(ConfigProviderBuckarooFee::class) - ->setMethods(['getTaxClass', 'getPaymentFeeTax']) + ->setMethods(['getBuckarooFeeTaxClass', 'getPaymentFeeTax']) ->getMock(); - $configProviderFeeMock->expects($this->once())->method('getTaxClass')->willReturn(1); + $configProviderFeeMock->expects($this->once())->method('getBuckarooFeeTaxClass')->willReturn(1); $configProviderFeeMock->expects($this->once())->method('getPaymentFeeTax')->willReturn($taxIncl); $catalogHelperMock = $this->getFakeMock(Data::class)->setMethods(['getTaxPrice'])->getMock(); diff --git a/Ui/Component/Listing/Column/Method/Filter.php b/Ui/Component/Listing/Column/Method/Filter.php index 981590392..12de372ab 100644 --- a/Ui/Component/Listing/Column/Method/Filter.php +++ b/Ui/Component/Listing/Column/Method/Filter.php @@ -35,24 +35,24 @@ public function toOptionArray() */ $result = $db->query( ' - SELECT - method, + SELECT + method, group_concat(distinct(' . $this->resourceConnection->getTableName('buckaroo_magento2_giftcard') . '.servicecode) SEPARATOR "-") as giftcard_codes, group_concat(distinct(' . $this->resourceConnection->getTableName('buckaroo_magento2_giftcard') . - '.label) SEPARATOR "-") as giftcard_titles + '.label) SEPARATOR "-") as giftcard_titles from ' . $this->resourceConnection->getTableName('sales_order_payment') . - ' + ' inner join ' . $this->resourceConnection->getTableName('sales_order') . ' on ' . $this->resourceConnection->getTableName('sales_order') . '.entity_id = ' . $this->resourceConnection->getTableName('sales_order_payment') . - '.parent_id + '.parent_id inner join ' . $this->resourceConnection->getTableName( 'buckaroo_magento2_group_transaction' @@ -63,7 +63,7 @@ public function toOptionArray() ) . '.order_id=' . $this->resourceConnection->getTableName('sales_order') . - '.increment_id + '.increment_id inner join ' . $this->resourceConnection->getTableName('buckaroo_magento2_giftcard') . ' on ' . @@ -72,7 +72,7 @@ public function toOptionArray() $this->resourceConnection->getTableName( 'buckaroo_magento2_group_transaction' ) . - '.servicecode + '.servicecode group by ' . $this->resourceConnection->getTableName( 'buckaroo_magento2_group_transaction' @@ -105,8 +105,7 @@ public function toOptionArray() $options = new \Buckaroo\Magento2\Model\Config\Source\PaymentMethods\PayPerEmail(); $option = $options->toOptionArray(); $option = array_merge($option, [ - ['value' => 'creditcards', 'label' => __('Creditcards')], - ['value' => 'sofortbanking', 'label' => __('Sofort')], + ['value' => 'creditcards', 'label' => __('Creditcards')] ]); foreach ($option as $item) { $this->options[] = [ diff --git a/composer.json b/composer.json index dfb034b7f..90ad1716d 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "docs": "https://docs.buckaroo.io/" }, "homepage": "https://www.buckaroo.nl", - "version" : "v1.50.2", + "version" : "v1.51.0", "minimum-stability": "stable", "autoload": { "files": [ diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 9ffd9d86f..58e89c5b4 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -21,9 +21,6 @@ --> -
- -
diff --git a/etc/adminhtml/system/account.xml b/etc/adminhtml/system/account.xml old mode 100644 new mode 100755 index 5f243a4e9..fdadf2b89 --- a/etc/adminhtml/system/account.xml +++ b/etc/adminhtml/system/account.xml @@ -105,9 +105,15 @@ buckaroo_magento2/account/idin + + + + \Magento\Tax\Model\TaxClass\Source\Product + buckaroo_magento2/account/buckaroo_fee_tax_class + + - Buckaroo\Magento2\Model\Config\Source\Idinmode buckaroo_magento2/account/idin_mode @@ -224,13 +230,6 @@ buckaroo_magento2/account/limit_by_ip - - - Please choose over which amount the fee percentage is calculated.]]> - Buckaroo\Magento2\Model\Config\Source\FeePercentageMode - buckaroo_magento2/account/fee_percentage_mode - - diff --git a/etc/adminhtml/system/payment_methods.xml b/etc/adminhtml/system/payment_methods.xml index 2aa07251a..dfb664a7e 100644 --- a/etc/adminhtml/system/payment_methods.xml +++ b/etc/adminhtml/system/payment_methods.xml @@ -64,10 +64,6 @@ - - - - diff --git a/etc/adminhtml/system/payment_methods/afterpay.xml b/etc/adminhtml/system/payment_methods/afterpay.xml index 6689ba7e6..b73b1ae62 100644 --- a/etc/adminhtml/system/payment_methods/afterpay.xml +++ b/etc/adminhtml/system/payment_methods/afterpay.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_afterpay/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_afterpay/subtext - + @@ -85,13 +86,6 @@ - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_afterpay/financial_warning - - @@ -154,7 +148,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_afterpay/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/afterpay2.xml b/etc/adminhtml/system/payment_methods/afterpay2.xml index c08e4aa4d..befd71e53 100644 --- a/etc/adminhtml/system/payment_methods/afterpay2.xml +++ b/etc/adminhtml/system/payment_methods/afterpay2.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_afterpay2/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_afterpay2/subtext - + @@ -85,13 +86,6 @@ - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_afterpay2/financial_warning - - @@ -154,7 +148,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_afterpay2/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/afterpay20.xml b/etc/adminhtml/system/payment_methods/afterpay20.xml index 23ffbadb3..38a21cdac 100644 --- a/etc/adminhtml/system/payment_methods/afterpay20.xml +++ b/etc/adminhtml/system/payment_methods/afterpay20.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_afterpay20/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_afterpay20/subtext - + @@ -93,7 +94,7 @@ both,b2b - + @@ -105,13 +106,6 @@ payment/buckaroo_magento2_afterpay20/payment_email - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_afterpay20/financial_warning - - @@ -133,7 +127,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_afterpay20/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/alipay.xml b/etc/adminhtml/system/payment_methods/alipay.xml index 5e9f1f23e..32d88ccbe 100644 --- a/etc/adminhtml/system/payment_methods/alipay.xml +++ b/etc/adminhtml/system/payment_methods/alipay.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_alipay/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_alipay/subtext - + @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_alipay/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/applepay.xml b/etc/adminhtml/system/payment_methods/applepay.xml index 77d82e06b..8a0369c5b 100644 --- a/etc/adminhtml/system/payment_methods/applepay.xml +++ b/etc/adminhtml/system/payment_methods/applepay.xml @@ -42,6 +42,7 @@ payment/buckaroo_magento2_applepay/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -49,7 +50,7 @@ payment/buckaroo_magento2_applepay/subtext - + diff --git a/etc/adminhtml/system/payment_methods/belfius.xml b/etc/adminhtml/system/payment_methods/belfius.xml index a34d477aa..37226b813 100644 --- a/etc/adminhtml/system/payment_methods/belfius.xml +++ b/etc/adminhtml/system/payment_methods/belfius.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_belfius/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_belfius/subtext - + @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_belfius/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/billink.xml b/etc/adminhtml/system/payment_methods/billink.xml index 922cef49c..8233786e5 100644 --- a/etc/adminhtml/system/payment_methods/billink.xml +++ b/etc/adminhtml/system/payment_methods/billink.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_billink/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_billink/subtext - + @@ -102,7 +103,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_billink/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/blik.xml b/etc/adminhtml/system/payment_methods/blik.xml index 382f2eda7..9ed3d9cc0 100644 --- a/etc/adminhtml/system/payment_methods/blik.xml +++ b/etc/adminhtml/system/payment_methods/blik.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_blik/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_blik/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/capayable_in3.xml b/etc/adminhtml/system/payment_methods/capayable_in3.xml index ac01e3b81..2190b352a 100644 --- a/etc/adminhtml/system/payment_methods/capayable_in3.xml +++ b/etc/adminhtml/system/payment_methods/capayable_in3.xml @@ -41,6 +41,7 @@ payment/buckaroo_magento2_capayablein3/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -48,7 +49,7 @@ payment/buckaroo_magento2_capayablein3/subtext - + @@ -66,7 +67,7 @@ - payment/buckaroo_magento2_capayablein3/sort_order + payment/buckaroo_magento2_capayablein3/sort_order @@ -88,7 +89,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_capayablein3/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/capayable_postpay.xml b/etc/adminhtml/system/payment_methods/capayable_postpay.xml index 8e3fcc608..41298c37a 100644 --- a/etc/adminhtml/system/payment_methods/capayable_postpay.xml +++ b/etc/adminhtml/system/payment_methods/capayable_postpay.xml @@ -34,6 +34,7 @@ payment/buckaroo_magento2_capayablepostpay/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -41,7 +42,7 @@ payment/buckaroo_magento2_capayablepostpay/subtext - + @@ -82,7 +83,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_capayablepostpay/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/creditcards.xml b/etc/adminhtml/system/payment_methods/creditcards.xml index 42ed09723..9eb7499eb 100644 --- a/etc/adminhtml/system/payment_methods/creditcards.xml +++ b/etc/adminhtml/system/payment_methods/creditcards.xml @@ -39,6 +39,7 @@ payment/buckaroo_magento2_creditcards/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -87,7 +88,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_creditcards/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/emandate.xml b/etc/adminhtml/system/payment_methods/emandate.xml index c1457d1ea..33a397c15 100644 --- a/etc/adminhtml/system/payment_methods/emandate.xml +++ b/etc/adminhtml/system/payment_methods/emandate.xml @@ -33,6 +33,7 @@ payment/buckaroo_magento2_emandate/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -40,7 +41,7 @@ payment/buckaroo_magento2_emandate/subtext - + @@ -55,7 +56,7 @@ Buckaroo\Magento2\Block\Config\Form\Field\ColorPicker - + @@ -93,7 +94,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_emandate/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/eps.xml b/etc/adminhtml/system/payment_methods/eps.xml index 8acc14fc6..4f7ca5f63 100644 --- a/etc/adminhtml/system/payment_methods/eps.xml +++ b/etc/adminhtml/system/payment_methods/eps.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_eps/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_eps/subtext - + @@ -58,7 +59,7 @@ Buckaroo\Magento2\Block\Config\Form\Field\ColorPicker - + @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_eps/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/giftcards.xml b/etc/adminhtml/system/payment_methods/giftcards.xml index 0ab1b0ee8..b85cc4037 100644 --- a/etc/adminhtml/system/payment_methods/giftcards.xml +++ b/etc/adminhtml/system/payment_methods/giftcards.xml @@ -35,6 +35,7 @@ payment/buckaroo_magento2_giftcards/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -42,7 +43,7 @@ payment/buckaroo_magento2_giftcards/subtext - + diff --git a/etc/adminhtml/system/payment_methods/giropay.xml b/etc/adminhtml/system/payment_methods/giropay.xml deleted file mode 100644 index 6ba00f4cb..000000000 --- a/etc/adminhtml/system/payment_methods/giropay.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - Buckaroo\Magento2\Block\Config\Form\Field\Fieldset - - - - - Buckaroo\Magento2\Model\Config\Source\Enablemode - payment/buckaroo_magento2_giropay/active - - - - - - payment/buckaroo_magento2_giropay/title - - - - - - payment/buckaroo_magento2_giropay/subtext - - - - - - Buckaroo\Magento2\Model\Config\Source\SubtextStyle - payment/buckaroo_magento2_giropay/subtext_style - - - - - - payment/buckaroo_magento2_giropay/subtext_color - Buckaroo\Magento2\Block\Config\Form\Field\ColorPicker - - - - - - - payment/buckaroo_magento2_giropay/sort_order - - - - - - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_giropay/order_email - - - - - Configuration > Sales > Tax.]]> - payment/buckaroo_magento2_giropay/payment_fee - Buckaroo\Magento2\Model\Config\Backend\PaymentFee - - - - - - payment/buckaroo_magento2_giropay/payment_fee_label - - - - - - The payment method shows only for orders with an order amount greater than the minimum amount. - payment/buckaroo_magento2_giropay/min_amount - Buckaroo\Magento2\Model\Config\Backend\Price - - - - - - The payment method shows only for orders with an order amount smaller than the maximum amount. - payment/buckaroo_magento2_giropay/max_amount - Buckaroo\Magento2\Model\Config\Backend\Price - - - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_giropay/active_status - - - - - - To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status. - Buckaroo\Magento2\Model\Config\Source\StatusesSuccess - payment/buckaroo_magento2_giropay/order_status_success - - 1 - - - - - - - To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status. - Buckaroo\Magento2\Model\Config\Source\StatusesFailed - payment/buckaroo_magento2_giropay/order_status_failed - - 1 - - - - - - - Your contract with Buckaroo must allow for the selected currencies to be used with this payment method. - payment/buckaroo_magento2_giropay/allowed_currencies - Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::giropay - Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies - - - - - Buckaroo\Magento2\Model\Config\Source\AllOrSpecificCountries - payment/buckaroo_magento2_giropay/allowspecific - - - - - - Magento\Config\Model\Config\Source\Locale\Country - payment/buckaroo_magento2_giropay/specificcountry - - 1 - - - - - - - Magento developer client restrictions. - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_giropay/limit_by_ip - - - - - Buckaroo\Magento2\Model\Config\Source\SpecificCustomerGroups - 1 - payment/buckaroo_magento2_giropay/specificcustomergroup - - - - diff --git a/etc/adminhtml/system/payment_methods/ideal.xml b/etc/adminhtml/system/payment_methods/ideal.xml index 908a3a4a1..e95fd4a8d 100644 --- a/etc/adminhtml/system/payment_methods/ideal.xml +++ b/etc/adminhtml/system/payment_methods/ideal.xml @@ -44,6 +44,7 @@ For precise cost details, please reach out to @@ -121,7 +122,7 @@ For precise cost details, please reach out to - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_ideal/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/idealprocessing.xml b/etc/adminhtml/system/payment_methods/idealprocessing.xml index 1c20cae97..edbed5192 100644 --- a/etc/adminhtml/system/payment_methods/idealprocessing.xml +++ b/etc/adminhtml/system/payment_methods/idealprocessing.xml @@ -42,6 +42,7 @@ For precise cost details, please reach out to @@ -49,7 +50,7 @@ For precise cost details, please reach out to @@ -93,7 +94,7 @@ For precise cost details, please reach out to - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_idealprocessing/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/kbc.xml b/etc/adminhtml/system/payment_methods/kbc.xml index 6076c45d4..b4a58099b 100644 --- a/etc/adminhtml/system/payment_methods/kbc.xml +++ b/etc/adminhtml/system/payment_methods/kbc.xml @@ -34,6 +34,7 @@ payment/buckaroo_magento2_kbc/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -41,7 +42,7 @@ payment/buckaroo_magento2_kbc/subtext - + @@ -75,7 +76,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_kbc/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/klarna.xml b/etc/adminhtml/system/payment_methods/klarna.xml index 7aac352b1..376344b84 100644 --- a/etc/adminhtml/system/payment_methods/klarna.xml +++ b/etc/adminhtml/system/payment_methods/klarna.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_klarna/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_klarna/subtext - + @@ -84,7 +85,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_klarna/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee @@ -182,4 +183,4 @@ - \ No newline at end of file + diff --git a/etc/adminhtml/system/payment_methods/klarnain.xml b/etc/adminhtml/system/payment_methods/klarnain.xml index 99a90ecbb..7f2560a64 100644 --- a/etc/adminhtml/system/payment_methods/klarnain.xml +++ b/etc/adminhtml/system/payment_methods/klarnain.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_klarnain/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_klarnain/subtext - + @@ -84,7 +85,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_klarnain/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee @@ -182,4 +183,4 @@ - \ No newline at end of file + diff --git a/etc/adminhtml/system/payment_methods/klarnakp.xml b/etc/adminhtml/system/payment_methods/klarnakp.xml index 006e63bee..fb7ed04b6 100644 --- a/etc/adminhtml/system/payment_methods/klarnakp.xml +++ b/etc/adminhtml/system/payment_methods/klarnakp.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_klarnakp/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_klarnakp/subtext - + @@ -84,7 +85,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_klarnakp/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee @@ -189,4 +190,4 @@ - \ No newline at end of file + diff --git a/etc/adminhtml/system/payment_methods/knaken.xml b/etc/adminhtml/system/payment_methods/knaken.xml index 6a83d5e59..1d4f1e313 100644 --- a/etc/adminhtml/system/payment_methods/knaken.xml +++ b/etc/adminhtml/system/payment_methods/knaken.xml @@ -34,6 +34,7 @@ payment/buckaroo_magento2_knaken/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -41,7 +42,7 @@ payment/buckaroo_magento2_knaken/subtext - + @@ -75,7 +76,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_knaken/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/mbway.xml b/etc/adminhtml/system/payment_methods/mbway.xml index cdd178b6f..89432fb04 100644 --- a/etc/adminhtml/system/payment_methods/mbway.xml +++ b/etc/adminhtml/system/payment_methods/mbway.xml @@ -34,6 +34,7 @@ payment/buckaroo_magento2_mbway/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -41,7 +42,7 @@ payment/buckaroo_magento2_mbway/subtext - + @@ -75,7 +76,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_mbway/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/mrcash.xml b/etc/adminhtml/system/payment_methods/mrcash.xml index c59d1e415..e14f145dd 100644 --- a/etc/adminhtml/system/payment_methods/mrcash.xml +++ b/etc/adminhtml/system/payment_methods/mrcash.xml @@ -20,13 +20,13 @@ */ --> - + - + Buckaroo\Magento2\Block\Config\Form\Field\Fieldset - + Buckaroo\Magento2\Model\Config\Source\Enablemode payment/buckaroo_magento2_mrcash/active @@ -36,6 +36,7 @@ payment/buckaroo_magento2_mrcash/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_mrcash/subtext - + @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_mrcash/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/multibanco.xml b/etc/adminhtml/system/payment_methods/multibanco.xml index 91bcc8f32..8e65869f5 100644 --- a/etc/adminhtml/system/payment_methods/multibanco.xml +++ b/etc/adminhtml/system/payment_methods/multibanco.xml @@ -34,6 +34,7 @@ payment/buckaroo_magento2_multibanco/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -41,7 +42,7 @@ payment/buckaroo_magento2_multibanco/subtext - + @@ -75,7 +76,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_multibanco/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/p24.xml b/etc/adminhtml/system/payment_methods/p24.xml index f3646596d..f2175b262 100644 --- a/etc/adminhtml/system/payment_methods/p24.xml +++ b/etc/adminhtml/system/payment_methods/p24.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_p24/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_p24/subtext - + @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_p24/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/paybybank.xml b/etc/adminhtml/system/payment_methods/paybybank.xml index 3ec7053d0..2310b75dc 100644 --- a/etc/adminhtml/system/payment_methods/paybybank.xml +++ b/etc/adminhtml/system/payment_methods/paybybank.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_paybybank/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_paybybank/subtext - + diff --git a/etc/adminhtml/system/payment_methods/payconiq.xml b/etc/adminhtml/system/payment_methods/payconiq.xml index cf93ea4e4..8843ad4d8 100644 --- a/etc/adminhtml/system/payment_methods/payconiq.xml +++ b/etc/adminhtml/system/payment_methods/payconiq.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_payconiq/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_payconiq/subtext - + @@ -78,7 +79,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_payconiq/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/paypal.xml b/etc/adminhtml/system/payment_methods/paypal.xml index 550d75979..9bec3319e 100644 --- a/etc/adminhtml/system/payment_methods/paypal.xml +++ b/etc/adminhtml/system/payment_methods/paypal.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_paypal/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -140,7 +141,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_paypal/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/payperemail.xml b/etc/adminhtml/system/payment_methods/payperemail.xml index c6b0a5c6e..3578f183d 100644 --- a/etc/adminhtml/system/payment_methods/payperemail.xml +++ b/etc/adminhtml/system/payment_methods/payperemail.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_payperemail/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_payperemail/subtext - + @@ -58,7 +59,7 @@ Buckaroo\Magento2\Block\Config\Form\Field\ColorPicker - + @@ -72,7 +73,7 @@ Magento\Config\Model\Config\Source\Yesno payment/buckaroo_magento2_payperemail/send_mail - + @@ -177,7 +178,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_payperemail/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/pospayment.xml b/etc/adminhtml/system/payment_methods/pospayment.xml index 2a4460fc3..17198e68b 100644 --- a/etc/adminhtml/system/payment_methods/pospayment.xml +++ b/etc/adminhtml/system/payment_methods/pospayment.xml @@ -34,6 +34,7 @@ payment/buckaroo_magento2_pospayment/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -41,7 +42,7 @@ payment/buckaroo_magento2_pospayment/subtext - + @@ -88,7 +89,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_pospayment/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml b/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml index 2bf6de454..da69647c7 100644 --- a/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml +++ b/etc/adminhtml/system/payment_methods/sepa_direct_debit.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_sepadirectdebit/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_sepadirectdebit/subtext - + @@ -58,7 +59,7 @@ Buckaroo\Magento2\Block\Config\Form\Field\ColorPicker - + @@ -124,7 +125,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_sepadirectdebit/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/sofort_banking.xml b/etc/adminhtml/system/payment_methods/sofort_banking.xml deleted file mode 100644 index 0e62bc223..000000000 --- a/etc/adminhtml/system/payment_methods/sofort_banking.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - Buckaroo\Magento2\Block\Config\Form\Field\Fieldset - - - - - Buckaroo\Magento2\Model\Config\Source\Enablemode - payment/buckaroo_magento2_sofortbanking/active - - - - - - payment/buckaroo_magento2_sofortbanking/title - - - - - - payment/buckaroo_magento2_sofortbanking/subtext - - - - - - Buckaroo\Magento2\Model\Config\Source\SubtextStyle - payment/buckaroo_magento2_sofortbanking/subtext_style - - - - - - payment/buckaroo_magento2_sofortbanking/subtext_color - Buckaroo\Magento2\Block\Config\Form\Field\ColorPicker - - - - - - - payment/buckaroo_magento2_sofortbanking/sort_order - - - - - - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_sofortbanking/order_email - - - - - Configuration > Sales > Tax.]]> - payment/buckaroo_magento2_sofortbanking/payment_fee - Buckaroo\Magento2\Model\Config\Backend\PaymentFee - - - - - - payment/buckaroo_magento2_sofortbanking/payment_fee_label - - - - - - The payment method shows only for orders with an order amount greater than the minimum amount. - payment/buckaroo_magento2_sofortbanking/min_amount - Buckaroo\Magento2\Model\Config\Backend\Price - - - - - - The payment method shows only for orders with an order amount smaller than the maximum amount. - payment/buckaroo_magento2_sofortbanking/max_amount - Buckaroo\Magento2\Model\Config\Backend\Price - - - - - - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_sofortbanking/active_status - - - - - - To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status. - Buckaroo\Magento2\Model\Config\Source\StatusesSuccess - payment/buckaroo_magento2_sofortbanking/order_status_success - - 1 - - - - - - - To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status. - Buckaroo\Magento2\Model\Config\Source\StatusesFailed - payment/buckaroo_magento2_sofortbanking/order_status_failed - - 1 - - - - - - - Your contract with Buckaroo must allow for the selected currencies to be used with this payment method. - payment/buckaroo_magento2_sofortbanking/allowed_currencies - Buckaroo\Magento2\Model\Config\Source\AllowedCurrencies::sofortbanking - Buckaroo\Magento2\Model\Config\Backend\AllowedCurrencies - - - - - Buckaroo\Magento2\Model\Config\Source\AllOrSpecificCountries - payment/buckaroo_magento2_sofortbanking/allowspecific - - - - - - Magento\Config\Model\Config\Source\Locale\Country - payment/buckaroo_magento2_sofortbanking/specificcountry - - 1 - - - - - - - Magento developer client restrictions. - Magento\Config\Model\Config\Source\Yesno - payment/buckaroo_magento2_sofortbanking/limit_by_ip - - - - - Buckaroo\Magento2\Model\Config\Source\SpecificCustomerGroups - 1 - payment/buckaroo_magento2_sofortbanking/specificcustomergroup - - - - diff --git a/etc/adminhtml/system/payment_methods/transfer.xml b/etc/adminhtml/system/payment_methods/transfer.xml index f02769cb4..363159802 100644 --- a/etc/adminhtml/system/payment_methods/transfer.xml +++ b/etc/adminhtml/system/payment_methods/transfer.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_transfer/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_transfer/subtext - + @@ -139,7 +140,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_transfer/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/trustly.xml b/etc/adminhtml/system/payment_methods/trustly.xml index 275af2725..0c3cbac75 100644 --- a/etc/adminhtml/system/payment_methods/trustly.xml +++ b/etc/adminhtml/system/payment_methods/trustly.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_trustly/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_trustly/subtext - + @@ -76,7 +77,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_trustly/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/voucher.xml b/etc/adminhtml/system/payment_methods/voucher.xml index f69baa7d3..2571114d3 100644 --- a/etc/adminhtml/system/payment_methods/voucher.xml +++ b/etc/adminhtml/system/payment_methods/voucher.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_voucher/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_voucher/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/payment_methods/wechatpay.xml b/etc/adminhtml/system/payment_methods/wechatpay.xml index 220f3c884..934d45c59 100644 --- a/etc/adminhtml/system/payment_methods/wechatpay.xml +++ b/etc/adminhtml/system/payment_methods/wechatpay.xml @@ -36,6 +36,7 @@ payment/buckaroo_magento2_wechatpay/title + Buckaroo\Magento2\Model\Config\Backend\EmptyToDelete @@ -43,7 +44,7 @@ payment/buckaroo_magento2_wechatpay/subtext - + @@ -77,7 +78,7 @@ - Configuration > Sales > Tax.]]> + General configuration and account information > Buckaroo Payment Fee Tax Class.]]> payment/buckaroo_magento2_wechatpay/payment_fee Buckaroo\Magento2\Model\Config\Backend\PaymentFee diff --git a/etc/adminhtml/system/tax.xml b/etc/adminhtml/system/tax.xml deleted file mode 100644 index 8c8166efa..000000000 --- a/etc/adminhtml/system/tax.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - Buckaroo\Magento2\Model\Config\Source\TaxClass\Product - - - - - - This sets whether buckaroo payment fee amounts entered from Magento Admin include tax. - Buckaroo\Magento2\Model\Config\Source\TaxClass\Calculation - - - - - - Buckaroo\Magento2\Model\Config\Source\Display\Type - - - - - - Buckaroo\Magento2\Model\Config\Source\Display\Type - - - diff --git a/etc/config.xml b/etc/config.xml index 320d22a16..270b06ff2 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -95,7 +95,7 @@ buckaroo_magento2 order 0 - amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,giftcard,giropay,ideal,mastercard,paypal,sofortueberweisung,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik + amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,giftcard,ideal,mastercard,paypal,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik @@ -182,28 +182,14 @@ buckaroo_magento2 order 1 - amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,giftcard,giropay,ideal,mastercard,paypal,sofortueberweisung,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik + amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,giftcard,ideal,mastercard,paypal,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik - - 0 - Buckaroo\Magento2\Model\Method\Giropay - pending - Giropay - 0 - 160 - 1 - Fee - buckaroo_magento2 - order - 0 - - 0 Buckaroo\Magento2\Model\Method\Mrcash pending - Bancontact/Mister Cash + Bancontact 0 140 1 @@ -216,20 +202,6 @@ 0 - - 0 - Buckaroo\Magento2\Model\Method\Sofortbanking - pending - Sofort - 0 - 150 - 1 - Fee - buckaroo_magento2 - order - 0 - - 0 Buckaroo\Magento2\Model\Method\Belfius @@ -290,8 +262,8 @@ 1 1 1 - amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,sepadirectdebit,giftcard,giropay,ideal,mastercard,paypal,sofortueberweisung,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik - amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,giftcard,giropay,ideal,mastercard,paypal,sofortueberweisung,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik + amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,sepadirectdebit,giftcard,ideal,mastercard,paypal,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik + amex,bancontactmrcash,cartebancaire,cartebleuevisa,nexi,postepay,dankort,eps,giftcard,ideal,mastercard,paypal,transfer,visa,maestro,visaelectron,vpay,alipay,wechatpay,p24,trustly,belfius,blik 7 1 @@ -472,7 +444,7 @@ 0 Buckaroo\Magento2\Model\Method\Billink pending - Billink - achteraf betalen + Billink 0 240 1 diff --git a/etc/di.xml b/etc/di.xml index 89cf99a36..4aa047713 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -249,10 +249,6 @@ creditcards Buckaroo\Magento2\Model\ConfigProvider\Method\Creditcards - - giropay - Buckaroo\Magento2\Model\ConfigProvider\Method\Giropay - mrcash Buckaroo\Magento2\Model\ConfigProvider\Method\Mrcash @@ -269,10 +265,6 @@ sepadirectdebit Buckaroo\Magento2\Model\ConfigProvider\Method\SepaDirectDebit - - sofortbanking - Buckaroo\Magento2\Model\ConfigProvider\Method\Sofortbanking - belfius Buckaroo\Magento2\Model\ConfigProvider\Method\Belfius @@ -481,6 +473,12 @@ + + + Buckaroo\Magento2\Service\BuckarooFee\Result + + + diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml index 6bd197d3b..740d585f3 100644 --- a/etc/frontend/di.xml +++ b/etc/frontend/di.xml @@ -34,9 +34,7 @@ Buckaroo\Magento2\Model\ConfigProvider\Method\Paypal Buckaroo\Magento2\Model\ConfigProvider\Method\SepaDirectDebit Buckaroo\Magento2\Model\ConfigProvider\Method\Mrcash - Buckaroo\Magento2\Model\ConfigProvider\Method\Sofortbanking Buckaroo\Magento2\Model\ConfigProvider\Method\Belfius - Buckaroo\Magento2\Model\ConfigProvider\Method\Giropay Buckaroo\Magento2\Model\ConfigProvider\Method\Afterpay Buckaroo\Magento2\Model\ConfigProvider\Method\Afterpay2 Buckaroo\Magento2\Model\ConfigProvider\Method\PayPerEmail diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml new file mode 100644 index 000000000..77833e767 --- /dev/null +++ b/etc/frontend/events.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/etc/module.xml b/etc/module.xml index fcd4535b7..a80e58929 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -20,7 +20,7 @@ */ --> - + diff --git a/etc/payment.xml b/etc/payment.xml index 80e06896c..b107ba51d 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -51,15 +51,9 @@ 0 - - 0 - 0 - - 0 - 0 diff --git a/i18n/de_AT.csv b/i18n/de_AT.csv new file mode 100644 index 000000000..e381bd765 --- /dev/null +++ b/i18n/de_AT.csv @@ -0,0 +1,492 @@ +"Buckaroo payment methods","Buckaroo-Zahlungsmethoden" +"Buckaroo Payment Methods","Buckaroo-Zahlungsmethoden" +"iDEAL","iDEAL" +"Enable iDEAL","iDEAL aktivieren" +"Enable or disable this payment method."," Aktivieren oder deaktivieren Sie diese Zahlungsmethode." +"Frontend label","Frontend-Label" +"Determines the frontend label shown.","Bestimmt das angezeigte Frontend-Label." +"Frontend sort order","Sortierung auf der Vorderseite" +"Determines the sorting of payment methods.","Bestimmt die Reihenfolge der Zahlungsarten auf der Vorderseite." +"Advanced Configuration","Erweiterte Optionen" +"Send order confirmation email","Bestellbestätigungs-E-Mail senden" +"Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Aktivieren, um eine Bestellbestätigungs-E-Mail zu senden, wenn die Bestellung erstellt wird. Spezifisch für diese Zahlungsmethode." +"Payment fee","Gebühr"Payment fee +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Dieser Betrag wird basierend auf den Mehrwertsteuereinstellungen berechnet in: Stores > Configuration > Sales > Tax." +"Payment fee frontend label","Zahlungsgebühren-Front-End-Etikett" +"This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Das Etikett wird beim Checkout neben dem Zahlungsaufschlag sowie auf den Bestell-, Rechnungs-, Gutschriftseiten und im PDF angezeigt." +"Max order amount (in Base Currency)","Maximaler Bestellbetrag (in Basiswährung)" +"Maximum order amount allowed.","Die Zahlungsmethode wird nicht über dem Höchstbetrag angezeigt." +"The payment method shows only for orders with an order amount smaller than the maximum amount.","Die Zahlungsart wird nur bei Bestellungen angezeigt, deren Gesamtsumme unter dem maximalen Bestellwert liegt." +"Min order amount (in Base Currency)","Mindest. Bestellbetrag (in Basiswährung)" +"Minimum order amount allowed.","Die Zahlungsmethode wird nicht unter Mindestbetrag angezeigt" +"The payment method shows only for orders with an order amount greater than the minimum amount.","Die Zahlungsart wird nur bei Bestellungen mit einem Gesamtwert über dem Mindestbestellwert angezeigt." +"Method specific status enabled","Methodenspezifischer Status aktiviert" +"Enable or disable specific status.","Aktivieren oder deaktivieren Sie einen bestimmten Status." +"Method specific success status","Methodenspezifischer Erfolgsstatus" +"Leave empty to use default 'success' status.","Lassen Sie dieses Feld leer, um den Standardstatus 'Erfolg' zu verwenden." +"Method specific failed status","Methodenspezifischer Fehlerstatus" +"Leave empty to use default 'failed' status.","Lassen Sie die Auswahl für den Standardstatus „Fehlgeschlagen“ leer." +"To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status.","Um einen Status zuzuweisen, muss dieser dem richtigen Zustand zugewiesen werden. Informationen zu 'Status' und 'Status' finden Sie in der Magento-Dokumentation." +"Allowed currencies","Akzeptierte Währungen" +"Select payment method specific currencies.","Wählen Sie eine bestimmte Währung für die Zahlungsmethode aus." +"Your contract with Buckaroo must allow for the selected currencies to be used with this payment method.","Die verfügbare Währung hängt vom Vertrag mit Buckaroo ab." +"Payment from applicable countries","Für die Zahlung zugelassenes Land" +"Payment from Specific Country","Zahlung aus bestimmten Ländern" +"Only available when set to 'specific countries'.","Nur verfügbar mit der Auswahl 'bestimmte Länder'." +"Display only for selected IPs","Nur für bestimmte IPs anzeigen" +"Show method only to Magento set IPs.","Nur für bestimmte in Magento festgelegte IPs anzeigen." +"Magento developer client restrictions.","Zeigen Sie diese Zahlungsmethode nur ausgewählten Magento-IPs an. Diese Option ist für Magento-Entwickler gedacht, wenn Sie eine bestimmte Zahlungsmethode testen möchten, ohne sie öffentlich zu zeigen." +"Credit and debit cards","Kartenzahlung" +"Enable credit and debit cards","Kartenzahlung aktivieren" +"Allowed credit and debit cards","Akzeptierte Kartenzahlung" +"Select payment method specific Credit and debit card.","Wählen Sie bestimmte Kartenzahlung für die Zahlungsmethode aus." +"American Express Specific","American Express-spezifisch" +"Verify address","Adressvalidierung" +"Set true to verify the address at American Express. Set false to disable address verification","Kreuzen Sie 'Ja' an, um die Adresse mit American Express zu bestätigen. Auf 'no' setzen, um die Adressüberprüfung zu deaktivieren." +"Maestro Specific","Maestro-spezifisch" +"Mastercard Specific","Mastercard-spezifisch" +"No SecureCode order status","Bestellstatus für Nicht-SecureCode-Bestellungen" +"Set no SecureCode orders onhold","Platzieren Sie keine SecureCode-Bestellungen in der Warteschleife" +"Hold orders which have no MasterCard SecureCode.","Bestellungen ohne MasterCard SecureCode werden zurückgestellt." +"Visa Specific","Visaspezifisch" +"No 3D Secure order status","Bestellstatus für Bestellungen ohne 3D Secure" +"Set no 3D Secure orders onhold","Platzieren Sie keine 3D Secure-Bestellungen in der Warteschleife" +"Hold orders which are not 3D Secure.","Bestellungen ohne 3D Secure by Visa werden zurückgestellt." +"Paypal","Paypal" +"Enable Paypal","PayPal aktivieren" +"Seller protection enabled","Profitieren Sie vom Verkäuferschutz" +"WARNING: Paypal Seller Protection requires additional configuration. Please consult Buckaroo for more information.","HINWEIS: Die Nutzung des PayPal-Verkäuferschutzes erfordert zusätzliche Einstellungen in der Magento-Konfiguration. Weitere Informationen finden Sie unter Buckaroo." +"Seller protection eligible","Verkäuferschutz vollumfänglich gewährt" +"Seller protection for unauthorized payment and item not received","Bei nicht autorisierter Zahlung und nicht erhaltener Ware wird Verkäuferschutz gewährt" +"Seller protection item not received","Verkäuferschutz Nicht erhaltene Ware" +"Seller protection for item not received","Für nicht erhaltene Ware wird Verkäuferschutz gewährt" +"Seller protection unauthorized payment","Verkäuferschutz Nicht autorisierte Zahlung" +"Seller protection for unauthorized payment","Bei nicht autorisierter Zahlung wird Verkäuferschutz gewährt" +"Seller protection ineligible","Kein Verkäuferschutz" +"Merchant is not protected by Seller Protection","Verkäuferschutz steht dem Händler nicht zu" +"Bank Transfer","Banküberweisung" +"Enable Bank Transfer","Banküberweisung aktivieren" +"Send payment instruction email","Zahlungsanweisung per E-Mail senden" +"Buckaroo sends an email to the customer with the payment procedures.","Eine E-Mail mit den Zahlungsanweisungen wird von Buckaroo gesendet." +"Set to 'No' the customer is informed once online.","Bei der Auswahl 'Nein' wird der Kunde einmalig nach Abschluss der Bestellung informiert." +"Due date (in days)","Fälligkeitsdatum (in Tagen)" +"The amount of days after the order date in which the customer has to complete the payment. After this period order will be cancelled. You can add this due date in the template of the Transfer email.","Die Anzahl der Tage nach dem Bestelldatum, in denen der Kunde die Zahlung abschließen muss. Nach Ablauf dieser Frist wird die Bestellung storniert. Sie können dieses Fälligkeitsdatum in der Vorlage der Überweisungs-E-Mail hinzufügen." +"Use credit management","Nutzen Sie das 'Kreditmanagement'" +"Buckaroo sends payment reminders to the customer.","Buckaroo versendet Zahlungserinnerungen an den Kunden." +"Contact Buckaroo before activating Credit Management. By default this is excluded in the contract.","Wenden Sie sich an Buckaroo, bevor Sie das Kreditmanagement aktivieren. Standardmäßig ist dies im Vertrag ausgeschlossen." +"Invoice delay (in days)","Rechnungsverzögerung (in Tagen)" +"Specify the amount of days before Buckaroo invoices the order and sends out the payment mail.","Geben Sie die Anzahl der Tage an, bevor Buckaroo die Bestellung in Rechnung stellt und die Zahlungsmail versendet." +"Max reminder level","Maximale Erinnerungsstufe" +"Select the maximum reminder level buckaroo will use.","Wählen Sie die maximale Erinnerungsstufe aus, die Buckaroo anwendet." +"SEPA direct debit","SEPA-Autorisierung" +"Enable SEPA direct debit","SEPA-Autorisierung activieren" +"Bancontact","Bancontact" +"Enable Bancontact","Bancontact activieren" +"Please enter a valid BIC number","Bitte geben Sie eine gültige BIC-Nummer ein" +"Please select a issuer from the list","Wählen Sie eine Bank aus der Liste aus" +"Belfius","Belfius" +"Enable Belfius","Belfius activieren" +"Alipay","Alipay" +"Enable Alipay","Alipay activieren" +"WeChatPay","WeChatPay" +"Enable WeChatPay","WeChatPay activieren" +"P24","P24" +"Przelewy24","Przelewy24" +"Enable Przelewy24","Przelewy24 activieren" +"Trustly","Trustly" +"Enable Trustly","Trustly activieren" +"Refunding","Erstattung" +"Enable or disable refunding.","Gutschrift/Rückerstattung aktivieren oder deaktivieren." +"Set to 'No' refunds must be done manualy in Payment Plaza.","Mit der Auswahl 'Nein' werden Gutschriften in Magento bei Payment Plaza nicht angeboten." +"Push Payment Plaza refunds to Magento","Akzeptieren Sie Payment Plaza-Rückerstattungen in Magento" +"Allow 2-way refunding from Magento and Payment Plaza.","Verarbeiten Sie die 'Rückerstattung' sowohl von Magento als auch von Payment Plaza." +"Enabled","Eingeschaltet" +"Enable or disable the Buckaroo module.","Aktivieren oder deaktivieren Sie das Buckaroo-Modul." +"Selecting 'Off' will overrule all individual settings.","Wenn Sie 'Aus“ wählen, werden alle individuellen Einstellungen überschrieben." +"Secret key","Secret key" +"Enter your Buckaroo Secret Key.","Fügen Sie Ihren Buckaroo 'Secret key' hinzu." +"The Secret Key can be retrieved in Payment Plaza under Configuration > Security > Secret Key. For support contact Buckaroo.","Der 'Secret Key' wird im Payment Plaza angezeigt unter 'Configuration > Security > Secret Key. Wenden Sie sich für Support an Buckaroo." +"(Merchant) key","(Merchant) key" +"Enter your Buckaroo merchant/website key.","Fügen Sie Ihren Buckaroo merchant/website key hinzu." +"The (Merchant) Key can be retrieved in Payment Plaza under My Buckaroo > Websites. For support contact Buckaroo.","Der '(Merchant)Key' wird angezeigt in the Buckaroo Payment Plaza unter My Buckaroo > Websites." +"(Merchant) guid","(Merchant) guid" +"Enter your Buckaroo merchant guid.","Fügen Sie Ihren Buckaroo-Guid code hinzu." +"The (Merchant) Guid can be retrieved in Payment Plaza under My Buckaroo > Details > Guid. For support contact Buckaroo.",""Die Händler-Guid wird im Buckaroo Payment Plaza angezeigt unter > My Buckaroo > Details > Guid." +"Transaction label","Transaktionsetikett" +"The transaction description in Payment Plaza.","Die Beschreibung der Transaktion in Payment Plaza." +"Certificate label","Zertifikatsetikett" +"Enter a name for the certificate. This is purely administrative.","Fügen Sie dem Zertifikat zur Identifizierung einen Namen hinzu." +"Upload your Buckaroo private key certificate","Laden Sie Ihr privates Schlüsselzertifikat (private key) von Buckaroo hoch'" +"Certificate file","Zertifikatsdatei" +"The certificate can be retrieved in Payment Plaza under Configuration > Security > Certificates. For support contact Buckaroo.","Das Zertifikat kann im Buckaroo Payment Plaza unter > Konfiguration > Sicherheit > Zertifikate abgerufen werden." +"These options are only intended for expert users. Tampering with the default settings may negatively affect the workflow and performance of all Buckaroo payment methods. Use at your own risk.","Diese Einstellungen sind nur für erfahrene Benutzer gedacht. Das Anpassen dieser Einstellungen kann die Funktion des Moduls und des Webshops beeinträchtigen. Benutzung auf eigene Gefahr." +"New status","Neuer Status" +"This status will be given to new orders.","Dieser Status wird neuen Bestellungen zugewiesen." +"Pending payment status","Offener Status der Zahlung" +"This status will be given to orders pending payment.","Dieser Status wird Bestellungen zugewiesen, die darauf warten, bezahlt zu werden." +"Payment success status","Zahlungserfolgsstatus" +"This status will be given to orders paid.","Dieser Status wird bezahlten Bestellungen gegeben." +"Payment failed status","Zahlungsstatus fehlgeschlagen" +"This status will be given to unsuccessful orders.","Dieser Status wird erfolglosen Bestellungen gegeben." +"Send transactional invoice email","Transaktionsrechnungs-E-Mail senden" +"Send a mail after successful creating the order.","Senden Sie nach erfolgreicher Erstellung der Bestellung eine E-Mail." +"Please enter a valid bank account holder name","Bitte geben Sie einen gültigen Namen des Bankkontoinhabers ein" +"Please enter a valid bank account number","Bitte geben Sie eine gültige Bankkontonummer ein" +"Create invoice after success","Rechnung nach Erfolg erstellen" +"If set to 'No' the order is not invoiced.","Wenn 'Nein' ausgewählt ist, wird keine Rechnung in Magento erstellt." +"Payment success status without invoice","Erfolgsstatus ohne Rechnung" +"Redirect url after 'Success'","Umleitungs-URL nach 'Erfolg'" +"Redirect after successful payments.","Weiterleitung nach erfolgreicher Zahlung." +"Redirect url after 'Failure'","Umleitungs-URL nach 'Fehler'" +"Redirect after failed payments.
Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Weiterleitung nach fehlgeschlagenen Zahlungen.
Bitte beachten Sie, dass diese Einstellung nicht für alle Express-Zahlungsmethoden gilt, wie zum Beispiel die iDEAL-Schnellkasse." +"'Canceled' state on failed payment","'Status 'Storniert' bei fehlgeschlagener Zahlung" +"Orders will stay open after failed payments.","Bestellungen bleiben nach fehlgeschlagenen Zahlungen offen." +"Debug email","E-Mail debuggen" +"Transaction data send as raw data.","Transaktionsdaten werden als Rohdaten gesendet." +"Fee percentage mode","Gebührenprozentsatzmodus" +"This setting only applies to percentage-based Buckaroo fees.
Please choose over which amount the fee percentage is calculated.","Diese Einstellung gilt nur für prozentuale Buckaroo-Gebühren.
Bitte wählen Sie aus, über welchen Betrag der Gebührenprozentsatz berechnet wird.." +"Please enter these fields as they appear on your bank account.","Bitte füllen Sie diese Felder so aus, wie sie auf Ihrem Bankkonto erscheinen." +"You will receive an email with further payment instructions when you place your order.","Sie erhalten eine E-Mail mit weiteren Zahlungsanweisungen, wenn Sie Ihre Bestellung aufgeben." +"Legend","Legende" +"Payment method","Zahlungsmethode" +"Disabled","Ausgeschaltet" +"Test Mode","Testmodus" +"Live Mode","Live-Modus" +"Magento & 3rd party version compatibility","Magento & Kompatibilität mit Drittanbieterversionen" +"Magento version compatibility","Kompatibilität der Magento-Version" +"Magento Community Edition version","Magento Community Edition-Version" +"Magento Enterprise Edition version","Magento Enterprise Edition-Version" +"Quick reference guide","Kurzanleitung" +"Log in to the ","Melden Sie sich an " +"Buckaroo Payment Plaza","Buckaroo Payment Plaza" +" to collect the following security settings:"," um die folgenden Sicherheitseinstellungen zu sammeln:" +"Support","Die Unterstützung" +"This extension is developed by Buckaroo.","Diese Erweiterung wird von Buckaroo entwickelt." +"Extension basic configuration and account information","Basiskonfiguration der Erweiterung und Kontoinformationen" +"Buckaroo Payment Plaza:","Buckaroo Payment Plaza:" +"Phone:","Telefon:" +"E-mail:","Email:" +"Extension support and advanced configuration","Erweiterungsunterstützung und erweiterte Konfiguration" +"Online documentation and FAQ:","Online-Dokumentation und FAQ:" +"Support question:","Supportfrage:" +"Support by email:","Unterstützung per E-Mail:" +"Documentation","Dokumentation" +"A list of documents regarding the extension.","Eine Liste der Dokumente zur Verlängerung." +"Download a PDF format of the manual. Currently the manual is only available in English.","Laden Sie ein PDF-Format des Handbuchs herunter. Derzeit ist das Handbuch nur in englischer Sprache verfügbar." +"View the complete changelog of the module. Currently the changelog is only available in Dutch.","Zeigen Sie das vollständige Änderungsprotokoll des Moduls an. Derzeit ist das Änderungsprotokoll nur auf Niederländisch verfügbar." +"Installation Manual Buckaroo.pdf (NL)","Installationshandbuch Buckaroo.pdf (NL)" +"Full Changelog","Vollständige Übersicht über die Änderungen" +"Selected card: %1","Ausgewählte Karte: %1" +"Tax Class for Buckaroo Fee","Steuerklasse für die Buckaroo-Gebühr" +"Display Buckaroo Fee Prices","Gebührenpreise von Buckaroo anzeigen" +"Buckaroo","Buckaroo" +"Version & Support","Ausführung & untersteuern" +"General configuration and account information","Allgemeine Konfigurations- und Kontoinformationen" +"(Merchant) key","(Merchant) key" +"Debug information will be sent to these comma-separated email addresses","Debug-Informationen werden an diese durch Kommas getrennten E-Mail-Adressen gesendet" +"Debugging","Debuggen" +"Decide what to debug. Log files will be created within the var/log/Buckaroo/ directory.","Bestimmen Sie, was protokolliert wird. Protokolldateien werden im Ordner var/log/Buckaroo/ erstellt." +"Please enter a valid number: '%1'.","Bitte geben Sie eine gültige Nummer ein: '%1'." +"This sets whether buckaroo payment fee amounts entered from Magento Admin include tax","Hiermit wird festgelegt, ob die von Magento Admin eingegebenen Gebührenbeträge für Buckaroo-Zahlungen Steuern enthalten." +"Excluding Tax","Steuer nicht inbegriffen" +"Including Tax","Mit Steuern" +"Including and Excluding Tax","Einschließlich und ohne Steuern" +"None","Keiner" +"All Allowed Countries","Alle zulässigen Länder" +"Specific Countries","Bestimmte Länder" +"You have not yet uploaded any certificate files","Sie haben noch keine Zertifikatsdateien hochgeladen" +"No certificate selected","Kein Zertifikat ausgewählt" +"Do not log debug information","Keine Debug-Informationen protokollieren" +"Log to file","In Datei protokollieren" +"Mail to debug email","E-Mail zum Debuggen von E-Mails" +"Log to file and mail to debug email","In Datei protokollieren und E-Mail zum Debuggen von E-Mails senden" +"Off","Aus" +"Test","Testmodus" +"Live","Live-Modus" +"Subtotal","Zwischensumme" +"Subtotal incl. tax","Zwischensumme inkl. MwSt" +"Grand Total","Gesamtsumme" +"-- Please Select --","-- Bitte auswählen --" +"Buckaroo refund is disabled","Buckaroo-Rückerstattung ist deaktiviert" +"Buckaroo refund push validation failed","Push-Validierung der Buckaroo-Rückerstattung fehlgeschlagen" +"The credit memo\'s total must be positive.","Die Summe der Gutschriften muss positiv sein." +"Failed to create the creditmemo","Die Gutschrift konnte nicht erstellt werden" +"Payment Fee","Gebühr" +"Refund failed ! Status : %1 and the order does not contain an invoice",""Rückerstattung fehlgeschlagen ! Status: %1 und die Bestellung enthält keine Rechnung" +"Skipped handling this push, duplicate","Bearbeitung dieses Pushs übersprungen, Duplikat +"Signature from push is incorrect","Signatur von Push ist falsch" +"Signature from push is correct but the order can not receive updates","Die Signatur von Push ist korrekt, aber die Bestellung kann keine Updates erhalten" +"There was no order found by transaction Id","Er wird von der Transaktions-ID bestimmt" +"Invalid status send by buckaroo, but the payment amount was correct.","Ungültiger Status von buckaroo gesendet, aber der Zahlungsbetrag war korrekt." +"Order can not be invoiced","Bestellung kann nicht in Rechnung gestellt werden" +"Buckaroo Pending Payment","Buckaroo wartet auf die Zahlung" +"Refund Reward Points","Treuepunkte" +"Buckaroo Fee for Order","Buckaroo-Gebühr für die Bestellung" +"order","bestellen" +"Buckaroo Fee","Buckaroo-Gebühr" +"Place Order","Bestellung aufgeben" +"Select a bank:","Wählen Sie eine Bank aus:" +"BIC number:","BIC-Nummer:" +"Select a Credit Card or Debit Card:","Wählen Sie eine Kredit- oder Debitkarte aus:" +"Bank account holder","Kontoinhaber" +"Bank account number","Kontonummer" +"BIC Number","BIC-Nummer" +"Disallowed file type.","Ungültiger Dateityp." +"Enter a name for the certificate.","Geben Sie einen Namen für das Zertifikat ein." +"Online refunds are currently disabled for Buckaroo payment methods.","Online-Rückerstattungen sind derzeit für Buckaroo-Zahlungsmethoden deaktiviert." +"Adjustment Refund","Anpassungsrückerstattung" +"Adjustment Fee","Anpassungsgebühr" +"Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Leider ist bei der Verarbeitung Ihrer Zahlung ein Fehler aufgetreten. Bitte versuche es erneut. Wenn dieser Fehler weiterhin besteht, wählen Sie bitte eine andere Zahlungsmethode." +"Riverty","Riverty" +"Enable Riverty","Riverty activieren" +"Giftcard","Geschenkkarte" +"Enable Giftcard","Geschenkkarte aktivieren" +"PayPerEmail","PayPerEmail" +"Enable PayPerEmail","PayPerEmail activieren" +"PayLink","PayLink" +"Enable PayLink","PayLink activieren" +"Combined","Kombiniert" +"Separate authorize and capture","Autorisieren und erfassen getrennt" +"Payment flow","Zahlungsfluss" +"Whether to use separate authorize and capture calls or to use a combined 'pay' call.","Ob getrennte Autorisierungs- und Erfassungsanrufe oder ein kombinierter 'Bezahl'-Anruf verwendet werden sollen." +"Eps","Eps" +"Enable Eps","EPS activieren" +"This is a required field.","Dies ist ein Pflichtfeld." +"You should be at least 18 years old.","Du solltest mindestens 18 Jahre alt sein." +"Phone number should be correct.","Telefonnummer sollte stimmen." +"Enter Valid IBAN","Geben Sie eine gültige IBAN ein" +"Enter Valid BIC number","Geben Sie eine gültige BIC-Nummer ein" +" (Excl. Tax)"," (exkl. MwSt.)" +" (Incl. Tax)"," (inkl. Steuern)" +"Please enter a valid currency: '%1'.","Bitte geben Sie eine gültige Währung ein: '%1'." +"Merchant is protected by PayPal Seller Protection Policy for both Unauthorized Payment and Item Not Received.","Der Händler ist durch die PayPal-Verkäuferschutzrichtlinie sowohl für nicht autorisierte Zahlungen als auch für nicht erhaltene Artikel geschützt." +"Merchant is protected by Paypal Seller Protection Policy for Item Not Received.","Der Händler ist durch die Paypal-Verkäuferschutzrichtlinie für nicht erhaltene Artikel geschützt." +"Merchant is protected by Paypal Seller Protection Policy for Unauthorized Payment.","Der Händler ist durch die Paypal-Verkäuferschutzrichtlinie für nicht autorisierte Zahlungen geschützt." +"Merchant is not protected under the Seller Protection Policy.","Der Händler ist nicht durch die Verkäuferschutzrichtlinie geschützt." +"Not enough paid: %1 has been transfered. Order grand total was: %2.","Nicht genug bezahlt: %1 wurde transferiert. Die Gesamtsumme der Bestellung war: %2." +"Too much paid: %1 has been transfered. Order grand total was: %2.","Zu viel bezahlt: %1 wurde transferiert. Die Gesamtsumme der Bestellung war: %2." +"Buckaroo New","Buckaroo Neu" +"Buckaroo Pending Payment","Buckaroo wartet auf die Zahlung" +"'%s' data type is invalid. String is expected.","'%s' Datentyp ist ungültig. Zeichenkette wird erwartet." +"Before contacting Buckaroo technical support, please retrieve your (Merchant) key, Secret key, certificate and certificate thumbprint.","Bevor Sie sich an den technischen Support von Buckaroo wenden, rufen Sie bitte Ihren Händler-Schlüssel, geheimen Schlüssel, Zertifikat und Zertifikat-Fingerabdruck ab." +"A list of documents regarding the extension.","Eine Liste der Dokumente zur Verlängerung." +"Installation and Configuration Manual Buckaroo.pdf","Installations- und Konfigurationshandbuch Buckaroo.pdf" +"View the complete release notes of the extension. Currently the release notes is only available in English.","Sehen Sie sich die vollständigen Versionshinweise der Erweiterung an. Derzeit sind die Versionshinweise nur auf Englisch verfügbar." +"Full Release Notes","Vollständige Versionshinweise" +"(Excluding Tax)","((Steuer nicht inbegriffen)" +"(Including Tax)","(Mit Steuern)" +"Salutation","Anrede" +"Mr.","Herr." +"Mrs.","Frau." +"Unknown","Unbekannt" +"Billing Name:","Fakturname:" +"Telephone:","Telefon:" +"Date of Birth:","Geburtsdatum:" +"Bank Account Number:","Kontonummer:" +"Business Model:","Geschäftsmodell:" +"B2C - Business to Consumer","B2C - Business to Consumer" +"B2B - Business to Business","B2B - Business to Business" +"COC Number:","Handelskammer nummer" +"Company Name:","Name der Firma" +"Cost Center:","Kostenstelle:" +"VAT Number:","Umsatzsteuer-Identifikationsnummer:" +"Terms and Conditions:","Geschäftsbedingungen:" +"Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." +"Not Applicable","Unzutreffend" +"Yes, I accept the terms and condition for the use of Riverty.","Ja, ich akzeptiere die Nutzungsbedingungen für Riverty." +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","Es gelten die allgemeinen Geschäftsbedingungen für die Zahlungsmethode Riverty. Die Datenschutzbestimmungen von Riverty findest Du hier." +"Accept terms of use","Akzeptieren Sie die Allgemeinen Geschäftsbedingungen" +"(DD/MM/YYYY)","(DD/MM/JJJJ)" +"Any comments about this Beta release? Please let us know! ","Irgendwelche Kommentare zu dieser Beta-Version? Lass uns wissen! " +"Buckaroo version","Buckaroo-Version" +"The transaction will be processed using %s.","Die Zahlung wird bearbeitet mit %s." +"The order has already been processed.","Die Bestellung wurde bereits bearbeitet." +"push notification for refund has no success status, ignoring.","Push-Benachrichtigung für Rückerstattung hat keinen Erfolgsstatus, wird ignoriert. " +"Warning:","Warnung:" +"Aufgrund zusammengesetzter Rundungsfehler in Magento bei der Verwendung von anderen Währungen als der Basiswährung des Shops beim Erstellen von Rückerstattungen kann der Betrag, den Sie zurückerstatten, einige Cent mehr oder weniger als beabsichtigt betragen. Wenn Sie sicherstellen möchten, dass der korrekte Betrag erstattet wird, erstellen Sie bitte eine Offline-Erstattung und verwenden Sie dann Buckaroos Zahlungsplatz, um die eigentliche Rückerstattung vorzunehmen.","Wegens oplopende afrondingsfouten in Magento wanneer gekrediteerd wordt in een andere valuta dan de winkel's basisvaluta, kan het voorkomen dat er enkele centen verschil zitten tussen het bedrag dat gekrediteerd moet worden en het bedrag dat daadwerkelijk teruggestort wordt. Indien u zeker wilt zijn dat het juiste bedrag teruggestort wordt, kunt u het beste een offline refund aanmaken en het eigenlijke bedrag terugstorten vanuit Buckaroo's Payment Plaza." +"support.buckaroo.nl","support.buckaroo.nl" +"Website","Website" +"www.buckaroo-payments.com","www.buckaroo.com" +"Buckaroo Request Form","Buckaroo-Anfrageformular" +"Buckaroo Knowledge Base","Buckaroo-Wissensdatenbank" +"Dankort Specific","Dankort-spezifisch" +"Hold orders which are not 3D Secure.","Bestellungen ohne 3D Secure by Dankort werden zurückgestellt." +"Buckaroo Giftcards","Buckaroo-Geschenkkarten" +"Giftcards","Geschenkkarten" +"Enable Giftcards","Geschenkkarten aktivieren" +"Allowed giftcards","Akzeptierte Geschenkkarten" +"Select which giftcards are available to the customer. You can add new cards in Stores > Buckaroo giftcards.","Wählen Sie aus, welche Geschenkkarten für den Kunden verfügbar sind. Sie können neue Karten unter 'Stores > Buckaroo-Geschenkkarten' hinzufügen." +"These options will be presented to the customer after Buckaroo has received the order. If left blank, the available options will be based on which Buckaroo payment options you have enabled.","Diese Optionen werden dem Kunden nach Eingang der Bestellung bei Buckaroo präsentiert. Wenn Sie das Feld leer lassen, basieren die verfügbaren Optionen darauf, welche Buckaroo-Zahlungsoptionen Sie aktiviert haben." +"You have not yet added any giftcards","Es wurden noch keine Geschenkkarten hinzugefügt" +"Add New Giftcard","Neuen Geschenkgutschein hinzufügen" +"Service Code","Service code" +"Name","Name" +"Label","Etikett" +"Save","Speichern" +"Delete","Löschen" +"Save and Continue","Speichern und fortfahren" +"Edit Giftcard '%s'","Geschenkkarte ändern '%s'" +"Add Giftcard","Geschenkkarte hinzufügen" +"This giftcard no longer exists.","Diese Geschenkkarte existiert nicht mehr." +"The giftcard has been saved.","Die Geschenkkarte wurde gespeichert." +"The giftcard has been deleted.","Die Geschenkkarte wurde entfernt." +"My billing and shipping address are the same", "Meine Rechnungs- und Lieferadresse sind identisch" +"Select a Credit Card or Debit Card", "Wählen Sie eine Kredit- oder Debitkarte aus" +"Salutation:","Anrede:" +"Send payment email","Zahlungs-E-Mail senden" +"Whether to use separate order/authorization and capture/invoice calls or to use a combined 'payment invitation' call.","Ob separate Bestell-/Autorisierungs- und Erfassungs-/Rechnungsanrufe oder ein kombinierter 'Zahlungsaufforderungs'-Aufruf verwendet werden soll." +"The selected payment method does not support the selected currency or the store's base currency.","Die ausgewählte Zahlungsmethode unterstützt die ausgewählte Währung oder die Basiswährung des Shops nicht." +"Invoice with id \"%1\" does not exist.","Rechnung mit der ID \"%1\" existiert nicht." +"The payment of the Customer's payment will be outsourced to Buckaroo. The invoice indicates how to pay the invoice (after reception of goods and/or services). The invoice must be paid within 14 (fourteen) days after the invoice date.","Die Zahlung der Zahlung des Kunden wird an Buckaroo ausgelagert. Die Rechnung gibt an, wie die Rechnung zu bezahlen ist (nach Erhalt der Waren und/oder Dienstleistungen). Die Rechnung ist innerhalb von 14 (vierzehn) Tagen nach Rechnungsdatum zu bezahlen." +"You must check this box to indicate that you agree to the terms and conditions.","Sie müssen dieses Kästchen ankreuzen, um anzugeben, dass Sie den Nutzungsbedingungen zustimmen." +"According to our system, you have canceled the payment. If this is not the case, please contact us.","Laut unserem System haben Sie die Zahlung storniert. Sollte dies nicht der Fall sein, kontaktieren Sie uns bitte.." +"Default Configuration","Standardkonfiguration" +"Credit Management Enabled","Kreditverwaltung aktiviert" +"Credit Management Scheme Key. It can be found here. This requires the Buckaroo Credit Management subscription.","Schlüssel des Kreditverwaltungssystems. Es kann hier gefunden werden. Hierfür ist das Abonnement von Buckaroo Credit Management erforderlich." +"Credit Management payment methods","Zahlungsmethoden für das Kreditmanagement" +"Credit management steps","Schritte im Kreditmanagement" +"Max level of the Credit Management steps.","Max. Stufe der Kreditverwaltungsschritte." +"Credit Management Due date","Kreditmanagement Fälligkeitsdatum" +"The amount of days after the order date, after which the Credit Management scheme will start.","Die Anzahl der Tage nach dem Bestelldatum, nach denen das Kreditverwaltungsprogramm beginnt." +"PayPerEmail payment methods", "PayPerEmail-Zahlungsmethoden" +"Show other active payment methods", "Andere aktive Zahlungsmethoden anzeigen" +"Select which paymethod can be used at PayPerEmail.","Wählen Sie aus, welche Zahlungsmethode bei PayPerEmail verwendet werden kann." +"Select which payment methods can be used after the payment due date.","Wählen Sie aus, welche Zahlungsmethoden nach dem Fälligkeitsdatum der Zahlung verwendet werden können." +"Billing First Name:","Vorname Rechnung:" +"Billing Last Name:","Rechnungsnachname:" +"Email:","Email" +"Frontend","Frontend" +"Backend","Backend" +"Frontend and Backend","Frontend und Backend" +"Black","Schwarz" +"White","Witz" +"White outline","Weißer Umriss" +"Select where this payment method will be available.","Wählen Sie aus, wo diese Zahlungsmethode verfügbar sein soll." +"Cannot Refund via Magento Backend. Partial refunds combined with a payment fee can only be refunded via the Buckaroo Payment Plaza, see also the KB article.
Open a new window to the Buckaroo Payment Plaza.","Rückerstattung über Magento Backend nicht möglich. Teilerstattungen in Verbindung mit einer Zahlungsgebühr können nur über die Buckaroo Payment Plaza erstattet werden, siehe auch die KB-Artikel.
Öffnen Sie ein neues Fenster zum Buckaroo Payment Plaza." +"Cannot refund this order via Magento Backend for now, we are working on a solution! Credit Management orders can only be refunded via the Buckaroo Payment Plaza.
Open a new window to the Buckaroo Payment Plaza.","Kann diese Bestellung vorerst nicht über Magento Backend zurückerstatten, wir arbeiten an einer Lösung! Credit Management-Bestellungen können nur über Buckaroo Payment Plaza erstattet werden.
Öffnen Sie ein neues Fenster zum Buckaroo Payment Plaza." +"Webshops","Webshops" +"Extensions","Erweiterungen" +"Commerce","Handel" +"Your PHP version","Ihre PHP-Version" +"Your order has been placed successfully.","Ihre Bestellung wurde erfolgreich aufgegeben." +"The payment methods of the Buckaroo Extension can be found under","Die Zahlungsmethoden der Buckaroo Extension finden Sie unter" +"Configuration > Sales > Payment Methods > Buckaroo","Konfiguration > Verkauf > Zahlungsmethoden > Buckaroo" +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Language","Sprache" +"Dutch","Niederländisch" +"English","Englisch" +"There was no transaction ID found","Es wurde keine Transaktions-ID gefunden" +"Digital Debit Authorization","Digitale Einzugsermächtigung" +"Enable Digital Debit Authorization","Digitale Einzugsermächtigung activieren" +"Type authorization","Autorisierungstyp" +"One-Off","Einmalig" +"Recurring","Wiederkehrend" +"One-Off means that the authorization can be used for an one-off direct debit. Recurring means that the authorization will be used for multiple direct debits.","Einmalig bedeutet, dass die Ermächtigung für einen einmaligen Lastschrifteinzug genutzt werden kann. Wiederkehrend bedeutet, dass die Autorisierung für mehrere Lastschriften verwendet wird." +"Authorization description","Berechtigungsbeschreibung" +"Enter a desciption that the customer will recognize as the authorization here, e.g. your webshop or company name.","Geben Sie hier eine Beschreibung ein, die der Kunde als Berechtigung erkennt, z. Ihr Webshop oder Firmenname." +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Identification number:","Identifikationsnummer:" +"(Or click here for the French translation: terms and condition.)","(Oder klicken Sie hier für die französische Übersetzung: Geschäftsbedingungen.)" +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Or CVV or CVC.","Oder CVV oder CVC." +"A 3 or 4 digit code located to the right of signature strip on the back of your card, separate from the card number.","Ein 3- oder 4-stelliger Code rechts neben dem Unterschriftsstreifen auf der Rückseite Ihrer Karte, getrennt von der Kartennummer." +"Year:","Jahr:" +"Month:","Monat:" +"Card:","Karte:" +"Card number:","Kartennummer:" +"Name on card:","Kartenhalter:" +"Cvc / Cvv Code:","Cvc / Cvv-Code:" +"Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." +"Orders with discount and paid with Klarna can not be partially invoiced. %1 More Information %2","Bestellungen mit Rabatt, die mit Klarna bezahlt wurden, können nicht teilweise in Rechnung gestellt werden. %1 Mehr Informationen %2" +"Select a card","Wählen Sie eine Karte aus" +"Select a month","Wähle einen Monat" +"Select a year","Wählen Sie ein Jahr aus" +"Card:","Karte:" +"Security Code:","Sicherheitscode:" +"Select a card","Wählen Sie eine Karte aus" +"Select a month","Wähle einen Monat" +"Select a year","Wählen Sie ein Jahr aus" +"Enable Apple Pay","Apple Pay aktivieren" +"Your payment could not be processed","Ihre Zahlung konnte nicht verarbeitet werden" +"Capayable Postpay","Capayable Nachzahlung" +"Enable In3","In3 aktivieren" +"Enable Capayable Postpay","Capayable Nachzahlung activieren" +"In3 version","In3-Version" +"The In3 version can be found in your Capayable contract.","Die In3-Version finden Sie in Ihrem Capayable-Vertrag." +"Product Page","Produktseite" +"Card","Karte" +"Error: postcode is required","Fehler: Postleitzahl ist erforderlich", +"Delivery costs","Versandkosten" +"Discount","Rabatt" +"Shipping fee","Versandkosten" +"Service costs","Servicekosten" +"Your paid successfully. Please finish your order","Sie haben erfolgreich bezahlt. Bitte schließen Sie Ihre Bestellung ab." +"Apply Gift Card","Geschenkkarte beantragen" +"Pay remaining amount: %1 %2","Restbetrag zahlen: %1 %2" +"A partial payment of %1 %2 was successfully performed on a requested amount. Remainder amount %3 %4","Eine Teilzahlung von %1 %2 wurde erfolgreich für einen angeforderten Betrag durchgeführt. Restbetrag %3 %4" +"Paid with","Bezahlt mit" +"Follow the instructions on the payment terminal","Folgen Sie den Anweisungen am Zahlungsterminal" +"Your order will be completed as soon as payment has been made","Ihre Bestellung wird abgeschlossen, sobald die Zahlung erfolgt ist" +"The transaction has not been completed, please try again","Die Transaktion wurde nicht abgeschlossen, bitte versuchen Sie es erneut" +"Cancel","Absagen" +"Credit card","Kreditkarte" +"Bancontact card","Bancontact-Karte" +"Mobile application","Mobile Applikation" +"You have canceled the order. We kindly ask you to not complete the payment in the Bancontact app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung in der Bancontact-App nicht abzuschließen - Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Scan the code below within 15 minutes with the ","Scannen Sie den unten stehenden Code innerhalb von 15 Minuten mit dem" +"Bancontact app","Bancontact-App" +"You must be 18 or older to pay for the products below","Sie müssen mindestens 18 Jahre alt sein, um die folgenden Produkte zu bezahlen" +"Age verification","Altersüberprüfung" +"Verify your age via iDIN","Verifizieren Sie Ihr Alter über iDIN" +"Select your bank","Wählen Sie Ihre Bank aus" +"Card number or pin not valid","Kartennummer oder PIN ungültig" +"Check with Buckaroo whether Client Side Encryption is enabled, otherwise transactions will fail. If in doubt, please contact us.","Erkundigen Sie sich bei Buckaroo, ob Client Side Encryption aktiviert ist, andernfalls schlagen Transaktionen fehl. Im Zweifelsfall kontaktieren Sie uns bitte." +"The refund has been initiated but it is waiting for a approval. Login to the Buckaroo Plaza to finalize the refund by approving it.","Die Rückerstattung wurde eingeleitet, wartet jedoch auf eine Genehmigung. Melden Sie sich auf der Buckaroo Plaza an, um die Rückerstattung abzuschließen, indem Sie sie genehmigen." +"Enabling this feature adds the option to hide this payment method after a certain number of failed attempts.","Durch Aktivieren dieser Funktion wird die Option hinzugefügt, diese Zahlungsmethode nach einer bestimmten Anzahl fehlgeschlagener Versuche auszublenden." +"When this number is exceeded, the payment method will be hidden. Minimum 1, maximum 10.","Wenn diese Anzahl überschritten wird, werden die Zahlungsmethoden ausgeblendet. Mindestens 1, höchstens 10." +"This message is shown when the payment method is hidden. Maximum 280 characters.","Diese Meldung wird angezeigt, wenn die Zahlungsmethode ausgeblendet ist. Maximal 280 Zeichen." +"Pay rejected: It is not allowed to specify another country for the invoice and delivery address for Afterpay transactions.","Pay rejected: Bei Afterpay-Transaktionen darf kein anderes Land für die Rechnungs- und Lieferadresse angegeben werden." +"-- Please Select Your Gender--","Bitte wähle dein Geschlecht aus" +"Show Issuer Selection in the Checkout","Bankauswahl im Checkout anzeigen" +"When the \"NO\" option is selected, the issuer selection for iDEAL will not be displayed in the checkout. Instead, customers will be redirected to a separate page where they can choose their iDEAL issuer (i.e., their bank). On the other hand, selecting the "Enable" option will display the issuer selection directly in the checkout. It's important to note that enabling this option will incur additional costs from Buckaroo. For precise cost details, please reach out to Buckaroo directly.","Wenn die Option 'Deaktiviert' ausgewählt ist, wird die Bankauswahl für iDEAL nicht im Checkout angezeigt. Stattdessen werden Kunden auf eine separate Seite weitergeleitet, auf der sie ihre eigene Bank auswählen können. Auf der anderen Seite wird das Aktivieren dieser Funktion die Bankauswahl direkt im Checkout anzeigen. Es ist wichtig zu beachten, dass das Aktivieren dieser Option zusätzliche Kosten von Buckaroo verursachen wird. Für genaue Kostenangaben können Sie sich direkt an Buckaroo wenden." +"Invoice Handling","Rechnungsverwaltung" +"Create Invoice on Payment","Rechnung erstellen bei Zahlung" +"Create Invoice on Shipment","Rechnung erstellen bei Versand" +"Select the moment when the invoice should be created.","Wählen Sie den Zeitpunkt aus, zu dem die Rechnung erstellt werden soll." +"Sort iDEAL banks","Die Reihenfolge der iDEAL-Anbieter" +"Sort PayByBank Banks","Die Reihenfolge der PayByBank-Anbieter" +"Sort Credit-debitcard issuers","Die Reihenfolge der Kredit- und Debitkartenherausgeber" +"Giftcard acquirer","Erwerber von Geschenkkarten" +"Select your giftcard supplier","Wählen Sie Ihren Geschenkkartenanbieter aus" +"You have canceled the payment request.","Sie haben die Zahlungsanforderung storniert." +"iDEAL Fast Checkout","iDEAL Schnellkauf" +"Enable","Aktiviert" +"Disable","Deaktiviert" +"Enable or disable the iDEAL Fast Checkout button.","Aktivieren oder deaktivieren Sie die iDEAL Schnellkauf-Schaltfläche." +"iDEAL Fast Checkout logo visibility","Sichtbarkeit des iDEAL Schnellkauf-Logos" +"iDEAL Fast Checkout logo scheme","Farbgebung des iDEAL Schnellkauf-Logos" +"Select the iDEAL fast checkout button (text) color.","Wählen Sie die (Text-)Farbe der iDEAL Schnellkauf-Schaltfläche." +"Select where you want the button to be visible. Multiple options can be selected at the same time.","Wählen Sie, wo die Schaltfläche sichtbar sein soll. Mehrere Optionen können gleichzeitig ausgewählt werden." +"Cart","Warenkorb" +"Light","Hell" +"Dark","Dunkel" +"Unable to create quote.","Angebot konnte nicht erstellt werden." +"An error occurred while processing your order","Beim Bearbeiten Ihrer Bestellung ist ein Fehler aufgetreten" +"Cannot create payment","Zahlung kann nicht erstellt werden" +"Failed to create quote","Angebotserstellung fehlgeschlagen" +"Failed to add address to quote","Adresse konnte dem Angebot nicht hinzugefügt werden" +"Buckaroo Hosted Fields Client ID:","Buckaroo Hosted Fields Client ID:" +"Buckaroo Hosted Fields Client Secret:","Buckaroo Hosted Fields Client Secret:" +"Enter your Buckaroo Hosted Fields Client ID, obtainable from the Buckaroo Plaza at → Settings → Token registration.","Geben Sie hier Ihren Buckaroo Hosted Fields Client ID ein, den Sie von der Buckaroo Plaza unter → Einstellungen → Tokenregistrierung." +"Enter your Buckaroo Hosted Fields Client Secret, obtainable from the Buckaroo Plaza at → Settings → Token registration.","Geben Sie hier Ihr Buckaroo Hosted Fields Client Secret ein, das Sie von der Buckaroo Plaza unter → Einstellungen → Tokenregistrierung." +"Mar","Mär" +"May","Mai" +"Oct","Okt" +"Dec","Dez" +"Mo","Mo" +"Tu","Di" +"We","Mi" +"Th","Do" +"Fr","Fr" +"Sa","Sa" +"Su","So" diff --git a/i18n/de_CH.csv b/i18n/de_CH.csv new file mode 100644 index 000000000..e381bd765 --- /dev/null +++ b/i18n/de_CH.csv @@ -0,0 +1,492 @@ +"Buckaroo payment methods","Buckaroo-Zahlungsmethoden" +"Buckaroo Payment Methods","Buckaroo-Zahlungsmethoden" +"iDEAL","iDEAL" +"Enable iDEAL","iDEAL aktivieren" +"Enable or disable this payment method."," Aktivieren oder deaktivieren Sie diese Zahlungsmethode." +"Frontend label","Frontend-Label" +"Determines the frontend label shown.","Bestimmt das angezeigte Frontend-Label." +"Frontend sort order","Sortierung auf der Vorderseite" +"Determines the sorting of payment methods.","Bestimmt die Reihenfolge der Zahlungsarten auf der Vorderseite." +"Advanced Configuration","Erweiterte Optionen" +"Send order confirmation email","Bestellbestätigungs-E-Mail senden" +"Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Aktivieren, um eine Bestellbestätigungs-E-Mail zu senden, wenn die Bestellung erstellt wird. Spezifisch für diese Zahlungsmethode." +"Payment fee","Gebühr"Payment fee +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Dieser Betrag wird basierend auf den Mehrwertsteuereinstellungen berechnet in: Stores > Configuration > Sales > Tax." +"Payment fee frontend label","Zahlungsgebühren-Front-End-Etikett" +"This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Das Etikett wird beim Checkout neben dem Zahlungsaufschlag sowie auf den Bestell-, Rechnungs-, Gutschriftseiten und im PDF angezeigt." +"Max order amount (in Base Currency)","Maximaler Bestellbetrag (in Basiswährung)" +"Maximum order amount allowed.","Die Zahlungsmethode wird nicht über dem Höchstbetrag angezeigt." +"The payment method shows only for orders with an order amount smaller than the maximum amount.","Die Zahlungsart wird nur bei Bestellungen angezeigt, deren Gesamtsumme unter dem maximalen Bestellwert liegt." +"Min order amount (in Base Currency)","Mindest. Bestellbetrag (in Basiswährung)" +"Minimum order amount allowed.","Die Zahlungsmethode wird nicht unter Mindestbetrag angezeigt" +"The payment method shows only for orders with an order amount greater than the minimum amount.","Die Zahlungsart wird nur bei Bestellungen mit einem Gesamtwert über dem Mindestbestellwert angezeigt." +"Method specific status enabled","Methodenspezifischer Status aktiviert" +"Enable or disable specific status.","Aktivieren oder deaktivieren Sie einen bestimmten Status." +"Method specific success status","Methodenspezifischer Erfolgsstatus" +"Leave empty to use default 'success' status.","Lassen Sie dieses Feld leer, um den Standardstatus 'Erfolg' zu verwenden." +"Method specific failed status","Methodenspezifischer Fehlerstatus" +"Leave empty to use default 'failed' status.","Lassen Sie die Auswahl für den Standardstatus „Fehlgeschlagen“ leer." +"To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status.","Um einen Status zuzuweisen, muss dieser dem richtigen Zustand zugewiesen werden. Informationen zu 'Status' und 'Status' finden Sie in der Magento-Dokumentation." +"Allowed currencies","Akzeptierte Währungen" +"Select payment method specific currencies.","Wählen Sie eine bestimmte Währung für die Zahlungsmethode aus." +"Your contract with Buckaroo must allow for the selected currencies to be used with this payment method.","Die verfügbare Währung hängt vom Vertrag mit Buckaroo ab." +"Payment from applicable countries","Für die Zahlung zugelassenes Land" +"Payment from Specific Country","Zahlung aus bestimmten Ländern" +"Only available when set to 'specific countries'.","Nur verfügbar mit der Auswahl 'bestimmte Länder'." +"Display only for selected IPs","Nur für bestimmte IPs anzeigen" +"Show method only to Magento set IPs.","Nur für bestimmte in Magento festgelegte IPs anzeigen." +"Magento developer client restrictions.","Zeigen Sie diese Zahlungsmethode nur ausgewählten Magento-IPs an. Diese Option ist für Magento-Entwickler gedacht, wenn Sie eine bestimmte Zahlungsmethode testen möchten, ohne sie öffentlich zu zeigen." +"Credit and debit cards","Kartenzahlung" +"Enable credit and debit cards","Kartenzahlung aktivieren" +"Allowed credit and debit cards","Akzeptierte Kartenzahlung" +"Select payment method specific Credit and debit card.","Wählen Sie bestimmte Kartenzahlung für die Zahlungsmethode aus." +"American Express Specific","American Express-spezifisch" +"Verify address","Adressvalidierung" +"Set true to verify the address at American Express. Set false to disable address verification","Kreuzen Sie 'Ja' an, um die Adresse mit American Express zu bestätigen. Auf 'no' setzen, um die Adressüberprüfung zu deaktivieren." +"Maestro Specific","Maestro-spezifisch" +"Mastercard Specific","Mastercard-spezifisch" +"No SecureCode order status","Bestellstatus für Nicht-SecureCode-Bestellungen" +"Set no SecureCode orders onhold","Platzieren Sie keine SecureCode-Bestellungen in der Warteschleife" +"Hold orders which have no MasterCard SecureCode.","Bestellungen ohne MasterCard SecureCode werden zurückgestellt." +"Visa Specific","Visaspezifisch" +"No 3D Secure order status","Bestellstatus für Bestellungen ohne 3D Secure" +"Set no 3D Secure orders onhold","Platzieren Sie keine 3D Secure-Bestellungen in der Warteschleife" +"Hold orders which are not 3D Secure.","Bestellungen ohne 3D Secure by Visa werden zurückgestellt." +"Paypal","Paypal" +"Enable Paypal","PayPal aktivieren" +"Seller protection enabled","Profitieren Sie vom Verkäuferschutz" +"WARNING: Paypal Seller Protection requires additional configuration. Please consult Buckaroo for more information.","HINWEIS: Die Nutzung des PayPal-Verkäuferschutzes erfordert zusätzliche Einstellungen in der Magento-Konfiguration. Weitere Informationen finden Sie unter Buckaroo." +"Seller protection eligible","Verkäuferschutz vollumfänglich gewährt" +"Seller protection for unauthorized payment and item not received","Bei nicht autorisierter Zahlung und nicht erhaltener Ware wird Verkäuferschutz gewährt" +"Seller protection item not received","Verkäuferschutz Nicht erhaltene Ware" +"Seller protection for item not received","Für nicht erhaltene Ware wird Verkäuferschutz gewährt" +"Seller protection unauthorized payment","Verkäuferschutz Nicht autorisierte Zahlung" +"Seller protection for unauthorized payment","Bei nicht autorisierter Zahlung wird Verkäuferschutz gewährt" +"Seller protection ineligible","Kein Verkäuferschutz" +"Merchant is not protected by Seller Protection","Verkäuferschutz steht dem Händler nicht zu" +"Bank Transfer","Banküberweisung" +"Enable Bank Transfer","Banküberweisung aktivieren" +"Send payment instruction email","Zahlungsanweisung per E-Mail senden" +"Buckaroo sends an email to the customer with the payment procedures.","Eine E-Mail mit den Zahlungsanweisungen wird von Buckaroo gesendet." +"Set to 'No' the customer is informed once online.","Bei der Auswahl 'Nein' wird der Kunde einmalig nach Abschluss der Bestellung informiert." +"Due date (in days)","Fälligkeitsdatum (in Tagen)" +"The amount of days after the order date in which the customer has to complete the payment. After this period order will be cancelled. You can add this due date in the template of the Transfer email.","Die Anzahl der Tage nach dem Bestelldatum, in denen der Kunde die Zahlung abschließen muss. Nach Ablauf dieser Frist wird die Bestellung storniert. Sie können dieses Fälligkeitsdatum in der Vorlage der Überweisungs-E-Mail hinzufügen." +"Use credit management","Nutzen Sie das 'Kreditmanagement'" +"Buckaroo sends payment reminders to the customer.","Buckaroo versendet Zahlungserinnerungen an den Kunden." +"Contact Buckaroo before activating Credit Management. By default this is excluded in the contract.","Wenden Sie sich an Buckaroo, bevor Sie das Kreditmanagement aktivieren. Standardmäßig ist dies im Vertrag ausgeschlossen." +"Invoice delay (in days)","Rechnungsverzögerung (in Tagen)" +"Specify the amount of days before Buckaroo invoices the order and sends out the payment mail.","Geben Sie die Anzahl der Tage an, bevor Buckaroo die Bestellung in Rechnung stellt und die Zahlungsmail versendet." +"Max reminder level","Maximale Erinnerungsstufe" +"Select the maximum reminder level buckaroo will use.","Wählen Sie die maximale Erinnerungsstufe aus, die Buckaroo anwendet." +"SEPA direct debit","SEPA-Autorisierung" +"Enable SEPA direct debit","SEPA-Autorisierung activieren" +"Bancontact","Bancontact" +"Enable Bancontact","Bancontact activieren" +"Please enter a valid BIC number","Bitte geben Sie eine gültige BIC-Nummer ein" +"Please select a issuer from the list","Wählen Sie eine Bank aus der Liste aus" +"Belfius","Belfius" +"Enable Belfius","Belfius activieren" +"Alipay","Alipay" +"Enable Alipay","Alipay activieren" +"WeChatPay","WeChatPay" +"Enable WeChatPay","WeChatPay activieren" +"P24","P24" +"Przelewy24","Przelewy24" +"Enable Przelewy24","Przelewy24 activieren" +"Trustly","Trustly" +"Enable Trustly","Trustly activieren" +"Refunding","Erstattung" +"Enable or disable refunding.","Gutschrift/Rückerstattung aktivieren oder deaktivieren." +"Set to 'No' refunds must be done manualy in Payment Plaza.","Mit der Auswahl 'Nein' werden Gutschriften in Magento bei Payment Plaza nicht angeboten." +"Push Payment Plaza refunds to Magento","Akzeptieren Sie Payment Plaza-Rückerstattungen in Magento" +"Allow 2-way refunding from Magento and Payment Plaza.","Verarbeiten Sie die 'Rückerstattung' sowohl von Magento als auch von Payment Plaza." +"Enabled","Eingeschaltet" +"Enable or disable the Buckaroo module.","Aktivieren oder deaktivieren Sie das Buckaroo-Modul." +"Selecting 'Off' will overrule all individual settings.","Wenn Sie 'Aus“ wählen, werden alle individuellen Einstellungen überschrieben." +"Secret key","Secret key" +"Enter your Buckaroo Secret Key.","Fügen Sie Ihren Buckaroo 'Secret key' hinzu." +"The Secret Key can be retrieved in Payment Plaza under Configuration > Security > Secret Key. For support contact Buckaroo.","Der 'Secret Key' wird im Payment Plaza angezeigt unter 'Configuration > Security > Secret Key. Wenden Sie sich für Support an Buckaroo." +"(Merchant) key","(Merchant) key" +"Enter your Buckaroo merchant/website key.","Fügen Sie Ihren Buckaroo merchant/website key hinzu." +"The (Merchant) Key can be retrieved in Payment Plaza under My Buckaroo > Websites. For support contact Buckaroo.","Der '(Merchant)Key' wird angezeigt in the Buckaroo Payment Plaza unter My Buckaroo > Websites." +"(Merchant) guid","(Merchant) guid" +"Enter your Buckaroo merchant guid.","Fügen Sie Ihren Buckaroo-Guid code hinzu." +"The (Merchant) Guid can be retrieved in Payment Plaza under My Buckaroo > Details > Guid. For support contact Buckaroo.",""Die Händler-Guid wird im Buckaroo Payment Plaza angezeigt unter > My Buckaroo > Details > Guid." +"Transaction label","Transaktionsetikett" +"The transaction description in Payment Plaza.","Die Beschreibung der Transaktion in Payment Plaza." +"Certificate label","Zertifikatsetikett" +"Enter a name for the certificate. This is purely administrative.","Fügen Sie dem Zertifikat zur Identifizierung einen Namen hinzu." +"Upload your Buckaroo private key certificate","Laden Sie Ihr privates Schlüsselzertifikat (private key) von Buckaroo hoch'" +"Certificate file","Zertifikatsdatei" +"The certificate can be retrieved in Payment Plaza under Configuration > Security > Certificates. For support contact Buckaroo.","Das Zertifikat kann im Buckaroo Payment Plaza unter > Konfiguration > Sicherheit > Zertifikate abgerufen werden." +"These options are only intended for expert users. Tampering with the default settings may negatively affect the workflow and performance of all Buckaroo payment methods. Use at your own risk.","Diese Einstellungen sind nur für erfahrene Benutzer gedacht. Das Anpassen dieser Einstellungen kann die Funktion des Moduls und des Webshops beeinträchtigen. Benutzung auf eigene Gefahr." +"New status","Neuer Status" +"This status will be given to new orders.","Dieser Status wird neuen Bestellungen zugewiesen." +"Pending payment status","Offener Status der Zahlung" +"This status will be given to orders pending payment.","Dieser Status wird Bestellungen zugewiesen, die darauf warten, bezahlt zu werden." +"Payment success status","Zahlungserfolgsstatus" +"This status will be given to orders paid.","Dieser Status wird bezahlten Bestellungen gegeben." +"Payment failed status","Zahlungsstatus fehlgeschlagen" +"This status will be given to unsuccessful orders.","Dieser Status wird erfolglosen Bestellungen gegeben." +"Send transactional invoice email","Transaktionsrechnungs-E-Mail senden" +"Send a mail after successful creating the order.","Senden Sie nach erfolgreicher Erstellung der Bestellung eine E-Mail." +"Please enter a valid bank account holder name","Bitte geben Sie einen gültigen Namen des Bankkontoinhabers ein" +"Please enter a valid bank account number","Bitte geben Sie eine gültige Bankkontonummer ein" +"Create invoice after success","Rechnung nach Erfolg erstellen" +"If set to 'No' the order is not invoiced.","Wenn 'Nein' ausgewählt ist, wird keine Rechnung in Magento erstellt." +"Payment success status without invoice","Erfolgsstatus ohne Rechnung" +"Redirect url after 'Success'","Umleitungs-URL nach 'Erfolg'" +"Redirect after successful payments.","Weiterleitung nach erfolgreicher Zahlung." +"Redirect url after 'Failure'","Umleitungs-URL nach 'Fehler'" +"Redirect after failed payments.
Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Weiterleitung nach fehlgeschlagenen Zahlungen.
Bitte beachten Sie, dass diese Einstellung nicht für alle Express-Zahlungsmethoden gilt, wie zum Beispiel die iDEAL-Schnellkasse." +"'Canceled' state on failed payment","'Status 'Storniert' bei fehlgeschlagener Zahlung" +"Orders will stay open after failed payments.","Bestellungen bleiben nach fehlgeschlagenen Zahlungen offen." +"Debug email","E-Mail debuggen" +"Transaction data send as raw data.","Transaktionsdaten werden als Rohdaten gesendet." +"Fee percentage mode","Gebührenprozentsatzmodus" +"This setting only applies to percentage-based Buckaroo fees.
Please choose over which amount the fee percentage is calculated.","Diese Einstellung gilt nur für prozentuale Buckaroo-Gebühren.
Bitte wählen Sie aus, über welchen Betrag der Gebührenprozentsatz berechnet wird.." +"Please enter these fields as they appear on your bank account.","Bitte füllen Sie diese Felder so aus, wie sie auf Ihrem Bankkonto erscheinen." +"You will receive an email with further payment instructions when you place your order.","Sie erhalten eine E-Mail mit weiteren Zahlungsanweisungen, wenn Sie Ihre Bestellung aufgeben." +"Legend","Legende" +"Payment method","Zahlungsmethode" +"Disabled","Ausgeschaltet" +"Test Mode","Testmodus" +"Live Mode","Live-Modus" +"Magento & 3rd party version compatibility","Magento & Kompatibilität mit Drittanbieterversionen" +"Magento version compatibility","Kompatibilität der Magento-Version" +"Magento Community Edition version","Magento Community Edition-Version" +"Magento Enterprise Edition version","Magento Enterprise Edition-Version" +"Quick reference guide","Kurzanleitung" +"Log in to the ","Melden Sie sich an " +"Buckaroo Payment Plaza","Buckaroo Payment Plaza" +" to collect the following security settings:"," um die folgenden Sicherheitseinstellungen zu sammeln:" +"Support","Die Unterstützung" +"This extension is developed by Buckaroo.","Diese Erweiterung wird von Buckaroo entwickelt." +"Extension basic configuration and account information","Basiskonfiguration der Erweiterung und Kontoinformationen" +"Buckaroo Payment Plaza:","Buckaroo Payment Plaza:" +"Phone:","Telefon:" +"E-mail:","Email:" +"Extension support and advanced configuration","Erweiterungsunterstützung und erweiterte Konfiguration" +"Online documentation and FAQ:","Online-Dokumentation und FAQ:" +"Support question:","Supportfrage:" +"Support by email:","Unterstützung per E-Mail:" +"Documentation","Dokumentation" +"A list of documents regarding the extension.","Eine Liste der Dokumente zur Verlängerung." +"Download a PDF format of the manual. Currently the manual is only available in English.","Laden Sie ein PDF-Format des Handbuchs herunter. Derzeit ist das Handbuch nur in englischer Sprache verfügbar." +"View the complete changelog of the module. Currently the changelog is only available in Dutch.","Zeigen Sie das vollständige Änderungsprotokoll des Moduls an. Derzeit ist das Änderungsprotokoll nur auf Niederländisch verfügbar." +"Installation Manual Buckaroo.pdf (NL)","Installationshandbuch Buckaroo.pdf (NL)" +"Full Changelog","Vollständige Übersicht über die Änderungen" +"Selected card: %1","Ausgewählte Karte: %1" +"Tax Class for Buckaroo Fee","Steuerklasse für die Buckaroo-Gebühr" +"Display Buckaroo Fee Prices","Gebührenpreise von Buckaroo anzeigen" +"Buckaroo","Buckaroo" +"Version & Support","Ausführung & untersteuern" +"General configuration and account information","Allgemeine Konfigurations- und Kontoinformationen" +"(Merchant) key","(Merchant) key" +"Debug information will be sent to these comma-separated email addresses","Debug-Informationen werden an diese durch Kommas getrennten E-Mail-Adressen gesendet" +"Debugging","Debuggen" +"Decide what to debug. Log files will be created within the var/log/Buckaroo/ directory.","Bestimmen Sie, was protokolliert wird. Protokolldateien werden im Ordner var/log/Buckaroo/ erstellt." +"Please enter a valid number: '%1'.","Bitte geben Sie eine gültige Nummer ein: '%1'." +"This sets whether buckaroo payment fee amounts entered from Magento Admin include tax","Hiermit wird festgelegt, ob die von Magento Admin eingegebenen Gebührenbeträge für Buckaroo-Zahlungen Steuern enthalten." +"Excluding Tax","Steuer nicht inbegriffen" +"Including Tax","Mit Steuern" +"Including and Excluding Tax","Einschließlich und ohne Steuern" +"None","Keiner" +"All Allowed Countries","Alle zulässigen Länder" +"Specific Countries","Bestimmte Länder" +"You have not yet uploaded any certificate files","Sie haben noch keine Zertifikatsdateien hochgeladen" +"No certificate selected","Kein Zertifikat ausgewählt" +"Do not log debug information","Keine Debug-Informationen protokollieren" +"Log to file","In Datei protokollieren" +"Mail to debug email","E-Mail zum Debuggen von E-Mails" +"Log to file and mail to debug email","In Datei protokollieren und E-Mail zum Debuggen von E-Mails senden" +"Off","Aus" +"Test","Testmodus" +"Live","Live-Modus" +"Subtotal","Zwischensumme" +"Subtotal incl. tax","Zwischensumme inkl. MwSt" +"Grand Total","Gesamtsumme" +"-- Please Select --","-- Bitte auswählen --" +"Buckaroo refund is disabled","Buckaroo-Rückerstattung ist deaktiviert" +"Buckaroo refund push validation failed","Push-Validierung der Buckaroo-Rückerstattung fehlgeschlagen" +"The credit memo\'s total must be positive.","Die Summe der Gutschriften muss positiv sein." +"Failed to create the creditmemo","Die Gutschrift konnte nicht erstellt werden" +"Payment Fee","Gebühr" +"Refund failed ! Status : %1 and the order does not contain an invoice",""Rückerstattung fehlgeschlagen ! Status: %1 und die Bestellung enthält keine Rechnung" +"Skipped handling this push, duplicate","Bearbeitung dieses Pushs übersprungen, Duplikat +"Signature from push is incorrect","Signatur von Push ist falsch" +"Signature from push is correct but the order can not receive updates","Die Signatur von Push ist korrekt, aber die Bestellung kann keine Updates erhalten" +"There was no order found by transaction Id","Er wird von der Transaktions-ID bestimmt" +"Invalid status send by buckaroo, but the payment amount was correct.","Ungültiger Status von buckaroo gesendet, aber der Zahlungsbetrag war korrekt." +"Order can not be invoiced","Bestellung kann nicht in Rechnung gestellt werden" +"Buckaroo Pending Payment","Buckaroo wartet auf die Zahlung" +"Refund Reward Points","Treuepunkte" +"Buckaroo Fee for Order","Buckaroo-Gebühr für die Bestellung" +"order","bestellen" +"Buckaroo Fee","Buckaroo-Gebühr" +"Place Order","Bestellung aufgeben" +"Select a bank:","Wählen Sie eine Bank aus:" +"BIC number:","BIC-Nummer:" +"Select a Credit Card or Debit Card:","Wählen Sie eine Kredit- oder Debitkarte aus:" +"Bank account holder","Kontoinhaber" +"Bank account number","Kontonummer" +"BIC Number","BIC-Nummer" +"Disallowed file type.","Ungültiger Dateityp." +"Enter a name for the certificate.","Geben Sie einen Namen für das Zertifikat ein." +"Online refunds are currently disabled for Buckaroo payment methods.","Online-Rückerstattungen sind derzeit für Buckaroo-Zahlungsmethoden deaktiviert." +"Adjustment Refund","Anpassungsrückerstattung" +"Adjustment Fee","Anpassungsgebühr" +"Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Leider ist bei der Verarbeitung Ihrer Zahlung ein Fehler aufgetreten. Bitte versuche es erneut. Wenn dieser Fehler weiterhin besteht, wählen Sie bitte eine andere Zahlungsmethode." +"Riverty","Riverty" +"Enable Riverty","Riverty activieren" +"Giftcard","Geschenkkarte" +"Enable Giftcard","Geschenkkarte aktivieren" +"PayPerEmail","PayPerEmail" +"Enable PayPerEmail","PayPerEmail activieren" +"PayLink","PayLink" +"Enable PayLink","PayLink activieren" +"Combined","Kombiniert" +"Separate authorize and capture","Autorisieren und erfassen getrennt" +"Payment flow","Zahlungsfluss" +"Whether to use separate authorize and capture calls or to use a combined 'pay' call.","Ob getrennte Autorisierungs- und Erfassungsanrufe oder ein kombinierter 'Bezahl'-Anruf verwendet werden sollen." +"Eps","Eps" +"Enable Eps","EPS activieren" +"This is a required field.","Dies ist ein Pflichtfeld." +"You should be at least 18 years old.","Du solltest mindestens 18 Jahre alt sein." +"Phone number should be correct.","Telefonnummer sollte stimmen." +"Enter Valid IBAN","Geben Sie eine gültige IBAN ein" +"Enter Valid BIC number","Geben Sie eine gültige BIC-Nummer ein" +" (Excl. Tax)"," (exkl. MwSt.)" +" (Incl. Tax)"," (inkl. Steuern)" +"Please enter a valid currency: '%1'.","Bitte geben Sie eine gültige Währung ein: '%1'." +"Merchant is protected by PayPal Seller Protection Policy for both Unauthorized Payment and Item Not Received.","Der Händler ist durch die PayPal-Verkäuferschutzrichtlinie sowohl für nicht autorisierte Zahlungen als auch für nicht erhaltene Artikel geschützt." +"Merchant is protected by Paypal Seller Protection Policy for Item Not Received.","Der Händler ist durch die Paypal-Verkäuferschutzrichtlinie für nicht erhaltene Artikel geschützt." +"Merchant is protected by Paypal Seller Protection Policy for Unauthorized Payment.","Der Händler ist durch die Paypal-Verkäuferschutzrichtlinie für nicht autorisierte Zahlungen geschützt." +"Merchant is not protected under the Seller Protection Policy.","Der Händler ist nicht durch die Verkäuferschutzrichtlinie geschützt." +"Not enough paid: %1 has been transfered. Order grand total was: %2.","Nicht genug bezahlt: %1 wurde transferiert. Die Gesamtsumme der Bestellung war: %2." +"Too much paid: %1 has been transfered. Order grand total was: %2.","Zu viel bezahlt: %1 wurde transferiert. Die Gesamtsumme der Bestellung war: %2." +"Buckaroo New","Buckaroo Neu" +"Buckaroo Pending Payment","Buckaroo wartet auf die Zahlung" +"'%s' data type is invalid. String is expected.","'%s' Datentyp ist ungültig. Zeichenkette wird erwartet." +"Before contacting Buckaroo technical support, please retrieve your (Merchant) key, Secret key, certificate and certificate thumbprint.","Bevor Sie sich an den technischen Support von Buckaroo wenden, rufen Sie bitte Ihren Händler-Schlüssel, geheimen Schlüssel, Zertifikat und Zertifikat-Fingerabdruck ab." +"A list of documents regarding the extension.","Eine Liste der Dokumente zur Verlängerung." +"Installation and Configuration Manual Buckaroo.pdf","Installations- und Konfigurationshandbuch Buckaroo.pdf" +"View the complete release notes of the extension. Currently the release notes is only available in English.","Sehen Sie sich die vollständigen Versionshinweise der Erweiterung an. Derzeit sind die Versionshinweise nur auf Englisch verfügbar." +"Full Release Notes","Vollständige Versionshinweise" +"(Excluding Tax)","((Steuer nicht inbegriffen)" +"(Including Tax)","(Mit Steuern)" +"Salutation","Anrede" +"Mr.","Herr." +"Mrs.","Frau." +"Unknown","Unbekannt" +"Billing Name:","Fakturname:" +"Telephone:","Telefon:" +"Date of Birth:","Geburtsdatum:" +"Bank Account Number:","Kontonummer:" +"Business Model:","Geschäftsmodell:" +"B2C - Business to Consumer","B2C - Business to Consumer" +"B2B - Business to Business","B2B - Business to Business" +"COC Number:","Handelskammer nummer" +"Company Name:","Name der Firma" +"Cost Center:","Kostenstelle:" +"VAT Number:","Umsatzsteuer-Identifikationsnummer:" +"Terms and Conditions:","Geschäftsbedingungen:" +"Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." +"Not Applicable","Unzutreffend" +"Yes, I accept the terms and condition for the use of Riverty.","Ja, ich akzeptiere die Nutzungsbedingungen für Riverty." +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","Es gelten die allgemeinen Geschäftsbedingungen für die Zahlungsmethode Riverty. Die Datenschutzbestimmungen von Riverty findest Du hier." +"Accept terms of use","Akzeptieren Sie die Allgemeinen Geschäftsbedingungen" +"(DD/MM/YYYY)","(DD/MM/JJJJ)" +"Any comments about this Beta release? Please let us know! ","Irgendwelche Kommentare zu dieser Beta-Version? Lass uns wissen! " +"Buckaroo version","Buckaroo-Version" +"The transaction will be processed using %s.","Die Zahlung wird bearbeitet mit %s." +"The order has already been processed.","Die Bestellung wurde bereits bearbeitet." +"push notification for refund has no success status, ignoring.","Push-Benachrichtigung für Rückerstattung hat keinen Erfolgsstatus, wird ignoriert. " +"Warning:","Warnung:" +"Aufgrund zusammengesetzter Rundungsfehler in Magento bei der Verwendung von anderen Währungen als der Basiswährung des Shops beim Erstellen von Rückerstattungen kann der Betrag, den Sie zurückerstatten, einige Cent mehr oder weniger als beabsichtigt betragen. Wenn Sie sicherstellen möchten, dass der korrekte Betrag erstattet wird, erstellen Sie bitte eine Offline-Erstattung und verwenden Sie dann Buckaroos Zahlungsplatz, um die eigentliche Rückerstattung vorzunehmen.","Wegens oplopende afrondingsfouten in Magento wanneer gekrediteerd wordt in een andere valuta dan de winkel's basisvaluta, kan het voorkomen dat er enkele centen verschil zitten tussen het bedrag dat gekrediteerd moet worden en het bedrag dat daadwerkelijk teruggestort wordt. Indien u zeker wilt zijn dat het juiste bedrag teruggestort wordt, kunt u het beste een offline refund aanmaken en het eigenlijke bedrag terugstorten vanuit Buckaroo's Payment Plaza." +"support.buckaroo.nl","support.buckaroo.nl" +"Website","Website" +"www.buckaroo-payments.com","www.buckaroo.com" +"Buckaroo Request Form","Buckaroo-Anfrageformular" +"Buckaroo Knowledge Base","Buckaroo-Wissensdatenbank" +"Dankort Specific","Dankort-spezifisch" +"Hold orders which are not 3D Secure.","Bestellungen ohne 3D Secure by Dankort werden zurückgestellt." +"Buckaroo Giftcards","Buckaroo-Geschenkkarten" +"Giftcards","Geschenkkarten" +"Enable Giftcards","Geschenkkarten aktivieren" +"Allowed giftcards","Akzeptierte Geschenkkarten" +"Select which giftcards are available to the customer. You can add new cards in Stores > Buckaroo giftcards.","Wählen Sie aus, welche Geschenkkarten für den Kunden verfügbar sind. Sie können neue Karten unter 'Stores > Buckaroo-Geschenkkarten' hinzufügen." +"These options will be presented to the customer after Buckaroo has received the order. If left blank, the available options will be based on which Buckaroo payment options you have enabled.","Diese Optionen werden dem Kunden nach Eingang der Bestellung bei Buckaroo präsentiert. Wenn Sie das Feld leer lassen, basieren die verfügbaren Optionen darauf, welche Buckaroo-Zahlungsoptionen Sie aktiviert haben." +"You have not yet added any giftcards","Es wurden noch keine Geschenkkarten hinzugefügt" +"Add New Giftcard","Neuen Geschenkgutschein hinzufügen" +"Service Code","Service code" +"Name","Name" +"Label","Etikett" +"Save","Speichern" +"Delete","Löschen" +"Save and Continue","Speichern und fortfahren" +"Edit Giftcard '%s'","Geschenkkarte ändern '%s'" +"Add Giftcard","Geschenkkarte hinzufügen" +"This giftcard no longer exists.","Diese Geschenkkarte existiert nicht mehr." +"The giftcard has been saved.","Die Geschenkkarte wurde gespeichert." +"The giftcard has been deleted.","Die Geschenkkarte wurde entfernt." +"My billing and shipping address are the same", "Meine Rechnungs- und Lieferadresse sind identisch" +"Select a Credit Card or Debit Card", "Wählen Sie eine Kredit- oder Debitkarte aus" +"Salutation:","Anrede:" +"Send payment email","Zahlungs-E-Mail senden" +"Whether to use separate order/authorization and capture/invoice calls or to use a combined 'payment invitation' call.","Ob separate Bestell-/Autorisierungs- und Erfassungs-/Rechnungsanrufe oder ein kombinierter 'Zahlungsaufforderungs'-Aufruf verwendet werden soll." +"The selected payment method does not support the selected currency or the store's base currency.","Die ausgewählte Zahlungsmethode unterstützt die ausgewählte Währung oder die Basiswährung des Shops nicht." +"Invoice with id \"%1\" does not exist.","Rechnung mit der ID \"%1\" existiert nicht." +"The payment of the Customer's payment will be outsourced to Buckaroo. The invoice indicates how to pay the invoice (after reception of goods and/or services). The invoice must be paid within 14 (fourteen) days after the invoice date.","Die Zahlung der Zahlung des Kunden wird an Buckaroo ausgelagert. Die Rechnung gibt an, wie die Rechnung zu bezahlen ist (nach Erhalt der Waren und/oder Dienstleistungen). Die Rechnung ist innerhalb von 14 (vierzehn) Tagen nach Rechnungsdatum zu bezahlen." +"You must check this box to indicate that you agree to the terms and conditions.","Sie müssen dieses Kästchen ankreuzen, um anzugeben, dass Sie den Nutzungsbedingungen zustimmen." +"According to our system, you have canceled the payment. If this is not the case, please contact us.","Laut unserem System haben Sie die Zahlung storniert. Sollte dies nicht der Fall sein, kontaktieren Sie uns bitte.." +"Default Configuration","Standardkonfiguration" +"Credit Management Enabled","Kreditverwaltung aktiviert" +"Credit Management Scheme Key. It can be found here. This requires the Buckaroo Credit Management subscription.","Schlüssel des Kreditverwaltungssystems. Es kann hier gefunden werden. Hierfür ist das Abonnement von Buckaroo Credit Management erforderlich." +"Credit Management payment methods","Zahlungsmethoden für das Kreditmanagement" +"Credit management steps","Schritte im Kreditmanagement" +"Max level of the Credit Management steps.","Max. Stufe der Kreditverwaltungsschritte." +"Credit Management Due date","Kreditmanagement Fälligkeitsdatum" +"The amount of days after the order date, after which the Credit Management scheme will start.","Die Anzahl der Tage nach dem Bestelldatum, nach denen das Kreditverwaltungsprogramm beginnt." +"PayPerEmail payment methods", "PayPerEmail-Zahlungsmethoden" +"Show other active payment methods", "Andere aktive Zahlungsmethoden anzeigen" +"Select which paymethod can be used at PayPerEmail.","Wählen Sie aus, welche Zahlungsmethode bei PayPerEmail verwendet werden kann." +"Select which payment methods can be used after the payment due date.","Wählen Sie aus, welche Zahlungsmethoden nach dem Fälligkeitsdatum der Zahlung verwendet werden können." +"Billing First Name:","Vorname Rechnung:" +"Billing Last Name:","Rechnungsnachname:" +"Email:","Email" +"Frontend","Frontend" +"Backend","Backend" +"Frontend and Backend","Frontend und Backend" +"Black","Schwarz" +"White","Witz" +"White outline","Weißer Umriss" +"Select where this payment method will be available.","Wählen Sie aus, wo diese Zahlungsmethode verfügbar sein soll." +"Cannot Refund via Magento Backend. Partial refunds combined with a payment fee can only be refunded via the Buckaroo Payment Plaza, see also the KB article.
Open a new window to the Buckaroo Payment Plaza.","Rückerstattung über Magento Backend nicht möglich. Teilerstattungen in Verbindung mit einer Zahlungsgebühr können nur über die Buckaroo Payment Plaza erstattet werden, siehe auch die KB-Artikel.
Öffnen Sie ein neues Fenster zum Buckaroo Payment Plaza." +"Cannot refund this order via Magento Backend for now, we are working on a solution! Credit Management orders can only be refunded via the Buckaroo Payment Plaza.
Open a new window to the Buckaroo Payment Plaza.","Kann diese Bestellung vorerst nicht über Magento Backend zurückerstatten, wir arbeiten an einer Lösung! Credit Management-Bestellungen können nur über Buckaroo Payment Plaza erstattet werden.
Öffnen Sie ein neues Fenster zum Buckaroo Payment Plaza." +"Webshops","Webshops" +"Extensions","Erweiterungen" +"Commerce","Handel" +"Your PHP version","Ihre PHP-Version" +"Your order has been placed successfully.","Ihre Bestellung wurde erfolgreich aufgegeben." +"The payment methods of the Buckaroo Extension can be found under","Die Zahlungsmethoden der Buckaroo Extension finden Sie unter" +"Configuration > Sales > Payment Methods > Buckaroo","Konfiguration > Verkauf > Zahlungsmethoden > Buckaroo" +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Language","Sprache" +"Dutch","Niederländisch" +"English","Englisch" +"There was no transaction ID found","Es wurde keine Transaktions-ID gefunden" +"Digital Debit Authorization","Digitale Einzugsermächtigung" +"Enable Digital Debit Authorization","Digitale Einzugsermächtigung activieren" +"Type authorization","Autorisierungstyp" +"One-Off","Einmalig" +"Recurring","Wiederkehrend" +"One-Off means that the authorization can be used for an one-off direct debit. Recurring means that the authorization will be used for multiple direct debits.","Einmalig bedeutet, dass die Ermächtigung für einen einmaligen Lastschrifteinzug genutzt werden kann. Wiederkehrend bedeutet, dass die Autorisierung für mehrere Lastschriften verwendet wird." +"Authorization description","Berechtigungsbeschreibung" +"Enter a desciption that the customer will recognize as the authorization here, e.g. your webshop or company name.","Geben Sie hier eine Beschreibung ein, die der Kunde als Berechtigung erkennt, z. Ihr Webshop oder Firmenname." +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Identification number:","Identifikationsnummer:" +"(Or click here for the French translation: terms and condition.)","(Oder klicken Sie hier für die französische Übersetzung: Geschäftsbedingungen.)" +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Or CVV or CVC.","Oder CVV oder CVC." +"A 3 or 4 digit code located to the right of signature strip on the back of your card, separate from the card number.","Ein 3- oder 4-stelliger Code rechts neben dem Unterschriftsstreifen auf der Rückseite Ihrer Karte, getrennt von der Kartennummer." +"Year:","Jahr:" +"Month:","Monat:" +"Card:","Karte:" +"Card number:","Kartennummer:" +"Name on card:","Kartenhalter:" +"Cvc / Cvv Code:","Cvc / Cvv-Code:" +"Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." +"Orders with discount and paid with Klarna can not be partially invoiced. %1 More Information %2","Bestellungen mit Rabatt, die mit Klarna bezahlt wurden, können nicht teilweise in Rechnung gestellt werden. %1 Mehr Informationen %2" +"Select a card","Wählen Sie eine Karte aus" +"Select a month","Wähle einen Monat" +"Select a year","Wählen Sie ein Jahr aus" +"Card:","Karte:" +"Security Code:","Sicherheitscode:" +"Select a card","Wählen Sie eine Karte aus" +"Select a month","Wähle einen Monat" +"Select a year","Wählen Sie ein Jahr aus" +"Enable Apple Pay","Apple Pay aktivieren" +"Your payment could not be processed","Ihre Zahlung konnte nicht verarbeitet werden" +"Capayable Postpay","Capayable Nachzahlung" +"Enable In3","In3 aktivieren" +"Enable Capayable Postpay","Capayable Nachzahlung activieren" +"In3 version","In3-Version" +"The In3 version can be found in your Capayable contract.","Die In3-Version finden Sie in Ihrem Capayable-Vertrag." +"Product Page","Produktseite" +"Card","Karte" +"Error: postcode is required","Fehler: Postleitzahl ist erforderlich", +"Delivery costs","Versandkosten" +"Discount","Rabatt" +"Shipping fee","Versandkosten" +"Service costs","Servicekosten" +"Your paid successfully. Please finish your order","Sie haben erfolgreich bezahlt. Bitte schließen Sie Ihre Bestellung ab." +"Apply Gift Card","Geschenkkarte beantragen" +"Pay remaining amount: %1 %2","Restbetrag zahlen: %1 %2" +"A partial payment of %1 %2 was successfully performed on a requested amount. Remainder amount %3 %4","Eine Teilzahlung von %1 %2 wurde erfolgreich für einen angeforderten Betrag durchgeführt. Restbetrag %3 %4" +"Paid with","Bezahlt mit" +"Follow the instructions on the payment terminal","Folgen Sie den Anweisungen am Zahlungsterminal" +"Your order will be completed as soon as payment has been made","Ihre Bestellung wird abgeschlossen, sobald die Zahlung erfolgt ist" +"The transaction has not been completed, please try again","Die Transaktion wurde nicht abgeschlossen, bitte versuchen Sie es erneut" +"Cancel","Absagen" +"Credit card","Kreditkarte" +"Bancontact card","Bancontact-Karte" +"Mobile application","Mobile Applikation" +"You have canceled the order. We kindly ask you to not complete the payment in the Bancontact app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung in der Bancontact-App nicht abzuschließen - Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Scan the code below within 15 minutes with the ","Scannen Sie den unten stehenden Code innerhalb von 15 Minuten mit dem" +"Bancontact app","Bancontact-App" +"You must be 18 or older to pay for the products below","Sie müssen mindestens 18 Jahre alt sein, um die folgenden Produkte zu bezahlen" +"Age verification","Altersüberprüfung" +"Verify your age via iDIN","Verifizieren Sie Ihr Alter über iDIN" +"Select your bank","Wählen Sie Ihre Bank aus" +"Card number or pin not valid","Kartennummer oder PIN ungültig" +"Check with Buckaroo whether Client Side Encryption is enabled, otherwise transactions will fail. If in doubt, please contact us.","Erkundigen Sie sich bei Buckaroo, ob Client Side Encryption aktiviert ist, andernfalls schlagen Transaktionen fehl. Im Zweifelsfall kontaktieren Sie uns bitte." +"The refund has been initiated but it is waiting for a approval. Login to the Buckaroo Plaza to finalize the refund by approving it.","Die Rückerstattung wurde eingeleitet, wartet jedoch auf eine Genehmigung. Melden Sie sich auf der Buckaroo Plaza an, um die Rückerstattung abzuschließen, indem Sie sie genehmigen." +"Enabling this feature adds the option to hide this payment method after a certain number of failed attempts.","Durch Aktivieren dieser Funktion wird die Option hinzugefügt, diese Zahlungsmethode nach einer bestimmten Anzahl fehlgeschlagener Versuche auszublenden." +"When this number is exceeded, the payment method will be hidden. Minimum 1, maximum 10.","Wenn diese Anzahl überschritten wird, werden die Zahlungsmethoden ausgeblendet. Mindestens 1, höchstens 10." +"This message is shown when the payment method is hidden. Maximum 280 characters.","Diese Meldung wird angezeigt, wenn die Zahlungsmethode ausgeblendet ist. Maximal 280 Zeichen." +"Pay rejected: It is not allowed to specify another country for the invoice and delivery address for Afterpay transactions.","Pay rejected: Bei Afterpay-Transaktionen darf kein anderes Land für die Rechnungs- und Lieferadresse angegeben werden." +"-- Please Select Your Gender--","Bitte wähle dein Geschlecht aus" +"Show Issuer Selection in the Checkout","Bankauswahl im Checkout anzeigen" +"When the \"NO\" option is selected, the issuer selection for iDEAL will not be displayed in the checkout. Instead, customers will be redirected to a separate page where they can choose their iDEAL issuer (i.e., their bank). On the other hand, selecting the "Enable" option will display the issuer selection directly in the checkout. It's important to note that enabling this option will incur additional costs from Buckaroo. For precise cost details, please reach out to Buckaroo directly.","Wenn die Option 'Deaktiviert' ausgewählt ist, wird die Bankauswahl für iDEAL nicht im Checkout angezeigt. Stattdessen werden Kunden auf eine separate Seite weitergeleitet, auf der sie ihre eigene Bank auswählen können. Auf der anderen Seite wird das Aktivieren dieser Funktion die Bankauswahl direkt im Checkout anzeigen. Es ist wichtig zu beachten, dass das Aktivieren dieser Option zusätzliche Kosten von Buckaroo verursachen wird. Für genaue Kostenangaben können Sie sich direkt an Buckaroo wenden." +"Invoice Handling","Rechnungsverwaltung" +"Create Invoice on Payment","Rechnung erstellen bei Zahlung" +"Create Invoice on Shipment","Rechnung erstellen bei Versand" +"Select the moment when the invoice should be created.","Wählen Sie den Zeitpunkt aus, zu dem die Rechnung erstellt werden soll." +"Sort iDEAL banks","Die Reihenfolge der iDEAL-Anbieter" +"Sort PayByBank Banks","Die Reihenfolge der PayByBank-Anbieter" +"Sort Credit-debitcard issuers","Die Reihenfolge der Kredit- und Debitkartenherausgeber" +"Giftcard acquirer","Erwerber von Geschenkkarten" +"Select your giftcard supplier","Wählen Sie Ihren Geschenkkartenanbieter aus" +"You have canceled the payment request.","Sie haben die Zahlungsanforderung storniert." +"iDEAL Fast Checkout","iDEAL Schnellkauf" +"Enable","Aktiviert" +"Disable","Deaktiviert" +"Enable or disable the iDEAL Fast Checkout button.","Aktivieren oder deaktivieren Sie die iDEAL Schnellkauf-Schaltfläche." +"iDEAL Fast Checkout logo visibility","Sichtbarkeit des iDEAL Schnellkauf-Logos" +"iDEAL Fast Checkout logo scheme","Farbgebung des iDEAL Schnellkauf-Logos" +"Select the iDEAL fast checkout button (text) color.","Wählen Sie die (Text-)Farbe der iDEAL Schnellkauf-Schaltfläche." +"Select where you want the button to be visible. Multiple options can be selected at the same time.","Wählen Sie, wo die Schaltfläche sichtbar sein soll. Mehrere Optionen können gleichzeitig ausgewählt werden." +"Cart","Warenkorb" +"Light","Hell" +"Dark","Dunkel" +"Unable to create quote.","Angebot konnte nicht erstellt werden." +"An error occurred while processing your order","Beim Bearbeiten Ihrer Bestellung ist ein Fehler aufgetreten" +"Cannot create payment","Zahlung kann nicht erstellt werden" +"Failed to create quote","Angebotserstellung fehlgeschlagen" +"Failed to add address to quote","Adresse konnte dem Angebot nicht hinzugefügt werden" +"Buckaroo Hosted Fields Client ID:","Buckaroo Hosted Fields Client ID:" +"Buckaroo Hosted Fields Client Secret:","Buckaroo Hosted Fields Client Secret:" +"Enter your Buckaroo Hosted Fields Client ID, obtainable from the Buckaroo Plaza at → Settings → Token registration.","Geben Sie hier Ihren Buckaroo Hosted Fields Client ID ein, den Sie von der Buckaroo Plaza unter → Einstellungen → Tokenregistrierung." +"Enter your Buckaroo Hosted Fields Client Secret, obtainable from the Buckaroo Plaza at → Settings → Token registration.","Geben Sie hier Ihr Buckaroo Hosted Fields Client Secret ein, das Sie von der Buckaroo Plaza unter → Einstellungen → Tokenregistrierung." +"Mar","Mär" +"May","Mai" +"Oct","Okt" +"Dec","Dez" +"Mo","Mo" +"Tu","Di" +"We","Mi" +"Th","Do" +"Fr","Fr" +"Sa","Sa" +"Su","So" diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv index e13182196..a1357efe9 100644 --- a/i18n/de_DE.csv +++ b/i18n/de_DE.csv @@ -11,7 +11,7 @@ "Send order confirmation email","Bestellbestätigungs-E-Mail senden" "Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Aktivieren, um eine Bestellbestätigungs-E-Mail zu senden, wenn die Bestellung erstellt wird. Spezifisch für diese Zahlungsmethode." "Payment fee","Gebühr"Payment fee -"The above amount is calculated based on de Tax settings in Stores > Configuration > Sales > Tax.","Dieser Betrag wird basierend auf den Mehrwertsteuereinstellungen berechnet in: Stores > Configuration > Sales > Tax." +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Dieser Betrag wird basierend auf den Mehrwertsteuereinstellungen berechnet in: Stores > Configuration > Sales > Tax." "Payment fee frontend label","Zahlungsgebühren-Front-End-Etikett" "This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Das Etikett wird beim Checkout neben dem Zahlungsaufschlag sowie auf den Bestell-, Rechnungs-, Gutschriftseiten und im PDF angezeigt." "Max order amount (in Base Currency)","Maximaler Bestellbetrag (in Basiswährung)" @@ -80,12 +80,10 @@ "Select the maximum reminder level buckaroo will use.","Wählen Sie die maximale Erinnerungsstufe aus, die Buckaroo anwendet." "SEPA direct debit","SEPA-Autorisierung" "Enable SEPA direct debit","SEPA-Autorisierung activieren" -"Bancontact / Mister Cash","Bancontact / Mister Cash" -"Enable Bancontact / Mister Cash","Bancontact / Mister Cash activieren" +"Bancontact","Bancontact" +"Enable Bancontact","Bancontact activieren" "Please enter a valid BIC number","Bitte geben Sie eine gültige BIC-Nummer ein" "Please select a issuer from the list","Wählen Sie eine Bank aus der Liste aus" -"SOFORT","SOFORT" -"Enable SOFORT","SOFORT activieren" "Belfius","Belfius" "Enable Belfius","Belfius activieren" "Alipay","Alipay" @@ -97,8 +95,6 @@ "Enable Przelewy24","Przelewy24 activieren" "Trustly","Trustly" "Enable Trustly","Trustly activieren" -"Giropay","Giropay" -"Enable Giropay","Giropay activieren" "Refunding","Erstattung" "Enable or disable refunding.","Gutschrift/Rückerstattung aktivieren oder deaktivieren." "Set to 'No' refunds must be done manualy in Payment Plaza.","Mit der Auswahl 'Nein' werden Gutschriften in Magento bei Payment Plaza nicht angeboten." @@ -298,6 +294,7 @@ "Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." "Not Applicable","Unzutreffend" "Yes, I accept the terms and condition for the use of Riverty.","Ja, ich akzeptiere die Nutzungsbedingungen für Riverty." +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","Es gelten die allgemeinen Geschäftsbedingungen für die Zahlungsmethode Riverty. Die Datenschutzbestimmungen von Riverty findest Du hier." "Accept terms of use","Akzeptieren Sie die Allgemeinen Geschäftsbedingungen" "(DD/MM/YYYY)","(DD/MM/JJJJ)" "Any comments about this Beta release? Please let us know! ","Irgendwelche Kommentare zu dieser Beta-Version? Lass uns wissen! " diff --git a/i18n/de_LU.csv b/i18n/de_LU.csv new file mode 100644 index 000000000..e381bd765 --- /dev/null +++ b/i18n/de_LU.csv @@ -0,0 +1,492 @@ +"Buckaroo payment methods","Buckaroo-Zahlungsmethoden" +"Buckaroo Payment Methods","Buckaroo-Zahlungsmethoden" +"iDEAL","iDEAL" +"Enable iDEAL","iDEAL aktivieren" +"Enable or disable this payment method."," Aktivieren oder deaktivieren Sie diese Zahlungsmethode." +"Frontend label","Frontend-Label" +"Determines the frontend label shown.","Bestimmt das angezeigte Frontend-Label." +"Frontend sort order","Sortierung auf der Vorderseite" +"Determines the sorting of payment methods.","Bestimmt die Reihenfolge der Zahlungsarten auf der Vorderseite." +"Advanced Configuration","Erweiterte Optionen" +"Send order confirmation email","Bestellbestätigungs-E-Mail senden" +"Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Aktivieren, um eine Bestellbestätigungs-E-Mail zu senden, wenn die Bestellung erstellt wird. Spezifisch für diese Zahlungsmethode." +"Payment fee","Gebühr"Payment fee +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Dieser Betrag wird basierend auf den Mehrwertsteuereinstellungen berechnet in: Stores > Configuration > Sales > Tax." +"Payment fee frontend label","Zahlungsgebühren-Front-End-Etikett" +"This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Das Etikett wird beim Checkout neben dem Zahlungsaufschlag sowie auf den Bestell-, Rechnungs-, Gutschriftseiten und im PDF angezeigt." +"Max order amount (in Base Currency)","Maximaler Bestellbetrag (in Basiswährung)" +"Maximum order amount allowed.","Die Zahlungsmethode wird nicht über dem Höchstbetrag angezeigt." +"The payment method shows only for orders with an order amount smaller than the maximum amount.","Die Zahlungsart wird nur bei Bestellungen angezeigt, deren Gesamtsumme unter dem maximalen Bestellwert liegt." +"Min order amount (in Base Currency)","Mindest. Bestellbetrag (in Basiswährung)" +"Minimum order amount allowed.","Die Zahlungsmethode wird nicht unter Mindestbetrag angezeigt" +"The payment method shows only for orders with an order amount greater than the minimum amount.","Die Zahlungsart wird nur bei Bestellungen mit einem Gesamtwert über dem Mindestbestellwert angezeigt." +"Method specific status enabled","Methodenspezifischer Status aktiviert" +"Enable or disable specific status.","Aktivieren oder deaktivieren Sie einen bestimmten Status." +"Method specific success status","Methodenspezifischer Erfolgsstatus" +"Leave empty to use default 'success' status.","Lassen Sie dieses Feld leer, um den Standardstatus 'Erfolg' zu verwenden." +"Method specific failed status","Methodenspezifischer Fehlerstatus" +"Leave empty to use default 'failed' status.","Lassen Sie die Auswahl für den Standardstatus „Fehlgeschlagen“ leer." +"To make a new status available it needs to be assigned to the correct state. See Magento documentation about state and status.","Um einen Status zuzuweisen, muss dieser dem richtigen Zustand zugewiesen werden. Informationen zu 'Status' und 'Status' finden Sie in der Magento-Dokumentation." +"Allowed currencies","Akzeptierte Währungen" +"Select payment method specific currencies.","Wählen Sie eine bestimmte Währung für die Zahlungsmethode aus." +"Your contract with Buckaroo must allow for the selected currencies to be used with this payment method.","Die verfügbare Währung hängt vom Vertrag mit Buckaroo ab." +"Payment from applicable countries","Für die Zahlung zugelassenes Land" +"Payment from Specific Country","Zahlung aus bestimmten Ländern" +"Only available when set to 'specific countries'.","Nur verfügbar mit der Auswahl 'bestimmte Länder'." +"Display only for selected IPs","Nur für bestimmte IPs anzeigen" +"Show method only to Magento set IPs.","Nur für bestimmte in Magento festgelegte IPs anzeigen." +"Magento developer client restrictions.","Zeigen Sie diese Zahlungsmethode nur ausgewählten Magento-IPs an. Diese Option ist für Magento-Entwickler gedacht, wenn Sie eine bestimmte Zahlungsmethode testen möchten, ohne sie öffentlich zu zeigen." +"Credit and debit cards","Kartenzahlung" +"Enable credit and debit cards","Kartenzahlung aktivieren" +"Allowed credit and debit cards","Akzeptierte Kartenzahlung" +"Select payment method specific Credit and debit card.","Wählen Sie bestimmte Kartenzahlung für die Zahlungsmethode aus." +"American Express Specific","American Express-spezifisch" +"Verify address","Adressvalidierung" +"Set true to verify the address at American Express. Set false to disable address verification","Kreuzen Sie 'Ja' an, um die Adresse mit American Express zu bestätigen. Auf 'no' setzen, um die Adressüberprüfung zu deaktivieren." +"Maestro Specific","Maestro-spezifisch" +"Mastercard Specific","Mastercard-spezifisch" +"No SecureCode order status","Bestellstatus für Nicht-SecureCode-Bestellungen" +"Set no SecureCode orders onhold","Platzieren Sie keine SecureCode-Bestellungen in der Warteschleife" +"Hold orders which have no MasterCard SecureCode.","Bestellungen ohne MasterCard SecureCode werden zurückgestellt." +"Visa Specific","Visaspezifisch" +"No 3D Secure order status","Bestellstatus für Bestellungen ohne 3D Secure" +"Set no 3D Secure orders onhold","Platzieren Sie keine 3D Secure-Bestellungen in der Warteschleife" +"Hold orders which are not 3D Secure.","Bestellungen ohne 3D Secure by Visa werden zurückgestellt." +"Paypal","Paypal" +"Enable Paypal","PayPal aktivieren" +"Seller protection enabled","Profitieren Sie vom Verkäuferschutz" +"WARNING: Paypal Seller Protection requires additional configuration. Please consult Buckaroo for more information.","HINWEIS: Die Nutzung des PayPal-Verkäuferschutzes erfordert zusätzliche Einstellungen in der Magento-Konfiguration. Weitere Informationen finden Sie unter Buckaroo." +"Seller protection eligible","Verkäuferschutz vollumfänglich gewährt" +"Seller protection for unauthorized payment and item not received","Bei nicht autorisierter Zahlung und nicht erhaltener Ware wird Verkäuferschutz gewährt" +"Seller protection item not received","Verkäuferschutz Nicht erhaltene Ware" +"Seller protection for item not received","Für nicht erhaltene Ware wird Verkäuferschutz gewährt" +"Seller protection unauthorized payment","Verkäuferschutz Nicht autorisierte Zahlung" +"Seller protection for unauthorized payment","Bei nicht autorisierter Zahlung wird Verkäuferschutz gewährt" +"Seller protection ineligible","Kein Verkäuferschutz" +"Merchant is not protected by Seller Protection","Verkäuferschutz steht dem Händler nicht zu" +"Bank Transfer","Banküberweisung" +"Enable Bank Transfer","Banküberweisung aktivieren" +"Send payment instruction email","Zahlungsanweisung per E-Mail senden" +"Buckaroo sends an email to the customer with the payment procedures.","Eine E-Mail mit den Zahlungsanweisungen wird von Buckaroo gesendet." +"Set to 'No' the customer is informed once online.","Bei der Auswahl 'Nein' wird der Kunde einmalig nach Abschluss der Bestellung informiert." +"Due date (in days)","Fälligkeitsdatum (in Tagen)" +"The amount of days after the order date in which the customer has to complete the payment. After this period order will be cancelled. You can add this due date in the template of the Transfer email.","Die Anzahl der Tage nach dem Bestelldatum, in denen der Kunde die Zahlung abschließen muss. Nach Ablauf dieser Frist wird die Bestellung storniert. Sie können dieses Fälligkeitsdatum in der Vorlage der Überweisungs-E-Mail hinzufügen." +"Use credit management","Nutzen Sie das 'Kreditmanagement'" +"Buckaroo sends payment reminders to the customer.","Buckaroo versendet Zahlungserinnerungen an den Kunden." +"Contact Buckaroo before activating Credit Management. By default this is excluded in the contract.","Wenden Sie sich an Buckaroo, bevor Sie das Kreditmanagement aktivieren. Standardmäßig ist dies im Vertrag ausgeschlossen." +"Invoice delay (in days)","Rechnungsverzögerung (in Tagen)" +"Specify the amount of days before Buckaroo invoices the order and sends out the payment mail.","Geben Sie die Anzahl der Tage an, bevor Buckaroo die Bestellung in Rechnung stellt und die Zahlungsmail versendet." +"Max reminder level","Maximale Erinnerungsstufe" +"Select the maximum reminder level buckaroo will use.","Wählen Sie die maximale Erinnerungsstufe aus, die Buckaroo anwendet." +"SEPA direct debit","SEPA-Autorisierung" +"Enable SEPA direct debit","SEPA-Autorisierung activieren" +"Bancontact","Bancontact" +"Enable Bancontact","Bancontact activieren" +"Please enter a valid BIC number","Bitte geben Sie eine gültige BIC-Nummer ein" +"Please select a issuer from the list","Wählen Sie eine Bank aus der Liste aus" +"Belfius","Belfius" +"Enable Belfius","Belfius activieren" +"Alipay","Alipay" +"Enable Alipay","Alipay activieren" +"WeChatPay","WeChatPay" +"Enable WeChatPay","WeChatPay activieren" +"P24","P24" +"Przelewy24","Przelewy24" +"Enable Przelewy24","Przelewy24 activieren" +"Trustly","Trustly" +"Enable Trustly","Trustly activieren" +"Refunding","Erstattung" +"Enable or disable refunding.","Gutschrift/Rückerstattung aktivieren oder deaktivieren." +"Set to 'No' refunds must be done manualy in Payment Plaza.","Mit der Auswahl 'Nein' werden Gutschriften in Magento bei Payment Plaza nicht angeboten." +"Push Payment Plaza refunds to Magento","Akzeptieren Sie Payment Plaza-Rückerstattungen in Magento" +"Allow 2-way refunding from Magento and Payment Plaza.","Verarbeiten Sie die 'Rückerstattung' sowohl von Magento als auch von Payment Plaza." +"Enabled","Eingeschaltet" +"Enable or disable the Buckaroo module.","Aktivieren oder deaktivieren Sie das Buckaroo-Modul." +"Selecting 'Off' will overrule all individual settings.","Wenn Sie 'Aus“ wählen, werden alle individuellen Einstellungen überschrieben." +"Secret key","Secret key" +"Enter your Buckaroo Secret Key.","Fügen Sie Ihren Buckaroo 'Secret key' hinzu." +"The Secret Key can be retrieved in Payment Plaza under Configuration > Security > Secret Key. For support contact Buckaroo.","Der 'Secret Key' wird im Payment Plaza angezeigt unter 'Configuration > Security > Secret Key. Wenden Sie sich für Support an Buckaroo." +"(Merchant) key","(Merchant) key" +"Enter your Buckaroo merchant/website key.","Fügen Sie Ihren Buckaroo merchant/website key hinzu." +"The (Merchant) Key can be retrieved in Payment Plaza under My Buckaroo > Websites. For support contact Buckaroo.","Der '(Merchant)Key' wird angezeigt in the Buckaroo Payment Plaza unter My Buckaroo > Websites." +"(Merchant) guid","(Merchant) guid" +"Enter your Buckaroo merchant guid.","Fügen Sie Ihren Buckaroo-Guid code hinzu." +"The (Merchant) Guid can be retrieved in Payment Plaza under My Buckaroo > Details > Guid. For support contact Buckaroo.",""Die Händler-Guid wird im Buckaroo Payment Plaza angezeigt unter > My Buckaroo > Details > Guid." +"Transaction label","Transaktionsetikett" +"The transaction description in Payment Plaza.","Die Beschreibung der Transaktion in Payment Plaza." +"Certificate label","Zertifikatsetikett" +"Enter a name for the certificate. This is purely administrative.","Fügen Sie dem Zertifikat zur Identifizierung einen Namen hinzu." +"Upload your Buckaroo private key certificate","Laden Sie Ihr privates Schlüsselzertifikat (private key) von Buckaroo hoch'" +"Certificate file","Zertifikatsdatei" +"The certificate can be retrieved in Payment Plaza under Configuration > Security > Certificates. For support contact Buckaroo.","Das Zertifikat kann im Buckaroo Payment Plaza unter > Konfiguration > Sicherheit > Zertifikate abgerufen werden." +"These options are only intended for expert users. Tampering with the default settings may negatively affect the workflow and performance of all Buckaroo payment methods. Use at your own risk.","Diese Einstellungen sind nur für erfahrene Benutzer gedacht. Das Anpassen dieser Einstellungen kann die Funktion des Moduls und des Webshops beeinträchtigen. Benutzung auf eigene Gefahr." +"New status","Neuer Status" +"This status will be given to new orders.","Dieser Status wird neuen Bestellungen zugewiesen." +"Pending payment status","Offener Status der Zahlung" +"This status will be given to orders pending payment.","Dieser Status wird Bestellungen zugewiesen, die darauf warten, bezahlt zu werden." +"Payment success status","Zahlungserfolgsstatus" +"This status will be given to orders paid.","Dieser Status wird bezahlten Bestellungen gegeben." +"Payment failed status","Zahlungsstatus fehlgeschlagen" +"This status will be given to unsuccessful orders.","Dieser Status wird erfolglosen Bestellungen gegeben." +"Send transactional invoice email","Transaktionsrechnungs-E-Mail senden" +"Send a mail after successful creating the order.","Senden Sie nach erfolgreicher Erstellung der Bestellung eine E-Mail." +"Please enter a valid bank account holder name","Bitte geben Sie einen gültigen Namen des Bankkontoinhabers ein" +"Please enter a valid bank account number","Bitte geben Sie eine gültige Bankkontonummer ein" +"Create invoice after success","Rechnung nach Erfolg erstellen" +"If set to 'No' the order is not invoiced.","Wenn 'Nein' ausgewählt ist, wird keine Rechnung in Magento erstellt." +"Payment success status without invoice","Erfolgsstatus ohne Rechnung" +"Redirect url after 'Success'","Umleitungs-URL nach 'Erfolg'" +"Redirect after successful payments.","Weiterleitung nach erfolgreicher Zahlung." +"Redirect url after 'Failure'","Umleitungs-URL nach 'Fehler'" +"Redirect after failed payments.
Please note that this setting does not apply to all express payment methods, such as iDEAL fast checkout.","Weiterleitung nach fehlgeschlagenen Zahlungen.
Bitte beachten Sie, dass diese Einstellung nicht für alle Express-Zahlungsmethoden gilt, wie zum Beispiel die iDEAL-Schnellkasse." +"'Canceled' state on failed payment","'Status 'Storniert' bei fehlgeschlagener Zahlung" +"Orders will stay open after failed payments.","Bestellungen bleiben nach fehlgeschlagenen Zahlungen offen." +"Debug email","E-Mail debuggen" +"Transaction data send as raw data.","Transaktionsdaten werden als Rohdaten gesendet." +"Fee percentage mode","Gebührenprozentsatzmodus" +"This setting only applies to percentage-based Buckaroo fees.
Please choose over which amount the fee percentage is calculated.","Diese Einstellung gilt nur für prozentuale Buckaroo-Gebühren.
Bitte wählen Sie aus, über welchen Betrag der Gebührenprozentsatz berechnet wird.." +"Please enter these fields as they appear on your bank account.","Bitte füllen Sie diese Felder so aus, wie sie auf Ihrem Bankkonto erscheinen." +"You will receive an email with further payment instructions when you place your order.","Sie erhalten eine E-Mail mit weiteren Zahlungsanweisungen, wenn Sie Ihre Bestellung aufgeben." +"Legend","Legende" +"Payment method","Zahlungsmethode" +"Disabled","Ausgeschaltet" +"Test Mode","Testmodus" +"Live Mode","Live-Modus" +"Magento & 3rd party version compatibility","Magento & Kompatibilität mit Drittanbieterversionen" +"Magento version compatibility","Kompatibilität der Magento-Version" +"Magento Community Edition version","Magento Community Edition-Version" +"Magento Enterprise Edition version","Magento Enterprise Edition-Version" +"Quick reference guide","Kurzanleitung" +"Log in to the ","Melden Sie sich an " +"Buckaroo Payment Plaza","Buckaroo Payment Plaza" +" to collect the following security settings:"," um die folgenden Sicherheitseinstellungen zu sammeln:" +"Support","Die Unterstützung" +"This extension is developed by Buckaroo.","Diese Erweiterung wird von Buckaroo entwickelt." +"Extension basic configuration and account information","Basiskonfiguration der Erweiterung und Kontoinformationen" +"Buckaroo Payment Plaza:","Buckaroo Payment Plaza:" +"Phone:","Telefon:" +"E-mail:","Email:" +"Extension support and advanced configuration","Erweiterungsunterstützung und erweiterte Konfiguration" +"Online documentation and FAQ:","Online-Dokumentation und FAQ:" +"Support question:","Supportfrage:" +"Support by email:","Unterstützung per E-Mail:" +"Documentation","Dokumentation" +"A list of documents regarding the extension.","Eine Liste der Dokumente zur Verlängerung." +"Download a PDF format of the manual. Currently the manual is only available in English.","Laden Sie ein PDF-Format des Handbuchs herunter. Derzeit ist das Handbuch nur in englischer Sprache verfügbar." +"View the complete changelog of the module. Currently the changelog is only available in Dutch.","Zeigen Sie das vollständige Änderungsprotokoll des Moduls an. Derzeit ist das Änderungsprotokoll nur auf Niederländisch verfügbar." +"Installation Manual Buckaroo.pdf (NL)","Installationshandbuch Buckaroo.pdf (NL)" +"Full Changelog","Vollständige Übersicht über die Änderungen" +"Selected card: %1","Ausgewählte Karte: %1" +"Tax Class for Buckaroo Fee","Steuerklasse für die Buckaroo-Gebühr" +"Display Buckaroo Fee Prices","Gebührenpreise von Buckaroo anzeigen" +"Buckaroo","Buckaroo" +"Version & Support","Ausführung & untersteuern" +"General configuration and account information","Allgemeine Konfigurations- und Kontoinformationen" +"(Merchant) key","(Merchant) key" +"Debug information will be sent to these comma-separated email addresses","Debug-Informationen werden an diese durch Kommas getrennten E-Mail-Adressen gesendet" +"Debugging","Debuggen" +"Decide what to debug. Log files will be created within the var/log/Buckaroo/ directory.","Bestimmen Sie, was protokolliert wird. Protokolldateien werden im Ordner var/log/Buckaroo/ erstellt." +"Please enter a valid number: '%1'.","Bitte geben Sie eine gültige Nummer ein: '%1'." +"This sets whether buckaroo payment fee amounts entered from Magento Admin include tax","Hiermit wird festgelegt, ob die von Magento Admin eingegebenen Gebührenbeträge für Buckaroo-Zahlungen Steuern enthalten." +"Excluding Tax","Steuer nicht inbegriffen" +"Including Tax","Mit Steuern" +"Including and Excluding Tax","Einschließlich und ohne Steuern" +"None","Keiner" +"All Allowed Countries","Alle zulässigen Länder" +"Specific Countries","Bestimmte Länder" +"You have not yet uploaded any certificate files","Sie haben noch keine Zertifikatsdateien hochgeladen" +"No certificate selected","Kein Zertifikat ausgewählt" +"Do not log debug information","Keine Debug-Informationen protokollieren" +"Log to file","In Datei protokollieren" +"Mail to debug email","E-Mail zum Debuggen von E-Mails" +"Log to file and mail to debug email","In Datei protokollieren und E-Mail zum Debuggen von E-Mails senden" +"Off","Aus" +"Test","Testmodus" +"Live","Live-Modus" +"Subtotal","Zwischensumme" +"Subtotal incl. tax","Zwischensumme inkl. MwSt" +"Grand Total","Gesamtsumme" +"-- Please Select --","-- Bitte auswählen --" +"Buckaroo refund is disabled","Buckaroo-Rückerstattung ist deaktiviert" +"Buckaroo refund push validation failed","Push-Validierung der Buckaroo-Rückerstattung fehlgeschlagen" +"The credit memo\'s total must be positive.","Die Summe der Gutschriften muss positiv sein." +"Failed to create the creditmemo","Die Gutschrift konnte nicht erstellt werden" +"Payment Fee","Gebühr" +"Refund failed ! Status : %1 and the order does not contain an invoice",""Rückerstattung fehlgeschlagen ! Status: %1 und die Bestellung enthält keine Rechnung" +"Skipped handling this push, duplicate","Bearbeitung dieses Pushs übersprungen, Duplikat +"Signature from push is incorrect","Signatur von Push ist falsch" +"Signature from push is correct but the order can not receive updates","Die Signatur von Push ist korrekt, aber die Bestellung kann keine Updates erhalten" +"There was no order found by transaction Id","Er wird von der Transaktions-ID bestimmt" +"Invalid status send by buckaroo, but the payment amount was correct.","Ungültiger Status von buckaroo gesendet, aber der Zahlungsbetrag war korrekt." +"Order can not be invoiced","Bestellung kann nicht in Rechnung gestellt werden" +"Buckaroo Pending Payment","Buckaroo wartet auf die Zahlung" +"Refund Reward Points","Treuepunkte" +"Buckaroo Fee for Order","Buckaroo-Gebühr für die Bestellung" +"order","bestellen" +"Buckaroo Fee","Buckaroo-Gebühr" +"Place Order","Bestellung aufgeben" +"Select a bank:","Wählen Sie eine Bank aus:" +"BIC number:","BIC-Nummer:" +"Select a Credit Card or Debit Card:","Wählen Sie eine Kredit- oder Debitkarte aus:" +"Bank account holder","Kontoinhaber" +"Bank account number","Kontonummer" +"BIC Number","BIC-Nummer" +"Disallowed file type.","Ungültiger Dateityp." +"Enter a name for the certificate.","Geben Sie einen Namen für das Zertifikat ein." +"Online refunds are currently disabled for Buckaroo payment methods.","Online-Rückerstattungen sind derzeit für Buckaroo-Zahlungsmethoden deaktiviert." +"Adjustment Refund","Anpassungsrückerstattung" +"Adjustment Fee","Anpassungsgebühr" +"Unfortunately an error occurred while processing your payment. Please try again. If this error persists, please choose a different payment method.","Leider ist bei der Verarbeitung Ihrer Zahlung ein Fehler aufgetreten. Bitte versuche es erneut. Wenn dieser Fehler weiterhin besteht, wählen Sie bitte eine andere Zahlungsmethode." +"Riverty","Riverty" +"Enable Riverty","Riverty activieren" +"Giftcard","Geschenkkarte" +"Enable Giftcard","Geschenkkarte aktivieren" +"PayPerEmail","PayPerEmail" +"Enable PayPerEmail","PayPerEmail activieren" +"PayLink","PayLink" +"Enable PayLink","PayLink activieren" +"Combined","Kombiniert" +"Separate authorize and capture","Autorisieren und erfassen getrennt" +"Payment flow","Zahlungsfluss" +"Whether to use separate authorize and capture calls or to use a combined 'pay' call.","Ob getrennte Autorisierungs- und Erfassungsanrufe oder ein kombinierter 'Bezahl'-Anruf verwendet werden sollen." +"Eps","Eps" +"Enable Eps","EPS activieren" +"This is a required field.","Dies ist ein Pflichtfeld." +"You should be at least 18 years old.","Du solltest mindestens 18 Jahre alt sein." +"Phone number should be correct.","Telefonnummer sollte stimmen." +"Enter Valid IBAN","Geben Sie eine gültige IBAN ein" +"Enter Valid BIC number","Geben Sie eine gültige BIC-Nummer ein" +" (Excl. Tax)"," (exkl. MwSt.)" +" (Incl. Tax)"," (inkl. Steuern)" +"Please enter a valid currency: '%1'.","Bitte geben Sie eine gültige Währung ein: '%1'." +"Merchant is protected by PayPal Seller Protection Policy for both Unauthorized Payment and Item Not Received.","Der Händler ist durch die PayPal-Verkäuferschutzrichtlinie sowohl für nicht autorisierte Zahlungen als auch für nicht erhaltene Artikel geschützt." +"Merchant is protected by Paypal Seller Protection Policy for Item Not Received.","Der Händler ist durch die Paypal-Verkäuferschutzrichtlinie für nicht erhaltene Artikel geschützt." +"Merchant is protected by Paypal Seller Protection Policy for Unauthorized Payment.","Der Händler ist durch die Paypal-Verkäuferschutzrichtlinie für nicht autorisierte Zahlungen geschützt." +"Merchant is not protected under the Seller Protection Policy.","Der Händler ist nicht durch die Verkäuferschutzrichtlinie geschützt." +"Not enough paid: %1 has been transfered. Order grand total was: %2.","Nicht genug bezahlt: %1 wurde transferiert. Die Gesamtsumme der Bestellung war: %2." +"Too much paid: %1 has been transfered. Order grand total was: %2.","Zu viel bezahlt: %1 wurde transferiert. Die Gesamtsumme der Bestellung war: %2." +"Buckaroo New","Buckaroo Neu" +"Buckaroo Pending Payment","Buckaroo wartet auf die Zahlung" +"'%s' data type is invalid. String is expected.","'%s' Datentyp ist ungültig. Zeichenkette wird erwartet." +"Before contacting Buckaroo technical support, please retrieve your (Merchant) key, Secret key, certificate and certificate thumbprint.","Bevor Sie sich an den technischen Support von Buckaroo wenden, rufen Sie bitte Ihren Händler-Schlüssel, geheimen Schlüssel, Zertifikat und Zertifikat-Fingerabdruck ab." +"A list of documents regarding the extension.","Eine Liste der Dokumente zur Verlängerung." +"Installation and Configuration Manual Buckaroo.pdf","Installations- und Konfigurationshandbuch Buckaroo.pdf" +"View the complete release notes of the extension. Currently the release notes is only available in English.","Sehen Sie sich die vollständigen Versionshinweise der Erweiterung an. Derzeit sind die Versionshinweise nur auf Englisch verfügbar." +"Full Release Notes","Vollständige Versionshinweise" +"(Excluding Tax)","((Steuer nicht inbegriffen)" +"(Including Tax)","(Mit Steuern)" +"Salutation","Anrede" +"Mr.","Herr." +"Mrs.","Frau." +"Unknown","Unbekannt" +"Billing Name:","Fakturname:" +"Telephone:","Telefon:" +"Date of Birth:","Geburtsdatum:" +"Bank Account Number:","Kontonummer:" +"Business Model:","Geschäftsmodell:" +"B2C - Business to Consumer","B2C - Business to Consumer" +"B2B - Business to Business","B2B - Business to Business" +"COC Number:","Handelskammer nummer" +"Company Name:","Name der Firma" +"Cost Center:","Kostenstelle:" +"VAT Number:","Umsatzsteuer-Identifikationsnummer:" +"Terms and Conditions:","Geschäftsbedingungen:" +"Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." +"Not Applicable","Unzutreffend" +"Yes, I accept the terms and condition for the use of Riverty.","Ja, ich akzeptiere die Nutzungsbedingungen für Riverty." +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","Es gelten die allgemeinen Geschäftsbedingungen für die Zahlungsmethode Riverty. Die Datenschutzbestimmungen von Riverty findest Du hier." +"Accept terms of use","Akzeptieren Sie die Allgemeinen Geschäftsbedingungen" +"(DD/MM/YYYY)","(DD/MM/JJJJ)" +"Any comments about this Beta release? Please let us know! ","Irgendwelche Kommentare zu dieser Beta-Version? Lass uns wissen! " +"Buckaroo version","Buckaroo-Version" +"The transaction will be processed using %s.","Die Zahlung wird bearbeitet mit %s." +"The order has already been processed.","Die Bestellung wurde bereits bearbeitet." +"push notification for refund has no success status, ignoring.","Push-Benachrichtigung für Rückerstattung hat keinen Erfolgsstatus, wird ignoriert. " +"Warning:","Warnung:" +"Aufgrund zusammengesetzter Rundungsfehler in Magento bei der Verwendung von anderen Währungen als der Basiswährung des Shops beim Erstellen von Rückerstattungen kann der Betrag, den Sie zurückerstatten, einige Cent mehr oder weniger als beabsichtigt betragen. Wenn Sie sicherstellen möchten, dass der korrekte Betrag erstattet wird, erstellen Sie bitte eine Offline-Erstattung und verwenden Sie dann Buckaroos Zahlungsplatz, um die eigentliche Rückerstattung vorzunehmen.","Wegens oplopende afrondingsfouten in Magento wanneer gekrediteerd wordt in een andere valuta dan de winkel's basisvaluta, kan het voorkomen dat er enkele centen verschil zitten tussen het bedrag dat gekrediteerd moet worden en het bedrag dat daadwerkelijk teruggestort wordt. Indien u zeker wilt zijn dat het juiste bedrag teruggestort wordt, kunt u het beste een offline refund aanmaken en het eigenlijke bedrag terugstorten vanuit Buckaroo's Payment Plaza." +"support.buckaroo.nl","support.buckaroo.nl" +"Website","Website" +"www.buckaroo-payments.com","www.buckaroo.com" +"Buckaroo Request Form","Buckaroo-Anfrageformular" +"Buckaroo Knowledge Base","Buckaroo-Wissensdatenbank" +"Dankort Specific","Dankort-spezifisch" +"Hold orders which are not 3D Secure.","Bestellungen ohne 3D Secure by Dankort werden zurückgestellt." +"Buckaroo Giftcards","Buckaroo-Geschenkkarten" +"Giftcards","Geschenkkarten" +"Enable Giftcards","Geschenkkarten aktivieren" +"Allowed giftcards","Akzeptierte Geschenkkarten" +"Select which giftcards are available to the customer. You can add new cards in Stores > Buckaroo giftcards.","Wählen Sie aus, welche Geschenkkarten für den Kunden verfügbar sind. Sie können neue Karten unter 'Stores > Buckaroo-Geschenkkarten' hinzufügen." +"These options will be presented to the customer after Buckaroo has received the order. If left blank, the available options will be based on which Buckaroo payment options you have enabled.","Diese Optionen werden dem Kunden nach Eingang der Bestellung bei Buckaroo präsentiert. Wenn Sie das Feld leer lassen, basieren die verfügbaren Optionen darauf, welche Buckaroo-Zahlungsoptionen Sie aktiviert haben." +"You have not yet added any giftcards","Es wurden noch keine Geschenkkarten hinzugefügt" +"Add New Giftcard","Neuen Geschenkgutschein hinzufügen" +"Service Code","Service code" +"Name","Name" +"Label","Etikett" +"Save","Speichern" +"Delete","Löschen" +"Save and Continue","Speichern und fortfahren" +"Edit Giftcard '%s'","Geschenkkarte ändern '%s'" +"Add Giftcard","Geschenkkarte hinzufügen" +"This giftcard no longer exists.","Diese Geschenkkarte existiert nicht mehr." +"The giftcard has been saved.","Die Geschenkkarte wurde gespeichert." +"The giftcard has been deleted.","Die Geschenkkarte wurde entfernt." +"My billing and shipping address are the same", "Meine Rechnungs- und Lieferadresse sind identisch" +"Select a Credit Card or Debit Card", "Wählen Sie eine Kredit- oder Debitkarte aus" +"Salutation:","Anrede:" +"Send payment email","Zahlungs-E-Mail senden" +"Whether to use separate order/authorization and capture/invoice calls or to use a combined 'payment invitation' call.","Ob separate Bestell-/Autorisierungs- und Erfassungs-/Rechnungsanrufe oder ein kombinierter 'Zahlungsaufforderungs'-Aufruf verwendet werden soll." +"The selected payment method does not support the selected currency or the store's base currency.","Die ausgewählte Zahlungsmethode unterstützt die ausgewählte Währung oder die Basiswährung des Shops nicht." +"Invoice with id \"%1\" does not exist.","Rechnung mit der ID \"%1\" existiert nicht." +"The payment of the Customer's payment will be outsourced to Buckaroo. The invoice indicates how to pay the invoice (after reception of goods and/or services). The invoice must be paid within 14 (fourteen) days after the invoice date.","Die Zahlung der Zahlung des Kunden wird an Buckaroo ausgelagert. Die Rechnung gibt an, wie die Rechnung zu bezahlen ist (nach Erhalt der Waren und/oder Dienstleistungen). Die Rechnung ist innerhalb von 14 (vierzehn) Tagen nach Rechnungsdatum zu bezahlen." +"You must check this box to indicate that you agree to the terms and conditions.","Sie müssen dieses Kästchen ankreuzen, um anzugeben, dass Sie den Nutzungsbedingungen zustimmen." +"According to our system, you have canceled the payment. If this is not the case, please contact us.","Laut unserem System haben Sie die Zahlung storniert. Sollte dies nicht der Fall sein, kontaktieren Sie uns bitte.." +"Default Configuration","Standardkonfiguration" +"Credit Management Enabled","Kreditverwaltung aktiviert" +"Credit Management Scheme Key. It can be found here. This requires the Buckaroo Credit Management subscription.","Schlüssel des Kreditverwaltungssystems. Es kann hier gefunden werden. Hierfür ist das Abonnement von Buckaroo Credit Management erforderlich." +"Credit Management payment methods","Zahlungsmethoden für das Kreditmanagement" +"Credit management steps","Schritte im Kreditmanagement" +"Max level of the Credit Management steps.","Max. Stufe der Kreditverwaltungsschritte." +"Credit Management Due date","Kreditmanagement Fälligkeitsdatum" +"The amount of days after the order date, after which the Credit Management scheme will start.","Die Anzahl der Tage nach dem Bestelldatum, nach denen das Kreditverwaltungsprogramm beginnt." +"PayPerEmail payment methods", "PayPerEmail-Zahlungsmethoden" +"Show other active payment methods", "Andere aktive Zahlungsmethoden anzeigen" +"Select which paymethod can be used at PayPerEmail.","Wählen Sie aus, welche Zahlungsmethode bei PayPerEmail verwendet werden kann." +"Select which payment methods can be used after the payment due date.","Wählen Sie aus, welche Zahlungsmethoden nach dem Fälligkeitsdatum der Zahlung verwendet werden können." +"Billing First Name:","Vorname Rechnung:" +"Billing Last Name:","Rechnungsnachname:" +"Email:","Email" +"Frontend","Frontend" +"Backend","Backend" +"Frontend and Backend","Frontend und Backend" +"Black","Schwarz" +"White","Witz" +"White outline","Weißer Umriss" +"Select where this payment method will be available.","Wählen Sie aus, wo diese Zahlungsmethode verfügbar sein soll." +"Cannot Refund via Magento Backend. Partial refunds combined with a payment fee can only be refunded via the Buckaroo Payment Plaza, see also the KB article.
Open a new window to the Buckaroo Payment Plaza.","Rückerstattung über Magento Backend nicht möglich. Teilerstattungen in Verbindung mit einer Zahlungsgebühr können nur über die Buckaroo Payment Plaza erstattet werden, siehe auch die KB-Artikel.
Öffnen Sie ein neues Fenster zum Buckaroo Payment Plaza." +"Cannot refund this order via Magento Backend for now, we are working on a solution! Credit Management orders can only be refunded via the Buckaroo Payment Plaza.
Open a new window to the Buckaroo Payment Plaza.","Kann diese Bestellung vorerst nicht über Magento Backend zurückerstatten, wir arbeiten an einer Lösung! Credit Management-Bestellungen können nur über Buckaroo Payment Plaza erstattet werden.
Öffnen Sie ein neues Fenster zum Buckaroo Payment Plaza." +"Webshops","Webshops" +"Extensions","Erweiterungen" +"Commerce","Handel" +"Your PHP version","Ihre PHP-Version" +"Your order has been placed successfully.","Ihre Bestellung wurde erfolgreich aufgegeben." +"The payment methods of the Buckaroo Extension can be found under","Die Zahlungsmethoden der Buckaroo Extension finden Sie unter" +"Configuration > Sales > Payment Methods > Buckaroo","Konfiguration > Verkauf > Zahlungsmethoden > Buckaroo" +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Language","Sprache" +"Dutch","Niederländisch" +"English","Englisch" +"There was no transaction ID found","Es wurde keine Transaktions-ID gefunden" +"Digital Debit Authorization","Digitale Einzugsermächtigung" +"Enable Digital Debit Authorization","Digitale Einzugsermächtigung activieren" +"Type authorization","Autorisierungstyp" +"One-Off","Einmalig" +"Recurring","Wiederkehrend" +"One-Off means that the authorization can be used for an one-off direct debit. Recurring means that the authorization will be used for multiple direct debits.","Einmalig bedeutet, dass die Ermächtigung für einen einmaligen Lastschrifteinzug genutzt werden kann. Wiederkehrend bedeutet, dass die Autorisierung für mehrere Lastschriften verwendet wird." +"Authorization description","Berechtigungsbeschreibung" +"Enter a desciption that the customer will recognize as the authorization here, e.g. your webshop or company name.","Geben Sie hier eine Beschreibung ein, die der Kunde als Berechtigung erkennt, z. Ihr Webshop oder Firmenname." +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Identification number:","Identifikationsnummer:" +"(Or click here for the French translation: terms and condition.)","(Oder klicken Sie hier für die französische Übersetzung: Geschäftsbedingungen.)" +"You have canceled the order. We kindly ask you to not complete the payment in the Payconiq app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung nicht in der Payconiq-App abzuschließen – Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Or CVV or CVC.","Oder CVV oder CVC." +"A 3 or 4 digit code located to the right of signature strip on the back of your card, separate from the card number.","Ein 3- oder 4-stelliger Code rechts neben dem Unterschriftsstreifen auf der Rückseite Ihrer Karte, getrennt von der Kartennummer." +"Year:","Jahr:" +"Month:","Monat:" +"Card:","Karte:" +"Card number:","Kartennummer:" +"Name on card:","Kartenhalter:" +"Cvc / Cvv Code:","Cvc / Cvv-Code:" +"Please make sure all fields are filled in correctly before proceeding.","Bitte stellen Sie sicher, dass alle Felder korrekt ausgefüllt sind, bevor Sie fortfahren." +"Orders with discount and paid with Klarna can not be partially invoiced. %1 More Information %2","Bestellungen mit Rabatt, die mit Klarna bezahlt wurden, können nicht teilweise in Rechnung gestellt werden. %1 Mehr Informationen %2" +"Select a card","Wählen Sie eine Karte aus" +"Select a month","Wähle einen Monat" +"Select a year","Wählen Sie ein Jahr aus" +"Card:","Karte:" +"Security Code:","Sicherheitscode:" +"Select a card","Wählen Sie eine Karte aus" +"Select a month","Wähle einen Monat" +"Select a year","Wählen Sie ein Jahr aus" +"Enable Apple Pay","Apple Pay aktivieren" +"Your payment could not be processed","Ihre Zahlung konnte nicht verarbeitet werden" +"Capayable Postpay","Capayable Nachzahlung" +"Enable In3","In3 aktivieren" +"Enable Capayable Postpay","Capayable Nachzahlung activieren" +"In3 version","In3-Version" +"The In3 version can be found in your Capayable contract.","Die In3-Version finden Sie in Ihrem Capayable-Vertrag." +"Product Page","Produktseite" +"Card","Karte" +"Error: postcode is required","Fehler: Postleitzahl ist erforderlich", +"Delivery costs","Versandkosten" +"Discount","Rabatt" +"Shipping fee","Versandkosten" +"Service costs","Servicekosten" +"Your paid successfully. Please finish your order","Sie haben erfolgreich bezahlt. Bitte schließen Sie Ihre Bestellung ab." +"Apply Gift Card","Geschenkkarte beantragen" +"Pay remaining amount: %1 %2","Restbetrag zahlen: %1 %2" +"A partial payment of %1 %2 was successfully performed on a requested amount. Remainder amount %3 %4","Eine Teilzahlung von %1 %2 wurde erfolgreich für einen angeforderten Betrag durchgeführt. Restbetrag %3 %4" +"Paid with","Bezahlt mit" +"Follow the instructions on the payment terminal","Folgen Sie den Anweisungen am Zahlungsterminal" +"Your order will be completed as soon as payment has been made","Ihre Bestellung wird abgeschlossen, sobald die Zahlung erfolgt ist" +"The transaction has not been completed, please try again","Die Transaktion wurde nicht abgeschlossen, bitte versuchen Sie es erneut" +"Cancel","Absagen" +"Credit card","Kreditkarte" +"Bancontact card","Bancontact-Karte" +"Mobile application","Mobile Applikation" +"You have canceled the order. We kindly ask you to not complete the payment in the Bancontact app - Your order will not be processed. Place the order again if you still want to make the payment.","Sie haben die Bestellung storniert. Wir bitten Sie, die Zahlung in der Bancontact-App nicht abzuschließen - Ihre Bestellung wird nicht bearbeitet. Geben Sie die Bestellung erneut auf, wenn Sie die Zahlung dennoch vornehmen möchten." +"Scan the code below within 15 minutes with the ","Scannen Sie den unten stehenden Code innerhalb von 15 Minuten mit dem" +"Bancontact app","Bancontact-App" +"You must be 18 or older to pay for the products below","Sie müssen mindestens 18 Jahre alt sein, um die folgenden Produkte zu bezahlen" +"Age verification","Altersüberprüfung" +"Verify your age via iDIN","Verifizieren Sie Ihr Alter über iDIN" +"Select your bank","Wählen Sie Ihre Bank aus" +"Card number or pin not valid","Kartennummer oder PIN ungültig" +"Check with Buckaroo whether Client Side Encryption is enabled, otherwise transactions will fail. If in doubt, please contact us.","Erkundigen Sie sich bei Buckaroo, ob Client Side Encryption aktiviert ist, andernfalls schlagen Transaktionen fehl. Im Zweifelsfall kontaktieren Sie uns bitte." +"The refund has been initiated but it is waiting for a approval. Login to the Buckaroo Plaza to finalize the refund by approving it.","Die Rückerstattung wurde eingeleitet, wartet jedoch auf eine Genehmigung. Melden Sie sich auf der Buckaroo Plaza an, um die Rückerstattung abzuschließen, indem Sie sie genehmigen." +"Enabling this feature adds the option to hide this payment method after a certain number of failed attempts.","Durch Aktivieren dieser Funktion wird die Option hinzugefügt, diese Zahlungsmethode nach einer bestimmten Anzahl fehlgeschlagener Versuche auszublenden." +"When this number is exceeded, the payment method will be hidden. Minimum 1, maximum 10.","Wenn diese Anzahl überschritten wird, werden die Zahlungsmethoden ausgeblendet. Mindestens 1, höchstens 10." +"This message is shown when the payment method is hidden. Maximum 280 characters.","Diese Meldung wird angezeigt, wenn die Zahlungsmethode ausgeblendet ist. Maximal 280 Zeichen." +"Pay rejected: It is not allowed to specify another country for the invoice and delivery address for Afterpay transactions.","Pay rejected: Bei Afterpay-Transaktionen darf kein anderes Land für die Rechnungs- und Lieferadresse angegeben werden." +"-- Please Select Your Gender--","Bitte wähle dein Geschlecht aus" +"Show Issuer Selection in the Checkout","Bankauswahl im Checkout anzeigen" +"When the \"NO\" option is selected, the issuer selection for iDEAL will not be displayed in the checkout. Instead, customers will be redirected to a separate page where they can choose their iDEAL issuer (i.e., their bank). On the other hand, selecting the "Enable" option will display the issuer selection directly in the checkout. It's important to note that enabling this option will incur additional costs from Buckaroo. For precise cost details, please reach out to Buckaroo directly.","Wenn die Option 'Deaktiviert' ausgewählt ist, wird die Bankauswahl für iDEAL nicht im Checkout angezeigt. Stattdessen werden Kunden auf eine separate Seite weitergeleitet, auf der sie ihre eigene Bank auswählen können. Auf der anderen Seite wird das Aktivieren dieser Funktion die Bankauswahl direkt im Checkout anzeigen. Es ist wichtig zu beachten, dass das Aktivieren dieser Option zusätzliche Kosten von Buckaroo verursachen wird. Für genaue Kostenangaben können Sie sich direkt an Buckaroo wenden." +"Invoice Handling","Rechnungsverwaltung" +"Create Invoice on Payment","Rechnung erstellen bei Zahlung" +"Create Invoice on Shipment","Rechnung erstellen bei Versand" +"Select the moment when the invoice should be created.","Wählen Sie den Zeitpunkt aus, zu dem die Rechnung erstellt werden soll." +"Sort iDEAL banks","Die Reihenfolge der iDEAL-Anbieter" +"Sort PayByBank Banks","Die Reihenfolge der PayByBank-Anbieter" +"Sort Credit-debitcard issuers","Die Reihenfolge der Kredit- und Debitkartenherausgeber" +"Giftcard acquirer","Erwerber von Geschenkkarten" +"Select your giftcard supplier","Wählen Sie Ihren Geschenkkartenanbieter aus" +"You have canceled the payment request.","Sie haben die Zahlungsanforderung storniert." +"iDEAL Fast Checkout","iDEAL Schnellkauf" +"Enable","Aktiviert" +"Disable","Deaktiviert" +"Enable or disable the iDEAL Fast Checkout button.","Aktivieren oder deaktivieren Sie die iDEAL Schnellkauf-Schaltfläche." +"iDEAL Fast Checkout logo visibility","Sichtbarkeit des iDEAL Schnellkauf-Logos" +"iDEAL Fast Checkout logo scheme","Farbgebung des iDEAL Schnellkauf-Logos" +"Select the iDEAL fast checkout button (text) color.","Wählen Sie die (Text-)Farbe der iDEAL Schnellkauf-Schaltfläche." +"Select where you want the button to be visible. Multiple options can be selected at the same time.","Wählen Sie, wo die Schaltfläche sichtbar sein soll. Mehrere Optionen können gleichzeitig ausgewählt werden." +"Cart","Warenkorb" +"Light","Hell" +"Dark","Dunkel" +"Unable to create quote.","Angebot konnte nicht erstellt werden." +"An error occurred while processing your order","Beim Bearbeiten Ihrer Bestellung ist ein Fehler aufgetreten" +"Cannot create payment","Zahlung kann nicht erstellt werden" +"Failed to create quote","Angebotserstellung fehlgeschlagen" +"Failed to add address to quote","Adresse konnte dem Angebot nicht hinzugefügt werden" +"Buckaroo Hosted Fields Client ID:","Buckaroo Hosted Fields Client ID:" +"Buckaroo Hosted Fields Client Secret:","Buckaroo Hosted Fields Client Secret:" +"Enter your Buckaroo Hosted Fields Client ID, obtainable from the Buckaroo Plaza at → Settings → Token registration.","Geben Sie hier Ihren Buckaroo Hosted Fields Client ID ein, den Sie von der Buckaroo Plaza unter → Einstellungen → Tokenregistrierung." +"Enter your Buckaroo Hosted Fields Client Secret, obtainable from the Buckaroo Plaza at → Settings → Token registration.","Geben Sie hier Ihr Buckaroo Hosted Fields Client Secret ein, das Sie von der Buckaroo Plaza unter → Einstellungen → Tokenregistrierung." +"Mar","Mär" +"May","Mai" +"Oct","Okt" +"Dec","Dez" +"Mo","Mo" +"Tu","Di" +"We","Mi" +"Th","Do" +"Fr","Fr" +"Sa","Sa" +"Su","So" diff --git a/i18n/es_ES.csv b/i18n/es_ES.csv index 37a3d4c79..c8d8d0aa6 100644 --- a/i18n/es_ES.csv +++ b/i18n/es_ES.csv @@ -11,7 +11,7 @@ "Send order confirmation email","Enviar correo electrónico de confirmación de pedido" "Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Activar para enviar un correo electrónico de confirmación de pedido al cliente cuando se crea correctamente el pedido. Específico para este método de pago." "Payment fee","Tarifa de pago" -"The above amount is calculated based on de Tax settings in Stores > Configuration > Sales > Tax.","La cantidad anterior se calcula a partir de los ajustes de Impuesto en Tiendas > Configuración > Ventas > Impuesto." +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","La cantidad anterior se calcula a partir de los ajustes de Impuesto en Tiendas > Configuración > Ventas > Impuesto." "Payment fee frontend label","Etiqueta front-end de tarifa de pago" "This label will be displayed next to the fee on the checkout","Esta etiqueta aparecerá junto a la tarifa en la pantalla de compra, el pedido, la factura, las notas de abono y los PDF." "Max order amount (in Base Currency)","Importe máx. del pedido (en moneda de base)" @@ -80,12 +80,10 @@ "Select the maximum reminder level buckaroo will use.","Seleccione el nivel máximo de recordatorio que usará Buckaroo." "SEPA direct debit","SEPA Direct Debit" "Enable SEPA direct debit","Activar SEPA Direct Debit" -"Bancontact / Mister Cash","Bancontact/Mister Cash" -"Enable Bancontact / Mister Cash","Activar Bancontact/Mister Cash" +"Bancontact","Bancontact" +"Enable Bancontact","Activar Bancontact" "Please enter a valid BIC number","Introduzca un número BIC válido" "Please select a issuer from the list","Seleccione un emisor de la lista" -"SOFORT","SOFORT" -"Enable SOFORT","Activar SOFORT" "Belfius","Belfius" "Enable Belfius","Activar Belfius" "Alipay","Alipay" @@ -99,8 +97,6 @@ "Enable Trustly","Activar Trustly" "Request To Pay","Request To Pay" "Enable Request To Pay","Activar Request To Pay" -"Giropay","Giropay" -"Enable Giropay","Activar Giropay" "Refunding","Reembolso" "Enable or disable refunding.","Activar o desactivar el reembolso." "Set to 'No' refunds must be done manualy in Payment Plaza.","Elegir 'No' para 'los reembolsos se deben realizar manualmente en Payment Plaza'." diff --git a/i18n/be_FR.csv b/i18n/fr_BE.csv similarity index 87% rename from i18n/be_FR.csv rename to i18n/fr_BE.csv index 0abb3c34f..61152e5e4 100644 --- a/i18n/be_FR.csv +++ b/i18n/fr_BE.csv @@ -2,6 +2,7 @@ "Create Invoice on Payment","Créer une facture lors du paiement" "Create Invoice on Shipment","Créer une facture lors de l'expédition" "Select the moment when the invoice should be created.","Sélectionnez le moment où la facture devrait être créée." +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","De Algemene Voorwaarden voor de betaalmethode Riverty zijn van toepassing. Het privacybeleid van Riverty vind je hier." "Delivery costs","Coûts de livraison" "Discount","Réduction" "Discount on","Réduction sur" diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv index 08d54046d..d0169fd9b 100644 --- a/i18n/fr_FR.csv +++ b/i18n/fr_FR.csv @@ -11,7 +11,7 @@ "Send order confirmation email","Envoyer un e-mail de confirmation de commande" "Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Activer pour envoyer un e-mail de confirmation de commande au client lorsque la création de la commande est réussie. Spécifique pour ce mode de paiement." "Payment fee","Frais de paiement" -"The above amount is calculated based on de Tax settings in Stores > Configuration > Sales > Tax.","Le montant ci-dessus est calculé en fonction des paramètres de taxe dans Boutiques > Configuration > Ventes > Taxe." +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Le montant ci-dessus est calculé en fonction des paramètres de taxe dans Boutiques > Configuration > Ventes > Taxe." "Payment fee frontend label","Étiquette frontale des frais de paiement" "This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Cette étiquette sera affichée à côté des frais sur les pages de paiement, de commande, de facture et de note de crédit et sur les fichiers .PDF." "Max order amount (in Base Currency)","Montant maximum de la commande (en devise de base)" @@ -80,12 +80,10 @@ "Select the maximum reminder level buckaroo will use.","Sélectionnez le niveau de rappel maximal que buckaroo utilisera." "SEPA direct debit","Prélèvement SEPA" "Enable SEPA direct debit","Activer le prélèvement SEPA" -"Bancontact / Mister Cash","Bancontact / Mister Cash" -"Enable Bancontact / Mister Cash","Activer Bancontact / Mister Cash" +"Bancontact","Bancontact" +"Enable Bancontact","Activer Bancontact" "Please enter a valid BIC number","Veuillez entrer un numéro BIC valide" "Please select a issuer from the list","Sélectionnez une banque dans la liste" -"SOFORT","SOFORT" -"Enable SOFORT","Activer SOFORT" "Belfius","Belfius" "Enable Belfius","Activer Belfius" "Alipay","Alipay" @@ -97,8 +95,6 @@ "Enable Przelewy24","Activer Przelewy24" "Trustly","Trustly" "Enable Trustly","Activer Trustly" -"Giropay","Giropay" -"Enable Giropay","Activer Giropay" "Refunding","Remboursement" "Enable or disable refunding.","Activer ou désactiver le remboursement" "Set to 'No' refunds must be done manualy in Payment Plaza.","Défini sur "Non", les remboursements doivent être effectués manuellement dans Payment Plaza." diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv index 598df015d..288d0d70e 100644 --- a/i18n/nl_BE.csv +++ b/i18n/nl_BE.csv @@ -11,7 +11,7 @@ "Send order confirmation email","Verstuur order bevestigingsmail" "Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Activeer om een order bevestigings email te versturen wanneer de order is aangemaakt. Specifiek voor deze betaalmethode." "Payment fee","Betaaltoeslag" -"The above amount is calculated based on de Tax settings in Stores > Configuration > Sales > Tax.","Dit bedrag wordt berekend op basis van de BTW instellingen in: Stores > Configuration > Verkoop > Belasting" +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Dit bedrag wordt berekend op basis van de BTW instellingen in: Stores > Configuration > Verkoop > Belasting" "Payment fee frontend label","Betaaltoeslag label aan de voorkant" "This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Het label wordt getoond naast de betaaltoeslag tijdens de checkout en op de order, invoice, creditmemo pagina's en PDF." "Max order amount (in Base Currency)","Max. order bedrag (in basis munteenheid)" @@ -80,12 +80,10 @@ "Select the maximum reminder level buckaroo will use.","Selecteer het maximale niveau van herinnering die Buckaroo toepast." "SEPA direct debit","SEPA machtiging" "Enable SEPA direct debit","SEPA machtiging inschakelen" -"Bancontact / Mister Cash","Bancontact / Mister Cash" -"Enable Bancontact / Mister Cash","Bancontact / Mister Cash inschakelen" +"Bancontact","Bancontact" +"Enable Bancontact","Bancontact inschakelen" "Please enter a valid BIC number","Voer een geldig BIC nummer in" "Please select a issuer from the list","Selecteer een bank uit de lijst" -"SOFORT","SOFORT" -"Enable SOFORT","SOFORT inschakelen" "Belfius","Belfius" "Enable Belfius","Belfius inschakelen" "Alipay","Alipay" @@ -97,8 +95,6 @@ "Enable Przelewy24","Przelewy24 inschakelen" "Trustly","Trustly" "Enable Trustly","Trustly inschakelen" -"Giropay","Giropay" -"Enable Giropay","Giropay inschakelen" "Refunding","Terugbetaling" "Enable or disable refunding.","Schakel de creditering/terugstorten in of uit." "Set to 'No' refunds must be done manualy in Payment Plaza.","Bij de selectie 'Nee' worden credit memo's in Magento niet aangeboden bij Payment Plaza." @@ -302,6 +298,7 @@ "Please make sure all fields are filled in correctly before proceeding.","Zorg ervoor dat alle velden correct ingevuld zijn voordat u doorgaat." "Not Applicable","Niet van toepassing" "Yes, I accept the terms and condition for the use of Riverty.","Ja, ik accepteer de algemene voorwaarden voor het gebruik van Riverty" +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","De Algemene Voorwaarden voor de betaalmethode Riverty zijn van toepassing. Het privacybeleid van Riverty vind je hier." "Accept terms of use","Accepteer algemene voorwaarden" "(DD/MM/YYYY)","(DD/MM/JJJJ)" "Any comments about this Beta release? Please let us know! ","Heeft u opmerkingen over deze Beta release? Laat het ons weten! " diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index 0eba9f0e5..11e22f204 100644 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -13,7 +13,7 @@ "Send order confirmation email","Verstuur order bevestigingsmail" "Enable to send an order confirmation email to the customer when the creating of the order is successful. Specific for this payment method.","Activeer om een order bevestigings email te versturen wanneer de order is aangemaakt. Specifiek voor deze betaalmethode." "Payment fee","Betaaltoeslag" -"The above amount is calculated based on de Tax settings in Stores > Configuration > Sales > Tax.","Dit bedrag wordt berekend op basis van de BTW instellingen in: Stores > Configuration > Verkoop > Belasting" +"The above amount is calculated based on de Tax settings in Buckaroo > General configuration and account information > Buckaroo Payment Fee Tax Class.","Dit bedrag wordt berekend op basis van de BTW instellingen in: Stores > Configuration > Verkoop > Belasting" "Payment fee frontend label","Betaaltoeslag label aan de voorkant" "This label will be displayed next to the fee on the checkout, order, invoice and creditmemo pages and pdfs.","Het label wordt getoond naast de betaaltoeslag tijdens de checkout en op de order, invoice, creditmemo pagina's en PDF." "Max order amount (in Base Currency)","Max. order bedrag (in basis munteenheid)" @@ -82,12 +82,10 @@ "Select the maximum reminder level buckaroo will use.","Selecteer het maximale niveau van herinnering die Buckaroo toepast." "SEPA direct debit","SEPA machtiging" "Enable SEPA direct debit","SEPA machtiging inschakelen" -"Bancontact / Mister Cash","Bancontact / Mister Cash" -"Enable Bancontact / Mister Cash","Bancontact / Mister Cash inschakelen" +"Bancontact","Bancontact" +"Enable Bancontact","Bancontact inschakelen" "Please enter a valid BIC number","Voer een geldig BIC nummer in" "Please select a issuer from the list","Selecteer een bank uit de lijst" -"SOFORT","SOFORT" -"Enable SOFORT","SOFORT inschakelen" "Belfius","Belfius" "Enable Belfius","Belfius inschakelen" "Alipay","Alipay" @@ -99,8 +97,6 @@ "Enable Przelewy24","Przelewy24 inschakelen" "Trustly","Trustly" "Enable Trustly","Trustly inschakelen" -"Giropay","Giropay" -"Enable Giropay","Giropay inschakelen" "Blik","Blik" "Enable Blik","Blik inschakelen" "Refunding","Terugbetaling" @@ -306,6 +302,7 @@ "Please make sure all fields are filled in correctly before proceeding.","Zorg ervoor dat alle velden correct ingevuld zijn voordat u doorgaat." "Not Applicable","Niet van toepassing" "Yes, I accept the terms and condition for the use of Riverty.","Ja, ik accepteer de algemene voorwaarden voor het gebruik van Riverty." +"The general Terms and Conditions for the Riverty payment method apply. The privacy policy of Riverty can be found here.","De Algemene Voorwaarden voor de betaalmethode Riverty zijn van toepassing. Het privacybeleid van Riverty vind je hier." "Accept terms of use","Accepteer algemene voorwaarden" "(DD/MM/YYYY)","(DD/MM/JJJJ)" "Any comments about this Beta release? Please let us know! ","Heeft u opmerkingen over deze Beta release? Laat het ons weten! " diff --git a/view/adminhtml/templates/sales/order/creditmemo/buckaroo_fee.phtml b/view/adminhtml/templates/sales/order/creditmemo/buckaroo_fee.phtml index 718f4a384..994f2002e 100644 --- a/view/adminhtml/templates/sales/order/creditmemo/buckaroo_fee.phtml +++ b/view/adminhtml/templates/sales/order/creditmemo/buckaroo_fee.phtml @@ -24,7 +24,7 @@ getTotals() as $_code => $_total): ?> - +
diff --git a/view/adminhtml/templates/sales/order/total.phtml b/view/adminhtml/templates/sales/order/total.phtml index 39d8af5a6..16f47766b 100644 --- a/view/adminhtml/templates/sales/order/total.phtml +++ b/view/adminhtml/templates/sales/order/total.phtml @@ -11,7 +11,7 @@ getSource()->getBuckarooFee()): ?> - + getSource()->getBuckarooFeeLabel() ?: __('Payment fee') ?> displayPrices($block->getSource()->getBaseBuckarooFee(), $block->getSource()->getBuckarooFee()); ?> diff --git a/view/adminhtml/web/css/adminhtml_system_config_edit.css b/view/adminhtml/web/css/adminhtml_system_config_edit.css index a32173b29..4a270a4af 100644 --- a/view/adminhtml/web/css/adminhtml_system_config_edit.css +++ b/view/adminhtml/web/css/adminhtml_system_config_edit.css @@ -25,7 +25,7 @@ height: 18px; content: ' '; - background-image: url(../images/buckaroo_small_black.png) !important; + background-image: url(../images/buckaroo_small.png) !important; background-position :0 2px; background-repeat:no-repeat; background-size: auto 13px; @@ -280,11 +280,11 @@ display:inline-block; vertical-align: middle; margin: 0 20px 0 0; - width: 180px; - height:60px; + width: 200px; + height: 90px; background-repeat: no-repeat; background-image: url(../images/buckaroo_config_logo_black.png) !important; - background-size: 180px; + background-size: 200px; background-position: 0 14px; } diff --git a/view/adminhtml/web/images/buckaroo_config_logo_black.png b/view/adminhtml/web/images/buckaroo_config_logo_black.png index df2277989..859d48a8e 100644 Binary files a/view/adminhtml/web/images/buckaroo_config_logo_black.png and b/view/adminhtml/web/images/buckaroo_config_logo_black.png differ diff --git a/view/adminhtml/web/images/buckaroo_small.png b/view/adminhtml/web/images/buckaroo_small.png index 748c109e1..fd1ddacf1 100644 Binary files a/view/adminhtml/web/images/buckaroo_small.png and b/view/adminhtml/web/images/buckaroo_small.png differ diff --git a/view/base/web/images/svg/giropay.svg b/view/base/web/images/svg/giropay.svg deleted file mode 100644 index c1c2f505e..000000000 --- a/view/base/web/images/svg/giropay.svg +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/view/base/web/images/svg/gosettle.svg b/view/base/web/images/svg/gosettle.svg new file mode 100644 index 000000000..9833ff9cb --- /dev/null +++ b/view/base/web/images/svg/gosettle.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + diff --git a/view/base/web/images/svg/paypal.svg b/view/base/web/images/svg/paypal.svg index 8cdc10551..b11da1957 100644 --- a/view/base/web/images/svg/paypal.svg +++ b/view/base/web/images/svg/paypal.svg @@ -1,102 +1,65 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/view/base/web/images/svg/payperemail.svg b/view/base/web/images/svg/payperemail.svg index b2026c0a6..d8d6852cc 100644 --- a/view/base/web/images/svg/payperemail.svg +++ b/view/base/web/images/svg/payperemail.svg @@ -1,68 +1,57 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index cb37f60ee..1ee6c5c25 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -122,15 +122,9 @@ true - - true - true - - true - true diff --git a/view/frontend/templates/cart/buckaroo_config.phtml b/view/frontend/templates/cart/buckaroo_config.phtml index aed3c186b..bb37e98c0 100644 --- a/view/frontend/templates/cart/buckaroo_config.phtml +++ b/view/frontend/templates/cart/buckaroo_config.phtml @@ -17,10 +17,12 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ + +/** @var string $cspNonce */ ?>
-
diff --git a/view/frontend/templates/catalog/product/view/applepay.phtml b/view/frontend/templates/catalog/product/view/applepay.phtml index 47759c26d..f6fb60822 100644 --- a/view/frontend/templates/catalog/product/view/applepay.phtml +++ b/view/frontend/templates/catalog/product/view/applepay.phtml @@ -17,12 +17,14 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ + +/** @var string $cspNonce */ ?> canShowButton('Product')): ?>
- diff --git a/view/frontend/templates/checkout/payconiq/pay.phtml b/view/frontend/templates/checkout/payconiq/pay.phtml index 663465f40..1a65781f7 100755 --- a/view/frontend/templates/checkout/payconiq/pay.phtml +++ b/view/frontend/templates/checkout/payconiq/pay.phtml @@ -1,3 +1,25 @@ +
@@ -10,11 +32,9 @@
-getTransactionKey(); - $script = << require(['buckaroo/payconiq/pay'], function (payconiqPay) { - var transactionKey = "$key"; + var transactionKey = "getTransactionKey(); ?>"; payconiqPay.setTransactionKey(transactionKey); payconiqPay.showQrCode(); @@ -24,6 +44,4 @@ payconiqPay.cancelPayment(); }); } -JS; -?> -renderTag('script', [], $script, false); ?> \ No newline at end of file + diff --git a/view/frontend/templates/checkout/success.phtml b/view/frontend/templates/checkout/success.phtml index 0a00aa914..6d2a7d4aa 100644 --- a/view/frontend/templates/checkout/success.phtml +++ b/view/frontend/templates/checkout/success.phtml @@ -17,8 +17,10 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ + +/** @var string $cspNonce */ ?> -