diff --git a/Block/Adminhtml/Render/Version.php b/Block/Adminhtml/Render/Version.php index 56b41733..04168ff1 100644 --- a/Block/Adminhtml/Render/Version.php +++ b/Block/Adminhtml/Render/Version.php @@ -7,10 +7,6 @@ use Magento\Framework\Data\Form\Element\AbstractElement; use Paynl\Payment\Model\Config; -/** - * Class Version - * - */ class Version extends Field { protected $paynlConfig; diff --git a/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/Block/Adminhtml/System/Config/Fieldset/Expanded.php index 0cee998c..c8420108 100644 --- a/Block/Adminhtml/System/Config/Fieldset/Expanded.php +++ b/Block/Adminhtml/System/Config/Fieldset/Expanded.php @@ -1,7 +1,4 @@ get('Magento\Framework\View\Page\Config'); - $store = $om->get('Magento\Store\Model\Store'); + $page = $om->get(\Magento\Framework\View\Page\Config::class); + $store = $om->get(\Magento\Store\Model\Store::class); if ($store->getConfig('payment/paynl/pay_style_checkout') == 1) { $page->addPageAsset('Paynl_Payment::css/paycheckout.css'); } diff --git a/Controller/Checkout/Exchange.php b/Controller/Checkout/Exchange.php index f20c8a7a..c88927a4 100644 --- a/Controller/Checkout/Exchange.php +++ b/Controller/Checkout/Exchange.php @@ -1,7 +1,4 @@ */ @@ -101,8 +98,7 @@ public function __construct( OrderRepository $orderRepository, \Paynl\Payment\Model\Config $paynlConfig, \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $builderInterface - ) - { + ) { $this->result = $result; $this->config = $config; $this->orderFactory = $orderFactory; @@ -203,7 +199,6 @@ public function execute() return $this->cancelOrder($order); } } - } private function cancelOrder(Order $order) @@ -332,7 +327,7 @@ private function processPaidOrder(Transaction $transaction, Order $order) # Skip creation of invoice for B2B if enabled if ($this->config->ignoreB2BInvoice($paymentMethod)) { $orderCompany = $order->getBillingAddress()->getCompany(); - if(!empty($orderCompany)) { + if (!empty($orderCompany)) { # Create transaction $formatedPrice = $order->getBaseCurrency()->formatTxt($order->getGrandTotal()); $transactionMessage = __('PAY. - Captured amount of %1.', $formatedPrice); @@ -420,8 +415,10 @@ private function processPartiallyPaidOrder(Order $order, $payOrderId) ->setTransactionId($subProfile) ->setFailSafe(true) ->build('capture') - ->setAdditionalInformation(\Magento\Sales\Model\Order\Payment\Transaction::RAW_DETAILS, - array("Paymentmethod" => $method, "Amount" => $amount, "Currency" => $currency)); + ->setAdditionalInformation( + \Magento\Sales\Model\Order\Payment\Transaction::RAW_DETAILS, + ["Paymentmethod" => $method, "Amount" => $amount, "Currency" => $currency] + ); $transactionBuilder->save(); $order->addStatusHistoryComment(__('PAY.: Partial payment received: '.$subProfile.' - Amount ' . $currency . ' ' . $amount . ' Method: ' . $method)); diff --git a/Controller/Checkout/Finish.php b/Controller/Checkout/Finish.php index 161ab3d8..0d3b9233 100644 --- a/Controller/Checkout/Finish.php +++ b/Controller/Checkout/Finish.php @@ -1,7 +1,4 @@ */ @@ -91,7 +88,7 @@ public function execute() $resultRedirect = $this->resultRedirectFactory->create(); $params = $this->getRequest()->getParams(); $payOrderId = empty($params['orderId']) ? (empty($params['orderid']) ? null : $params['orderid']) : $params['orderId']; - $orderStatusId = empty($params['orderStatusId']) ? null : intval($params['orderStatusId']); + $orderStatusId = empty($params['orderStatusId']) ? null : (int)$params['orderStatusId']; $magOrderId = empty($params['entityid']) ? null : $params['entityid']; $bSuccess = $orderStatusId === Config::ORDERSTATUS_PAID; $bDenied = $orderStatusId === Config::ORDERSTATUS_DENIED; diff --git a/Controller/Checkout/Paylink.php b/Controller/Checkout/Paylink.php index d81a9db5..aea7060c 100644 --- a/Controller/Checkout/Paylink.php +++ b/Controller/Checkout/Paylink.php @@ -1,25 +1,20 @@ _pageFactory = $pageFactory; + return parent::__construct($context); + } - $this->_pageFactory = $pageFactory; - return parent::__construct($context); - } - - public function execute() - { - return $this->_pageFactory->create(); - } -} \ No newline at end of file + public function execute() + { + return $this->_pageFactory->create(); + } +} diff --git a/Controller/Checkout/Redirect.php b/Controller/Checkout/Redirect.php index 2f94cebe..91d2a80a 100644 --- a/Controller/Checkout/Redirect.php +++ b/Controller/Checkout/Redirect.php @@ -1,7 +1,4 @@ */ @@ -21,33 +18,32 @@ class Redirect extends PayAction /** * @var \Paynl\Payment\Model\Config */ - private $config; + private $config; /** * @var \Magento\Checkout\Model\Session */ - private $checkoutSession; + private $checkoutSession; /** * @var \Psr\Log\LoggerInterface */ - private $_logger; + private $_logger; /** * @var PaymentHelper */ - private $paymentHelper; - - /** - * @var QuoteRepository - */ - private $quoteRepository; + private $paymentHelper; + /** + * @var QuoteRepository + */ + private $quoteRepository; - /** - * @var OrderRepository - */ - private $orderRepository; + /** + * @var OrderRepository + */ + private $orderRepository; /** * @param \Magento\Framework\App\Action\Context $context @@ -60,16 +56,15 @@ public function __construct( \Magento\Checkout\Model\Session $checkoutSession, \Psr\Log\LoggerInterface $logger, PaymentHelper $paymentHelper, - QuoteRepository $quoteRepository, - OrderRepository $orderRepository - ) - { + QuoteRepository $quoteRepository, + OrderRepository $orderRepository + ) { $this->config = $config; // PAY. config helper $this->checkoutSession = $checkoutSession; $this->_logger = $logger; $this->paymentHelper = $paymentHelper; - $this->quoteRepository = $quoteRepository; - $this->orderRepository = $orderRepository; + $this->quoteRepository = $quoteRepository; + $this->orderRepository = $orderRepository; parent::__construct($context); } @@ -79,22 +74,22 @@ public function execute() try { $order = $this->checkoutSession->getLastRealOrder(); - if(empty($order)){ + if (empty($order)) { throw new Error('No order found in session, please try again'); } # Restore the quote - $quote = $this->quoteRepository->get($order->getQuoteId()); - $quote->setIsActive(true)->setReservedOrderId(null); - $this->checkoutSession->replaceQuote($quote); - $this->quoteRepository->save($quote); + $quote = $this->quoteRepository->get($order->getQuoteId()); + $quote->setIsActive(true)->setReservedOrderId(null); + $this->checkoutSession->replaceQuote($quote); + $this->quoteRepository->save($quote); - $payment = $order->getPayment(); + $payment = $order->getPayment(); - if (empty($payment)) { - $this->_redirect('checkout/cart'); - return; - } + if (empty($payment)) { + $this->_redirect('checkout/cart'); + return; + } $methodInstance = $this->paymentHelper->getMethodInstance($payment->getMethod()); if ($methodInstance instanceof \Paynl\Payment\Model\Paymentmethod\Paymentmethod) { @@ -103,7 +98,7 @@ public function execute() $this->getResponse()->setNoCacheHeaders(); $this->getResponse()->setRedirect($redirectUrl); } else { - throw new Error('PAY.: Method is not a paynl payment method'); + throw new Error('PAY.: Method is not a paynl payment method'); } } catch (\Exception $e) { diff --git a/Controller/PayAction.php b/Controller/PayAction.php index cf58fe65..82148c46 100644 --- a/Controller/PayAction.php +++ b/Controller/PayAction.php @@ -1,14 +1,7 @@ */ @@ -26,7 +23,7 @@ class Config private $resources; /** @array Brands */ - public $brands = array( + public $brands = [ "paynl_payment_afterpay" => "14", "paynl_payment_afterpay_international" => "14", "paynl_payment_alipay" => "82", @@ -82,7 +79,7 @@ class Config "paynl_payment_wijncadeau" => "135", "paynl_payment_yehhpay" => "1", "paynl_payment_yourgift" => "31" - ); + ]; public function __construct( Store $store, @@ -113,7 +110,7 @@ public function getVersion($defaultValue = '') public function getMagentoVersion() { $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); - $productMetadata = $objectManager->get('Magento\Framework\App\ProductMetadataInterface'); + $productMetadata = $objectManager->get(\Magento\Framework\App\ProductMetadataInterface::class); $version = $productMetadata->getVersion(); return $version; @@ -144,7 +141,7 @@ public function isTestMode() $ipconfig = $this->store->getConfig('payment/paynl/testipaddress'); $allowed_ips = explode(',', $ipconfig); - if(in_array($ip, $allowed_ips) && filter_var($ip, FILTER_VALIDATE_IP) && strlen($ip) > 0 && count($allowed_ips) > 0){ + if (in_array($ip, $allowed_ips) && filter_var($ip, FILTER_VALIDATE_IP) && strlen($ip) > 0 && count($allowed_ips) > 0) { return true; } return $this->store->getConfig('payment/paynl/testmode') == 1; @@ -204,7 +201,7 @@ public function ignoreB2BInvoice($methodCode) public function autoCaptureEnabled() { - return $this->store->getConfig('payment/paynl/auto_capture') == 1; + return $this->store->getConfig('payment/paynl/auto_capture') == 1; } /** @@ -275,12 +272,18 @@ public function getIconUrl($methodCode, $paymentOptionId) $iconUrl = $this->resources->getViewFileUrl("Paynl_Payment::logos/" . $brandId . ".png"); } else { $iconsize = '50x32'; - if($this->store->getConfig('payment/paynl/pay_style_checkout') == 1){ - switch($this->store->getConfig('payment/paynl/icon_size')){ - case 'xlarge': $iconsize = '100x100'; break; - case 'large': $iconsize = '75x75'; break; - case 'medium': $iconsize = '50x50'; break; - } + if ($this->store->getConfig('payment/paynl/pay_style_checkout') == 1) { + switch ($this->store->getConfig('payment/paynl/icon_size')) { + case 'xlarge': + $iconsize = '100x100'; + break; + case 'large': + $iconsize = '75x75'; + break; + case 'medium': + $iconsize = '50x50'; + break; + } } $iconUrl = 'https://static.pay.nl/payment_profiles/' . $iconsize . '/' . $paymentOptionId . '.png'; $customUrl = trim($this->store->getConfig('payment/paynl/iconurl')); @@ -293,8 +296,8 @@ public function getIconUrl($methodCode, $paymentOptionId) } public function getIconSize() - { - if($this->store->getConfig('payment/paynl/pay_style_checkout') == 1 && $this->store->getConfig('payment/paynl/image_style') == 'newest'){ + { + if ($this->store->getConfig('payment/paynl/pay_style_checkout') == 1 && $this->store->getConfig('payment/paynl/image_style') == 'newest') { return $this->store->getConfig('payment/paynl/icon_size'); } return false; @@ -320,17 +323,18 @@ public function registerPartialPayments() return $this->store->getConfig('payment/paynl/register_partial_payments'); } - public function getPaymentmethodCode($paymentProfileId){ + public function getPaymentmethodCode($paymentProfileId) + { //Get all PAY. methods $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); - $paymentHelper = $objectManager->get('Magento\Payment\Helper\Data'); + $paymentHelper = $objectManager->get(\Magento\Payment\Helper\Data::class); $paymentMethodList = $paymentHelper->getPaymentMethods(); - $pay_methods = array(); + $pay_methods = []; foreach ($paymentMethodList as $key => $value) { if (strpos($key, 'paynl_') !== false && $key != 'paynl_payment_paylink') { $code = $this->store->getConfig('payment/' . $key . '/payment_option_id'); - if($code == $paymentProfileId){ + if ($code == $paymentProfileId) { return $key; } } diff --git a/Model/Config/Source/Available/Afterpay.php b/Model/Config/Source/Available/Afterpay.php index 5a8f0b1f..30f470f5 100644 --- a/Model/Config/Source/Available/Afterpay.php +++ b/Model/Config/Source/Available/Afterpay.php @@ -1,12 +1,8 @@ _config = $config; $this->_request = $request; $this->_scopeConfig = $scopeConfig; @@ -101,13 +97,12 @@ public function toArray() } catch (\Exception $e) { return [0 => 'Error: ' . $e->getMessage()]; } - } protected function getPaymentOptionId() { $method = $this->_paymentmethodFactory->create($this->_class); - if($method instanceof PaymentMethod){ + if ($method instanceof PaymentMethod) { return $method->getPaymentOptionId(); } return null; @@ -128,7 +123,6 @@ protected function getConfigValue($path) $scopeType = ScopeInterface::SCOPE_WEBSITE; } - return $this->_scopeConfig->getValue($path, $scopeType, $scopeValue); } diff --git a/Model/Config/Source/Available/Billink.php b/Model/Config/Source/Available/Billink.php index f34fda49..c140b867 100644 --- a/Model/Config/Source/Available/Billink.php +++ b/Model/Config/Source/Available/Billink.php @@ -1,12 +1,8 @@ __('checkout') ]; } - } diff --git a/Model/Config/Source/DefaultPaymentOption.php b/Model/Config/Source/DefaultPaymentOption.php index 4faf9f34..fd86e183 100644 --- a/Model/Config/Source/DefaultPaymentOption.php +++ b/Model/Config/Source/DefaultPaymentOption.php @@ -1,7 +1,4 @@ get('Magento\Payment\Model\Config'); + $objectManager = \Magento\Framework\App\ObjectManager::getInstance(); + $paymentConfig = $objectManager->get(\Magento\Payment\Model\Config::class); $activePaymentMethods = $paymentConfig->getActiveMethods(); - $scopeConfigInterface = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface'); + $scopeConfigInterface = $objectManager->get(\Magento\Framework\App\Config\ScopeConfigInterface::class); //get only PAY. Methods - $active_paynl_methods = array(); + $active_paynl_methods = []; $active_paynl_methods[0] = 'None'; foreach ($activePaymentMethods as $key => $value) { - if(strpos($key, 'paynl') !== false && $key != 'paynl_payment_paylink'){ + if (strpos($key, 'paynl') !== false && $key != 'paynl_payment_paylink') { $active_paynl_methods[$key] = $scopeConfigInterface->getValue('payment/' . $key . '/title'); } } return $active_paynl_methods; } - } diff --git a/Model/Config/Source/IconSize.php b/Model/Config/Source/IconSize.php new file mode 100644 index 00000000..06ce2aa3 --- /dev/null +++ b/Model/Config/Source/IconSize.php @@ -0,0 +1,41 @@ +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 [ + 'xsmall' => __('Extra small'), + 'small' => __('Small'), + 'medium' => __('Medium'), + 'large' => __('Large'), + 'xlarge' => __('Extra large'), + ]; + } +} diff --git a/Model/Config/Source/ImageStyle.php b/Model/Config/Source/ImageStyle.php new file mode 100644 index 00000000..c0d29278 --- /dev/null +++ b/Model/Config/Source/ImageStyle.php @@ -0,0 +1,38 @@ +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 [ + 'classic' => __('Classic'), + 'newest' => __('Newest'), + ]; + } +} diff --git a/Model/Config/Source/Languages.php b/Model/Config/Source/Languages.php index e327fe1a..1ba02752 100644 --- a/Model/Config/Source/Languages.php +++ b/Model/Config/Source/Languages.php @@ -1,7 +1,4 @@ __('Spanish') ]; } - } diff --git a/Model/Config/Source/OffOn.php b/Model/Config/Source/OffOn.php index 4d099d23..2474de8c 100644 --- a/Model/Config/Source/OffOn.php +++ b/Model/Config/Source/OffOn.php @@ -1,7 +1,4 @@ toArray(); + public function toOptionArray() + { + $arrOptions = $this->toArray(); - $arrResult = []; - foreach ($arrOptions as $value => $label) { - $arrResult[] = ['value' => $value, 'label' => $label]; + $arrResult = []; + foreach ($arrOptions as $value => $label) { + $arrResult[] = ['value' => $value, 'label' => $label]; + } + return $arrResult; } - return $arrResult; - } /** * Get options in "key-value" format * * @return array */ - public function toArray() - { - return [ - '0' => __('Off'), - '1' => __('On'), - ]; - } - + public function toArray() + { + return [ + '0' => __('Off'), + '1' => __('On'), + ]; + } } diff --git a/Model/Config/Source/Order/Status/Holded.php b/Model/Config/Source/Order/Status/Holded.php index ca5ac0c6..ee49ed41 100644 --- a/Model/Config/Source/Order/Status/Holded.php +++ b/Model/Config/Source/Order/Status/Holded.php @@ -1,16 +1,10 @@ __('Before payment') ]; } - } diff --git a/Model/Config/Source/ShowCompanyOptions.php b/Model/Config/Source/ShowCompanyOptions.php new file mode 100644 index 00000000..fe107ffb --- /dev/null +++ b/Model/Config/Source/ShowCompanyOptions.php @@ -0,0 +1,39 @@ +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 [ + '0' => __('Both'), + '1' => __('Private only'), + '2' => __('Companies only'), + ]; + } +} diff --git a/Model/Config/Source/ShowDobOptions.php b/Model/Config/Source/ShowDobOptions.php new file mode 100644 index 00000000..a36aeff7 --- /dev/null +++ b/Model/Config/Source/ShowDobOptions.php @@ -0,0 +1,39 @@ +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 [ + '0' => __('No'), + '1' => __('Yes, as optional'), + '2' => __('Yes, as required'), + ]; + } +} diff --git a/Model/Config/Source/ShowKvkOptions.php b/Model/Config/Source/ShowKvkOptions.php new file mode 100644 index 00000000..7b090f2f --- /dev/null +++ b/Model/Config/Source/ShowKvkOptions.php @@ -0,0 +1,39 @@ +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 [ + '0' => __('No'), + '1' => __('Yes, as optional'), + '2' => __('Yes, as required'), + ]; + } +} diff --git a/Model/Config/Source/ShowNonPrivate.php b/Model/Config/Source/ShowNonPrivate.php new file mode 100644 index 00000000..6e2b8830 --- /dev/null +++ b/Model/Config/Source/ShowNonPrivate.php @@ -0,0 +1,39 @@ +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 [ + '0' => __('Off'), + '1' => __('Optional for business customers'), + '2' => __('Required for business customers'), + ]; + } +} diff --git a/Model/Config/Source/ShowPaylinkOptions.php b/Model/Config/Source/ShowPaylinkOptions.php new file mode 100644 index 00000000..30f2e3da --- /dev/null +++ b/Model/Config/Source/ShowPaylinkOptions.php @@ -0,0 +1,38 @@ +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 [ + true => __('Enable'), + false => __('Disable') + ]; + } +} diff --git a/Model/Config/Source/showUseragentOptions.php b/Model/Config/Source/ShowUseragentOptions.php similarity index 88% rename from Model/Config/Source/showUseragentOptions.php rename to Model/Config/Source/ShowUseragentOptions.php index 27d4ab34..5d996faf 100644 --- a/Model/Config/Source/showUseragentOptions.php +++ b/Model/Config/Source/ShowUseragentOptions.php @@ -1,13 +1,10 @@ __('Custom') ]; } - } diff --git a/Model/Config/Source/iconSize.php b/Model/Config/Source/iconSize.php deleted file mode 100644 index a1befa75..00000000 --- a/Model/Config/Source/iconSize.php +++ /dev/null @@ -1,45 +0,0 @@ -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 [ - 'xsmall' => __('Extra small'), - 'small' => __('Small'), - 'medium' => __('Medium'), - 'large' => __('Large'), - 'xlarge' => __('Extra large'), - ]; - } - -} diff --git a/Model/Config/Source/imageStyle.php b/Model/Config/Source/imageStyle.php deleted file mode 100644 index 1872c81f..00000000 --- a/Model/Config/Source/imageStyle.php +++ /dev/null @@ -1,42 +0,0 @@ -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 [ - 'classic' => __('Classic'), - 'newest' => __('Newest'), - ]; - } - -} diff --git a/Model/Config/Source/showCompanyOptions.php b/Model/Config/Source/showCompanyOptions.php deleted file mode 100644 index 8803acce..00000000 --- a/Model/Config/Source/showCompanyOptions.php +++ /dev/null @@ -1,43 +0,0 @@ -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 [ - '0' => __('Both'), - '1' => __('Private only'), - '2' => __('Companies only'), - ]; - } - -} diff --git a/Model/Config/Source/showDobOptions.php b/Model/Config/Source/showDobOptions.php deleted file mode 100644 index 278c4adf..00000000 --- a/Model/Config/Source/showDobOptions.php +++ /dev/null @@ -1,43 +0,0 @@ -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 [ - '0' => __('No'), - '1' => __('Yes, as optional'), - '2' => __('Yes, as required'), - ]; - } - -} diff --git a/Model/Config/Source/showKvkOptions.php b/Model/Config/Source/showKvkOptions.php deleted file mode 100644 index 7379dccf..00000000 --- a/Model/Config/Source/showKvkOptions.php +++ /dev/null @@ -1,43 +0,0 @@ -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 [ - '0' => __('No'), - '1' => __('Yes, as optional'), - '2' => __('Yes, as required'), - ]; - } - -} diff --git a/Model/Config/Source/showNonPrivate.php b/Model/Config/Source/showNonPrivate.php deleted file mode 100644 index 5510b8d6..00000000 --- a/Model/Config/Source/showNonPrivate.php +++ /dev/null @@ -1,43 +0,0 @@ -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 [ - '0' => __('Off'), - '1' => __('Optional for business customers'), - '2' => __('Required for business customers'), - ]; - } - -} diff --git a/Model/Config/Source/showPaylinkOptions.php b/Model/Config/Source/showPaylinkOptions.php deleted file mode 100644 index 3d4c4f9d..00000000 --- a/Model/Config/Source/showPaylinkOptions.php +++ /dev/null @@ -1,42 +0,0 @@ -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 [ - true => __('Enable'), - false => __('Disable') - ]; - } - -} diff --git a/Model/ConfigProvider.php b/Model/ConfigProvider.php index 1cd2ab52..3f49f3e9 100644 --- a/Model/ConfigProvider.php +++ b/Model/ConfigProvider.php @@ -1,16 +1,11 @@ paynlConfig->getUseAdditionalValidation(); - $config['payment']['iconsize'] = $this->paynlConfig->getIconSize();; + $config['payment']['iconsize'] = $this->paynlConfig->getIconSize(); + ; return $config; } @@ -198,5 +193,4 @@ protected function getIcon($code) $url = $this->paynlConfig->getIconUrl($code, $this->methods[$code]->getPaymentOptionId()); return $url; } - } diff --git a/Model/Paymentmethod/Afterpay.php b/Model/Paymentmethod/Afterpay.php index fe8a38cd..b0237c7f 100644 --- a/Model/Paymentmethod/Afterpay.php +++ b/Model/Paymentmethod/Afterpay.php @@ -1,14 +1,7 @@ get('Magento\Framework\App\CacheInterface'); - return $cache; - } - + private function getCache() + { + /** @var \Magento\Framework\ObjectManagerInterface $om */ + $om = \Magento\Framework\App\ObjectManager::getInstance(); + /** @var \Magento\Framework\App\CacheInterface $cache */ + $cache = $om->get(\Magento\Framework\App\CacheInterface::class); + return $cache; + } } diff --git a/Model/Paymentmethod/Capayable.php b/Model/Paymentmethod/Capayable.php index 359eac74..f9136c6a 100644 --- a/Model/Paymentmethod/Capayable.php +++ b/Model/Paymentmethod/Capayable.php @@ -1,14 +1,7 @@ getPaymentOptionId()); $cache->save(json_encode($banks), $cacheName); } - array_unshift($banks, array( + array_unshift($banks, [ 'id' => '', 'name' => __('Choose your bank'), 'visibleName' => __('Choose your bank') - )); + ]); return $banks; } @@ -74,7 +67,7 @@ private function getCache() /** @var \Magento\Framework\ObjectManagerInterface $om */ $om = \Magento\Framework\App\ObjectManager::getInstance(); /** @var \Magento\Framework\App\CacheInterface $cache */ - $cache = $om->get('Magento\Framework\App\CacheInterface'); + $cache = $om->get(\Magento\Framework\App\CacheInterface::class); return $cache; } } diff --git a/Model/Paymentmethod/Instore.php b/Model/Paymentmethod/Instore.php index 1ef83e9c..91cac934 100644 --- a/Model/Paymentmethod/Instore.php +++ b/Model/Paymentmethod/Instore.php @@ -1,16 +1,9 @@ getRedirectUrl(); } catch (\Exception $e) { - $this->logger->critical($e->getMessage(), array()); + $this->logger->critical($e->getMessage(), []); if ($e->getCode() == 201) { $this->messageManager->addNoticeMessage($e->getMessage()); @@ -101,14 +94,14 @@ public function getPaymentOptions() } $cache->save(json_encode($terminalsArr), $cacheName); } catch (\Paynl\Error\Error $e) { - // Probably instore is not activated, no terminals present + return false; } } - array_unshift($terminalsArr, array( + array_unshift($terminalsArr, [ 'id' => '', 'name' => __('Choose the pin terminal'), 'visibleName' => __('Choose the pin terminal') - )); + ]); return $terminalsArr; } @@ -125,7 +118,7 @@ private function getCache() /** @var \Magento\Framework\ObjectManagerInterface $om */ $om = \Magento\Framework\App\ObjectManager::getInstance(); /** @var \Magento\Framework\App\CacheInterface $cache */ - $cache = $om->get('Magento\Framework\App\CacheInterface'); + $cache = $om->get(\Magento\Framework\App\CacheInterface::class); return $cache; } @@ -177,5 +170,4 @@ public function isCurrentAgentValid() return false; } - } diff --git a/Model/Paymentmethod/Invisible.php b/Model/Paymentmethod/Invisible.php index 3d976e30..fcaf89e0 100644 --- a/Model/Paymentmethod/Invisible.php +++ b/Model/Paymentmethod/Invisible.php @@ -17,4 +17,4 @@ protected function getDefaultPaymentOptionId() { return 0; } -} \ No newline at end of file +} diff --git a/Model/Paymentmethod/Klarna.php b/Model/Paymentmethod/Klarna.php index c6843a91..e059df90 100644 --- a/Model/Paymentmethod/Klarna.php +++ b/Model/Paymentmethod/Klarna.php @@ -1,10 +1,7 @@ get('Magento\Framework\Locale\Resolver'); + $getLocale = $objectManager->get(\Magento\Framework\Locale\Resolver::class); $haystack = $getLocale->getLocale(); $lang = strstr($haystack, '_', true); @@ -71,41 +65,40 @@ public function initialize($paymentAction, $stateObject) 'email' => $senderEmail, ]; - $customerEmail = array($order->getCustomerEmail()); + $customerEmail = [$order->getCustomerEmail()]; - $paymentHelper = $objectManager->create('Magento\Payment\Helper\Data'); + $paymentHelper = $objectManager->create(\Magento\Payment\Helper\Data::class); $orderHTML = $paymentHelper->getInfoBlockHtml( $order->getPayment(), $storeId ); - $addressRenderer = $objectManager->create('Magento\Sales\Model\Order\Address\Renderer'); + $addressRenderer = $objectManager->create(\Magento\Sales\Model\Order\Address\Renderer::class); $show_order_in_mail = $this->_scopeConfig->getValue('payment/paynl_payment_paylink/show_order_in_mail', 'store', $storeId); - if($show_order_in_mail){ + if ($show_order_in_mail) { $show_order_in_mail = 1; - } - else{ + } else { $show_order_in_mail = 0; } $subject = $this->_scopeConfig->getValue('payment/paynl_payment_paylink/paylink_subject', 'store', $storeId); - $subject = str_replace('((paylink))',''.__('PAY. paylink').'',$subject); - $subject = str_replace('((customer_name))',$order->getCustomerName(),$subject); - $subject = str_replace('((store_name))',$order->getStore()->getName(),$subject); - $subject = str_replace('((support_email))',''.$supportEmail.'',$subject); - $subject = str_replace('((order_id))',$order->getIncrementId(),$subject); + $subject = str_replace('((paylink))', ''.__('PAY. paylink').'', $subject); + $subject = str_replace('((customer_name))', $order->getCustomerName(), $subject); + $subject = str_replace('((store_name))', $order->getStore()->getName(), $subject); + $subject = str_replace('((support_email))', ''.$supportEmail.'', $subject); + $subject = str_replace('((order_id))', $order->getIncrementId(), $subject); $body = $this->_scopeConfig->getValue('payment/paynl_payment_paylink/paylink_body', 'store', $storeId); $body = nl2br($body); - $body = str_replace('((paylink))',''.__('PAY. paylink').'',$body); - $body = str_replace('((customer_name))',$order->getCustomerName(),$body); - $body = str_replace('((store_name))',$order->getStore()->getName(),$body); - $body = str_replace('((support_email))',''.$supportEmail.'',$body); - $body = str_replace('((order_id))',$order->getIncrementId(),$body); + $body = str_replace('((paylink))', ''.__('PAY. paylink').'', $body); + $body = str_replace('((customer_name))', $order->getCustomerName(), $body); + $body = str_replace('((store_name))', $order->getStore()->getName(), $body); + $body = str_replace('((support_email))', ''.$supportEmail.'', $body); + $body = str_replace('((order_id))', $order->getIncrementId(), $body); - $templateVars = array( + $templateVars = [ 'subject' => $subject, 'body' => $body, 'order' => $order, @@ -128,9 +121,9 @@ public function initialize($paymentAction, $stateObject) 'show_order_in_mail' => $show_order_in_mail ], - ); + ]; - $transportBuilder = $objectManager->create('\Magento\Framework\Mail\Template\TransportBuilder'); + $transportBuilder = $objectManager->create(\Magento\Framework\Mail\Template\TransportBuilder::class); $transport = $transportBuilder->setTemplateIdentifier('paylink_email_template') ->setTemplateOptions(['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]) diff --git a/Model/Paymentmethod/PaymentMethod.php b/Model/Paymentmethod/PaymentMethod.php index c167f02c..4ee121bc 100644 --- a/Model/Paymentmethod/PaymentMethod.php +++ b/Model/Paymentmethod/PaymentMethod.php @@ -1,7 +1,4 @@ messageManager = $objectManager->get(\Magento\Framework\Message\ManagerInterface::class); - $this->helper = $objectManager->create('Paynl\Payment\Helper\PayHelper'); + $this->helper = $objectManager->create(\Paynl\Payment\Helper\PayHelper::class); $this->paynlConfig = $paynlConfig; $this->orderRepository = $orderRepository; $this->orderConfig = $orderConfig; $this->logger = $objectManager->get(\Psr\Log\LoggerInterface::class); - $this->storeManager = $objectManager->create('\Magento\Store\Model\StoreManagerInterface'); + $this->storeManager = $objectManager->create(\Magento\Store\Model\StoreManagerInterface::class); } protected function getState($status) @@ -113,7 +113,9 @@ protected function getState($status) foreach ($validStates as $state) { $statusses = $this->orderConfig->getStateStatuses($state, false); - if (in_array($status, $statusses)) return $state; + if (in_array($status, $statusses)) { + return $state; + } } return false; } @@ -158,7 +160,6 @@ public function getCompany() return $this->_scopeConfig->getValue('payment/' . $this->_code . '/showforcompany', 'store'); } - public function isCurrentIpValid() { return true; @@ -320,7 +321,6 @@ protected function doStartTransaction(Order $order) $orderId = $order->getIncrementId(); $quoteId = $order->getQuoteId(); - $store = $order->getStore(); $baseUrl = $store->getBaseUrl(); @@ -333,12 +333,12 @@ protected function doStartTransaction(Order $order) if ($arrBillingAddress) { $arrBillingAddress = $arrBillingAddress->toArray(); - $enduser = array( + $enduser = [ 'initials' => $arrBillingAddress['firstname'], 'lastName' => $arrBillingAddress['lastname'], 'phoneNumber' => $arrBillingAddress['telephone'], 'emailAddress' => $arrBillingAddress['email'], - ); + ]; if (isset($additionalData['dob'])) { $enduser['dob'] = $additionalData['dob']; @@ -350,27 +350,27 @@ protected function doStartTransaction(Order $order) $enduser['gender'] = $this->genderConversion((empty($enduser['gender'])) ? $order->getCustomerGender($order) : $enduser['gender']); if (!empty($arrBillingAddress['company'])) { - $enduser['company']['name'] = $arrBillingAddress['company']; + $enduser['company']['name'] = $arrBillingAddress['company']; } if (!empty($arrBillingAddress['country_id'])) { $enduser['company']['countryCode'] = $arrBillingAddress['country_id']; - } + } if (!empty($kvknummer)) { - $enduser['company']['cocNumber'] = $kvknummer; + $enduser['company']['cocNumber'] = $kvknummer; } if (!empty($arrBillingAddress['vat_id'])) { $enduser['company']['vatNumber'] = $arrBillingAddress['vat_id']; - } else if (!empty($vatnumber)) { + } elseif (!empty($vatnumber)) { $enduser['company']['vatNumber'] = $vatnumber; } - $invoiceAddress = array( + $invoiceAddress = [ 'initials' => $arrBillingAddress['firstname'], 'lastName' => $arrBillingAddress['lastname'] - ); + ]; $arrAddress = \Paynl\Helper::splitAddress($arrBillingAddress['street']); $invoiceAddress['streetName'] = $arrAddress[0]; @@ -380,7 +380,7 @@ protected function doStartTransaction(Order $order) $invoiceAddress['country'] = $arrBillingAddress['country_id']; if (!empty($arrShippingAddress['vat_id'])) { - $enduser['company']['vatNumber'] = $arrShippingAddress['vat_id']; + $enduser['company']['vatNumber'] = $arrShippingAddress['vat_id']; } } @@ -388,10 +388,10 @@ protected function doStartTransaction(Order $order) if ($arrShippingAddress) { $arrShippingAddress = $arrShippingAddress->toArray(); - $shippingAddress = array( + $shippingAddress = [ 'initials' => $arrShippingAddress['firstname'], 'lastName' => $arrShippingAddress['lastname'] - ); + ]; $arrAddress2 = \Paynl\Helper::splitAddress($arrShippingAddress['street']); $shippingAddress['streetName'] = $arrAddress2[0]; $shippingAddress['houseNumber'] = $arrAddress2[1]; @@ -404,7 +404,7 @@ protected function doStartTransaction(Order $order) $prefix = $this->_scopeConfig->getValue('payment/paynl/order_description_prefix', 'store'); $description = !empty($prefix) ? $prefix . $orderId : $orderId; - $data = array( + $data = [ 'amount' => $total, 'returnUrl' => $returnUrl, 'paymentMethod' => $paymentOptionId, @@ -419,7 +419,7 @@ protected function doStartTransaction(Order $order) 'exchangeUrl' => $exchangeUrl, 'currency' => $currency, 'object' => substr('magento2 ' . $this->paynlConfig->getVersion() . ' | ' . $this->paynlConfig->getMagentoVersion() . ' | ' . $this->paynlConfig->getPHPVersion(), 0, 64), - ); + ]; if (isset($shippingAddress)) { $data['address'] = $shippingAddress; } @@ -429,7 +429,7 @@ protected function doStartTransaction(Order $order) if (isset($enduser)) { $data['enduser'] = $enduser; } - $arrProducts = array(); + $arrProducts = []; foreach ($items as $item) { $arrItem = $item->toArray(); if ($arrItem['price_incl_tax'] != null) { @@ -442,14 +442,14 @@ protected function doStartTransaction(Order $order) $price = $arrItem['base_price_incl_tax']; } - $product = array( + $product = [ 'id' => $arrItem['product_id'], 'name' => $arrItem['name'], 'price' => $price, 'qty' => $arrItem['qty_ordered'], 'tax' => $taxAmount, 'type' => \Paynl\Transaction::PRODUCT_TYPE_ARTICLE - ); + ]; # Product id's must be unique. Combinations of a "Configurable products" share the same product id. # Each combination of a "configurable product" can be represented by a "simple product". @@ -459,9 +459,9 @@ protected function doStartTransaction(Order $order) $children = $item->getChildrenItems(); $child = array_shift($children); - if (!empty($child) && $child instanceof \Magento\Sales\Model\Order\Item && method_exists($child, 'getProductId')) { - $product['id'] = $child->getProductId(); - } + if (!empty($child) && $child instanceof \Magento\Sales\Model\Order\Item && method_exists($child, 'getProductId')) { + $product['id'] = $child->getProductId(); + } } $arrProducts[] = $product; @@ -480,14 +480,14 @@ protected function doStartTransaction(Order $order) $shippingDescription = $order->getShippingDescription(); if ($shippingCost != 0) { - $arrProducts[] = array( + $arrProducts[] = [ 'id' => 'shipping', 'name' => $shippingDescription, 'price' => $shippingCost, 'qty' => 1, 'tax' => $shippingTax, 'type' => \Paynl\Transaction::PRODUCT_TYPE_SHIPPING - ); + ]; } // Gift Wrapping @@ -500,14 +500,14 @@ protected function doStartTransaction(Order $order) } if ($gwCost != 0) { - $arrProducts[] = array( + $arrProducts[] = [ 'id' => $order->getGwId(), 'name' => 'Gift Wrapping', 'price' => $gwCost, 'qty' => 1, 'tax' => $gwTax, 'type' => \Paynl\Transaction::PRODUCT_TYPE_HANDLING - ); + ]; } // kortingen @@ -526,14 +526,14 @@ protected function doStartTransaction(Order $order) $discountDescription = __('Discount'); if ($discount != 0) { - $arrProducts[] = array( + $arrProducts[] = [ 'id' => 'discount', 'name' => $discountDescription, 'price' => $discount, 'qty' => 1, 'tax' => $discountTax, 'type' => \Paynl\Transaction::PRODUCT_TYPE_DISCOUNT - ); + ]; } $data['products'] = $arrProducts; @@ -548,8 +548,6 @@ protected function doStartTransaction(Order $order) } $data['ipaddress'] = $ipAddress; - - $transaction = \Paynl\Transaction::start($data); return $transaction; @@ -559,7 +557,9 @@ public function getPaymentOptionId() { $paymentOptionId = $this->getConfigData('payment_option_id'); - if (empty($paymentOptionId)) $paymentOptionId = $this->getDefaultPaymentOptionId(); + if (empty($paymentOptionId)) { + $paymentOptionId = $this->getDefaultPaymentOptionId(); + } return $paymentOptionId; } diff --git a/Model/Paymentmethod/Paypal.php b/Model/Paymentmethod/Paypal.php index e8de440c..bf93a7b8 100644 --- a/Model/Paymentmethod/Paypal.php +++ b/Model/Paymentmethod/Paypal.php @@ -1,14 +1,7 @@ getEvent()->getOrder(); + $order = $observer->getEvent()->getOrder(); $this->config->setStore($order->getStore()); - if ($this->config->autoCaptureEnabled()) { + if ($this->config->autoCaptureEnabled()) { if ($order->getState() == Order::STATE_PROCESSING && !$order->hasInvoices() && $order->hasShipments()) { $data = $order->getPayment()->getData(); @@ -54,7 +54,7 @@ public function execute(\Magento\Framework\Event\Observer $observer) $amountPaid = isset($data['amount_paid']) ? $data['amount_paid'] : null; $amountRefunded = isset($data['amount_refunded']) ? $data['amount_refunded'] : null; - if ($bHasAmountAuthorized && is_null($amountPaid) && is_null($amountRefunded)) { + if ($bHasAmountAuthorized && $amountPaid === null && $amountRefunded === null) { $this->logger->debug('PAY.: AUTO-CAPTURING ' . $data['last_trans_id']); try { \Paynl\Config::setApiToken($this->config->getApiToken()); @@ -71,5 +71,4 @@ public function execute(\Magento\Framework\Event\Observer $observer) } } } - } diff --git a/Observer/ShipmentSaveAfter.php b/Observer/ShipmentSaveAfter.php index ad20e8a4..106d9982 100644 --- a/Observer/ShipmentSaveAfter.php +++ b/Observer/ShipmentSaveAfter.php @@ -44,8 +44,8 @@ public function execute(\Magento\Framework\Event\Observer $observer) { $order = $observer->getEvent()->getShipment()->getOrder(); $this->config->setStore($order->getStore()); - - if ($this->config->autoCaptureEnabled()) { + + if ($this->config->autoCaptureEnabled()) { if ($order->getState() == Order::STATE_PROCESSING && !$order->hasInvoices()) { $data = $order->getPayment()->getData(); @@ -54,7 +54,7 @@ public function execute(\Magento\Framework\Event\Observer $observer) $amountPaid = isset($data['amount_paid']) ? $data['amount_paid'] : null; $amountRefunded = isset($data['amount_refunded']) ? $data['amount_refunded'] : null; - if ($bHasAmountAuthorized && is_null($amountPaid) && is_null($amountRefunded)) { + if ($bHasAmountAuthorized && $amountPaid === null && $amountRefunded === null) { $this->logger->debug('PAY.: AUTO-CAPTURING (rest)' . $data['last_trans_id']); try { \Paynl\Config::setApiToken($this->config->getApiToken()); diff --git a/Observer/SubtractInventoryObserver.php b/Observer/SubtractInventoryObserver.php index 31470130..e4cc994a 100644 --- a/Observer/SubtractInventoryObserver.php +++ b/Observer/SubtractInventoryObserver.php @@ -1,4 +1,5 @@ stockManagement = $stockManagement; $this->stockIndexerProcessor = $stockIndexerProcessor; $this->logger = $logger; @@ -63,8 +63,7 @@ public function execute(EventObserver $observer) $productQty, $order->getStore()->getWebsiteId() ); - - + $productIds = []; foreach ($itemsForReindex as $item) { $item->save(); @@ -77,4 +76,4 @@ public function execute(EventObserver $observer) $order->setInventoryProcessed(true); return $this; } -} \ No newline at end of file +} diff --git a/Plugin/OrderPaymentAdditionalInformation.php b/Plugin/OrderPaymentAdditionalInformation.php index dac7ce8b..a9103243 100644 --- a/Plugin/OrderPaymentAdditionalInformation.php +++ b/Plugin/OrderPaymentAdditionalInformation.php @@ -4,10 +4,6 @@ use Magento\Sales\Model\Order\Payment; -/** - * Class OrderPaymentAdditionalInformation - * @package Paynl\Payment\Plugin - */ class OrderPaymentAdditionalInformation { /** diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index e1e56c94..14502352 100644 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -8,11 +8,6 @@ use Magento\Store\Model\Store; use Psr\Log\LoggerInterface; -/** - * Class InstallSchema - * - * @package Paynl\Payment\Setup - */ class InstallSchema implements \Magento\Framework\Setup\InstallSchemaInterface { /** @@ -52,9 +47,8 @@ public function install(\Magento\Framework\Setup\SchemaSetupInterface $setup, \M $this->configWriter->save('payment/paynl/image_style', 'newest'); $this->configWriter->save('payment/paynl/pay_style_checkout', 1); - $this->configWriter->save('payment/paynl/icon_size', 'small'); + $this->configWriter->save('payment/paynl/icon_size', 'small'); $setup->endSetup(); } - } diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index af073333..75244fab 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -13,11 +13,6 @@ use Magento\Framework\Setup\ModuleDataSetupInterface; use Psr\Log\LoggerInterface; -/** - * Class UpgradeData - * - * @package Paynl\Payment\Setup - */ class UpgradeData implements UpgradeDataInterface { /** @@ -107,5 +102,4 @@ private function updateFashionGiftcard() $this->resourceConfig->saveConfig($path, '1669', 'default', 0); } } - } diff --git a/etc/adminhtml/paymentmethods.xml b/etc/adminhtml/paymentmethods.xml index e5293645..3ee1c5d9 100644 --- a/etc/adminhtml/paymentmethods.xml +++ b/etc/adminhtml/paymentmethods.xml @@ -1,8 +1,5 @@ diff --git a/etc/adminhtml/paymentmethods/afterpay.xml b/etc/adminhtml/paymentmethods/afterpay.xml index d3aeac52..5d88be94 100644 --- a/etc/adminhtml/paymentmethods/afterpay.xml +++ b/etc/adminhtml/paymentmethods/afterpay.xml @@ -108,7 +108,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -117,7 +117,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -126,7 +126,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/alipay.xml b/etc/adminhtml/paymentmethods/alipay.xml index 78aa3dac..e05ea303 100644 --- a/etc/adminhtml/paymentmethods/alipay.xml +++ b/etc/adminhtml/paymentmethods/alipay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/amazonpay.xml b/etc/adminhtml/paymentmethods/amazonpay.xml index 937a6e3c..4b58cf44 100644 --- a/etc/adminhtml/paymentmethods/amazonpay.xml +++ b/etc/adminhtml/paymentmethods/amazonpay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/amex.xml b/etc/adminhtml/paymentmethods/amex.xml index 9f1196ad..d99d274a 100644 --- a/etc/adminhtml/paymentmethods/amex.xml +++ b/etc/adminhtml/paymentmethods/amex.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/applepay.xml b/etc/adminhtml/paymentmethods/applepay.xml index 8745c99f..852cf5dc 100644 --- a/etc/adminhtml/paymentmethods/applepay.xml +++ b/etc/adminhtml/paymentmethods/applepay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/billink.xml b/etc/adminhtml/paymentmethods/billink.xml index 5d71daea..b4ee2aac 100644 --- a/etc/adminhtml/paymentmethods/billink.xml +++ b/etc/adminhtml/paymentmethods/billink.xml @@ -11,7 +11,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -20,7 +20,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -29,7 +29,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/capayable.xml b/etc/adminhtml/paymentmethods/capayable.xml index e6720661..6b66fd3f 100644 --- a/etc/adminhtml/paymentmethods/capayable.xml +++ b/etc/adminhtml/paymentmethods/capayable.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/capayable_gespreid.xml b/etc/adminhtml/paymentmethods/capayable_gespreid.xml index 6f4bf4c9..0d546c2e 100644 --- a/etc/adminhtml/paymentmethods/capayable_gespreid.xml +++ b/etc/adminhtml/paymentmethods/capayable_gespreid.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/cartasi.xml b/etc/adminhtml/paymentmethods/cartasi.xml index e8aa72a9..842c4baa 100644 --- a/etc/adminhtml/paymentmethods/cartasi.xml +++ b/etc/adminhtml/paymentmethods/cartasi.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/cartebleue.xml b/etc/adminhtml/paymentmethods/cartebleue.xml index c681fd60..03c75c1f 100644 --- a/etc/adminhtml/paymentmethods/cartebleue.xml +++ b/etc/adminhtml/paymentmethods/cartebleue.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/cashly.xml b/etc/adminhtml/paymentmethods/cashly.xml index 4b312858..f682e3a9 100644 --- a/etc/adminhtml/paymentmethods/cashly.xml +++ b/etc/adminhtml/paymentmethods/cashly.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/clickandbuy.xml b/etc/adminhtml/paymentmethods/clickandbuy.xml index b14a27eb..83272b7f 100644 --- a/etc/adminhtml/paymentmethods/clickandbuy.xml +++ b/etc/adminhtml/paymentmethods/clickandbuy.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/creditclick.xml b/etc/adminhtml/paymentmethods/creditclick.xml index 0df4664a..f8829c67 100644 --- a/etc/adminhtml/paymentmethods/creditclick.xml +++ b/etc/adminhtml/paymentmethods/creditclick.xml @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/dankort.xml b/etc/adminhtml/paymentmethods/dankort.xml index 73378e80..5e02515e 100644 --- a/etc/adminhtml/paymentmethods/dankort.xml +++ b/etc/adminhtml/paymentmethods/dankort.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/decadeaukaart.xml b/etc/adminhtml/paymentmethods/decadeaukaart.xml index 9ef33341..da4d956b 100644 --- a/etc/adminhtml/paymentmethods/decadeaukaart.xml +++ b/etc/adminhtml/paymentmethods/decadeaukaart.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/eps.xml b/etc/adminhtml/paymentmethods/eps.xml index 374cfa21..c642eb52 100644 --- a/etc/adminhtml/paymentmethods/eps.xml +++ b/etc/adminhtml/paymentmethods/eps.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/fashioncheque.xml b/etc/adminhtml/paymentmethods/fashioncheque.xml index 11677da6..a7475d4d 100644 --- a/etc/adminhtml/paymentmethods/fashioncheque.xml +++ b/etc/adminhtml/paymentmethods/fashioncheque.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/fashiongiftcard.xml b/etc/adminhtml/paymentmethods/fashiongiftcard.xml index 1c010542..71753362 100644 --- a/etc/adminhtml/paymentmethods/fashiongiftcard.xml +++ b/etc/adminhtml/paymentmethods/fashiongiftcard.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/focum.xml b/etc/adminhtml/paymentmethods/focum.xml index 9c7ae28e..f4cc02f7 100644 --- a/etc/adminhtml/paymentmethods/focum.xml +++ b/etc/adminhtml/paymentmethods/focum.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/gezondheidsbon.xml b/etc/adminhtml/paymentmethods/gezondheidsbon.xml index d9e93a6c..5037f2b0 100644 --- a/etc/adminhtml/paymentmethods/gezondheidsbon.xml +++ b/etc/adminhtml/paymentmethods/gezondheidsbon.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/giropay.xml b/etc/adminhtml/paymentmethods/giropay.xml index 108b81d5..64863f98 100644 --- a/etc/adminhtml/paymentmethods/giropay.xml +++ b/etc/adminhtml/paymentmethods/giropay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/givacard.xml b/etc/adminhtml/paymentmethods/givacard.xml index 0809a9b5..c083bafd 100644 --- a/etc/adminhtml/paymentmethods/givacard.xml +++ b/etc/adminhtml/paymentmethods/givacard.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/good4fun.xml b/etc/adminhtml/paymentmethods/good4fun.xml index 66718097..72fdde70 100644 --- a/etc/adminhtml/paymentmethods/good4fun.xml +++ b/etc/adminhtml/paymentmethods/good4fun.xml @@ -130,7 +130,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/googlepay.xml b/etc/adminhtml/paymentmethods/googlepay.xml index 1235705c..2aee6108 100644 --- a/etc/adminhtml/paymentmethods/googlepay.xml +++ b/etc/adminhtml/paymentmethods/googlepay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/huisentuincadeau.xml b/etc/adminhtml/paymentmethods/huisentuincadeau.xml index adee2fb3..cdb23725 100644 --- a/etc/adminhtml/paymentmethods/huisentuincadeau.xml +++ b/etc/adminhtml/paymentmethods/huisentuincadeau.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/ideal.xml b/etc/adminhtml/paymentmethods/ideal.xml index 3fac58c4..34ea04f9 100644 --- a/etc/adminhtml/paymentmethods/ideal.xml +++ b/etc/adminhtml/paymentmethods/ideal.xml @@ -1,8 +1,5 @@ @@ -133,7 +130,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/instore.xml b/etc/adminhtml/paymentmethods/instore.xml index f2af6aba..cf1bb047 100644 --- a/etc/adminhtml/paymentmethods/instore.xml +++ b/etc/adminhtml/paymentmethods/instore.xml @@ -125,7 +125,7 @@ - Paynl\Payment\Model\Config\Source\showUseragentOptions + Paynl\Payment\Model\Config\Source\ShowUseragentOptions 1 diff --git a/etc/adminhtml/paymentmethods/klarna.xml b/etc/adminhtml/paymentmethods/klarna.xml index 8b2a0581..20c0254f 100644 --- a/etc/adminhtml/paymentmethods/klarna.xml +++ b/etc/adminhtml/paymentmethods/klarna.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/klarnakp.xml b/etc/adminhtml/paymentmethods/klarnakp.xml index db6d8c0e..92e3ad0f 100644 --- a/etc/adminhtml/paymentmethods/klarnakp.xml +++ b/etc/adminhtml/paymentmethods/klarnakp.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/maestro.xml b/etc/adminhtml/paymentmethods/maestro.xml index 846b9610..884e9130 100644 --- a/etc/adminhtml/paymentmethods/maestro.xml +++ b/etc/adminhtml/paymentmethods/maestro.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/mistercash.xml b/etc/adminhtml/paymentmethods/mistercash.xml index e5e7ccb5..f3b383a3 100644 --- a/etc/adminhtml/paymentmethods/mistercash.xml +++ b/etc/adminhtml/paymentmethods/mistercash.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/multibanco.xml b/etc/adminhtml/paymentmethods/multibanco.xml index 3b16d81c..8eef0206 100644 --- a/etc/adminhtml/paymentmethods/multibanco.xml +++ b/etc/adminhtml/paymentmethods/multibanco.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/mybank.xml b/etc/adminhtml/paymentmethods/mybank.xml index eb1404e2..edb9dbb2 100644 --- a/etc/adminhtml/paymentmethods/mybank.xml +++ b/etc/adminhtml/paymentmethods/mybank.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/overboeking.xml b/etc/adminhtml/paymentmethods/overboeking.xml index 6c2360f0..ccf725a2 100644 --- a/etc/adminhtml/paymentmethods/overboeking.xml +++ b/etc/adminhtml/paymentmethods/overboeking.xml @@ -129,7 +129,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/payconiq.xml b/etc/adminhtml/paymentmethods/payconiq.xml index 6718d2cf..0d3ad093 100644 --- a/etc/adminhtml/paymentmethods/payconiq.xml +++ b/etc/adminhtml/paymentmethods/payconiq.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/paylink.xml b/etc/adminhtml/paymentmethods/paylink.xml index cda7d30e..a221cc9f 100644 --- a/etc/adminhtml/paymentmethods/paylink.xml +++ b/etc/adminhtml/paymentmethods/paylink.xml @@ -109,7 +109,7 @@ - Paynl\Payment\Model\Config\Source\showPaylinkOptions + Paynl\Payment\Model\Config\Source\ShowPaylinkOptions 1 diff --git a/etc/adminhtml/paymentmethods/paypal.xml b/etc/adminhtml/paymentmethods/paypal.xml index b4d9da3e..db3c1b2b 100644 --- a/etc/adminhtml/paymentmethods/paypal.xml +++ b/etc/adminhtml/paymentmethods/paypal.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/paysafecard.xml b/etc/adminhtml/paymentmethods/paysafecard.xml index 326169ec..8280dd47 100644 --- a/etc/adminhtml/paymentmethods/paysafecard.xml +++ b/etc/adminhtml/paymentmethods/paysafecard.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml b/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml index 70e4c765..b0f3c721 100644 --- a/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml +++ b/etc/adminhtml/paymentmethods/podiumcadeaukaart.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/postepay.xml b/etc/adminhtml/paymentmethods/postepay.xml index 9779bef7..46e230c2 100644 --- a/etc/adminhtml/paymentmethods/postepay.xml +++ b/etc/adminhtml/paymentmethods/postepay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/przelewy24.xml b/etc/adminhtml/paymentmethods/przelewy24.xml index 5353936e..9b407875 100644 --- a/etc/adminhtml/paymentmethods/przelewy24.xml +++ b/etc/adminhtml/paymentmethods/przelewy24.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/sofortbanking.xml b/etc/adminhtml/paymentmethods/sofortbanking.xml index 06522b46..0b6c9f39 100644 --- a/etc/adminhtml/paymentmethods/sofortbanking.xml +++ b/etc/adminhtml/paymentmethods/sofortbanking.xml @@ -130,7 +130,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/sofortbanking_ds.xml b/etc/adminhtml/paymentmethods/sofortbanking_ds.xml index 612e7de7..51ad126f 100644 --- a/etc/adminhtml/paymentmethods/sofortbanking_ds.xml +++ b/etc/adminhtml/paymentmethods/sofortbanking_ds.xml @@ -125,7 +125,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/sofortbanking_hr.xml b/etc/adminhtml/paymentmethods/sofortbanking_hr.xml index b8a5770e..6fe1cd8b 100644 --- a/etc/adminhtml/paymentmethods/sofortbanking_hr.xml +++ b/etc/adminhtml/paymentmethods/sofortbanking_hr.xml @@ -130,7 +130,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/spraypay.xml b/etc/adminhtml/paymentmethods/spraypay.xml index 55b95ac6..4bdfe9b0 100644 --- a/etc/adminhtml/paymentmethods/spraypay.xml +++ b/etc/adminhtml/paymentmethods/spraypay.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/telefonischbetalen.xml b/etc/adminhtml/paymentmethods/telefonischbetalen.xml index 9e730f45..f834356e 100644 --- a/etc/adminhtml/paymentmethods/telefonischbetalen.xml +++ b/etc/adminhtml/paymentmethods/telefonischbetalen.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/tikkie.xml b/etc/adminhtml/paymentmethods/tikkie.xml index c3b4ddd5..4cf9ec15 100644 --- a/etc/adminhtml/paymentmethods/tikkie.xml +++ b/etc/adminhtml/paymentmethods/tikkie.xml @@ -30,7 +30,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/trustly.xml b/etc/adminhtml/paymentmethods/trustly.xml index 8d664519..c830d93d 100644 --- a/etc/adminhtml/paymentmethods/trustly.xml +++ b/etc/adminhtml/paymentmethods/trustly.xml @@ -129,7 +129,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/visamastercard.xml b/etc/adminhtml/paymentmethods/visamastercard.xml index ddcf3809..b1b2c2a1 100644 --- a/etc/adminhtml/paymentmethods/visamastercard.xml +++ b/etc/adminhtml/paymentmethods/visamastercard.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/vvvgiftcard.xml b/etc/adminhtml/paymentmethods/vvvgiftcard.xml index 22e5d2fb..302c8bbf 100644 --- a/etc/adminhtml/paymentmethods/vvvgiftcard.xml +++ b/etc/adminhtml/paymentmethods/vvvgiftcard.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/webshopgiftcard.xml b/etc/adminhtml/paymentmethods/webshopgiftcard.xml index 86d13e87..3d8a4cbc 100644 --- a/etc/adminhtml/paymentmethods/webshopgiftcard.xml +++ b/etc/adminhtml/paymentmethods/webshopgiftcard.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/wechatpay.xml b/etc/adminhtml/paymentmethods/wechatpay.xml index 3bec7dd1..e4e9ee39 100644 --- a/etc/adminhtml/paymentmethods/wechatpay.xml +++ b/etc/adminhtml/paymentmethods/wechatpay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/wijncadeau.xml b/etc/adminhtml/paymentmethods/wijncadeau.xml index 2d453215..f6d41150 100644 --- a/etc/adminhtml/paymentmethods/wijncadeau.xml +++ b/etc/adminhtml/paymentmethods/wijncadeau.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/yehhpay.xml b/etc/adminhtml/paymentmethods/yehhpay.xml index 2322584e..614b21e8 100644 --- a/etc/adminhtml/paymentmethods/yehhpay.xml +++ b/etc/adminhtml/paymentmethods/yehhpay.xml @@ -119,7 +119,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/paymentmethods/yourgift.xml b/etc/adminhtml/paymentmethods/yourgift.xml index e6ef2717..4a5ba6dd 100644 --- a/etc/adminhtml/paymentmethods/yourgift.xml +++ b/etc/adminhtml/paymentmethods/yourgift.xml @@ -73,7 +73,7 @@ - Paynl\Payment\Model\Config\Source\showKvkOptions + Paynl\Payment\Model\Config\Source\ShowKvkOptions 1 @@ -82,7 +82,7 @@ - Paynl\Payment\Model\Config\Source\showNonPrivate + Paynl\Payment\Model\Config\Source\ShowNonPrivate 1 @@ -91,7 +91,7 @@ - Paynl\Payment\Model\Config\Source\showDobOptions + Paynl\Payment\Model\Config\Source\ShowDobOptions 1 @@ -146,7 +146,7 @@ - Paynl\Payment\Model\Config\Source\showCompanyOptions + Paynl\Payment\Model\Config\Source\ShowCompanyOptions 1 diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 705e9414..e64c68c5 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -1,8 +1,5 @@ @@ -67,7 +64,7 @@ - Paynl\Payment\Model\Config\Source\imageStyle + Paynl\Payment\Model\Config\Source\ImageStyle @@ -84,7 +81,7 @@ - Paynl\Payment\Model\Config\Source\iconSize + Paynl\Payment\Model\Config\Source\IconSize 1 diff --git a/etc/config.xml b/etc/config.xml index 9400bd3a..029088fc 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -1,8 +1,5 @@ diff --git a/etc/di.xml b/etc/di.xml index 8a3225a3..f04f959c 100755 --- a/etc/di.xml +++ b/etc/di.xml @@ -1,8 +1,5 @@ diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml index f50edd8b..a7265f7f 100644 --- a/etc/frontend/di.xml +++ b/etc/frontend/di.xml @@ -1,8 +1,5 @@ diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml index 25b160d6..4a2ba901 100644 --- a/etc/frontend/routes.xml +++ b/etc/frontend/routes.xml @@ -1,8 +1,5 @@ diff --git a/etc/module.xml b/etc/module.xml index 58346cdc..177ba2ee 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,8 +1,5 @@ diff --git a/etc/payment.xml b/etc/payment.xml index 3e973fdb..8e95b1d7 100644 --- a/etc/payment.xml +++ b/etc/payment.xml @@ -1,8 +1,5 @@ diff --git a/registration.php b/registration.php index 216b1a05..447f106e 100644 --- a/registration.php +++ b/registration.php @@ -1,9 +1,6 @@ escapeHtml($message); ?>