Merge branch 'master' into feature/PLUG-3911

# Conflicts:
#	i18n/de_AT.csv
#	i18n/de_CH.csv
#	i18n/de_DE.csv
#	i18n/de_LU.csv
#	i18n/en_US.csv
#	i18n/fr_BE.csv
#	i18n/nl_BE.csv
#	i18n/nl_NL.csv

Model/Config.php

@@ -105,6 +105,7 @@ class Config
         "paynl_payment_klarnakp" => "15",
         "paynl_payment_kunstencultuurkaart" => "315",
         "paynl_payment_maestro" => "33",
+        "paynl_payment_mastercard" => "8",
         "paynl_payment_mistercash" => "2",
         "paynl_payment_mobilepay" => "324",
         "paynl_payment_monizze" => "183",
@@ -132,6 +133,7 @@ class Config
         "paynl_payment_stadspasamsterdam" => "336",
         "paynl_payment_telefonischbetalen" => "173",
         "paynl_payment_trustly" => "213",
+        "paynl_payment_visa" => "228",
         "paynl_payment_visamastercard" => "7",
         "paynl_payment_vvvgiftcard" => "25",
         "paynl_payment_webshopgiftcard" => "26",
@@ -302,6 +304,16 @@ public function getLanguage()
     {
         $language = $this->store->getConfig('payment/paynl/language');
 
+        if ($language == 'browser' && isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) {
+            $language = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
+        }
+        if ($language == 'website') {
+            $currentLocaleCode = $this->scopeConfig->getValue('general/locale/code', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->store->getId());
+            if (!empty($currentLocaleCode)) {
+                $language = explode('_', $currentLocaleCode)[0];
+            }
+        }
+
         return $language ? $language : 'nl'; //default nl
     }
 

Model/Config/Source/Available/Mastercard.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+class Mastercard extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Mastercard::class;
+}

Model/Config/Source/Available/Visa.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Paynl\Payment\Model\Config\Source\Available;
+
+class Visa extends Available
+{
+    protected $_class = \Paynl\Payment\Model\Paymentmethod\Visa::class;
+}

Model/Config/Source/Languages.php

@@ -37,7 +37,23 @@ public function toArray()
             'fr' => __('French'),
             'es' => __('Spanish'),
             'dk' => __('Danish'),
-            'pl' => __('Polish')
+            'pl' => __('Polish'),
+            'us' => __('American'),
+            'mx' => __('Mexican'),
+            'hu' => __('Hungarian'),
+            'no' => __('Norwegian'),
+            'hr' => __('Croatian'),
+            'pt' => __('Portuguese'),
+            'ro' => __('Romanian'),
+            'sv' => __('Swedish'),
+            'sl' => __('Slovenian'),
+            'tr' => __('Turkish'),
+            'fi' => __('Finnish'),
+            'cz' => __('Czech'),
+            'gr' => __('Greek'),
+            'jp' => __('Japanese'),
+            'browser' => __('Use browser language'),
+            'website' => __('Use website language')
         ];
     }
 }

Model/ConfigProvider.php

@@ -58,6 +58,7 @@ class ConfigProvider implements ConfigProviderInterface
         'paynl_payment_klarnakp',
         'paynl_payment_kunstencultuurkaart',
         'paynl_payment_maestro',
+        'paynl_payment_mastercard',
         'paynl_payment_mistercash',
         'paynl_payment_mobilepay',
         'paynl_payment_monizze',
@@ -86,6 +87,7 @@ class ConfigProvider implements ConfigProviderInterface
         'paynl_payment_telefonischbetalen',
         'paynl_payment_trustly',
         'paynl_payment_visamastercard',
+        'paynl_payment_visa',
         'paynl_payment_vvvgiftcard',
         'paynl_payment_webshopgiftcard',
         'paynl_payment_wechatpay',

Model/PayPaymentCreate.php

@@ -109,6 +109,8 @@ public function __construct($order, PaymentMethod $methodInstance)
 
             $finishUrl = $order->getStore()->getBaseUrl() . 'paynl/checkout/finish/?entityid=' . $order->getEntityId();
             $exchangeUrl = $order->getStore()->getBaseUrl() . 'paynl/checkout/exchange/';
+
+            $this->payConfig->setStore($order->getStore());
         }
 
         $this->setCompanyField($this->additionalData['companyfield'] ?? '');

Model/Paymentmethod/Mastercard.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+class Mastercard extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_mastercard';
+
+    /**
+     * @return integer
+     */
+    protected function getDefaultPaymentOptionId()
+    {
+        return 3138;
+    }
+}

Model/Paymentmethod/Visa.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Paynl\Payment\Model\Paymentmethod;
+
+class Visa extends PaymentMethod
+{
+    protected $_code = 'paynl_payment_visa';
+
+    /**
+     * @return integer
+     */
+    protected function getDefaultPaymentOptionId()
+    {
+        return 3141;
+    }
+}

etc/adminhtml/paymentmethods.xml

@@ -49,6 +49,7 @@
     <include path="Paynl_Payment::paymentmethods/klarnakp.xml" />
     <include path="Paynl_Payment::paymentmethods/kunstencultuurkaart.xml" />
     <include path="Paynl_Payment::paymentmethods/maestro.xml" />
