Merge pull request #17 from mageplaza/2.4-develop

2.4 develop

composer.json

@@ -2,10 +2,10 @@
  "name": "mageplaza/module-google-maps",
  "description": "Magento 2 Google Maps Extension",
  "require": {
- "mageplaza/module-core": "^1.4.5"
+ "mageplaza/module-core": "^1.5.4"
  },
  "type": "magento2-module",
- "version": "4.0.2",
+ "version": "4.0.3",
  "license": "proprietary",
  "authors": [
  {

etc/config.xml

@@ -1,43 +1,43 @@
-<?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_Store:etc/config.xsd">
- <default>
- <mpgooglemaps>
- <module>
- <type>1</type>
- </module>
- <general>
- <enabled>1</enabled>
- <contact_page>1</contact_page>
- <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>
- </map_setting>
- </mpgooglemaps>
- </default>
-</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_Store:etc/config.xsd">
+ <default>
+ <mpgooglemaps>
+ <module>
+ <type>1</type>
+ </module>
+ <general>
+ <enabled>1</enabled>
+ <contact_page>1</contact_page>
+ <position>top</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>
+ </map_setting>
+ </mpgooglemaps>
+ </default>
+</config>

view/frontend/templates/map.phtml

@@ -52,10 +52,17 @@ $position = $block->getPosition();
  };
 
  var map = new google.maps.Map(document.getElementById("mpgooglemaps_map_<?= /** @noEscape */ $block->getNameInLayout() ?>"), mapOptions);
+ var icon = {
+ url: mapMarkerIcon,
+ scaledSize: new google.maps.Size(40, 40),
+ origin: new google.maps.Point(0,0),
+ anchor: new google.maps.Point(0, 0)
+ };
+
  var marker = new google.maps.Marker({
  draggable: !!(parseInt(isDraggable)),
  position: mapLatLng,
- icon: mapMarkerIcon,
+ icon: icon,
  animation: google.maps.Animation.DROP
  });
  marker.setMap(map);