diff --git a/ConfigProvider.php b/ConfigProvider.php index efd12c2..caf5db6 100644 --- a/ConfigProvider.php +++ b/ConfigProvider.php @@ -25,7 +25,10 @@ protected function config() {return * @return array(string => mixed) */ private function option($id) {$s = $this->s(); return [$id => [ - 'enable' => $s->b("$id/enable") && $s->applicableForQuote($id) + 'enable' => + $s->b("$id/enable") + && $s->applicableForQuoteByMinMaxTotal($id) + && $s->applicableForQuoteByCountry($id) /** * 2017-12-13 * 1) "Provide an ability to the Magento backend users (merchants) diff --git a/composer.json b/composer.json index 1c0ae63..78aacd2 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "mage2pro/alphacommercehub" - ,"version": "0.7.3" + ,"version": "0.7.4" ,"description": "AlphaCommerceHub integration with Magento 2" ,"type": "magento2-module" ,"homepage": "https://mage2.pro/c/extensions/alphacommercehub" @@ -11,7 +11,7 @@ "homepage": "https://mage2.pro/users/dmitry_fedyuk", "role": "Developer" }] - ,"require": {"mage2pro/core": ">=3.4.11"} + ,"require": {"mage2pro/core": ">=3.5.0"} ,"autoload": {"files": ["registration.php"], "psr-4": {"Dfe\\AlphaCommerceHub\\": ""}} ,"keywords": [ "3D Secure" diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 2862cb4..5537b59 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -310,44 +310,6 @@ So the `sortOrder` value is 1920. --> df_payment/alpha_commerce_hub/dsd validate-length maximum-length-22 - - df_payment/alpha_commerce_hub/country_restriction - - Df\Config\Source\NoWhiteBlack - 1 - - - - Magento\Directory\Model\Config\Source\Country - 1 - - df_payment/alpha_commerce_hub/countries - - 1 - - 0 - - validate-number validate-greater-than-zero + + + Df\Config\Source\NoWhiteBlack + 1 + + + + Magento\Directory\Model\Config\Source\Country + 1 + + + 1 + + 0 + + validate-number validate-greater-than-zero + + + Df\Config\Source\NoWhiteBlack + 1 + + + + Magento\Directory\Model\Config\Source\Country + 1 + + + 1 + + 0 + + validate-number validate-greater-than-zero + + + Df\Config\Source\NoWhiteBlack + 1 + + + + Magento\Directory\Model\Config\Source\Country + 1 + + + 1 + + 0 + +