diff --git a/Model/ConfigProvider/Account.php b/Model/ConfigProvider/Account.php index 468662c5d..7fc5a46bb 100644 --- a/Model/ConfigProvider/Account.php +++ b/Model/ConfigProvider/Account.php @@ -43,7 +43,6 @@ * @method mixed getDebugTypes() * @method mixed getDebugEmail() * @method mixed getLimitByIp() - * @method mixed getFeePercentageMode() * @method mixed getOrderStatusPending() * @method mixed getOrderStatusNew() * @method mixed getPaymentFeeLabel() @@ -73,7 +72,6 @@ class Account extends AbstractConfigProvider const XPATH_ACCOUNT_DEBUG_TYPES = 'buckaroo_magento2/account/debug_types'; const XPATH_ACCOUNT_DEBUG_EMAIL = 'buckaroo_magento2/account/debug_email'; const XPATH_ACCOUNT_LIMIT_BY_IP = 'buckaroo_magento2/account/limit_by_ip'; - const XPATH_ACCOUNT_FEE_PERCENTAGE_MODE = 'buckaroo_magento2/account/fee_percentage_mode'; const XPATH_ACCOUNT_PAYMENT_FEE_LABEL = 'buckaroo_magento2/account/payment_fee_label'; const XPATH_ACCOUNT_ORDER_STATUS_NEW = 'buckaroo_magento2/account/order_status_new'; const XPATH_ACCOUNT_ORDER_STATUS_PENDING = 'buckaroo_magento2/account/order_status_pending'; @@ -135,7 +133,6 @@ public function getConfig($store = null) 'debug_types' => $this->getDebugTypes($store), 'debug_email' => $this->getDebugEmail($store), 'limit_by_ip' => $this->getLimitByIp($store), - 'fee_percentage_mode' => $this->getFeePercentageMode($store), 'payment_fee_label' => $this->getPaymentFeeLabel($store), 'order_status_new' => $this->getOrderStatusNew($store), 'order_status_pending' => $this->getOrderStatusPending($store), diff --git a/Model/Total/Quote/BuckarooFee.php b/Model/Total/Quote/BuckarooFee.php index 294fb4fce..57ef22de3 100644 --- a/Model/Total/Quote/BuckarooFee.php +++ b/Model/Total/Quote/BuckarooFee.php @@ -19,22 +19,28 @@ */ namespace Buckaroo\Magento2\Model\Total\Quote; +use Buckaroo\Magento2\Exception; use Magento\Catalog\Helper\Data; use Buckaroo\Magento2\Logging\Log; use Buckaroo\Magento2\Helper\PaymentGroupTransaction; use Magento\Framework\Pricing\PriceCurrencyInterface; +use Magento\Quote\Model\Quote\Address\Total\AbstractTotal; use Magento\Tax\Model\Calculation as TaxModelCalculation; use Buckaroo\Magento2\Model\ConfigProvider\Method\Factory; use Buckaroo\Magento2\Model\Config\Source\TaxClass\Calculation; use Buckaroo\Magento2\Model\ConfigProvider\Account as ConfigProviderAccount; use Buckaroo\Magento2\Model\ConfigProvider\BuckarooFee as ConfigProviderBuckarooFee; -class BuckarooFee extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal +class BuckarooFee extends AbstractTotal { - /** @var ConfigProviderAccount */ + /** + * @var ConfigProviderAccount + */ protected $configProviderAccount; - /** @var ConfigProviderBuckarooFee */ + /** + * @var ConfigProviderBuckarooFee + */ protected $configProviderBuckarooFee; /** @@ -53,7 +59,7 @@ class BuckarooFee extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal public $catalogHelper; /** - * @var \Buckaroo\Magento2\Helper\PaymentGroupTransaction + * @var PaymentGroupTransaction */ public $groupTransaction; @@ -103,12 +109,13 @@ public function __construct( /** * Collect grand total address amount * - * @param \Magento\Quote\Model\Quote $quote - * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment - * @param \Magento\Quote\Model\Quote\Address\Total $total + * @param \Magento\Quote\Model\Quote $quote + * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment + * @param \Magento\Quote\Model\Quote\Address\Total $total * @return $this * - * @throws \LogicException + * @throws \Buckaroo\Magento2\Exception + * @throws Exception */ public function collect( \Magento\Quote\Model\Quote $quote, @@ -136,7 +143,6 @@ public function collect( return $this; } - // Ensure payment method is set correctly $paymentMethod = $quote->getPayment()->getMethod(); if (!$paymentMethod || strpos($paymentMethod, 'buckaroo_magento2_') !== 0) { return $this; @@ -148,7 +154,7 @@ public function collect( } // Calculate the base payment fee using the getBaseFee method - $basePaymentFee = $this->getBaseFee($methodInstance, $quote); + $basePaymentFee = $this->getBaseFee($methodInstance, $quote, $total); if ($basePaymentFee < 0.01) { return $this; } @@ -163,7 +169,6 @@ public function collect( * @noinspection PhpUndefinedMethodInspection */ $quote->setBaseBuckarooFee($basePaymentFee); - /** * @noinspection PhpUndefinedMethodInspection */ @@ -190,14 +195,14 @@ public function collect( * * @param \Magento\Quote\Model\Quote $quote * @param \Magento\Quote\Model\Quote\Address\Total $total - * @return $this + * @return array */ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total) { /** * @noinspection PhpUndefinedMethodInspection */ - $totals = [ + return [ 'code' => $this->getCode(), 'title' => $this->getLabel(), 'buckaroo_fee' => $total->getBuckarooFee(), @@ -207,14 +212,12 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu 'buckaroo_fee_tax_amount' => $total->getBuckarooFeeTaxAmount(), 'buckaroo_fee_base_tax_amount' => $total->getBuckarooFeeBaseTaxAmount(), ]; - - return $totals; } /** * @param \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance * @param \Magento\Quote\Model\Quote $quote - * @param bool $inclTax + * @param \Magento\Quote\Model\Quote\Address\Total $total * * @return bool|false|float * @throws \Buckaroo\Magento2\Exception @@ -222,7 +225,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu public function getBaseFee( \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance, \Magento\Quote\Model\Quote $quote, - $inclTax = false + \Magento\Quote\Model\Quote\Address\Total $total ) { $buckarooPaymentMethodCode = $methodInstance->buckarooPaymentMethodCode; if (!$this->configProviderMethodFactory->has($buckarooPaymentMethodCode)) { @@ -230,127 +233,47 @@ public function getBaseFee( } $configProvider = $this->configProviderMethodFactory->get($buckarooPaymentMethodCode); - $basePaymentFee = trim($configProvider->getPaymentFee($quote->getStore())); - $inclTax = $this->configProviderBuckarooFee->getPaymentFeeTax() == - Calculation::DISPLAY_TYPE_INCLUDING_TAX; + $basePaymentFeeRaw = trim($configProvider->getPaymentFee($quote->getStore())); - $shippingAddress = $quote->getShippingAddress(); - $billingAddress = $quote->getBillingAddress(); - $customerTaxClassId = $quote->getCustomerTaxClassId(); - $storeId = $quote->getStoreId(); - $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); - - $request = $this->taxCalculation->getRateRequest( - $shippingAddress, - $billingAddress, - $customerTaxClassId, - $storeId - ); - $request->setProductClassId($taxClassId); - $percent = $this->taxCalculation->getRate($request); - - if (is_numeric($basePaymentFee)) { - if (in_array($buckarooPaymentMethodCode, ['billink','afterpay20','afterpay','paypal'])) { - if ($inclTax) { - if ($percent > 0) { - return $basePaymentFee / (1 + ($percent / 100)); - } - } - return $basePaymentFee; - } else { - if ($inclTax){ - return $basePaymentFee / (1 + ($percent / 100)); - } - /** - * Payment fee is a number - */ - return $this->getFeePrice($basePaymentFee); - } + $inclTax= $this->configProviderBuckarooFee->getPaymentFeeTax() == + Calculation::DISPLAY_TYPE_INCLUDING_TAX; - } elseif (strpos($basePaymentFee, '%') === false) { - /** - * Payment fee is invalid - */ - return false; - } + // Determine if the fee is a percentage or fixed amount + $isPercentage = strpos($basePaymentFeeRaw, '%') !== false; - /** - * Payment fee is a percentage - */ - $percentage = floatval($basePaymentFee); - if ($quote->getShippingAddress()) { - $address = $quote->getShippingAddress(); + if ($isPercentage) { + $subtotal = $total->getData('base_subtotal_incl_tax'); + if (!$subtotal) { + $subtotal = $total->getTotalAmount('subtotal'); + } + $percentage = (float) rtrim($basePaymentFeeRaw, '%'); + $basePaymentFee = ($percentage / 100) * $subtotal; } else { - $address = $quote->getBillingAddress(); - } - - $total = 0; - - $feePercentageMode = $this->configProviderAccount->getFeePercentageMode($quote->getStore()); - - switch ($feePercentageMode) { - case 'subtotal': - $total = $address->getBaseSubtotal(); - break; - case 'subtotal_incl_tax': - $total = $address->getBaseSubtotalTotalInclTax(); - break; + $basePaymentFee = (float) $basePaymentFeeRaw; } - $percentageFee = ($percentage / 100) * $total; - if($inclTax){ - if($percent > 0){ - return $percentageFee / (1 + ($percent / 100)); + if (!$inclTax) { + $shippingAddress = $quote->getShippingAddress() ?: $quote->getBillingAddress(); + $billingAddress = $quote->getBillingAddress(); + $customerTaxClassId = $quote->getCustomerTaxClassId(); + $storeId = $quote->getStoreId(); + $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); + if (!$taxClassId) { + $taxClassId = 0; } - } else{ - return $percentageFee; - } - - return $basePaymentFee; - } - - /** - * Get payment fee price with correct tax - * - * @param float $price - * @param null $priceIncl - * - * @param \Magento\Framework\DataObject|null $pseudoProduct - * - * @return float - * @throws \Buckaroo\Magento2\Exception - */ - public function getFeePrice($price, $priceIncl = null, \Magento\Framework\DataObject $pseudoProduct = null) - { - if ($pseudoProduct === null) { - $pseudoProduct = new \Magento\Framework\DataObject(); - } - - $pseudoProduct->setTaxClassId($this->configProviderBuckarooFee->getTaxClass()); - /** - * @noinspection PhpUndefinedMethodInspection - */ - if ($priceIncl === null - && $this->configProviderBuckarooFee->getPaymentFeeTax() == Calculation::DISPLAY_TYPE_INCLUDING_TAX - ) { - $priceIncl = true; - } else { - $priceIncl = false; + $taxRate = $this->taxCalculation->getRate( + $this->taxCalculation->getRateRequest( + $shippingAddress, + $billingAddress, + $customerTaxClassId, + $storeId + )->setProductClassId($taxClassId) + ); + $basePaymentFee = $basePaymentFee * (1 + $taxRate / 100); } - $price = $this->catalogHelper->getTaxPrice( - $pseudoProduct, - $price, - false, - null, - null, - null, - null, - $priceIncl - ); - - return $price; + return $basePaymentFee; } /** @@ -360,6 +283,6 @@ public function getFeePrice($price, $priceIncl = null, \Magento\Framework\DataOb */ public function getLabel() { - return __('Fee'); + return __('Payment Fee'); } } diff --git a/Model/Total/Quote/BuckarooFeeHyva.php b/Model/Total/Quote/BuckarooFeeHyva.php index 9e04a3a2d..036ef0164 100644 --- a/Model/Total/Quote/BuckarooFeeHyva.php +++ b/Model/Total/Quote/BuckarooFeeHyva.php @@ -19,6 +19,7 @@ */ namespace Buckaroo\Magento2\Model\Total\Quote; +use Buckaroo\Magento2\Exception; use Buckaroo\Magento2\Helper\PaymentGroupTransaction; use Buckaroo\Magento2\Logging\Log; use Buckaroo\Magento2\Model\Config\Source\TaxClass\Calculation; @@ -114,12 +115,13 @@ public function __construct( /** * Collect grand total address amount * - * @param \Magento\Quote\Model\Quote $quote - * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment - * @param \Magento\Quote\Model\Quote\Address\Total $total + * @param \Magento\Quote\Model\Quote $quote + * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment + * @param \Magento\Quote\Model\Quote\Address\Total $total * @return $this * * @throws \LogicException + * @throws Exception */ public function collect( \Magento\Quote\Model\Quote $quote, @@ -137,6 +139,15 @@ public function collect( return $this; } + /** + * @noinspection PhpUndefinedMethodInspection + */ + $total->setBuckarooFee(0); + /** + * @noinspection PhpUndefinedMethodInspection + */ + $total->setBaseBuckarooFee(0); + $orderId = $quote->getReservedOrderId(); // Check if already paid amount is affecting the calculation @@ -156,7 +167,7 @@ public function collect( } // Calculate the base payment fee using the getBaseFee method - $basePaymentFee = $this->getBaseFee($methodInstance, $quote); + $basePaymentFee = $this->getBaseFee($methodInstance, $quote, $total); if ($basePaymentFee < 0.01) { return $this; } @@ -169,7 +180,13 @@ public function collect( $total->addBaseTotalAmount('buckaroo_fee_hyva', $basePaymentFee); // Set the fee on the total object for further calculations + /** + * @noinspection PhpUndefinedMethodInspection + */ $total->setBuckarooFee($paymentFee); + /** + * @noinspection PhpUndefinedMethodInspection + */ $total->setBaseBuckarooFee($basePaymentFee); return $this; @@ -200,7 +217,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu /** * @param \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance * @param \Magento\Quote\Model\Quote $quote - * @param bool $inclTax + * @param \Magento\Quote\Model\Quote\Address\Total $total * * @return bool|false|float * @throws \Buckaroo\Magento2\Exception @@ -208,7 +225,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu public function getBaseFee( \Buckaroo\Magento2\Model\Method\AbstractMethod $methodInstance, \Magento\Quote\Model\Quote $quote, - $inclTax = false + \Magento\Quote\Model\Quote\Address\Total $total ) { $buckarooPaymentMethodCode = $methodInstance->buckarooPaymentMethodCode; if (!$this->configProviderMethodFactory->has($buckarooPaymentMethodCode)) { @@ -216,129 +233,50 @@ public function getBaseFee( } $configProvider = $this->configProviderMethodFactory->get($buckarooPaymentMethodCode); - $basePaymentFee = trim($configProvider->getPaymentFee($quote->getStore())); - $inclTax = $this->configProviderBuckarooFee->getPaymentFeeTax() == + $basePaymentFeeRaw = trim($configProvider->getPaymentFee($quote->getStore())); + + $inclTax= $this->configProviderBuckarooFee->getPaymentFeeTax() == Calculation::DISPLAY_TYPE_INCLUDING_TAX; - $shippingAddress = $quote->getShippingAddress(); - $billingAddress = $quote->getBillingAddress(); - $customerTaxClassId = $quote->getCustomerTaxClassId(); - $storeId = $quote->getStoreId(); - $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); - - $request = $this->taxCalculation->getRateRequest( - $shippingAddress, - $billingAddress, - $customerTaxClassId, - $storeId - ); - $request->setProductClassId($taxClassId); - $percent = $this->taxCalculation->getRate($request); - - if (is_numeric($basePaymentFee)) { - if (in_array($buckarooPaymentMethodCode, ['billink','afterpay20','afterpay','paypal'])) { - if ($inclTax) { - if ($percent > 0) { - return $basePaymentFee / (1 + ($percent / 100)); - } - } - return $basePaymentFee; - } else { - if ($inclTax) { - return $basePaymentFee / (1 + ($percent / 100)); - } - /** - * Payment fee is a number - */ - return $this->getFeePrice($basePaymentFee); - } + // Determine if the fee is a percentage or fixed amount + $isPercentage = strpos($basePaymentFeeRaw, '%') !== false; - } elseif (strpos($basePaymentFee, '%') === false) { - /** - * Payment fee is invalid - */ - return false; - } - - /** - * Payment fee is a percentage - */ - $percentage = floatval($basePaymentFee); - if ($quote->getShippingAddress()) { - $address = $quote->getShippingAddress(); + if ($isPercentage) { + $subtotal = $total->getData('base_subtotal_incl_tax'); + if (!$subtotal) { + $subtotal = $total->getTotalAmount('subtotal'); + } + $percentage = (float) rtrim($basePaymentFeeRaw, '%'); + $basePaymentFee = ($percentage / 100) * $subtotal; } else { - $address = $quote->getBillingAddress(); + $basePaymentFee = (float) $basePaymentFeeRaw; } - $total = 0; - - $feePercentageMode = $this->configProviderAccount->getFeePercentageMode($quote->getStore()); - - switch ($feePercentageMode) { - case 'subtotal': - $total = $address->getBaseSubtotal(); - break; - case 'subtotal_incl_tax': - $total = $address->getBaseSubtotalTotalInclTax(); - break; - } - $percentageFee = ($percentage / 100) * $total; - - if($inclTax){ - if($percent > 0){ - return $percentageFee / (1 + ($percent / 100)); + if (!$inclTax) { + $shippingAddress = $quote->getShippingAddress() ?: $quote->getBillingAddress(); + $billingAddress = $quote->getBillingAddress(); + $customerTaxClassId = $quote->getCustomerTaxClassId(); + $storeId = $quote->getStoreId(); + $taxClassId = $this->configProviderBuckarooFee->getTaxClass(); + if (!$taxClassId) { + $taxClassId = 0; } - } else{ - return $percentageFee; - } - return $basePaymentFee; - } - - /** - * Get payment fee price with correct tax - * - * @param float $price - * @param null $priceIncl - * - * @param \Magento\Framework\DataObject|null $pseudoProduct - * - * @return float - * @throws \Buckaroo\Magento2\Exception - */ - public function getFeePrice($price, $priceIncl = null, \Magento\Framework\DataObject $pseudoProduct = null) - { - if ($pseudoProduct === null) { - $pseudoProduct = new \Magento\Framework\DataObject(); - } - - $pseudoProduct->setTaxClassId($this->configProviderBuckarooFee->getTaxClass()); - - /** - * @noinspection PhpUndefinedMethodInspection - */ - if ($priceIncl === null - && $this->configProviderBuckarooFee->getPaymentFeeTax() == Calculation::DISPLAY_TYPE_INCLUDING_TAX - ) { - $priceIncl = true; + $taxRate = $this->taxCalculation->getRate( + $this->taxCalculation->getRateRequest( + $shippingAddress, + $billingAddress, + $customerTaxClassId, + $storeId + )->setProductClassId($taxClassId) + ); + $paymentFee = $basePaymentFee * (1 + $taxRate / 100); } else { - $priceIncl = false; + $paymentFee = $basePaymentFee; } - $price = $this->catalogHelper->getTaxPrice( - $pseudoProduct, - $price, - false, - null, - null, - null, - null, - $priceIncl - ); - - return $price; + return $paymentFee; } - /** * Get Buckaroo label * @@ -346,6 +284,6 @@ public function getFeePrice($price, $priceIncl = null, \Magento\Framework\DataOb */ public function getLabel() { - return __('Fee'); + return __('Payment Fee'); } } diff --git a/Model/Total/Quote/BuckarooRemainingAmount.php b/Model/Total/Quote/BuckarooRemainingAmount.php index bc6eff67a..2f21a31c4 100644 --- a/Model/Total/Quote/BuckarooRemainingAmount.php +++ b/Model/Total/Quote/BuckarooRemainingAmount.php @@ -59,7 +59,7 @@ public function fetch(Quote $quote, Total $total) return [ 'code' => $this->getCode(), - 'title' => __('Remaining Amount'), + 'title' => $this->getLabel(), 'value' => $remainingAmount ]; } @@ -71,6 +71,6 @@ public function fetch(Quote $quote, Total $total) */ public function getLabel() { - return __('Fee'); + return __('Remaining Amount'); } } diff --git a/Model/Total/Quote/Tax/BuckarooFee.php b/Model/Total/Quote/Tax/BuckarooFee.php index 06bf8d86f..6ba49db52 100644 --- a/Model/Total/Quote/Tax/BuckarooFee.php +++ b/Model/Total/Quote/Tax/BuckarooFee.php @@ -99,7 +99,7 @@ public function collect( return $this; } - $basePaymentFee = $this->getBaseFee($methodInstance, $quote, true); + $basePaymentFee = $this->getBaseFee($methodInstance, $quote, $total); if ($basePaymentFee < 0.01) { return $this; diff --git a/Test/Fixtures/buckaroo-magento2-fixture.sql b/Test/Fixtures/buckaroo-magento2-fixture.sql index 1232d7416..82830c7f0 100644 --- a/Test/Fixtures/buckaroo-magento2-fixture.sql +++ b/Test/Fixtures/buckaroo-magento2-fixture.sql @@ -3156,7 +3156,7 @@ CREATE TABLE `core_config_data` ( LOCK TABLES `core_config_data` WRITE; /*!40000 ALTER TABLE `core_config_data` DISABLE KEYS */; -INSERT INTO `core_config_data` VALUES (1,'default',0,'web/seo/use_rewrites','1'),(2,'default',0,'web/unsecure/base_url','http://buckaroo.jenkins/'),(3,'default',0,'web/secure/base_url','https://buckaroo.jenkins/'),(4,'default',0,'general/locale/code','nl-NL'),(5,'default',0,'web/secure/use_in_frontend',NULL),(6,'default',0,'web/secure/use_in_adminhtml',NULL),(7,'default',0,'general/locale/timezone','Europe/Amsterdam'),(8,'default',0,'currency/options/base','EUR'),(9,'default',0,'currency/options/default','EUR'),(10,'default',0,'currency/options/allow','EUR'),(11,'default',0,'general/region/display_all','1'),(12,'default',0,'general/region/state_required','AT,BR,CA,CH,DE,EE,ES,FI,FR,LT,LV,RO,US'),(13,'default',0,'catalog/category/root_id',NULL),(14,'default',0,'paypal/general/merchant_country','NL'),(15,'default',0,'payment/buckaroo_magento2_ideal/active','1'),(16,'default',0,'payment/braintree/active','0'),(17,'default',0,'payment/braintree_paypal/active','1'),(18,'default',0,'payment/braintree/title','Credit Card (Braintree)'),(19,'default',0,'payment/braintree/environment','sandbox'),(20,'default',0,'payment/braintree/payment_action','authorize'),(21,'default',0,'payment/braintree/merchant_account_id','bart.buckaroo'),(22,'default',0,'payment/braintree/merchant_id','4qzzt63rc7krn522'),(23,'default',0,'payment/braintree/debug','0'),(24,'default',0,'payment/braintree/capture_action','invoice'),(25,'default',0,'payment/braintree/order_status','processing'),(26,'default',0,'payment/braintree/use_vault','0'),(27,'default',0,'payment/braintree/duplicate_card','0'),(28,'default',0,'payment/braintree/useccv','1'),(29,'default',0,'payment/braintree/cctypes','AE,VI,MC,DI,JCB'),(30,'default',0,'payment/braintree/enable_cc_detection','1'),(31,'default',0,'payment/braintree/fraudprotection','0'),(32,'default',0,'payment/braintree/kount_id',NULL),(33,'default',0,'payment/braintree/usecache','0'),(34,'default',0,'payment/braintree/sort_order',NULL),(35,'default',0,'payment/braintree/allowspecific','0'),(36,'default',0,'payment/braintree/specificcountry',NULL),(37,'default',0,'payment/braintree/countrycreditcard','a:0:{}'),(38,'default',0,'payment/braintree_paypal/title','PayPal (Braintree)'),(39,'default',0,'payment/braintree_paypal/sort_order',NULL),(40,'default',0,'payment/braintree_paypal/merchant_name_override',NULL),(41,'default',0,'payment/braintree_paypal/payment_action','authorize'),(42,'default',0,'payment/braintree_paypal/order_status','processing'),(43,'default',0,'payment/braintree_paypal/allowspecific','0'),(44,'default',0,'payment/braintree_paypal/specificcountry',NULL),(45,'default',0,'payment/braintree_paypal/require_billing_address','0'),(46,'default',0,'payment/braintree_paypal/display_on_shopping_cart','0'),(47,'default',0,'payment/braintree_paypal/allow_shipping_address_override','0'),(48,'default',0,'payment/braintree_paypal/debug','0'),(49,'default',0,'payment/braintree/verify_3dsecure','0'),(50,'default',0,'payment/braintreetwo/active','0'),(51,'default',0,'payment/braintreetwo/title','Credit Card (BraintreeTwo)'),(52,'default',0,'payment/braintreetwo/environment','sandbox'),(53,'default',0,'payment/braintreetwo/payment_action','authorize'),(54,'default',0,'payment/braintreetwo/merchant_id',NULL),(55,'default',0,'payment/braintreetwo/merchant_account_id',NULL),(56,'default',0,'payment/braintreetwo/debug','0'),(57,'default',0,'payment/braintreetwo/useccv','1'),(58,'default',0,'payment/braintreetwo/cctypes','CUP,AE,VI,MC,DI,JCB,DN,MI'),(59,'default',0,'payment/braintreetwo/sort_order',NULL),(60,'default',0,'payment/braintreetwo/allowspecific','0'),(61,'default',0,'payment/braintreetwo/specificcountry',NULL),(62,'default',0,'payment/braintreetwo/countrycreditcard','a:0:{}'),(63,'default',0,'payment/payflow_express/active','0'),(64,'default',0,'payment/payflow_advanced/active','0'),(65,'default',0,'payment/payflow_express_bml/active','0'),(66,'default',0,'paypal/general/business_account',NULL),(67,'default',0,'payment/payflow_advanced/partner','PayPal'),(68,'default',0,'payment/payflow_advanced/vendor','PayPal'),(69,'default',0,'payment/payflow_advanced/sandbox_flag','0'),(70,'default',0,'payment/payflow_advanced/use_proxy','0'),(71,'default',0,'payment/paypal_express_bml/publisher_id',NULL),(72,'default',0,'payment/paypal_express_bml/homepage_display','0'),(73,'default',0,'payment/paypal_express_bml/homepage_position','0'),(74,'default',0,'payment/paypal_express_bml/homepage_size','190x100'),(75,'default',0,'payment/paypal_express_bml/categorypage_display','0'),(76,'default',0,'payment/paypal_express_bml/categorypage_position','0'),(77,'default',0,'payment/paypal_express_bml/categorypage_size','190x100'),(78,'default',0,'payment/paypal_express_bml/productpage_display','0'),(79,'default',0,'payment/paypal_express_bml/productpage_position','0'),(80,'default',0,'payment/paypal_express_bml/productpage_size','190x100'),(81,'default',0,'payment/paypal_express_bml/checkout_display','0'),(82,'default',0,'payment/paypal_express_bml/checkout_position','0'),(83,'default',0,'payment/paypal_express_bml/checkout_size','234x60'),(84,'default',0,'payment/payflow_advanced/title','Credit Card'),(85,'default',0,'payment/payflow_advanced/sort_order',NULL),(86,'default',0,'payment/payflow_advanced/payment_action','Authorization'),(87,'default',0,'payment/payflow_advanced/allowspecific','0'),(88,'default',0,'payment/payflow_advanced/debug','0'),(89,'default',0,'payment/payflow_advanced/verify_peer','1'),(90,'default',0,'payment/payflow_advanced/csc_editable','1'),(91,'default',0,'payment/payflow_advanced/csc_required','1'),(92,'default',0,'payment/payflow_advanced/email_confirmation','0'),(93,'default',0,'payment/payflow_advanced/url_method','GET'),(94,'default',0,'paypal/fetch_reports/ftp_sandbox','0'),(95,'default',0,'paypal/fetch_reports/ftp_ip',NULL),(96,'default',0,'paypal/fetch_reports/ftp_path',NULL),(97,'default',0,'paypal/fetch_reports/active','0'),(98,'default',0,'paypal/fetch_reports/schedule','1'),(99,'default',0,'paypal/fetch_reports/time','00,00,00'),(100,'default',0,'paypal/style/logo',NULL),(101,'default',0,'paypal/style/page_style',NULL),(102,'default',0,'paypal/style/paypal_hdrimg',NULL),(103,'default',0,'paypal/style/paypal_hdrbackcolor',NULL),(104,'default',0,'paypal/style/paypal_hdrbordercolor',NULL),(105,'default',0,'paypal/style/paypal_payflowcolor',NULL),(106,'default',0,'payment/payflow_express/title','PayPal Express Checkout Payflow Edition'),(107,'default',0,'payment/payflow_express/sort_order',NULL),(108,'default',0,'payment/payflow_express/payment_action','Authorization'),(109,'default',0,'payment/payflow_express/visible_on_product','1'),(110,'default',0,'payment/payflow_express/visible_on_cart','1'),(111,'default',0,'payment/payflow_express/allowspecific','0'),(112,'default',0,'payment/payflow_express/debug','0'),(113,'default',0,'payment/payflow_express/verify_peer','1'),(114,'default',0,'payment/payflow_express/line_items_enabled','1'),(115,'default',0,'payment/paypal_express/skip_order_review_step','1'),(116,'default',0,'payment/paypal_payment_pro/active','0'),(117,'default',0,'payment/payflowpro/partner',NULL),(118,'default',0,'payment/payflowpro/vendor',NULL),(119,'default',0,'payment/payflowpro/sandbox_flag','0'),(120,'default',0,'payment/payflowpro/use_proxy','0'),(121,'default',0,'payment/payflowpro/title','Credit Card'),(122,'default',0,'payment/payflowpro/sort_order',NULL),(123,'default',0,'payment/payflowpro/payment_action','Authorization'),(124,'default',0,'payment/payflowpro/cctypes','AE,VI'),(125,'default',0,'payment/payflowpro/allowspecific','0'),(126,'default',0,'payment/payflowpro/debug','0'),(127,'default',0,'payment/payflowpro/verify_peer','1'),(128,'default',0,'payment/payflowpro/useccv','1'),(129,'default',0,'payment/payflowpro/avs_street','0'),(130,'default',0,'payment/payflowpro/avs_zip','0'),(131,'default',0,'payment/payflowpro/avs_international','0'),(132,'default',0,'payment/payflowpro/avs_security_code','1'),(133,'default',0,'payment/wps_express/active','0'),(134,'default',0,'payment/wps_express_bml/active','0'),(135,'default',0,'paypal/wpp/api_authentication','0'),(136,'default',0,'paypal/wpp/sandbox_flag','0'),(137,'default',0,'paypal/wpp/use_proxy','0'),(138,'default',0,'payment/paypal_express/title','PayPal Express Checkout'),(139,'default',0,'payment/paypal_express/sort_order',NULL),(140,'default',0,'payment/paypal_express/payment_action','Authorization'),(141,'default',0,'payment/paypal_express/visible_on_product','1'),(142,'default',0,'payment/paypal_express/visible_on_cart','1'),(143,'default',0,'payment/paypal_express/allowspecific','0'),(144,'default',0,'payment/paypal_express/debug','0'),(145,'default',0,'payment/paypal_express/verify_peer','1'),(146,'default',0,'payment/paypal_express/line_items_enabled','1'),(147,'default',0,'payment/paypal_express/transfer_shipping_options','0'),(148,'default',0,'paypal/wpp/button_flavor','dynamic'),(149,'default',0,'payment/paypal_express/solution_type','Mark'),(150,'default',0,'payment/paypal_express/require_billing_address','0'),(151,'default',0,'payment/paypal_express/allow_ba_signup','never'),(152,'default',0,'payment/paypal_billing_agreement/active','1'),(153,'default',0,'payment/paypal_billing_agreement/title','PayPal Billing Agreement'),(154,'default',0,'payment/paypal_billing_agreement/sort_order',NULL),(155,'default',0,'payment/paypal_billing_agreement/payment_action','Authorization'),(156,'default',0,'payment/paypal_billing_agreement/allowspecific','0'),(157,'default',0,'payment/paypal_billing_agreement/debug','0'),(158,'default',0,'payment/paypal_billing_agreement/verify_peer','1'),(159,'default',0,'payment/paypal_billing_agreement/line_items_enabled','0'),(160,'default',0,'payment/paypal_billing_agreement/allow_billing_agreement_wizard','1'),(161,'default',0,'payment/payflowpro/active','0'),(162,'default',0,'payment/payflow_link/active','0'),(163,'default',0,'payment/payflow_link/partner','PayPal'),(164,'default',0,'payment/payflow_link/vendor',NULL),(165,'default',0,'payment/payflow_link/sandbox_flag','0'),(166,'default',0,'payment/payflow_link/use_proxy','0'),(167,'default',0,'payment/payflow_link/title','Credit Card'),(168,'default',0,'payment/payflow_link/sort_order',NULL),(169,'default',0,'payment/payflow_link/payment_action','Authorization'),(170,'default',0,'payment/payflow_link/allowspecific','0'),(171,'default',0,'payment/payflow_link/debug','0'),(172,'default',0,'payment/payflow_link/verify_peer','1'),(173,'default',0,'payment/payflow_link/csc_editable','1'),(174,'default',0,'payment/payflow_link/csc_required','1'),(175,'default',0,'payment/payflow_link/email_confirmation','0'),(176,'default',0,'payment/payflow_link/url_method','GET'),(177,'default',0,'payment/paypal_express/active','0'),(178,'default',0,'payment/paypal_express_bml/active','0'),(179,'default',0,'payment/checkmo/active','1'),(180,'default',0,'payment/checkmo/title','Check / Money order'),(181,'default',0,'payment/checkmo/order_status','pending'),(182,'default',0,'payment/checkmo/allowspecific','0'),(183,'default',0,'payment/checkmo/specificcountry',NULL),(184,'default',0,'payment/checkmo/payable_to',NULL),(185,'default',0,'payment/checkmo/mailing_address',NULL),(186,'default',0,'payment/checkmo/min_order_total',NULL),(187,'default',0,'payment/checkmo/max_order_total',NULL),(188,'default',0,'payment/checkmo/sort_order',NULL),(189,'default',0,'payment/cashondelivery/active','1'),(190,'default',0,'payment/cashondelivery/title','Cash On Delivery'),(191,'default',0,'payment/cashondelivery/order_status','pending'),(192,'default',0,'payment/cashondelivery/allowspecific','0'),(193,'default',0,'payment/cashondelivery/specificcountry',NULL),(194,'default',0,'payment/cashondelivery/instructions',NULL),(195,'default',0,'payment/cashondelivery/min_order_total',NULL),(196,'default',0,'payment/cashondelivery/max_order_total',NULL),(197,'default',0,'payment/cashondelivery/sort_order',NULL),(198,'default',0,'payment/banktransfer/active','1'),(199,'default',0,'payment/banktransfer/title','Bank Transfer Payment'),(200,'default',0,'payment/banktransfer/order_status','pending'),(201,'default',0,'payment/banktransfer/allowspecific','0'),(202,'default',0,'payment/banktransfer/specificcountry',NULL),(203,'default',0,'payment/banktransfer/instructions',NULL),(204,'default',0,'payment/banktransfer/min_order_total',NULL),(205,'default',0,'payment/banktransfer/max_order_total',NULL),(206,'default',0,'payment/banktransfer/sort_order',NULL),(207,'default',0,'payment/free/title','No Payment Information Required'),(208,'default',0,'payment/free/active','1'),(209,'default',0,'payment/free/order_status','pending'),(210,'default',0,'payment/free/allowspecific','0'),(211,'default',0,'payment/free/specificcountry',NULL),(212,'default',0,'payment/free/sort_order','1'),(213,'default',0,'payment/purchaseorder/active','1'),(214,'default',0,'payment/purchaseorder/title','Purchase Order'),(215,'default',0,'payment/purchaseorder/order_status','pending'),(216,'default',0,'payment/purchaseorder/allowspecific','0'),(217,'default',0,'payment/purchaseorder/specificcountry',NULL),(218,'default',0,'payment/purchaseorder/min_order_total',NULL),(219,'default',0,'payment/purchaseorder/max_order_total',NULL),(220,'default',0,'payment/purchaseorder/sort_order',NULL),(221,'default',0,'payment/authorizenet_directpost/active','1'),(222,'default',0,'payment/authorizenet_directpost/payment_action','authorize'),(223,'default',0,'payment/authorizenet_directpost/title','Credit Card Direct Post (Authorize.net)'),(224,'default',0,'payment/authorizenet_directpost/order_status','processing'),(225,'default',0,'payment/authorizenet_directpost/test','1'),(226,'default',0,'payment/authorizenet_directpost/cgi_url','https://secure.authorize.net/gateway/transact.dll'),(227,'default',0,'payment/authorizenet_directpost/cgi_url_td','https://api2.authorize.net/xml/v1/request.api'),(228,'default',0,'payment/authorizenet_directpost/currency','USD'),(229,'default',0,'payment/authorizenet_directpost/debug','0'),(230,'default',0,'payment/authorizenet_directpost/email_customer','0'),(231,'default',0,'payment/authorizenet_directpost/merchant_email',NULL),(232,'default',0,'payment/authorizenet_directpost/cctypes','AE,VI,MC,DI'),(233,'default',0,'payment/authorizenet_directpost/useccv','0'),(234,'default',0,'payment/authorizenet_directpost/allowspecific','0'),(235,'default',0,'payment/authorizenet_directpost/min_order_total',NULL),(236,'default',0,'payment/authorizenet_directpost/max_order_total',NULL),(237,'default',0,'payment/authorizenet_directpost/sort_order',NULL),(238,'default',0,'payment/braintree/public_key','0:2:N0QO0UMZO2fsUYqjGHCgiPxapsDxdfQR:YS66eAz1MQA12iu/ErWE0C1U1qK7fWvo+bmGA+PWY2k='),(239,'default',0,'payment/braintree/private_key','0:2:xvVh7LV0QeKEvUa3mhb1FchXFE1LlIGI:ri1BZsG4nOF1SsM23YLFojAwNPxu9IWFeh/SI/2Tkdw='),(240,'default',0,'payment/buckaroo_magento2_account/active','1'),(241,'default',0,'payment/buckaroo_magento2_account/secret_key',NULL),(242,'default',0,'payment/buckaroo_magento2_account/merchant_key',NULL),(243,'default',0,'payment/buckaroo_magento2_account/transaction_label',NULL),(244,'default',0,'payment/buckaroo_magento2_account/certificate_file','1'),(245,'default',0,'payment/buckaroo_magento2_account/advanced',NULL),(246,'default',0,'payment/buckaroo_magento2_ideal/title','Buckaroo iDEAL'),(247,'default',0,'payment/buckaroo_magento2_ideal/sort_order','1'),(248,'default',0,'payment/buckaroo_magento2_ideal/order_email','0'),(249,'default',0,'payment/buckaroo_magento2_ideal/payment_fee',NULL),(250,'default',0,'payment/buckaroo_magento2_ideal/payment_fee_label',NULL),(251,'default',0,'payment/buckaroo_magento2_ideal/max_amount',NULL),(252,'default',0,'payment/buckaroo_magento2_ideal/min_amount',NULL),(253,'default',0,'payment/buckaroo_magento2_ideal/active_status','0'),(254,'default',0,'payment/buckaroo_magento2_ideal/allowspecific','0'),(255,'default',0,'payment/buckaroo_magento2_ideal/limit_by_ip','0'),(256,'default',0,'payment/buckaroo_magento2_creditcards/active','0'),(257,'default',0,'payment/buckaroo_magento2_creditcards/title',NULL),(258,'default',0,'payment/buckaroo_magento2_creditcards/sort_order',NULL),(259,'default',0,'payment/buckaroo_magento2_creditcards/max_amount',NULL),(260,'default',0,'payment/buckaroo_magento2_creditcards/min_amount',NULL),(261,'default',0,'payment/buckaroo_magento2_creditcards/active_status','0'),(262,'default',0,'payment/buckaroo_magento2_creditcards/allowspecific','0'),(263,'default',0,'payment/buckaroo_magento2_creditcards/limit_by_ip','0'),(264,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee',NULL),(265,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee_label',NULL),(266,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee',NULL),(267,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee_label',NULL),(268,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_status_processing',NULL),(269,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_hold','0'),(270,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee',NULL),(271,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee_label',NULL),(272,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_status_processing',NULL),(273,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_hold','0'),(274,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee',NULL),(275,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee_label',NULL),(276,'default',0,'payment/buckaroo_magento2_paypal/active','1'),(277,'default',0,'payment/buckaroo_magento2_paypal/title','Buckaroo PayPal'),(278,'default',0,'payment/buckaroo_magento2_paypal/sort_order','1'),(279,'default',0,'payment/buckaroo_magento2_paypal/sellers_protection','0'),(280,'default',0,'payment/buckaroo_magento2_paypal/order_email','0'),(281,'default',0,'payment/buckaroo_magento2_paypal/payment_fee',NULL),(282,'default',0,'payment/buckaroo_magento2_paypal/payment_fee_label',NULL),(283,'default',0,'payment/buckaroo_magento2_paypal/max_amount',NULL),(284,'default',0,'payment/buckaroo_magento2_paypal/min_amount',NULL),(285,'default',0,'payment/buckaroo_magento2_paypal/active_status','0'),(286,'default',0,'payment/buckaroo_magento2_paypal/allowspecific','0'),(287,'default',0,'payment/buckaroo_magento2_paypal/limit_by_ip','0'),(288,'default',0,'payment/buckaroo_magento2_bank_transfer/active','0'),(289,'default',0,'payment/buckaroo_magento2_bank_transfer/title',NULL),(290,'default',0,'payment/buckaroo_magento2_bank_transfer/sort_order',NULL),(291,'default',0,'payment/buckaroo_magento2_bank_transfer/send_email','0'),(292,'default',0,'payment/buckaroo_magento2_bank_transfer/due_date',NULL),(293,'default',0,'payment/buckaroo_magento2_bank_transfer/use_creditmanagement','0'),(294,'default',0,'payment/buckaroo_magento2_bank_transfer/order_email','0'),(295,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee',NULL),(296,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee_label',NULL),(297,'default',0,'payment/buckaroo_magento2_bank_transfer/max_amount',NULL),(298,'default',0,'payment/buckaroo_magento2_bank_transfer/min_amount',NULL),(299,'default',0,'payment/buckaroo_magento2_bank_transfer/active_status','0'),(300,'default',0,'payment/buckaroo_magento2_bank_transfer/allowspecific','0'),(301,'default',0,'payment/buckaroo_magento2_bank_transfer/limit_by_ip','0'),(302,'default',0,'payment/buckaroo_magento2_directdebit/active','0'),(303,'default',0,'payment/buckaroo_magento2_directdebit/title',NULL),(304,'default',0,'payment/buckaroo_magento2_directdebit/sort_order',NULL),(305,'default',0,'payment/buckaroo_magento2_directdebit/send_email','0'),(306,'default',0,'payment/buckaroo_magento2_directdebit/use_creditmanagement','0'),(307,'default',0,'payment/buckaroo_magento2_directdebit/order_email','0'),(308,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee',NULL),(309,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee_label',NULL),(310,'default',0,'payment/buckaroo_magento2_directdebit/max_amount',NULL),(311,'default',0,'payment/buckaroo_magento2_directdebit/min_amount',NULL),(312,'default',0,'payment/buckaroo_magento2_directdebit/active_status','0'),(313,'default',0,'payment/buckaroo_magento2_directdebit/allowspecific','0'),(314,'default',0,'payment/buckaroo_magento2_directdebit/limit_by_ip','0'),(315,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active','0'),(316,'default',0,'payment/buckaroo_magento2_bancontactmrcash/title',NULL),(317,'default',0,'payment/buckaroo_magento2_bancontactmrcash/sort_order',NULL),(318,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee',NULL),(319,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee_label',NULL),(320,'default',0,'payment/buckaroo_magento2_bancontactmrcash/max_amount',NULL),(321,'default',0,'payment/buckaroo_magento2_bancontactmrcash/min_amount',NULL),(322,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active_status','0'),(323,'default',0,'payment/buckaroo_magento2_bancontactmrcash/allowspecific','0'),(324,'default',0,'payment/buckaroo_magento2_bancontactmrcash/limit_by_ip','0'),(325,'default',0,'buckaroo_magento2/account/active','1'),(326,'default',0,'buckaroo_magento2/account/secret_key',NULL),(327,'default',0,'buckaroo_magento2/account/merchant_key',NULL),(328,'default',0,'buckaroo_magento2/account/transaction_label','Magento Buckaroo'),(329,'default',0,'buckaroo_magento2/account/certificate_file','1'),(330,'default',0,'buckaroo_magento2/account/order_state_new',NULL),(331,'default',0,'buckaroo_magento2/account/order_state_pending',NULL),(332,'default',0,'buckaroo_magento2/account/order_state_success',NULL),(333,'default',0,'buckaroo_magento2/account/order_state_failed',NULL),(334,'default',0,'buckaroo_magento2/account/invoice_email','1'),(335,'default',0,'buckaroo_magento2/account/auto_invoice','1'),(336,'default',0,'buckaroo_magento2/account/auto_invoice_status','pending'),(337,'default',0,'buckaroo_magento2/account/success_redirect','checkout/onepage/success'),(338,'default',0,'buckaroo_magento2/account/failure_redirect','checkout/onepage'),(339,'default',0,'buckaroo_magento2/account/cancel_on_failed','1'),(340,'default',0,'buckaroo_magento2/account/debug_mode',NULL),(341,'default',0,'buckaroo_magento2/account/debug_email',NULL),(342,'default',0,'buckaroo_magento2/account/limit_by_ip','0'),(343,'default',0,'buckaroo_magento2/account/fee_percentage_mode','subtotal'),(344,'default',0,'payment/buckaroo_magento2_creditcard/active','1'),(345,'default',0,'payment/buckaroo_magento2_creditcard/title','Buckaroo Creditcard and Debit Card'),(346,'default',0,'payment/buckaroo_magento2_creditcard/sort_order','30'),(347,'default',0,'payment/buckaroo_magento2_creditcard/max_amount',NULL),(348,'default',0,'payment/buckaroo_magento2_creditcard/min_amount',NULL),(349,'default',0,'payment/buckaroo_magento2_creditcard/active_status','0'),(350,'default',0,'payment/buckaroo_magento2_creditcard/allowspecific','0'),(351,'default',0,'payment/buckaroo_magento2_creditcard/limit_by_ip','0'),(352,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee',NULL),(353,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee_label','Fee'),(354,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee',NULL),(355,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee_label','Fee'),(356,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_status_processing',NULL),(357,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_hold','0'),(358,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee',NULL),(359,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee_label','Fee'),(360,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_status_processing',NULL),(361,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_hold','0'),(362,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee',NULL),(363,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee_label','Fee'),(364,'default',0,'payment/buckaroo_magento2_transfer/active','1'),(365,'default',0,'payment/buckaroo_magento2_transfer/title','Buckaroo Transfer'),(366,'default',0,'payment/buckaroo_magento2_transfer/sort_order','100'),(367,'default',0,'payment/buckaroo_magento2_transfer/send_email','0'),(368,'default',0,'payment/buckaroo_magento2_transfer/due_date','7'),(369,'default',0,'payment/buckaroo_magento2_transfer/use_creditmanagement','0'),(370,'default',0,'payment/buckaroo_magento2_transfer/order_email','1'),(371,'default',0,'payment/buckaroo_magento2_transfer/payment_fee',NULL),(372,'default',0,'payment/buckaroo_magento2_transfer/payment_fee_label','Fee'),(373,'default',0,'payment/buckaroo_magento2_transfer/max_amount',NULL),(374,'default',0,'payment/buckaroo_magento2_transfer/min_amount',NULL),(375,'default',0,'payment/buckaroo_magento2_transfer/active_status','0'),(376,'default',0,'payment/buckaroo_magento2_transfer/allowspecific','0'),(377,'default',0,'payment/buckaroo_magento2_transfer/limit_by_ip','0'),(378,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active','1'),(379,'default',0,'payment/buckaroo_magento2_sepadirectdebit/title','Buckaroo SEPA Direct Debit'),(380,'default',0,'payment/buckaroo_magento2_sepadirectdebit/sort_order','110'),(381,'default',0,'payment/buckaroo_magento2_sepadirectdebit/send_email','1'),(382,'default',0,'payment/buckaroo_magento2_sepadirectdebit/use_creditmanagement','0'),(383,'default',0,'payment/buckaroo_magento2_sepadirectdebit/order_email','1'),(384,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee',NULL),(385,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee_label',NULL),(386,'default',0,'payment/buckaroo_magento2_sepadirectdebit/max_amount',NULL),(387,'default',0,'payment/buckaroo_magento2_sepadirectdebit/min_amount',NULL),(388,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active_status','0'),(389,'default',0,'payment/buckaroo_magento2_sepadirectdebit/allowspecific','0'),(390,'default',0,'payment/buckaroo_magento2_sepadirectdebit/limit_by_ip','0'),(391,'default',0,'payment/buckaroo_magento2_mrcash/active','1'),(392,'default',0,'payment/buckaroo_magento2_mrcash/title','Buckaroo Mrcash'),(393,'default',0,'payment/buckaroo_magento2_mrcash/sort_order','140'),(394,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee',NULL),(395,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee_label','Fee'),(396,'default',0,'payment/buckaroo_magento2_mrcash/max_amount',NULL),(397,'default',0,'payment/buckaroo_magento2_mrcash/min_amount',NULL),(398,'default',0,'payment/buckaroo_magento2_mrcash/active_status','0'),(399,'default',0,'payment/buckaroo_magento2_mrcash/allowspecific','0'),(400,'default',0,'payment/buckaroo_magento2_mrcash/limit_by_ip','0'),(421,'default',0,'buckaroo_magento2/refund/active','0'),(422,'default',0,'system/full_page_cache/varnish/access_list','localhost'),(423,'default',0,'system/full_page_cache/varnish/backend_host','localhost'),(424,'default',0,'system/full_page_cache/varnish/backend_port','8080'),(425,'default',0,'dev/front_end_development_workflow/type','server_side_compilation'),(426,'default',0,'dev/restrict/allow_ips','127.0.0.2,::2'),(427,'default',0,'dev/debug/template_hints_storefront','0'),(428,'default',0,'dev/debug/template_hints_admin','0'),(429,'default',0,'dev/debug/template_hints_blocks','0'),(430,'default',0,'dev/template/allow_symlink','0'),(431,'default',0,'dev/template/minify_html','0'),(432,'default',0,'dev/translate_inline/active','0'),(433,'default',0,'dev/translate_inline/active_admin','0'),(434,'default',0,'dev/js/enable_js_bundling','0'),(435,'default',0,'dev/js/merge_files','0'),(436,'default',0,'dev/js/minify_files','0'),(437,'default',0,'dev/js/translate_strategy','dictionary'),(438,'default',0,'dev/js/session_storage_logging','0'),(439,'default',0,'dev/js/session_storage_key','collected_errors'),(440,'default',0,'dev/css/merge_css_files','0'),(441,'default',0,'dev/css/minify_files','0'),(442,'default',0,'dev/image/default_adapter','GD2'),(443,'default',0,'dev/static/sign','0'),(444,'default',0,'dev/grid/async_indexing','0'),(445,'default',0,'payment/buckaroo_magento2_creditcard/allowed_issuers','cartebleuevisa,maestro,mastercard,visa'),(446,'default',0,'admin/emails/forgot_email_template','admin_emails_forgot_email_template'),(447,'default',0,'admin/emails/forgot_email_identity','general'),(448,'default',0,'admin/emails/password_reset_link_expiration_period','1'),(449,'default',0,'admin/emails/reset_password_template','admin_emails_reset_password_template'),(450,'default',0,'admin/startup/menu_item_id','Magento_Backend::dashboard'),(451,'default',0,'admin/url/use_custom','0'),(452,'default',0,'admin/url/use_custom_path','0'),(453,'default',0,'admin/security/use_form_key','1'),(454,'default',0,'admin/security/use_case_sensitive_login','0'),(455,'default',0,'admin/security/session_lifetime','999999'),(456,'default',0,'admin/security/lockout_failures','6'),(457,'default',0,'admin/security/lockout_threshold','30'),(458,'default',0,'admin/security/password_lifetime','90'),(459,'default',0,'admin/security/password_is_forced','1'),(460,'default',0,'admin/dashboard/enable_charts','0'),(461,'default',0,'admin/captcha/enable','0'),(462,'default',0,'payment/buckaroo_magento2_ideal/specificcountry','AF'),(465,'default',0,'buckaroo_magento2/account/order_status_new',NULL),(466,'default',0,'buckaroo_magento2/account/order_status_pending',NULL),(467,'default',0,'buckaroo_magento2/account/order_status_success',NULL),(468,'default',0,'buckaroo_magento2/account/order_status_failed',NULL),(469,'default',0,'payment/buckaroo_magento2_ideal/allowed_currencies','ARS,AUD,BRL,CAD,CHF,CNY,CZK,DKK,EUR,GBP,HRK,LTL,LVL,MXN,MXP,NOK,PLN,SEK,TRL,TRY,USD'); +INSERT INTO `core_config_data` VALUES (1,'default',0,'web/seo/use_rewrites','1'),(2,'default',0,'web/unsecure/base_url','http://buckaroo.jenkins/'),(3,'default',0,'web/secure/base_url','https://buckaroo.jenkins/'),(4,'default',0,'general/locale/code','nl-NL'),(5,'default',0,'web/secure/use_in_frontend',NULL),(6,'default',0,'web/secure/use_in_adminhtml',NULL),(7,'default',0,'general/locale/timezone','Europe/Amsterdam'),(8,'default',0,'currency/options/base','EUR'),(9,'default',0,'currency/options/default','EUR'),(10,'default',0,'currency/options/allow','EUR'),(11,'default',0,'general/region/display_all','1'),(12,'default',0,'general/region/state_required','AT,BR,CA,CH,DE,EE,ES,FI,FR,LT,LV,RO,US'),(13,'default',0,'catalog/category/root_id',NULL),(14,'default',0,'paypal/general/merchant_country','NL'),(15,'default',0,'payment/buckaroo_magento2_ideal/active','1'),(16,'default',0,'payment/braintree/active','0'),(17,'default',0,'payment/braintree_paypal/active','1'),(18,'default',0,'payment/braintree/title','Credit Card (Braintree)'),(19,'default',0,'payment/braintree/environment','sandbox'),(20,'default',0,'payment/braintree/payment_action','authorize'),(21,'default',0,'payment/braintree/merchant_account_id','bart.buckaroo'),(22,'default',0,'payment/braintree/merchant_id','4qzzt63rc7krn522'),(23,'default',0,'payment/braintree/debug','0'),(24,'default',0,'payment/braintree/capture_action','invoice'),(25,'default',0,'payment/braintree/order_status','processing'),(26,'default',0,'payment/braintree/use_vault','0'),(27,'default',0,'payment/braintree/duplicate_card','0'),(28,'default',0,'payment/braintree/useccv','1'),(29,'default',0,'payment/braintree/cctypes','AE,VI,MC,DI,JCB'),(30,'default',0,'payment/braintree/enable_cc_detection','1'),(31,'default',0,'payment/braintree/fraudprotection','0'),(32,'default',0,'payment/braintree/kount_id',NULL),(33,'default',0,'payment/braintree/usecache','0'),(34,'default',0,'payment/braintree/sort_order',NULL),(35,'default',0,'payment/braintree/allowspecific','0'),(36,'default',0,'payment/braintree/specificcountry',NULL),(37,'default',0,'payment/braintree/countrycreditcard','a:0:{}'),(38,'default',0,'payment/braintree_paypal/title','PayPal (Braintree)'),(39,'default',0,'payment/braintree_paypal/sort_order',NULL),(40,'default',0,'payment/braintree_paypal/merchant_name_override',NULL),(41,'default',0,'payment/braintree_paypal/payment_action','authorize'),(42,'default',0,'payment/braintree_paypal/order_status','processing'),(43,'default',0,'payment/braintree_paypal/allowspecific','0'),(44,'default',0,'payment/braintree_paypal/specificcountry',NULL),(45,'default',0,'payment/braintree_paypal/require_billing_address','0'),(46,'default',0,'payment/braintree_paypal/display_on_shopping_cart','0'),(47,'default',0,'payment/braintree_paypal/allow_shipping_address_override','0'),(48,'default',0,'payment/braintree_paypal/debug','0'),(49,'default',0,'payment/braintree/verify_3dsecure','0'),(50,'default',0,'payment/braintreetwo/active','0'),(51,'default',0,'payment/braintreetwo/title','Credit Card (BraintreeTwo)'),(52,'default',0,'payment/braintreetwo/environment','sandbox'),(53,'default',0,'payment/braintreetwo/payment_action','authorize'),(54,'default',0,'payment/braintreetwo/merchant_id',NULL),(55,'default',0,'payment/braintreetwo/merchant_account_id',NULL),(56,'default',0,'payment/braintreetwo/debug','0'),(57,'default',0,'payment/braintreetwo/useccv','1'),(58,'default',0,'payment/braintreetwo/cctypes','CUP,AE,VI,MC,DI,JCB,DN,MI'),(59,'default',0,'payment/braintreetwo/sort_order',NULL),(60,'default',0,'payment/braintreetwo/allowspecific','0'),(61,'default',0,'payment/braintreetwo/specificcountry',NULL),(62,'default',0,'payment/braintreetwo/countrycreditcard','a:0:{}'),(63,'default',0,'payment/payflow_express/active','0'),(64,'default',0,'payment/payflow_advanced/active','0'),(65,'default',0,'payment/payflow_express_bml/active','0'),(66,'default',0,'paypal/general/business_account',NULL),(67,'default',0,'payment/payflow_advanced/partner','PayPal'),(68,'default',0,'payment/payflow_advanced/vendor','PayPal'),(69,'default',0,'payment/payflow_advanced/sandbox_flag','0'),(70,'default',0,'payment/payflow_advanced/use_proxy','0'),(71,'default',0,'payment/paypal_express_bml/publisher_id',NULL),(72,'default',0,'payment/paypal_express_bml/homepage_display','0'),(73,'default',0,'payment/paypal_express_bml/homepage_position','0'),(74,'default',0,'payment/paypal_express_bml/homepage_size','190x100'),(75,'default',0,'payment/paypal_express_bml/categorypage_display','0'),(76,'default',0,'payment/paypal_express_bml/categorypage_position','0'),(77,'default',0,'payment/paypal_express_bml/categorypage_size','190x100'),(78,'default',0,'payment/paypal_express_bml/productpage_display','0'),(79,'default',0,'payment/paypal_express_bml/productpage_position','0'),(80,'default',0,'payment/paypal_express_bml/productpage_size','190x100'),(81,'default',0,'payment/paypal_express_bml/checkout_display','0'),(82,'default',0,'payment/paypal_express_bml/checkout_position','0'),(83,'default',0,'payment/paypal_express_bml/checkout_size','234x60'),(84,'default',0,'payment/payflow_advanced/title','Credit Card'),(85,'default',0,'payment/payflow_advanced/sort_order',NULL),(86,'default',0,'payment/payflow_advanced/payment_action','Authorization'),(87,'default',0,'payment/payflow_advanced/allowspecific','0'),(88,'default',0,'payment/payflow_advanced/debug','0'),(89,'default',0,'payment/payflow_advanced/verify_peer','1'),(90,'default',0,'payment/payflow_advanced/csc_editable','1'),(91,'default',0,'payment/payflow_advanced/csc_required','1'),(92,'default',0,'payment/payflow_advanced/email_confirmation','0'),(93,'default',0,'payment/payflow_advanced/url_method','GET'),(94,'default',0,'paypal/fetch_reports/ftp_sandbox','0'),(95,'default',0,'paypal/fetch_reports/ftp_ip',NULL),(96,'default',0,'paypal/fetch_reports/ftp_path',NULL),(97,'default',0,'paypal/fetch_reports/active','0'),(98,'default',0,'paypal/fetch_reports/schedule','1'),(99,'default',0,'paypal/fetch_reports/time','00,00,00'),(100,'default',0,'paypal/style/logo',NULL),(101,'default',0,'paypal/style/page_style',NULL),(102,'default',0,'paypal/style/paypal_hdrimg',NULL),(103,'default',0,'paypal/style/paypal_hdrbackcolor',NULL),(104,'default',0,'paypal/style/paypal_hdrbordercolor',NULL),(105,'default',0,'paypal/style/paypal_payflowcolor',NULL),(106,'default',0,'payment/payflow_express/title','PayPal Express Checkout Payflow Edition'),(107,'default',0,'payment/payflow_express/sort_order',NULL),(108,'default',0,'payment/payflow_express/payment_action','Authorization'),(109,'default',0,'payment/payflow_express/visible_on_product','1'),(110,'default',0,'payment/payflow_express/visible_on_cart','1'),(111,'default',0,'payment/payflow_express/allowspecific','0'),(112,'default',0,'payment/payflow_express/debug','0'),(113,'default',0,'payment/payflow_express/verify_peer','1'),(114,'default',0,'payment/payflow_express/line_items_enabled','1'),(115,'default',0,'payment/paypal_express/skip_order_review_step','1'),(116,'default',0,'payment/paypal_payment_pro/active','0'),(117,'default',0,'payment/payflowpro/partner',NULL),(118,'default',0,'payment/payflowpro/vendor',NULL),(119,'default',0,'payment/payflowpro/sandbox_flag','0'),(120,'default',0,'payment/payflowpro/use_proxy','0'),(121,'default',0,'payment/payflowpro/title','Credit Card'),(122,'default',0,'payment/payflowpro/sort_order',NULL),(123,'default',0,'payment/payflowpro/payment_action','Authorization'),(124,'default',0,'payment/payflowpro/cctypes','AE,VI'),(125,'default',0,'payment/payflowpro/allowspecific','0'),(126,'default',0,'payment/payflowpro/debug','0'),(127,'default',0,'payment/payflowpro/verify_peer','1'),(128,'default',0,'payment/payflowpro/useccv','1'),(129,'default',0,'payment/payflowpro/avs_street','0'),(130,'default',0,'payment/payflowpro/avs_zip','0'),(131,'default',0,'payment/payflowpro/avs_international','0'),(132,'default',0,'payment/payflowpro/avs_security_code','1'),(133,'default',0,'payment/wps_express/active','0'),(134,'default',0,'payment/wps_express_bml/active','0'),(135,'default',0,'paypal/wpp/api_authentication','0'),(136,'default',0,'paypal/wpp/sandbox_flag','0'),(137,'default',0,'paypal/wpp/use_proxy','0'),(138,'default',0,'payment/paypal_express/title','PayPal Express Checkout'),(139,'default',0,'payment/paypal_express/sort_order',NULL),(140,'default',0,'payment/paypal_express/payment_action','Authorization'),(141,'default',0,'payment/paypal_express/visible_on_product','1'),(142,'default',0,'payment/paypal_express/visible_on_cart','1'),(143,'default',0,'payment/paypal_express/allowspecific','0'),(144,'default',0,'payment/paypal_express/debug','0'),(145,'default',0,'payment/paypal_express/verify_peer','1'),(146,'default',0,'payment/paypal_express/line_items_enabled','1'),(147,'default',0,'payment/paypal_express/transfer_shipping_options','0'),(148,'default',0,'paypal/wpp/button_flavor','dynamic'),(149,'default',0,'payment/paypal_express/solution_type','Mark'),(150,'default',0,'payment/paypal_express/require_billing_address','0'),(151,'default',0,'payment/paypal_express/allow_ba_signup','never'),(152,'default',0,'payment/paypal_billing_agreement/active','1'),(153,'default',0,'payment/paypal_billing_agreement/title','PayPal Billing Agreement'),(154,'default',0,'payment/paypal_billing_agreement/sort_order',NULL),(155,'default',0,'payment/paypal_billing_agreement/payment_action','Authorization'),(156,'default',0,'payment/paypal_billing_agreement/allowspecific','0'),(157,'default',0,'payment/paypal_billing_agreement/debug','0'),(158,'default',0,'payment/paypal_billing_agreement/verify_peer','1'),(159,'default',0,'payment/paypal_billing_agreement/line_items_enabled','0'),(160,'default',0,'payment/paypal_billing_agreement/allow_billing_agreement_wizard','1'),(161,'default',0,'payment/payflowpro/active','0'),(162,'default',0,'payment/payflow_link/active','0'),(163,'default',0,'payment/payflow_link/partner','PayPal'),(164,'default',0,'payment/payflow_link/vendor',NULL),(165,'default',0,'payment/payflow_link/sandbox_flag','0'),(166,'default',0,'payment/payflow_link/use_proxy','0'),(167,'default',0,'payment/payflow_link/title','Credit Card'),(168,'default',0,'payment/payflow_link/sort_order',NULL),(169,'default',0,'payment/payflow_link/payment_action','Authorization'),(170,'default',0,'payment/payflow_link/allowspecific','0'),(171,'default',0,'payment/payflow_link/debug','0'),(172,'default',0,'payment/payflow_link/verify_peer','1'),(173,'default',0,'payment/payflow_link/csc_editable','1'),(174,'default',0,'payment/payflow_link/csc_required','1'),(175,'default',0,'payment/payflow_link/email_confirmation','0'),(176,'default',0,'payment/payflow_link/url_method','GET'),(177,'default',0,'payment/paypal_express/active','0'),(178,'default',0,'payment/paypal_express_bml/active','0'),(179,'default',0,'payment/checkmo/active','1'),(180,'default',0,'payment/checkmo/title','Check / Money order'),(181,'default',0,'payment/checkmo/order_status','pending'),(182,'default',0,'payment/checkmo/allowspecific','0'),(183,'default',0,'payment/checkmo/specificcountry',NULL),(184,'default',0,'payment/checkmo/payable_to',NULL),(185,'default',0,'payment/checkmo/mailing_address',NULL),(186,'default',0,'payment/checkmo/min_order_total',NULL),(187,'default',0,'payment/checkmo/max_order_total',NULL),(188,'default',0,'payment/checkmo/sort_order',NULL),(189,'default',0,'payment/cashondelivery/active','1'),(190,'default',0,'payment/cashondelivery/title','Cash On Delivery'),(191,'default',0,'payment/cashondelivery/order_status','pending'),(192,'default',0,'payment/cashondelivery/allowspecific','0'),(193,'default',0,'payment/cashondelivery/specificcountry',NULL),(194,'default',0,'payment/cashondelivery/instructions',NULL),(195,'default',0,'payment/cashondelivery/min_order_total',NULL),(196,'default',0,'payment/cashondelivery/max_order_total',NULL),(197,'default',0,'payment/cashondelivery/sort_order',NULL),(198,'default',0,'payment/banktransfer/active','1'),(199,'default',0,'payment/banktransfer/title','Bank Transfer Payment'),(200,'default',0,'payment/banktransfer/order_status','pending'),(201,'default',0,'payment/banktransfer/allowspecific','0'),(202,'default',0,'payment/banktransfer/specificcountry',NULL),(203,'default',0,'payment/banktransfer/instructions',NULL),(204,'default',0,'payment/banktransfer/min_order_total',NULL),(205,'default',0,'payment/banktransfer/max_order_total',NULL),(206,'default',0,'payment/banktransfer/sort_order',NULL),(207,'default',0,'payment/free/title','No Payment Information Required'),(208,'default',0,'payment/free/active','1'),(209,'default',0,'payment/free/order_status','pending'),(210,'default',0,'payment/free/allowspecific','0'),(211,'default',0,'payment/free/specificcountry',NULL),(212,'default',0,'payment/free/sort_order','1'),(213,'default',0,'payment/purchaseorder/active','1'),(214,'default',0,'payment/purchaseorder/title','Purchase Order'),(215,'default',0,'payment/purchaseorder/order_status','pending'),(216,'default',0,'payment/purchaseorder/allowspecific','0'),(217,'default',0,'payment/purchaseorder/specificcountry',NULL),(218,'default',0,'payment/purchaseorder/min_order_total',NULL),(219,'default',0,'payment/purchaseorder/max_order_total',NULL),(220,'default',0,'payment/purchaseorder/sort_order',NULL),(221,'default',0,'payment/authorizenet_directpost/active','1'),(222,'default',0,'payment/authorizenet_directpost/payment_action','authorize'),(223,'default',0,'payment/authorizenet_directpost/title','Credit Card Direct Post (Authorize.net)'),(224,'default',0,'payment/authorizenet_directpost/order_status','processing'),(225,'default',0,'payment/authorizenet_directpost/test','1'),(226,'default',0,'payment/authorizenet_directpost/cgi_url','https://secure.authorize.net/gateway/transact.dll'),(227,'default',0,'payment/authorizenet_directpost/cgi_url_td','https://api2.authorize.net/xml/v1/request.api'),(228,'default',0,'payment/authorizenet_directpost/currency','USD'),(229,'default',0,'payment/authorizenet_directpost/debug','0'),(230,'default',0,'payment/authorizenet_directpost/email_customer','0'),(231,'default',0,'payment/authorizenet_directpost/merchant_email',NULL),(232,'default',0,'payment/authorizenet_directpost/cctypes','AE,VI,MC,DI'),(233,'default',0,'payment/authorizenet_directpost/useccv','0'),(234,'default',0,'payment/authorizenet_directpost/allowspecific','0'),(235,'default',0,'payment/authorizenet_directpost/min_order_total',NULL),(236,'default',0,'payment/authorizenet_directpost/max_order_total',NULL),(237,'default',0,'payment/authorizenet_directpost/sort_order',NULL),(238,'default',0,'payment/braintree/public_key','0:2:N0QO0UMZO2fsUYqjGHCgiPxapsDxdfQR:YS66eAz1MQA12iu/ErWE0C1U1qK7fWvo+bmGA+PWY2k='),(239,'default',0,'payment/braintree/private_key','0:2:xvVh7LV0QeKEvUa3mhb1FchXFE1LlIGI:ri1BZsG4nOF1SsM23YLFojAwNPxu9IWFeh/SI/2Tkdw='),(240,'default',0,'payment/buckaroo_magento2_account/active','1'),(241,'default',0,'payment/buckaroo_magento2_account/secret_key',NULL),(242,'default',0,'payment/buckaroo_magento2_account/merchant_key',NULL),(243,'default',0,'payment/buckaroo_magento2_account/transaction_label',NULL),(244,'default',0,'payment/buckaroo_magento2_account/certificate_file','1'),(245,'default',0,'payment/buckaroo_magento2_account/advanced',NULL),(246,'default',0,'payment/buckaroo_magento2_ideal/title','Buckaroo iDEAL'),(247,'default',0,'payment/buckaroo_magento2_ideal/sort_order','1'),(248,'default',0,'payment/buckaroo_magento2_ideal/order_email','0'),(249,'default',0,'payment/buckaroo_magento2_ideal/payment_fee',NULL),(250,'default',0,'payment/buckaroo_magento2_ideal/payment_fee_label',NULL),(251,'default',0,'payment/buckaroo_magento2_ideal/max_amount',NULL),(252,'default',0,'payment/buckaroo_magento2_ideal/min_amount',NULL),(253,'default',0,'payment/buckaroo_magento2_ideal/active_status','0'),(254,'default',0,'payment/buckaroo_magento2_ideal/allowspecific','0'),(255,'default',0,'payment/buckaroo_magento2_ideal/limit_by_ip','0'),(256,'default',0,'payment/buckaroo_magento2_creditcards/active','0'),(257,'default',0,'payment/buckaroo_magento2_creditcards/title',NULL),(258,'default',0,'payment/buckaroo_magento2_creditcards/sort_order',NULL),(259,'default',0,'payment/buckaroo_magento2_creditcards/max_amount',NULL),(260,'default',0,'payment/buckaroo_magento2_creditcards/min_amount',NULL),(261,'default',0,'payment/buckaroo_magento2_creditcards/active_status','0'),(262,'default',0,'payment/buckaroo_magento2_creditcards/allowspecific','0'),(263,'default',0,'payment/buckaroo_magento2_creditcards/limit_by_ip','0'),(264,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee',NULL),(265,'default',0,'payment/buckaroo_magento2_creditcards/amex_payment_fee_label',NULL),(266,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee',NULL),(267,'default',0,'payment/buckaroo_magento2_creditcards/maestro_payment_fee_label',NULL),(268,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_status_processing',NULL),(269,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_unsecure_hold','0'),(270,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee',NULL),(271,'default',0,'payment/buckaroo_magento2_creditcards/mastercard_payment_fee_label',NULL),(272,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_status_processing',NULL),(273,'default',0,'payment/buckaroo_magento2_creditcards/visa_unsecure_hold','0'),(274,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee',NULL),(275,'default',0,'payment/buckaroo_magento2_creditcards/visa_payment_fee_label',NULL),(276,'default',0,'payment/buckaroo_magento2_paypal/active','1'),(277,'default',0,'payment/buckaroo_magento2_paypal/title','Buckaroo PayPal'),(278,'default',0,'payment/buckaroo_magento2_paypal/sort_order','1'),(279,'default',0,'payment/buckaroo_magento2_paypal/sellers_protection','0'),(280,'default',0,'payment/buckaroo_magento2_paypal/order_email','0'),(281,'default',0,'payment/buckaroo_magento2_paypal/payment_fee',NULL),(282,'default',0,'payment/buckaroo_magento2_paypal/payment_fee_label',NULL),(283,'default',0,'payment/buckaroo_magento2_paypal/max_amount',NULL),(284,'default',0,'payment/buckaroo_magento2_paypal/min_amount',NULL),(285,'default',0,'payment/buckaroo_magento2_paypal/active_status','0'),(286,'default',0,'payment/buckaroo_magento2_paypal/allowspecific','0'),(287,'default',0,'payment/buckaroo_magento2_paypal/limit_by_ip','0'),(288,'default',0,'payment/buckaroo_magento2_bank_transfer/active','0'),(289,'default',0,'payment/buckaroo_magento2_bank_transfer/title',NULL),(290,'default',0,'payment/buckaroo_magento2_bank_transfer/sort_order',NULL),(291,'default',0,'payment/buckaroo_magento2_bank_transfer/send_email','0'),(292,'default',0,'payment/buckaroo_magento2_bank_transfer/due_date',NULL),(293,'default',0,'payment/buckaroo_magento2_bank_transfer/use_creditmanagement','0'),(294,'default',0,'payment/buckaroo_magento2_bank_transfer/order_email','0'),(295,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee',NULL),(296,'default',0,'payment/buckaroo_magento2_bank_transfer/payment_fee_label',NULL),(297,'default',0,'payment/buckaroo_magento2_bank_transfer/max_amount',NULL),(298,'default',0,'payment/buckaroo_magento2_bank_transfer/min_amount',NULL),(299,'default',0,'payment/buckaroo_magento2_bank_transfer/active_status','0'),(300,'default',0,'payment/buckaroo_magento2_bank_transfer/allowspecific','0'),(301,'default',0,'payment/buckaroo_magento2_bank_transfer/limit_by_ip','0'),(302,'default',0,'payment/buckaroo_magento2_directdebit/active','0'),(303,'default',0,'payment/buckaroo_magento2_directdebit/title',NULL),(304,'default',0,'payment/buckaroo_magento2_directdebit/sort_order',NULL),(305,'default',0,'payment/buckaroo_magento2_directdebit/send_email','0'),(306,'default',0,'payment/buckaroo_magento2_directdebit/use_creditmanagement','0'),(307,'default',0,'payment/buckaroo_magento2_directdebit/order_email','0'),(308,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee',NULL),(309,'default',0,'payment/buckaroo_magento2_directdebit/payment_fee_label',NULL),(310,'default',0,'payment/buckaroo_magento2_directdebit/max_amount',NULL),(311,'default',0,'payment/buckaroo_magento2_directdebit/min_amount',NULL),(312,'default',0,'payment/buckaroo_magento2_directdebit/active_status','0'),(313,'default',0,'payment/buckaroo_magento2_directdebit/allowspecific','0'),(314,'default',0,'payment/buckaroo_magento2_directdebit/limit_by_ip','0'),(315,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active','0'),(316,'default',0,'payment/buckaroo_magento2_bancontactmrcash/title',NULL),(317,'default',0,'payment/buckaroo_magento2_bancontactmrcash/sort_order',NULL),(318,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee',NULL),(319,'default',0,'payment/buckaroo_magento2_bancontactmrcash/payment_fee_label',NULL),(320,'default',0,'payment/buckaroo_magento2_bancontactmrcash/max_amount',NULL),(321,'default',0,'payment/buckaroo_magento2_bancontactmrcash/min_amount',NULL),(322,'default',0,'payment/buckaroo_magento2_bancontactmrcash/active_status','0'),(323,'default',0,'payment/buckaroo_magento2_bancontactmrcash/allowspecific','0'),(324,'default',0,'payment/buckaroo_magento2_bancontactmrcash/limit_by_ip','0'),(325,'default',0,'buckaroo_magento2/account/active','1'),(326,'default',0,'buckaroo_magento2/account/secret_key',NULL),(327,'default',0,'buckaroo_magento2/account/merchant_key',NULL),(328,'default',0,'buckaroo_magento2/account/transaction_label','Magento Buckaroo'),(329,'default',0,'buckaroo_magento2/account/certificate_file','1'),(330,'default',0,'buckaroo_magento2/account/order_state_new',NULL),(331,'default',0,'buckaroo_magento2/account/order_state_pending',NULL),(332,'default',0,'buckaroo_magento2/account/order_state_success',NULL),(333,'default',0,'buckaroo_magento2/account/order_state_failed',NULL),(334,'default',0,'buckaroo_magento2/account/invoice_email','1'),(335,'default',0,'buckaroo_magento2/account/auto_invoice','1'),(336,'default',0,'buckaroo_magento2/account/auto_invoice_status','pending'),(337,'default',0,'buckaroo_magento2/account/success_redirect','checkout/onepage/success'),(338,'default',0,'buckaroo_magento2/account/failure_redirect','checkout/onepage'),(339,'default',0,'buckaroo_magento2/account/cancel_on_failed','1'),(340,'default',0,'buckaroo_magento2/account/debug_mode',NULL),(341,'default',0,'buckaroo_magento2/account/debug_email',NULL),(342,'default',0,'buckaroo_magento2/account/limit_by_ip','0'),(344,'default',0,'payment/buckaroo_magento2_creditcard/active','1'),(345,'default',0,'payment/buckaroo_magento2_creditcard/title','Buckaroo Creditcard and Debit Card'),(346,'default',0,'payment/buckaroo_magento2_creditcard/sort_order','30'),(347,'default',0,'payment/buckaroo_magento2_creditcard/max_amount',NULL),(348,'default',0,'payment/buckaroo_magento2_creditcard/min_amount',NULL),(349,'default',0,'payment/buckaroo_magento2_creditcard/active_status','0'),(350,'default',0,'payment/buckaroo_magento2_creditcard/allowspecific','0'),(351,'default',0,'payment/buckaroo_magento2_creditcard/limit_by_ip','0'),(352,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee',NULL),(353,'default',0,'payment/buckaroo_magento2_creditcard/amex_payment_fee_label','Fee'),(354,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee',NULL),(355,'default',0,'payment/buckaroo_magento2_creditcard/maestro_payment_fee_label','Fee'),(356,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_status_processing',NULL),(357,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_unsecure_hold','0'),(358,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee',NULL),(359,'default',0,'payment/buckaroo_magento2_creditcard/mastercard_payment_fee_label','Fee'),(360,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_status_processing',NULL),(361,'default',0,'payment/buckaroo_magento2_creditcard/visa_unsecure_hold','0'),(362,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee',NULL),(363,'default',0,'payment/buckaroo_magento2_creditcard/visa_payment_fee_label','Fee'),(364,'default',0,'payment/buckaroo_magento2_transfer/active','1'),(365,'default',0,'payment/buckaroo_magento2_transfer/title','Buckaroo Transfer'),(366,'default',0,'payment/buckaroo_magento2_transfer/sort_order','100'),(367,'default',0,'payment/buckaroo_magento2_transfer/send_email','0'),(368,'default',0,'payment/buckaroo_magento2_transfer/due_date','7'),(369,'default',0,'payment/buckaroo_magento2_transfer/use_creditmanagement','0'),(370,'default',0,'payment/buckaroo_magento2_transfer/order_email','1'),(371,'default',0,'payment/buckaroo_magento2_transfer/payment_fee',NULL),(372,'default',0,'payment/buckaroo_magento2_transfer/payment_fee_label','Fee'),(373,'default',0,'payment/buckaroo_magento2_transfer/max_amount',NULL),(374,'default',0,'payment/buckaroo_magento2_transfer/min_amount',NULL),(375,'default',0,'payment/buckaroo_magento2_transfer/active_status','0'),(376,'default',0,'payment/buckaroo_magento2_transfer/allowspecific','0'),(377,'default',0,'payment/buckaroo_magento2_transfer/limit_by_ip','0'),(378,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active','1'),(379,'default',0,'payment/buckaroo_magento2_sepadirectdebit/title','Buckaroo SEPA Direct Debit'),(380,'default',0,'payment/buckaroo_magento2_sepadirectdebit/sort_order','110'),(381,'default',0,'payment/buckaroo_magento2_sepadirectdebit/send_email','1'),(382,'default',0,'payment/buckaroo_magento2_sepadirectdebit/use_creditmanagement','0'),(383,'default',0,'payment/buckaroo_magento2_sepadirectdebit/order_email','1'),(384,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee',NULL),(385,'default',0,'payment/buckaroo_magento2_sepadirectdebit/payment_fee_label',NULL),(386,'default',0,'payment/buckaroo_magento2_sepadirectdebit/max_amount',NULL),(387,'default',0,'payment/buckaroo_magento2_sepadirectdebit/min_amount',NULL),(388,'default',0,'payment/buckaroo_magento2_sepadirectdebit/active_status','0'),(389,'default',0,'payment/buckaroo_magento2_sepadirectdebit/allowspecific','0'),(390,'default',0,'payment/buckaroo_magento2_sepadirectdebit/limit_by_ip','0'),(391,'default',0,'payment/buckaroo_magento2_mrcash/active','1'),(392,'default',0,'payment/buckaroo_magento2_mrcash/title','Buckaroo Mrcash'),(393,'default',0,'payment/buckaroo_magento2_mrcash/sort_order','140'),(394,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee',NULL),(395,'default',0,'payment/buckaroo_magento2_mrcash/payment_fee_label','Fee'),(396,'default',0,'payment/buckaroo_magento2_mrcash/max_amount',NULL),(397,'default',0,'payment/buckaroo_magento2_mrcash/min_amount',NULL),(398,'default',0,'payment/buckaroo_magento2_mrcash/active_status','0'),(399,'default',0,'payment/buckaroo_magento2_mrcash/allowspecific','0'),(400,'default',0,'payment/buckaroo_magento2_mrcash/limit_by_ip','0'),(421,'default',0,'buckaroo_magento2/refund/active','0'),(422,'default',0,'system/full_page_cache/varnish/access_list','localhost'),(423,'default',0,'system/full_page_cache/varnish/backend_host','localhost'),(424,'default',0,'system/full_page_cache/varnish/backend_port','8080'),(425,'default',0,'dev/front_end_development_workflow/type','server_side_compilation'),(426,'default',0,'dev/restrict/allow_ips','127.0.0.2,::2'),(427,'default',0,'dev/debug/template_hints_storefront','0'),(428,'default',0,'dev/debug/template_hints_admin','0'),(429,'default',0,'dev/debug/template_hints_blocks','0'),(430,'default',0,'dev/template/allow_symlink','0'),(431,'default',0,'dev/template/minify_html','0'),(432,'default',0,'dev/translate_inline/active','0'),(433,'default',0,'dev/translate_inline/active_admin','0'),(434,'default',0,'dev/js/enable_js_bundling','0'),(435,'default',0,'dev/js/merge_files','0'),(436,'default',0,'dev/js/minify_files','0'),(437,'default',0,'dev/js/translate_strategy','dictionary'),(438,'default',0,'dev/js/session_storage_logging','0'),(439,'default',0,'dev/js/session_storage_key','collected_errors'),(440,'default',0,'dev/css/merge_css_files','0'),(441,'default',0,'dev/css/minify_files','0'),(442,'default',0,'dev/image/default_adapter','GD2'),(443,'default',0,'dev/static/sign','0'),(444,'default',0,'dev/grid/async_indexing','0'),(445,'default',0,'payment/buckaroo_magento2_creditcard/allowed_issuers','cartebleuevisa,maestro,mastercard,visa'),(446,'default',0,'admin/emails/forgot_email_template','admin_emails_forgot_email_template'),(447,'default',0,'admin/emails/forgot_email_identity','general'),(448,'default',0,'admin/emails/password_reset_link_expiration_period','1'),(449,'default',0,'admin/emails/reset_password_template','admin_emails_reset_password_template'),(450,'default',0,'admin/startup/menu_item_id','Magento_Backend::dashboard'),(451,'default',0,'admin/url/use_custom','0'),(452,'default',0,'admin/url/use_custom_path','0'),(453,'default',0,'admin/security/use_form_key','1'),(454,'default',0,'admin/security/use_case_sensitive_login','0'),(455,'default',0,'admin/security/session_lifetime','999999'),(456,'default',0,'admin/security/lockout_failures','6'),(457,'default',0,'admin/security/lockout_threshold','30'),(458,'default',0,'admin/security/password_lifetime','90'),(459,'default',0,'admin/security/password_is_forced','1'),(460,'default',0,'admin/dashboard/enable_charts','0'),(461,'default',0,'admin/captcha/enable','0'),(462,'default',0,'payment/buckaroo_magento2_ideal/specificcountry','AF'),(465,'default',0,'buckaroo_magento2/account/order_status_new',NULL),(466,'default',0,'buckaroo_magento2/account/order_status_pending',NULL),(467,'default',0,'buckaroo_magento2/account/order_status_success',NULL),(468,'default',0,'buckaroo_magento2/account/order_status_failed',NULL),(469,'default',0,'payment/buckaroo_magento2_ideal/allowed_currencies','ARS,AUD,BRL,CAD,CHF,CNY,CZK,DKK,EUR,GBP,HRK,LTL,LVL,MXN,MXP,NOK,PLN,SEK,TRL,TRY,USD'); /*!40000 ALTER TABLE `core_config_data` ENABLE KEYS */; UNLOCK TABLES; diff --git a/Test/Unit/Model/ConfigProvider/AccountTest.php b/Test/Unit/Model/ConfigProvider/AccountTest.php index b0e472f0e..8844a7bcd 100644 --- a/Test/Unit/Model/ConfigProvider/AccountTest.php +++ b/Test/Unit/Model/ConfigProvider/AccountTest.php @@ -40,7 +40,7 @@ public function testGetConfig() $expectedKeys = [ 'active', 'secret_key', 'merchant_key', 'merchant_guid', 'transaction_label', 'certificate_file', 'order_confirmation_email', 'invoice_email', 'success_redirect', 'failure_redirect', 'cancel_on_failed', - 'digital_signature', 'debug_email', 'limit_by_ip', 'fee_percentage_mode', + 'digital_signature', 'debug_email', 'limit_by_ip', 'payment_fee_label', 'order_status_new', 'order_status_pending', 'order_status_success', 'order_status_failed', 'create_order_before_transaction' ]; diff --git a/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php b/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php index f479a994f..cc5c69ab4 100644 --- a/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php +++ b/Test/Unit/Model/Total/Quote/BuckarooFeeTest.php @@ -18,7 +18,7 @@ * @copyright Copyright (c) Buckaroo B.V. * @license https://tldrlegal.com/license/mit-license */ -namespace Buckaroo\Magento2\Test\Unit\Model\Quote\Total; +namespace Buckaroo\Magento2\Test\Unit\Model\Total\Quote; use Magento\Catalog\Helper\Data; use Magento\Framework\Pricing\PriceCurrencyInterface; @@ -62,6 +62,10 @@ public function testGetBaseFeeReturnsConfigValueIfIsNumber() $configProviderFactoryMock->expects($this->once())->method('has')->with($paymentCode)->willReturn(true); $configProviderFactoryMock->expects($this->once())->method('get')->with($paymentCode)->willReturnSelf(); $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($expectedFee); + $totalMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Total::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseSubtotalInclTax', 'getTotalAmount', 'getBaseGrandTotal', 'setBaseGrandTotal', 'setGrandTotal']) + ->getMock(); $instance = $this->getInstance([ 'configProviderBuckarooFee' => $configProviderFeeMock, @@ -69,7 +73,7 @@ public function testGetBaseFeeReturnsConfigValueIfIsNumber() 'catalogHelper' => $catalogHelper ]); - $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); + $result = $instance->getBaseFee($paymentMethodMock, $quoteMock, $totalMock); $this->assertEquals($expectedFee, $result); } @@ -84,9 +88,13 @@ public function testGetBaseFeeReturnFalseForANonExistingConfigProvider() $configProviderFactoryMock = $this->getFakeMock(Factory::class)->setMethods(['has'])->getMock(); $configProviderFactoryMock->expects($this->once())->method('has')->with($paymentCode)->willReturn(false); + $totalMock = $this->getMockBuilder(\Magento\Quote\Model\Quote\Address\Total::class) + ->disableOriginalConstructor() + ->setMethods(['getBaseSubtotalInclTax', 'getTotalAmount', 'getBaseGrandTotal', 'setBaseGrandTotal', 'setGrandTotal']) + ->getMock(); $instance = $this->getInstance(['configProviderMethodFactory' => $configProviderFactoryMock]); - $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); + $result = $instance->getBaseFee($paymentMethodMock, $quoteMock, $totalMock); $this->assertFalse($result); } @@ -149,11 +157,8 @@ public function testGetBaseFeeCalculatesPercentageOnCorrectTotal( $configProviderFactoryMock->expects($this->once())->method('get')->with($paymentCode)->willReturnSelf(); $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($fee); - $configAccountMock = $this->getFakeMock(Account::class)->setMethods(['getFeePercentageMode'])->getMock(); - $configAccountMock->expects($this->once())->method('getFeePercentageMode')->willReturn($feeMode); $instance = $this->getInstance([ - 'configProviderAccount' => $configAccountMock, 'configProviderMethodFactory' => $configProviderFactoryMock ]); $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); @@ -222,11 +227,7 @@ public function testGetBaseFeeCalculatesPercentageOnCorrectTotalWithBillingAddre $configProviderFactoryMock->expects($this->once())->method('get')->with($paymentCode)->willReturnSelf(); $configProviderFactoryMock->expects($this->once())->method('getPaymentFee')->willReturn($fee); - $configAccountMock = $this->getFakeMock(Account::class)->setMethods(['getFeePercentageMode'])->getMock(); - $configAccountMock->expects($this->once())->method('getFeePercentageMode')->willReturn($feeMode); - $instance = $this->getInstance([ - 'configProviderAccount' => $configAccountMock, 'configProviderMethodFactory' => $configProviderFactoryMock ]); $result = $instance->getBaseFee($paymentMethodMock, $quoteMock); diff --git a/etc/adminhtml/system/account.xml b/etc/adminhtml/system/account.xml index 5f243a4e9..4496641dc 100644 --- a/etc/adminhtml/system/account.xml +++ b/etc/adminhtml/system/account.xml @@ -224,13 +224,6 @@ buckaroo_magento2/account/limit_by_ip - - - Please choose over which amount the fee percentage is calculated.]]> - Buckaroo\Magento2\Model\Config\Source\FeePercentageMode - buckaroo_magento2/account/fee_percentage_mode - -