From e1719c2fb998e5e4b05217b21f465b99354ad820 Mon Sep 17 00:00:00 2001
From: Dmitri Mackert <d.mackert@techdivision.com>
Date: Thu, 18 Apr 2019 11:16:20 +0200
Subject: [PATCH] Enable or Disable the Modal responsiveness

---
 Block/Popup.php                       |  3 ++-
 Helper/Config.php                     | 16 ++++++++++++++++
 etc/adminhtml/system.xml              |  5 +++++
 etc/config.xml                        |  1 +
 view/frontend/web/js/country_modal.js |  3 ++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Block/Popup.php b/Block/Popup.php
index 33c689d..5fca8a9 100644
--- a/Block/Popup.php
+++ b/Block/Popup.php
@@ -154,7 +154,8 @@ public function hintedCountry()
             'delayDuration'     => (int)$this->config->getDelayDuration(),
             'cookieLifetime'    => (int)$this->config->getCookieDuration(),
             'modalContent'      => $this->getModalText($lang, $this->getShowForUnselected()),
-            'showModalOverlay'  => $this->config->getShowModal()
+            'showModalOverlay'  => $this->config->getShowModal(),
+            'responsiveModal'   => $this->config->isResponsiveModal()
         ];
     }
 
diff --git a/Helper/Config.php b/Helper/Config.php
index bfc7c83..56dcd20 100644
--- a/Helper/Config.php
+++ b/Helper/Config.php
@@ -93,6 +93,12 @@ class Config extends AbstractHelper
     const SHOW_MODAL = 'countrypopup/general/show_modal';
 
 
+    /**
+     * config path for responsive modal setting
+     */
+    const RESPONSIVE_MODAL = 'countrypopup/general/responsive_modal';
+
+
     /**
      * fallback detect string
      */
@@ -215,4 +221,14 @@ public function getShowModal($scope = ScopeInterface::SCOPE_STORE)
     {
         return $this->scopeConfig->isSetFlag(self::SHOW_MODAL, $scope);
     }
+
+    /**
+     * return true if modal is responsive
+     * @param string $scope
+     * @return bool
+     */
+    public function isResponsiveModal($scope = ScopeInterface::SCOPE_STORE)
+    {
+        return $this->scopeConfig->isSetFlag(self::RESPONSIVE_MODAL, $scope);
+    }
 }
\ No newline at end of file
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index f9c4ea6..475da99 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -52,12 +52,17 @@
                     <comment><![CDATA[If "Yes" is selected the default modaltext will be shown for all countries that are not selected <br /> If the detected country is equal the <strong>current store country</strong> no hint will be shown.]]></comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+
                 <field id="show_modal" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1"
                        showInStore="1">
                     <label>Popup as modal dialog</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Show dialog modal with overlay]]></comment>
                 </field>
+                <field id="responsive_modal" translate="label" type="select" sortOrder="50" showInDefault="1" canRestore="1">
+                    <label>Responsive Modal</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="popup_values" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>County Modal Properties</label>
diff --git a/etc/config.xml b/etc/config.xml
index 23cf26f..7a7bea7 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -23,6 +23,7 @@
             <general>
                 <cookie>0</cookie>
                 <show_modal>1</show_modal>
+                <responsive_modal>1</responsive_modal>
             </general>
             <popup_delay>
                 <delay_duration>1000</delay_duration>
diff --git a/view/frontend/web/js/country_modal.js b/view/frontend/web/js/country_modal.js
index b878185..775fd47 100644
--- a/view/frontend/web/js/country_modal.js
+++ b/view/frontend/web/js/country_modal.js
@@ -46,6 +46,7 @@ define([
                         that.options.delay = (response.useDelay) ? response.delayDuration : 0;
                         that.options.cookie_lifetime = response.cookieLifetime;
                         that.options.show_modal_overlay = response.showModalOverlay;
+                        that.options.modal_responsive = response.responsiveModal;
                         that.prepareModal(response);
                     }
                 });
@@ -74,7 +75,7 @@ define([
             var that = this,
                 options = {
                     type: 'popup',
-                    responsive: true,
+                    responsive: this.options.modal_responsive,
                     innerScroll: true,
                     wrapperClass: 'hint-country-modal'
                 },