diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php index b0ca3402..7fb6386a 100644 --- a/Controller/Checkout/Exchange.php +++ b/Controller/Checkout/Exchange.php @@ -14,219 +14,225 @@ * * @author Andy Pieters */ -class Exchange extends \Magento\Framework\App\Action\Action -{ - /** - * - * @var \Paynl\Payment\Model\Config - */ - protected $_config; - - /** - * - * @var \Magento\Sales\Model\OrderFactory - */ - protected $_orderFactory; - - /** - * @var \Psr\Log\LoggerInterface - */ - protected $_logger; - - /** - * - * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender - */ - protected $_orderSender; - - /** - * - * @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender - */ - protected $_invoiceSender; - - /** - * @var \Magento\Framework\Controller\Result\Raw - */ - protected $_result; +class Exchange extends \Magento\Framework\App\Action\Action { + /** + * + * @var \Paynl\Payment\Model\Config + */ + private $config; + + /** + * + * @var \Magento\Sales\Model\OrderFactory + */ + private $orderFactory; + + /** + * @var \Psr\Log\LoggerInterface + */ + private $logger; + + /** + * + * @var \Magento\Sales\Model\Order\Email\Sender\OrderSender + */ + private $orderSender; + + /** + * + * @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender + */ + private $invoiceSender; + + /** + * @var \Magento\Framework\Controller\Result\Raw + */ + private $result; /** * @var OrderRepository */ - protected $_orderRepository; - - /** - * Exchange constructor. - * @param \Magento\Framework\App\Action\Context $context - * @param \Paynl\Payment\Model\Config $config - * @param \Magento\Sales\Model\OrderFactory $orderFactory - * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender - * @param \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender - * @param \Psr\Log\LoggerInterface $logger - * @param \Magento\Framework\Controller\Result\Raw $result - */ - public function __construct( - \Magento\Framework\App\Action\Context $context, - \Paynl\Payment\Model\Config $config, - \Magento\Sales\Model\OrderFactory $orderFactory, - \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender, - \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender, - \Psr\Log\LoggerInterface $logger, - \Magento\Framework\Controller\Result\Raw $result, - OrderRepository $orderRepository - ) - { - $this->_result = $result; - $this->_config = $config; - $this->_orderFactory = $orderFactory; - $this->_orderSender = $orderSender; - $this->_invoiceSender = $invoiceSender; - $this->_logger = $logger; - $this->_orderRepository = $orderRepository; - parent::__construct($context); - } - - private function uncancel(\Magento\Sales\Model\Order $order){ - if ($order->isCanceled()) { - $state = \Magento\Sales\Model\Order::STATE_PENDING_PAYMENT; - $productStockQty = []; - foreach ($order->getAllVisibleItems() as $item) { - $productStockQty[$item->getProductId()] = $item->getQtyCanceled(); - foreach ($item->getChildrenItems() as $child) { - $productStockQty[$child->getProductId()] = $item->getQtyCanceled(); - $child->setQtyCanceled(0); - $child->setTaxCanceled(0); - $child->setDiscountTaxCompensationCanceled(0); - } - $item->setQtyCanceled(0); - $item->setTaxCanceled(0); - $item->setDiscountTaxCompensationCanceled(0); - $this->_eventManager->dispatch('sales_order_item_uncancel', ['item' => $item]); - } - $this->_eventManager->dispatch( - 'sales_order_uncancel_inventory', - [ - 'order' => $order, - 'product_qty' => $productStockQty - ] - ); - $order->setSubtotalCanceled(0); - $order->setBaseSubtotalCanceled(0); - $order->setTaxCanceled(0); - $order->setBaseTaxCanceled(0); - $order->setShippingCanceled(0); - $order->setBaseShippingCanceled(0); - $order->setDiscountCanceled(0); - $order->setBaseDiscountCanceled(0); - $order->setTotalCanceled(0); - $order->setBaseTotalCanceled(0); - $order->setState($state); - $order->setStatus($state); - - $order->addStatusHistoryComment(__('Pay.nl Uncanceled order'), false); - - $this->_eventManager->dispatch('order_uncancel_after', ['order' => $order]); - } else { - throw new LocalizedException(__('We cannot un-cancel this order.')); - } - return $order; - } - - public function execute() - { - $skipFraudDetection = false; - \Paynl\Config::setApiToken($this->_config->getApiToken()); - - $params = $this->getRequest()->getParams(); - if(!isset($params['order_id'])){ - $this->_logger->critical('Exchange: order_id is not set in the request', $params); - return $this->_result->setContents('FALSE| order_id is not set in the request'); - } - - try{ - $transaction = \Paynl\Transaction::get($params['order_id']); - } catch(\Exception $e){ - $this->_logger->critical($e, $params); - return $this->_result->setContents('FALSE| Error fetching transaction. '. $e->getMessage()); - } - - if($transaction->isPending()){ - return $this->_result->setContents("TRUE| Ignoring pending"); - } - - $orderEntityId = $transaction->getExtra3(); - /** @var Order $order */ - $order = $this->_orderRepository->get($orderEntityId); - - if(empty($order)){ - $this->_logger->critical('Cannot load order: '.$orderEntityId); - return $this->_result->setContents('FALSE| Cannot load order'); - } - if($order->getTotalDue() <= 0){ - $this->_logger->debug('Total due <= 0, so iam not touching the status of the order: '.$orderEntityId); - return $this->_result->setContents('TRUE| Total due <= 0, so iam not touching the status of the order'); - } - - if ($transaction->isPaid()) { - $message = "PAID"; - if($order->isCanceled()){ - try{ - $this->uncancel($order); - } catch(LocalizedException $e){ - return $this->_result->setContents('FALSE| Cannot un-cancel order: '.$e->getMessage()); - } - $message .= " order was uncanceled"; - } - $payment = $order->getPayment(); - $payment->setTransactionId( - $transaction->getId() - ); - - $payment->setPreparedMessage('Pay.nl - '); - $payment->setIsTransactionClosed( - 0 - ); - $payment->registerCaptureNotification( - $transaction->getPaidCurrencyAmount(), $skipFraudDetection - ); - $this->_orderRepository->save($order); - - // notify customer - $invoice = $payment->getCreatedInvoice(); - if ($invoice && !$order->getEmailSent()) { - $this->_orderSender->send($order); - $order->addStatusHistoryComment( - __('New order email sent') - )->setIsCustomerNotified( - true - )->save(); - } - if($invoice && !$invoice->getEmailSent()){ - $this->_invoiceSender->send($invoice); - - $order->addStatusHistoryComment( - __('You notified customer about invoice #%1.', - $invoice->getIncrementId()) - )->setIsCustomerNotified( - true - )->save(); - - } - return $this->_result->setContents("TRUE| ".$message); - - } elseif($transaction->isCanceled()){ - if($this->_config->isNeverCancel()){ - return $this->_result->setContents("TRUE| Not Canceled because never cancel is enabled"); + private $orderRepository; + + /** + * Exchange constructor. + * + * @param \Magento\Framework\App\Action\Context $context + * @param \Paynl\Payment\Model\Config $config + * @param \Magento\Sales\Model\OrderFactory $orderFactory + * @param \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender + * @param \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender + * @param \Psr\Log\LoggerInterface $logger + * @param \Magento\Framework\Controller\Result\Raw $result + */ + public function __construct( + \Magento\Framework\App\Action\Context $context, + \Paynl\Payment\Model\Config $config, + \Magento\Sales\Model\OrderFactory $orderFactory, + \Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender, + \Magento\Sales\Model\Order\Email\Sender\InvoiceSender $invoiceSender, + \Psr\Log\LoggerInterface $logger, + \Magento\Framework\Controller\Result\Raw $result, + OrderRepository $orderRepository + ) { + $this->result = $result; + $this->config = $config; + $this->orderFactory = $orderFactory; + $this->orderSender = $orderSender; + $this->invoiceSender = $invoiceSender; + $this->logger = $logger; + $this->orderRepository = $orderRepository; + + parent::__construct( $context ); + } + + public function execute() { + $skipFraudDetection = false; + \Paynl\Config::setApiToken( $this->config->getApiToken() ); + + $params = $this->getRequest()->getParams(); + if ( ! isset( $params['order_id'] ) ) { + $this->logger->critical( 'Exchange: order_id is not set in the request', $params ); + + return $this->result->setContents( 'FALSE| order_id is not set in the request' ); + } + + try { + $transaction = \Paynl\Transaction::get( $params['order_id'] ); + } catch ( \Exception $e ) { + $this->logger->critical( $e, $params ); + + return $this->result->setContents( 'FALSE| Error fetching transaction. ' . $e->getMessage() ); + } + + if ( $transaction->isPending() ) { + return $this->result->setContents( "TRUE| Ignoring pending" ); + } + + $orderEntityId = $transaction->getExtra3(); + /** @var Order $order */ + $order = $this->orderRepository->get( $orderEntityId ); + + if ( empty( $order ) ) { + $this->logger->critical( 'Cannot load order: ' . $orderEntityId ); + + return $this->result->setContents( 'FALSE| Cannot load order' ); + } + if ( $order->getTotalDue() <= 0 ) { + $this->logger->debug( 'Total due <= 0, so iam not touching the status of the order: ' . $orderEntityId ); + + return $this->result->setContents( 'TRUE| Total due <= 0, so iam not touching the status of the order' ); + } + + if ( $transaction->isPaid() ) { + $message = "PAID"; + if ( $order->isCanceled() ) { + try { + $this->uncancel( $order ); + } catch ( LocalizedException $e ) { + return $this->result->setContents( 'FALSE| Cannot un-cancel order: ' . $e->getMessage() ); + } + $message .= " order was uncanceled"; + } + $payment = $order->getPayment(); + $payment->setTransactionId( + $transaction->getId() + ); + + $payment->setPreparedMessage( 'Pay.nl - ' ); + $payment->setIsTransactionClosed( + 0 + ); + $payment->registerCaptureNotification( + $transaction->getPaidCurrencyAmount(), $skipFraudDetection + ); + $this->orderRepository->save( $order ); + + // notify customer + $invoice = $payment->getCreatedInvoice(); + if ( $invoice && ! $order->getEmailSent() ) { + $this->orderSender->send( $order ); + $order->addStatusHistoryComment( + __( 'New order email sent' ) + )->setIsCustomerNotified( + true + )->save(); } - if($order->getState() == 'holded'){ - $order->unhold(); - } + if ( $invoice && ! $invoice->getEmailSent() ) { + $this->invoiceSender->send( $invoice ); - $order->cancel(); - $order->addStatusHistoryComment( __('Pay.nl canceled the order')); - $this->_orderRepository->save($order); - return $this->_result->setContents("TRUE| CANCELED"); - } + $order->addStatusHistoryComment( + __( 'You notified customer about invoice #%1.', + $invoice->getIncrementId() ) + )->setIsCustomerNotified( + true + )->save(); - } + } + + return $this->result->setContents( "TRUE| " . $message ); + + } elseif ( $transaction->isCanceled() ) { + if ( $this->config->isNeverCancel() ) { + return $this->result->setContents( "TRUE| Not Canceled because never cancel is enabled" ); + } + if ( $order->getState() == 'holded' ) { + $order->unhold(); + } + + $order->cancel(); + $order->addStatusHistoryComment( __( 'Pay.nl canceled the order' ) ); + $this->orderRepository->save( $order ); + + return $this->result->setContents( "TRUE| CANCELED" ); + } + + } + + private function uncancel( \Magento\Sales\Model\Order $order ) { + if ( $order->isCanceled() ) { + $state = \Magento\Sales\Model\Order::STATE_PENDING_PAYMENT; + $productStockQty = []; + foreach ( $order->getAllVisibleItems() as $item ) { + $productStockQty[ $item->getProductId() ] = $item->getQtyCanceled(); + foreach ( $item->getChildrenItems() as $child ) { + $productStockQty[ $child->getProductId() ] = $item->getQtyCanceled(); + $child->setQtyCanceled( 0 ); + $child->setTaxCanceled( 0 ); + $child->setDiscountTaxCompensationCanceled( 0 ); + } + $item->setQtyCanceled( 0 ); + $item->setTaxCanceled( 0 ); + $item->setDiscountTaxCompensationCanceled( 0 ); + $this->_eventManager->dispatch( 'sales_order_item_uncancel', [ 'item' => $item ] ); + } + $this->_eventManager->dispatch( + 'sales_order_uncancel_inventory', + [ + 'order' => $order, + 'product_qty' => $productStockQty + ] + ); + $order->setSubtotalCanceled( 0 ); + $order->setBaseSubtotalCanceled( 0 ); + $order->setTaxCanceled( 0 ); + $order->setBaseTaxCanceled( 0 ); + $order->setShippingCanceled( 0 ); + $order->setBaseShippingCanceled( 0 ); + $order->setDiscountCanceled( 0 ); + $order->setBaseDiscountCanceled( 0 ); + $order->setTotalCanceled( 0 ); + $order->setBaseTotalCanceled( 0 ); + $order->setState( $state ); + $order->setStatus( $state ); + + $order->addStatusHistoryComment( __( 'Pay.nl Uncanceled order' ), false ); + + $this->_eventManager->dispatch( 'order_uncancel_after', [ 'order' => $order ] ); + } else { + throw new LocalizedException( __( 'We cannot un-cancel this order.' ) ); + } + + return $order; + } } \ No newline at end of file diff --git a/Controller/Checkout/Finish.php b/Controller/Checkout/Finish.php index f931f67d..9d594abe 100644 --- a/Controller/Checkout/Finish.php +++ b/Controller/Checkout/Finish.php @@ -21,27 +21,27 @@ class Finish extends \Magento\Framework\App\Action\Action * * @var \Paynl\Payment\Model\Config */ - protected $config; + private $config; /** * @var Session */ - protected $checkoutSession; + private $checkoutSession; /** * @var \Psr\Log\LoggerInterface */ - protected $logger; + private $logger; /** * @var OrderRepository */ - protected $orderRepository; + private $orderRepository; /** * @var QuoteRepository */ - protected $quoteRepository; + private $quoteRepository; /** * Index constructor. diff --git a/Controller/Checkout/Redirect.php b/Controller/Checkout/Redirect.php index 3013ba76..77556c06 100644 --- a/Controller/Checkout/Redirect.php +++ b/Controller/Checkout/Redirect.php @@ -7,6 +7,7 @@ use Magento\Payment\Helper\Data as PaymentHelper; use Magento\Quote\Model\QuoteRepository; +use Magento\Sales\Model\OrderRepository; use Paynl\Error\Error; /** @@ -19,28 +20,33 @@ class Redirect extends \Magento\Framework\App\Action\Action /** * @var \Paynl\Payment\Model\Config */ - protected $_config; - + private $config; /** * @var \Magento\Checkout\Model\Session */ - protected $_checkoutSession; + private $checkoutSession; /** * @var \Psr\Log\LoggerInterface */ - protected $_logger; + private $_logger; /** * @var PaymentHelper */ - protected $_paymentHelper; + private $paymentHelper; /** * @var QuoteRepository */ - protected $_quoteRepository; + private $quoteRepository; + + + /** + * @var OrderRepository + */ + private $orderRepository; /** * @param \Magento\Framework\App\Action\Context $context @@ -53,14 +59,16 @@ public function __construct( \Magento\Checkout\Model\Session $checkoutSession, \Psr\Log\LoggerInterface $logger, PaymentHelper $paymentHelper, - QuoteRepository $quoteRepository + QuoteRepository $quoteRepository, + OrderRepository $orderRepository ) { - $this->_config = $config; // Pay.nl config helper - $this->_checkoutSession = $checkoutSession; - $this->_logger = $logger; - $this->_paymentHelper = $paymentHelper; - $this->_quoteRepository = $quoteRepository; + $this->config = $config; // Pay.nl config helper + $this->checkoutSession = $checkoutSession; + $this->_logger = $logger; + $this->paymentHelper = $paymentHelper; + $this->quoteRepository = $quoteRepository; + $this->orderRepository = $orderRepository; parent::__construct($context); } @@ -69,15 +77,14 @@ public function execute() { try { $order = $this->_getCheckoutSession()->getLastRealOrder(); - $method = $order->getPayment()->getMethod(); // restore the quote - $quote = $this->_quoteRepository->get($order->getQuoteId()); + $quote = $this->quoteRepository->get($order->getQuoteId()); $quote->setIsActive(true)->setReservedOrderId(null); - $this->_quoteRepository->save($quote); + $this->quoteRepository->save($quote); - $methodInstance = $this->_paymentHelper->getMethodInstance($method); + $methodInstance = $this->paymentHelper->getMethodInstance($method); if ($methodInstance instanceof \Paynl\Payment\Model\Paymentmethod\Paymentmethod) { $redirectUrl = $methodInstance->startTransaction($order); $this->getResponse()->setNoCacheHeaders(); @@ -102,6 +109,6 @@ public function execute() */ protected function _getCheckoutSession() { - return $this->_checkoutSession; + return $this->checkoutSession; } } diff --git a/Model/Config/Source/SendNewOrderEmail.php b/Model/Config/Source/SendNewOrderEmail.php new file mode 100644 index 00000000..d5ee3fc3 --- /dev/null +++ b/Model/Config/Source/SendNewOrderEmail.php @@ -0,0 +1,43 @@ +toArray(); + + $arrResult = []; + foreach ($arrOptions as $value => $label) { + $arrResult[] = ['value' => $value, 'label' => $label]; + } + return $arrResult; + } + + /** + * Get options in "key-value" format + * + * @return array + */ + public function toArray() + { + return [ + 'after_payment' => __('After successful payment'), + 'before_payment' => __('Before payment') + ]; + } + +} diff --git a/Model/Paymentmethod/PaymentMethod.php b/Model/Paymentmethod/PaymentMethod.php index 27bcd49d..a56ca34d 100644 --- a/Model/Paymentmethod/PaymentMethod.php +++ b/Model/Paymentmethod/PaymentMethod.php @@ -5,7 +5,6 @@ namespace Paynl\Payment\Model\Paymentmethod; -use Magento\Framework\UrlInterface; use Magento\Payment\Model\Method\AbstractMethod; use Magento\Sales\Model\Order; use Paynl\Payment\Model\Config; @@ -21,6 +20,29 @@ abstract class PaymentMethod extends AbstractMethod protected $_canRefund = true; protected $_canRefundInvoicePartial = true; + /** + * @var Config + */ + protected $paynlConfig; + + public function __construct( + \Magento\Framework\Model\Context $context, + \Magento\Framework\Registry $registry, + \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory, + \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory, + \Magento\Payment\Helper\Data $paymentData, + \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + \Magento\Payment\Model\Method\Logger $logger, + \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null, + \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null, + array $data = [] + ) { + parent::__construct( + $context, $registry, $extensionFactory, $customAttributeFactory, + $paymentData, $scopeConfig, $logger, $resource, $resourceCollection, $data ); + + $this->paynlConfig = new Config($this->_scopeConfig); + } /** * Get payment instructions text from config @@ -40,12 +62,20 @@ public function initialize($paymentAction, $stateObject) $stateObject->setState($state); $stateObject->setStatus($state); $stateObject->setIsNotified(false); + + $sendEmail = $this->_scopeConfig->getValue('payment/' . $this->_code . '/send_new_order_email', 'store'); + + if($sendEmail == 'after_payment') { + //prevent sending the order confirmation + $payment = $this->getInfoInstance(); + $order = $payment->getOrder(); + $order->setCanSendNewEmailFlag( false ); + } } public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount) { - $config = new Config($this->_scopeConfig); - $config->configureSDK(); + $this->paynlConfig->configureSDK(); $transactionId = $payment->getParentTransactionId(); @@ -59,9 +89,7 @@ public function startTransaction(Order $order){ } protected function doStartTransaction(Order $order) { - $config = new Config($this->_scopeConfig); - - $config->configureSDK(); + $this->paynlConfig->configureSDK(); $additionalData = $order->getPayment()->getAdditionalInformation(); $bankId = null; $expireDate = null; @@ -96,7 +124,7 @@ protected function doStartTransaction(Order $order) $strBillingFirstName = substr($arrBillingAddress['firstname'], 0, 1); // Use full first name for Klarna - if($paymentOptionId == $config->getPaymentOptionId('paynl_payment_klarna')) + if($paymentOptionId == $this->paynlConfig->getPaymentOptionId('paynl_payment_klarna')) { $strBillingFirstName = $arrBillingAddress['firstname']; } @@ -130,7 +158,7 @@ protected function doStartTransaction(Order $order) $strShippingFirstName = substr($arrShippingAddress['firstname'], 0, 1); // Use full first name for Klarna - if($paymentOptionId == $config->getPaymentOptionId('paynl_payment_klarna')) + if($paymentOptionId == $this->paynlConfig->getPaymentOptionId('paynl_payment_klarna')) { $strShippingFirstName = $arrShippingAddress['firstname']; } @@ -151,7 +179,7 @@ protected function doStartTransaction(Order $order) 'amount' => $total, 'returnUrl' => $returnUrl, 'paymentMethod' => $paymentOptionId, - 'language' => $config->getLanguage(), + 'language' => $this->paynlConfig->getLanguage(), 'bank' => $bankId, 'expireDate' => $expireDate, 'description' => $orderId, @@ -218,7 +246,7 @@ protected function doStartTransaction(Order $order) $data['products'] = $arrProducts; - if ($config->isTestMode()) { + if ($this->paynlConfig->isTestMode()) { $data['testmode'] = 1; } $ipAddress = $order->getRemoteIp(); diff --git a/etc/adminhtml/paymentmethods/afterpay.xml b/etc/adminhtml/paymentmethods/afterpay.xml index fee2ed4c..181969e3 100644 --- a/etc/adminhtml/paymentmethods/afterpay.xml +++ b/etc/adminhtml/paymentmethods/afterpay.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_afterpay/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/amex.xml b/etc/adminhtml/paymentmethods/amex.xml index 0dd4a22c..b029a582 100644 --- a/etc/adminhtml/paymentmethods/amex.xml +++ b/etc/adminhtml/paymentmethods/amex.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_amex/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/billink.xml b/etc/adminhtml/paymentmethods/billink.xml index 64dadefd..77ff7d08 100644 --- a/etc/adminhtml/paymentmethods/billink.xml +++ b/etc/adminhtml/paymentmethods/billink.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_billink/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/capayable.xml b/etc/adminhtml/paymentmethods/capayable.xml index 48e9f186..96a46704 100644 --- a/etc/adminhtml/paymentmethods/capayable.xml +++ b/etc/adminhtml/paymentmethods/capayable.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_capayable/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/capayable_gespreid.xml b/etc/adminhtml/paymentmethods/capayable_gespreid.xml index f96d0469..be7f5b18 100644 --- a/etc/adminhtml/paymentmethods/capayable_gespreid.xml +++ b/etc/adminhtml/paymentmethods/capayable_gespreid.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_capayable_gespreid/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/cartebleue.xml b/etc/adminhtml/paymentmethods/cartebleue.xml index 42620ae5..75b32a97 100644 --- a/etc/adminhtml/paymentmethods/cartebleue.xml +++ b/etc/adminhtml/paymentmethods/cartebleue.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_cartebleue/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/clickandbuy.xml b/etc/adminhtml/paymentmethods/clickandbuy.xml index ced0c7da..dd401f49 100644 --- a/etc/adminhtml/paymentmethods/clickandbuy.xml +++ b/etc/adminhtml/paymentmethods/clickandbuy.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_clickandbuy/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/fashioncheque.xml b/etc/adminhtml/paymentmethods/fashioncheque.xml index 1d53ead2..4a6cb7de 100644 --- a/etc/adminhtml/paymentmethods/fashioncheque.xml +++ b/etc/adminhtml/paymentmethods/fashioncheque.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_fashioncheque/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/fashiongiftcard.xml b/etc/adminhtml/paymentmethods/fashiongiftcard.xml index e583806b..abe30eca 100644 --- a/etc/adminhtml/paymentmethods/fashiongiftcard.xml +++ b/etc/adminhtml/paymentmethods/fashiongiftcard.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_fashiongiftcard/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/focum.xml b/etc/adminhtml/paymentmethods/focum.xml index 4ed97b83..7a7795b0 100644 --- a/etc/adminhtml/paymentmethods/focum.xml +++ b/etc/adminhtml/paymentmethods/focum.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_focum/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/gezondheidsbon.xml b/etc/adminhtml/paymentmethods/gezondheidsbon.xml index da07dd3e..40632dd8 100644 --- a/etc/adminhtml/paymentmethods/gezondheidsbon.xml +++ b/etc/adminhtml/paymentmethods/gezondheidsbon.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_gezondheidsbon/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/giropay.xml b/etc/adminhtml/paymentmethods/giropay.xml index 92279ddf..abe32688 100644 --- a/etc/adminhtml/paymentmethods/giropay.xml +++ b/etc/adminhtml/paymentmethods/giropay.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_giropay/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/givacard.xml b/etc/adminhtml/paymentmethods/givacard.xml index 826ca99d..881a85c9 100644 --- a/etc/adminhtml/paymentmethods/givacard.xml +++ b/etc/adminhtml/paymentmethods/givacard.xml @@ -74,7 +74,6 @@ 1 - @@ -84,6 +83,16 @@ 1 + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_givacard/send_new_order_email + + 1 + + diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml index 8e2184ba..c34a19c1 100644 --- a/etc/adminhtml/paymentmethods/ideal.xml +++ b/etc/adminhtml/paymentmethods/ideal.xml @@ -58,7 +58,8 @@ payment/paynl_payment_ideal/instructions - + Magento\Config\Model\Config\Source\Yesno @@ -82,7 +83,6 @@ 1 - @@ -92,7 +92,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_ideal/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/instore.xml b/etc/adminhtml/paymentmethods/instore.xml index a3a4c95c..543c6f31 100644 --- a/etc/adminhtml/paymentmethods/instore.xml +++ b/etc/adminhtml/paymentmethods/instore.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_instore/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/klarna.xml b/etc/adminhtml/paymentmethods/klarna.xml index e3935e6d..603b6f9d 100644 --- a/etc/adminhtml/paymentmethods/klarna.xml +++ b/etc/adminhtml/paymentmethods/klarna.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_klarna/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/maestro.xml b/etc/adminhtml/paymentmethods/maestro.xml index b20c40c6..d0990aea 100644 --- a/etc/adminhtml/paymentmethods/maestro.xml +++ b/etc/adminhtml/paymentmethods/maestro.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_maestro/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/mistercash.xml b/etc/adminhtml/paymentmethods/mistercash.xml index a5ecc427..0f1a03ef 100644 --- a/etc/adminhtml/paymentmethods/mistercash.xml +++ b/etc/adminhtml/paymentmethods/mistercash.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_mistercash/send_new_order_email + + 1 + + diff --git a/etc/adminhtml/paymentmethods/mybank.xml b/etc/adminhtml/paymentmethods/mybank.xml index e243d85c..cbcd5bb8 100644 --- a/etc/adminhtml/paymentmethods/mybank.xml +++ b/etc/adminhtml/paymentmethods/mybank.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_mybank/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/overboeking.xml b/etc/adminhtml/paymentmethods/overboeking.xml index 3a8c6135..dd2b417d 100644 --- a/etc/adminhtml/paymentmethods/overboeking.xml +++ b/etc/adminhtml/paymentmethods/overboeking.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_overboeking/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/paylink.xml b/etc/adminhtml/paymentmethods/paylink.xml index 68e3ecbf..18561157 100644 --- a/etc/adminhtml/paymentmethods/paylink.xml +++ b/etc/adminhtml/paymentmethods/paylink.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_paylink/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/paypal.xml b/etc/adminhtml/paymentmethods/paypal.xml index ac32bf0c..a8f30ddc 100644 --- a/etc/adminhtml/paymentmethods/paypal.xml +++ b/etc/adminhtml/paymentmethods/paypal.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_paypal/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/paysafecard.xml b/etc/adminhtml/paymentmethods/paysafecard.xml index e6acafe3..a66d83d3 100644 --- a/etc/adminhtml/paymentmethods/paysafecard.xml +++ b/etc/adminhtml/paymentmethods/paysafecard.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_paysafecard/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml b/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml index d0a60290..5f40b6c5 100644 --- a/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml +++ b/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_podiumcadeaukaart/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/postepay.xml b/etc/adminhtml/paymentmethods/postepay.xml index c1c4b76c..72cc3a86 100644 --- a/etc/adminhtml/paymentmethods/postepay.xml +++ b/etc/adminhtml/paymentmethods/postepay.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_postepay/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/sofortbanking.xml b/etc/adminhtml/paymentmethods/sofortbanking.xml index deeb0f8a..e180872d 100644 --- a/etc/adminhtml/paymentmethods/sofortbanking.xml +++ b/etc/adminhtml/paymentmethods/sofortbanking.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_sofortbanking/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/telefonischbetalen.xml b/etc/adminhtml/paymentmethods/telefonischbetalen.xml index c0c46323..056306a7 100644 --- a/etc/adminhtml/paymentmethods/telefonischbetalen.xml +++ b/etc/adminhtml/paymentmethods/telefonischbetalen.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_telefonischbetalen/send_new_order_email + + 1 + + diff --git a/etc/adminhtml/paymentmethods/visamastercard.xml b/etc/adminhtml/paymentmethods/visamastercard.xml index 9a024dc0..4a1479bd 100644 --- a/etc/adminhtml/paymentmethods/visamastercard.xml +++ b/etc/adminhtml/paymentmethods/visamastercard.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_visamastercard/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/vvvgiftcard.xml b/etc/adminhtml/paymentmethods/vvvgiftcard.xml index bfb2cffa..223b131f 100644 --- a/etc/adminhtml/paymentmethods/vvvgiftcard.xml +++ b/etc/adminhtml/paymentmethods/vvvgiftcard.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_vvvgiftcard/send_new_order_email + + 1 + + diff --git a/etc/adminhtml/paymentmethods/webshopgiftcard.xml b/etc/adminhtml/paymentmethods/webshopgiftcard.xml index bd78e09b..97be1c66 100644 --- a/etc/adminhtml/paymentmethods/webshopgiftcard.xml +++ b/etc/adminhtml/paymentmethods/webshopgiftcard.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_webshopgiftcard/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/wijncadeau.xml b/etc/adminhtml/paymentmethods/wijncadeau.xml index ea0ca710..4eaa9b28 100644 --- a/etc/adminhtml/paymentmethods/wijncadeau.xml +++ b/etc/adminhtml/paymentmethods/wijncadeau.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_wijncadeau/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/yehhpay.xml b/etc/adminhtml/paymentmethods/yehhpay.xml index 33d1c323..c6221608 100644 --- a/etc/adminhtml/paymentmethods/yehhpay.xml +++ b/etc/adminhtml/paymentmethods/yehhpay.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_yehhpay/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/paymentmethods/yourgift.xml b/etc/adminhtml/paymentmethods/yourgift.xml index 1a4fbfb1..8f15d14a 100644 --- a/etc/adminhtml/paymentmethods/yourgift.xml +++ b/etc/adminhtml/paymentmethods/yourgift.xml @@ -74,7 +74,6 @@ 1 - @@ -84,7 +83,16 @@ 1 - + + + Paynl\Payment\Model\Config\Source\SendNewOrderEmail + payment/paynl_payment_yourgift/send_new_order_email + + 1 + + \ No newline at end of file diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 25ce71a1..db09eb4f 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -4,35 +4,40 @@ * Copyright © 2015 Pay.nl All rights reserved. */ --> - - + +
- + - - + Magento\Config\Model\Config\Source\Yesno - - + - + - - + Paynl\Payment\Model\Config\Source\Languages - + Magento\Config\Model\Config\Source\Yesno - + Paynl\Payment\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/etc/config.xml b/etc/config.xml index 5b0e771d..ebf20f09 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -18,6 +18,7 @@ Paynl\Payment\Model\Paymentmethod\Paylink paynl_payment valid_days + before_payment 0 @@ -28,6 +29,7 @@ order Paynl\Payment\Model\Paymentmethod\Afterpay paynl_payment + after_payment 0 @@ -38,6 +40,7 @@ order Paynl\Payment\Model\Paymentmethod\Amex paynl_payment + after_payment 0 @@ -48,6 +51,7 @@ order Paynl\Payment\Model\Paymentmethod\Billink paynl_payment + after_payment 0 @@ -58,6 +62,7 @@ order Paynl\Payment\Model\Paymentmethod\Capayable paynl_payment + after_payment 0 @@ -68,6 +73,7 @@ order Paynl\Payment\Model\Paymentmethod\CapayableGespreid paynl_payment + after_payment 0 @@ -78,6 +84,7 @@ order Paynl\Payment\Model\Paymentmethod\Cartebleue paynl_payment + after_payment 0 @@ -88,6 +95,7 @@ order Paynl\Payment\Model\Paymentmethod\Clickandbuy paynl_payment + after_payment 0 @@ -98,6 +106,7 @@ order Paynl\Payment\Model\Paymentmethod\Fashioncheque paynl_payment + after_payment 0 @@ -108,6 +117,7 @@ order Paynl\Payment\Model\Paymentmethod\Fashiongiftcard paynl_payment + after_payment 0 @@ -118,6 +128,7 @@ order Paynl\Payment\Model\Paymentmethod\Focum paynl_payment + after_payment 0 @@ -128,6 +139,7 @@ order Paynl\Payment\Model\Paymentmethod\Gezondheidsbon paynl_payment + after_payment 0 @@ -138,6 +150,7 @@ order Paynl\Payment\Model\Paymentmethod\Giropay paynl_payment + after_payment 0 @@ -148,6 +161,7 @@ order Paynl\Payment\Model\Paymentmethod\Givacard paynl_payment + after_payment 0 @@ -168,6 +182,7 @@ order Paynl\Payment\Model\Paymentmethod\Instore paynl_payment + after_payment 0 @@ -178,6 +193,7 @@ order Paynl\Payment\Model\Paymentmethod\Klarna paynl_payment + after_payment 0 @@ -188,6 +204,7 @@ order Paynl\Payment\Model\Paymentmethod\Maestro paynl_payment + after_payment 0 @@ -198,6 +215,7 @@ order Paynl\Payment\Model\Paymentmethod\Mistercash paynl_payment + after_payment 0 @@ -208,6 +226,7 @@ order Paynl\Payment\Model\Paymentmethod\Mybank paynl_payment + after_payment 0 @@ -218,6 +237,7 @@ order Paynl\Payment\Model\Paymentmethod\Overboeking paynl_payment + before_payment 0 @@ -228,6 +248,7 @@ order Paynl\Payment\Model\Paymentmethod\Paypal paynl_payment + after_payment 0 @@ -238,6 +259,7 @@ order Paynl\Payment\Model\Paymentmethod\Paysafecard paynl_payment + after_payment 0 @@ -248,6 +270,7 @@ order Paynl\Payment\Model\Paymentmethod\Podiumcadeaukaart paynl_payment + after_payment 0 @@ -258,6 +281,7 @@ order Paynl\Payment\Model\Paymentmethod\Postepay paynl_payment + after_payment 0 @@ -268,6 +292,7 @@ order Paynl\Payment\Model\Paymentmethod\Sofortbanking paynl_payment + before_payment 0 @@ -278,6 +303,7 @@ order Paynl\Payment\Model\Paymentmethod\Telefonischbetalen paynl_payment + after_payment 0 @@ -288,6 +314,7 @@ order Paynl\Payment\Model\Paymentmethod\Visamastercard paynl_payment + after_payment 0 @@ -298,6 +325,7 @@ order Paynl\Payment\Model\Paymentmethod\Vvvgiftcard paynl_payment + after_payment 0 @@ -308,6 +336,7 @@ order Paynl\Payment\Model\Paymentmethod\Webshopgiftcard paynl_payment + after_payment 0 @@ -318,6 +347,7 @@ order Paynl\Payment\Model\Paymentmethod\Wijncadeau paynl_payment + after_payment 0 @@ -328,6 +358,7 @@ order Paynl\Payment\Model\Paymentmethod\Yehhpay paynl_payment + after_payment 0 @@ -338,6 +369,7 @@ order Paynl\Payment\Model\Paymentmethod\Yourgift paynl_payment + after_payment diff --git a/i18n/en_US.csv b/i18n/en_US.csv index 19b61f1b..fbc803cc 100644 --- a/i18n/en_US.csv +++ b/i18n/en_US.csv @@ -1,15 +1,30 @@ "New order email sent","New order email sent" "You notified customer about invoice #%1.","You notified customer about invoice #%1." +"Pay.nl canceled the order","Pay.nl canceled the order" +"Pay.nl Uncanceled order","Pay.nl Uncanceled order" +"We cannot un-cancel this order.","We cannot un-cancel this order." "Invalid return, no transactionId specified","Invalid return, no transactionId specified" "There was an error checking the transaction status","There was an error checking the transaction status" "Payment canceled","Payment canceled" -"Unable to cancel order","Unable to cancel order" "Something went wrong, please try again later","Something went wrong, please try again later" "Enter your API-token and ServiceId first","Enter your API-token and ServiceId first" No,No Yes,Yes "Not available, you can enable this on admin.pay.nl","Not available, you can enable this on admin.pay.nl" +Dutch,Dutch +English,English +German,German +Italian,Italian +French,French +Spanish,Spanish +"After successful payment","After successful payment" +"Before payment","Before payment" "Choose your bank","Choose your bank" +"Choose the pin terminal","Choose the pin terminal" +Caution!,Caution! +"The paylink is added as an order note, you'll have to send the link to the customer yourself.","The paylink is added as an order note, you'll have to send the link to the customer yourself." +"Valid for","Valid for" +days,days Enabled,Enabled Title,Title "New Order Status","New Order Status" @@ -19,10 +34,15 @@ Instructions,Instructions "Minimum Order Total","Minimum Order Total" "Maximum Order Total","Maximum Order Total" "Sort Order","Sort Order" +"Send new order email","Send new order email" "Show bankselection","Show bankselection" "Pay.nl Settings","Pay.nl Settings" +Testmode,Testmode API-token,API-token ServiceId,ServiceId -Testmode,Testmode +"Language payment screen","Language payment screen" +"Never cancel order","Never cancel order" +"This setting will disable cancelling the order when the payment is canceled. + This can be used if uncancelling the order in case of a second chance payment produces errors. WARNING! Orders will never be cancelled automaticly","This setting will disable cancelling the order when the payment is canceled. + This can be used if uncancelling the order in case of a second chance payment produces errors. WARNING! Orders will never be cancelled automaticly" Paymentmethods,Paymentmethods -Dictionary successfully processed. diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index 8dc149b3..0d95ffae 100644 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -1,13 +1,13 @@ -Pay.nl Uncanceled order,Pay.nl heeft de annulering ongedaan gemaakt -We cannot un-cancel this order.,Kan annulering niet ongedaan maken -New order email sent,Nieuwe order email is verzonden -You notified customer about invoice #%1.,Klantemail verzonden over factuur #%1 +"New order email sent","Nieuwe order email is verzonden" +"You notified customer about invoice #%1.","Klantemail verzonden over factuur #%1" +"Pay.nl canceled the order","Pay.nl - Order geannuleerd" +"Pay.nl Uncanceled order","Pay.nl - Annulering ongedaan gemaakt" +"We cannot un-cancel this order.","Kan annulering niet ongedaan maken" "Invalid return, no transactionId specified","Ongeldige return, geen transactieId meegegeven" -There was an error checking the transaction status,Fout bij het controleren van de transactie status -Payment canceled,Betaling geannuleerd -Unable to cancel order,Kan order niet annuleren +"There was an error checking the transaction status","Fout bij het controleren van de transactie status" +"Payment canceled","Betaling geannuleerd" "Something went wrong, please try again later","Er is iet mis gegaan, probeer het later nogmaals" -Enter your API-token and ServiceId first,Voer eerst je API-token en Service Id in +"Enter your API-token and ServiceId first","Voer eerst je API-token en Service Id in" No,Nee Yes,Ja "Not available, you can enable this on admin.pay.nl","Niet beschikbaar, activeer deze betaalmethode eerst op admin.pay.nl" @@ -17,21 +17,32 @@ German,Duits Italian,Italiaans French,Frans Spanish,Spaans -Choose your bank,Kies uw bank -Choose the pin terminal,Kies de pin terminal +"After successful payment","Na voltooide betaling" +"Before payment","Voor betaling" +"Choose your bank","Kies uw bank" +"Choose the pin terminal","Kies de pin terminal" +Caution!,Let op! +"The paylink is added as an order note, you'll have to send the link to the customer yourself.","De betaallink wordt als notitie bij de order geplaatst, u dient zelf de link naar de klant te mailen" +"Valid for","Geldig voor" +days,dagen Enabled,Ingeschakeld Title,Titel -New Order Status,Nieuwe order status -Payment from Applicable Countries,Selecteer landen -Payment from Specific Countries,Alleen geldig in bepaalde landen +"New Order Status","Nieuwe Order Status" +"Payment from Applicable Countries","Selecteer landen" +"Payment from Specific Countries","Alleen geldig in bepaalde landen" Instructions,Instructies -Minimum Order Total,Minimale order bedrag -Maximum Order Total,Maximale order bedrag -Sort Order,Sorteer volgorde -Show bankselection,Bankselectie weergeven -Pay.nl Settings,Pay.nl instellingen -Testmode,Testmode +"Minimum Order Total","Minimaal order bedrag" +"Maximum Order Total","Maximaal order bedrag" +"Sort Order","Sorteer volgorde" +"Send new order email","Nieuwe order email sturen" +"Show bankselection","Bankselectie tonen" +"Pay.nl Settings","Pay.nl Instellingen" +Testmode,Testmodus API-token,API-token ServiceId,ServiceId -Language payment screen,Taal betaalscherm +"Language payment screen","Taal betaalscherm" +"Never cancel order","Order nooit annuleren" Paymentmethods,Betaalmethoden +"This setting will disable cancelling the order when the payment is canceled. + This can be used if uncancelling the order in case of a second chance payment produces errors. WARNING! Orders will never be cancelled automaticly","Deze instelling zorgt er voor dat orders niet meer geannuleerd worden. + Dit kan je gebruiken als het uncancellen van orders problemen geeft, bijvoorbeeld als je second chance gebruikt. WAARSCHUWING! Orders worden nooit meer automatisch geannuleerd"