From 08364b18638e9a9dfa7976c84633770af2e90789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Th=E1=BA=BF=20Vinh?= <vinhlt@mageplaza.com>
Date: Fri, 15 Jan 2021 11:56:44 +0700
Subject: [PATCH 1/5] [2.4.0] Add default config and remove require config of
 Lng Lat field

---
 etc/adminhtml/system.xml | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index ce38e42..99f9dfb 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -28,16 +28,16 @@
             <resource>Mageplaza_GoogleMaps::configuration</resource>
             <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>General</label>
-                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[Select <b>Yes</b> to enable this module]]></comment>
                 </field>
-                <field id="contact_page" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="contact_page" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Insert on Contact Page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="position" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="position" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Position</label>
                     <source_model>Mageplaza\GoogleMaps\Model\Config\Source\System\Position</source_model>
                     <depends>
@@ -47,7 +47,7 @@
             </group>
             <group id="map_setting" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Map Settings</label>
-                <field id="protocol" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="protocol" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Protocol</label>
                     <source_model>Mageplaza\GoogleMaps\Model\Config\Source\System\Protocol</source_model>
                 </field>
@@ -58,21 +58,21 @@
                     </depends>
                     <comment><![CDATA[Get Google Map API <a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank">here</a>.]]></comment>
                 </field>
-                <field id="map_type" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="map_type" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Map Type</label>
                     <source_model>Mageplaza\GoogleMaps\Model\Config\Source\System\MapType</source_model>
                     <depends>
                         <field id="protocol">1</field>
                     </depends>
                 </field>
-                <field id="map_style" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="map_style" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Map Style</label>
                     <source_model>Mageplaza\GoogleMaps\Model\Config\Source\System\MapStyle</source_model>
                     <depends>
                         <field id="protocol">1</field>
                     </depends>
                 </field>
-                <field id="allow_drag" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="allow_drag" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Allow Map Dragging</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <depends>
@@ -80,7 +80,7 @@
                     </depends>
                     <comment><![CDATA[Select <b>Yes</b> to allow dragging the map.]]></comment>
                 </field>
-                <field id="zoom_default" translate="label comment" type="text" sortOrder="60" showInWebsite="1" showInStore="1" showInDefault="1">
+                <field id="zoom_default" translate="label comment" type="text" sortOrder="60" showInWebsite="1" showInStore="1" showInDefault="1" canRestore="1">
                     <label>Zoom Default</label>
                     <validate>validate-zero-or-greater</validate>
                     <depends>
@@ -121,17 +121,9 @@
                     </field>
                     <field id="latitude" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Latitude</label>
-                        <validate>required-entry</validate>
-                        <comment><![CDATA[
-                        <span><strong style="color:red">Warning</strong>:  This field is <b>required</b></span>
-                        ]]></comment>
                     </field>
                     <field id="longitude" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Longitude</label>
-                        <validate>required-entry</validate>
-                        <comment><![CDATA[
-                        <span><strong style="color:red">Warning</strong>:  This field is <b>required</b></span>
-                        ]]></comment>
                     </field>
                 </group>
             </group>

From 8b31b89baa12d0c43301739a870cec5edfef187b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Th=E1=BA=BF=20Vinh?= <vinhlt@mageplaza.com>
Date: Fri, 15 Jan 2021 11:57:15 +0700
Subject: [PATCH 2/5] [2.4.0] Add default config

---
 etc/config.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/config.xml b/etc/config.xml
index 8d6519c..6bd2eba 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -32,6 +32,8 @@
                 <position>1</position>
             </general>
             <map_setting>
+                <map_type>roadmap</map_type>
+                <map_style>default</map_style>
                 <protocol>1</protocol>
                 <allow_drag>0</allow_drag>
                 <zoom_default>20</zoom_default>

From 34bf7d331e7794f49dfba3178fdcf7c6e58d60f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Th=E1=BA=BF=20Vinh?= <vinhlt@mageplaza.com>
Date: Fri, 15 Jan 2021 11:58:31 +0700
Subject: [PATCH 3/5] [2.4.0] Fix error map not show when choose Potocol = API

---
 view/frontend/templates/map.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/templates/map.phtml b/view/frontend/templates/map.phtml
index dae8a5b..6a99806 100644
--- a/view/frontend/templates/map.phtml
+++ b/view/frontend/templates/map.phtml
@@ -22,7 +22,7 @@
 /** @var \Mageplaza\GoogleMaps\Block\Map $block */
 ?>
 <?php if ($block->isEnabled()): ?>
-    <?php if ($block->getProtocol() === Mageplaza\GoogleMaps\Model\Config\Source\System\Protocol::API): ?>
+    <?php if ((int)$block->getProtocol() === Mageplaza\GoogleMaps\Model\Config\Source\System\Protocol::API): ?>
         <div class="mpgooglemaps_review_map">
             <div class="mpgooglemaps_map" id="mpgooglemaps_map_<?= $block->getNameInLayout() ?>"
                  style="height: 550px;width: 100%;margin: 15px 0;">

From 66fcae371128038ff72716d7d80efba9de64bf4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Th=E1=BA=BF=20Vinh?= <vinhlt@mageplaza.com>
Date: Fri, 15 Jan 2021 11:59:16 +0700
Subject: [PATCH 4/5] [2.4.0] Remove config on Content tab

---
 etc/adminhtml/{menu.xml => menu.xml--} | 56 +++++++++++++-------------
 1 file changed, 28 insertions(+), 28 deletions(-)
 rename etc/adminhtml/{menu.xml => menu.xml--} (97%)

diff --git a/etc/adminhtml/menu.xml b/etc/adminhtml/menu.xml--
similarity index 97%
rename from etc/adminhtml/menu.xml
rename to etc/adminhtml/menu.xml--
index dc4033f..b68033e 100644
--- a/etc/adminhtml/menu.xml
+++ b/etc/adminhtml/menu.xml--
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Mageplaza
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Mageplaza.com license that is
- * available through the world-wide-web at this URL:
- * https://www.mageplaza.com/LICENSE.txt
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this extension to newer
- * version in the future.
- *
- * @category    Mageplaza
- * @package     Mageplaza_GoogleMaps
- * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
- * @license     https://www.mageplaza.com/LICENSE.txt
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
-    <menu>
-        <add id="Mageplaza_GoogleMaps::googlemaps" title="Google Maps" module="Mageplaza_GoogleMaps" sortOrder="110" resource="Mageplaza_GoogleMaps::googlemaps" parent="Magento_Backend::content"/>
-        <add id="Mageplaza_GoogleMaps::configuration" title="Configuration" module="Mageplaza_GoogleMaps" sortOrder="1000" action="adminhtml/system_config/edit/section/mpgooglemaps" resource="Mageplaza_GoogleMaps::configuration" parent="Mageplaza_GoogleMaps::googlemaps"/>
-    </menu>
-</config>
+<?xml version="1.0"?>
+<!--
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_GoogleMaps
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Mageplaza_GoogleMaps::googlemaps" title="Google Maps" module="Mageplaza_GoogleMaps" sortOrder="110" resource="Mageplaza_GoogleMaps::googlemaps" parent="Magento_Backend::content"/>
+        <add id="Mageplaza_GoogleMaps::configuration" title="Configuration" module="Mageplaza_GoogleMaps" sortOrder="1000" action="adminhtml/system_config/edit/section/mpgooglemaps" resource="Mageplaza_GoogleMaps::configuration" parent="Mageplaza_GoogleMaps::googlemaps"/>
+    </menu>
+</config>

From e0247bf32632fdc15375957cac5ad88d26514946 Mon Sep 17 00:00:00 2001
From: prime <trungbd@mageplaza.com>
Date: Tue, 23 Mar 2021 17:45:03 +0700
Subject: [PATCH 5/5] clean code

---
 composer.json | 52 +++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/composer.json b/composer.json
index 2dd3374..fe91af9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,26 @@
-{
-  "name": "mageplaza/module-google-maps",
-  "description": "Magento 2 Google Maps Extension",
-  "require": {
-    "mageplaza/module-core": "^1.4.5"
-  },
-  "type": "magento2-module",
-  "version": "1.0.4",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "Mageplaza",
-      "email": "support@mageplaza.com",
-      "homepage": "https://www.mageplaza.com",
-      "role": "Technical Support"
-    }
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Mageplaza\\GoogleMaps\\": ""
-    }
-  }
-}
+{
+  "name": "mageplaza/module-google-maps",
+  "description": "Magento 2 Google Maps Extension",
+  "require": {
+    "mageplaza/module-core": "^1.4.5"
+  },
+  "type": "magento2-module",
+  "version": "4.0.0",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "Mageplaza",
+      "email": "support@mageplaza.com",
+      "homepage": "https://www.mageplaza.com",
+      "role": "Technical Support"
+    }
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Mageplaza\\GoogleMaps\\": ""
+    }
+  }
+}