+    <include path="Paynl_Payment::paymentmethods/mastercard.xml" />
     <include path="Paynl_Payment::paymentmethods/mistercash.xml" />
     <include path="Paynl_Payment::paymentmethods/mobilepay.xml" />
     <include path="Paynl_Payment::paymentmethods/monizze.xml" />
@@ -75,6 +76,7 @@
     <include path="Paynl_Payment::paymentmethods/stadspasamsterdam.xml" />
     <include path="Paynl_Payment::paymentmethods/telefonischbetalen.xml" />
     <include path="Paynl_Payment::paymentmethods/trustly.xml" />
+    <include path="Paynl_Payment::paymentmethods/visa.xml" />
     <include path="Paynl_Payment::paymentmethods/visamastercard.xml" />
     <include path="Paynl_Payment::paymentmethods/vvvgiftcard.xml" />
     <include path="Paynl_Payment::paymentmethods/webshopgiftcard.xml" />

etc/adminhtml/paymentmethods/mastercard.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="paynl_payment_mastercard" sortOrder="1103" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label>Mastercard</label>
+        <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Enabled</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Available\Mastercard</source_model>
+            <config_path>payment/paynl_payment_mastercard/active</config_path>
+        </field>
+        <field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Title</label>
+            <config_path>payment/paynl_payment_mastercard/title</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>New order status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\PendingPayment</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/order_status</config_path>
+        </field>
+        <field id="order_status_authorized" translate="label" type="select" sortOrder="32" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Authorized order status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\Processing</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/order_status_authorized</config_path>
+        </field>
+        <field id="order_status_processing" translate="label" type="select" sortOrder="35" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Paid order status</label>
+            <source_model>Paynl\Payment\Model\Config\Source\Order\Status\Processing</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/order_status_processing</config_path>
+        </field>
+        <field id="allowspecific" translate="label" type="allowspecific" sortOrder="40" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Accepted billing country</label>
+            <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
+            <config_path>payment/paynl_payment_mastercard/allowspecific</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="specificcountry" translate="label" type="multiselect" sortOrder="50" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Select accepted countries</label>
+            <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+            <can_be_empty>1</can_be_empty>
+            <config_path>payment/paynl_payment_mastercard/specificcountry</config_path>
+            <depends>
+                <field id="allowspecific">1</field>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="instructions" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Payment instructions</label>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/instructions</config_path>
+        </field>
+        <field id="min_order_total" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Minimum order total</label>
+            <config_path>payment/paynl_payment_mastercard/min_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="max_order_total" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Maximum order total</label>
+            <config_path>payment/paynl_payment_mastercard/max_order_total</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="sort_order" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1"
+               showInStore="1">
+            <label>Sort order</label>
+            <frontend_class>validate-number</frontend_class>
+            <config_path>payment/paynl_payment_mastercard/sort_order</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="send_new_order_email" translate="label" type="select" sortOrder="100" showInDefault="1"
+               showInWebsite="1"
+               showInStore="1">
+            <label>Send order confirmation email</label>
+            <source_model>Paynl\Payment\Model\Config\Source\SendNewOrderEmail</source_model>
+            <config_path>payment/paynl_payment_mastercard/send_new_order_email</config_path>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+        </field>
+        <field id="disallowedshipping" translate="label" type="multiselect" sortOrder="110" showInDefault="1"
+               showInWebsite="1" showInStore="1">
+            <label>Disallowed Shipping Methods</label>
+            <source_model>Magento\Shipping\Model\Config\Source\Allmethods</source_model>
+            <can_be_empty>1</can_be_empty>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/disallowedshipping</config_path>
+            <comment><![CDATA[Hold CTRL button to select/deselect multiple]]></comment>
+        </field>
+        <field id="showforcompany" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Customer Type</label>
+            <source_model>Paynl\Payment\Model\Config\Source\ShowCompanyOptions</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/showforcompany</config_path>
+            <tooltip>By default payment methods are available in the checkout for all customer types.
+Private, B2C: Only show this payment method when the customer didn't enter a company name.
+Business, BB2: Only show this payment method when the customer entered a company name.</tooltip>
+            <comment><![CDATA[Specify which type of customer this payment method should be available to.]]></comment>
+        </field>
+        <field id="showforgroup" translate="label" type="select" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Customer Group</label>
+            <source_model>Paynl\Payment\Model\Config\Source\UserGroups</source_model>
+            <depends>
+                <field id="active">1</field>
+            </depends>
+            <config_path>payment/paynl_payment_mastercard/showforgroup</config_path>
+            <comment><![CDATA[Show payment method only to specific customer groups.]]></comment>
+        </field>
+        <group id="advanced" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Advanced</label>
+            <field id="payment_option_id" translate="label comment" type="text" sortOrder="10" showInDefault="1"
+                   showInWebsite="1"
+                   showInStore="1">
+                <label>Payment method ID</label>
+                <comment>Only change this if you are told to do so by Pay. Support</comment>
+                <config_path>payment/paynl_payment_mastercard/payment_option_id</config_path>
+            </field>
+        </group>
+    </group>
+</include>
+