Merge pull request #14 from mageplaza/2.4-develop

2.4 develop
mageplaza · Jun 6, 2021 · 2cfdaef · 2cfdaef
2 parents 2ea82d3 + bf12bc0
commit 2cfdaef
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 1 deletion.
diff --git a/Block/Map.php b/Block/Map.php
@@ -166,4 +166,12 @@ public function isEnabled()
  {
  return $this->helperData->isEnabled();
  }
+
+ /**
+ * @return string
+ */
+ public function getPosition()
+ {
+ return $this->helperData->getConfigGeneral('position');
+ }
 }
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
  "mageplaza/module-core": "^1.4.5"
  },
  "type": "magento2-module",
- "version": "4.0.0",
+ "version": "4.0.1",
  "license": "proprietary",
  "authors": [
  {

diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
@@ -0,0 +1,38 @@
+<?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
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+ <body>
+ <referenceContainer name="main">
+ <block class="Magento\Framework\View\Element\Template" name="mp.googlemaps.map.top" before="-" template="Mageplaza_GoogleMaps::map/widget_position.phtml" ifconfig="mpgooglemaps/general/enabled">
+ <arguments>
+ <argument name="position" xsi:type="string">top</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Framework\View\Element\Template" name="mp.googlemaps.map.bottom" after="-" template="Mageplaza_GoogleMaps::map/widget_position.phtml" ifconfig="mpgooglemaps/general/enabled">
+ <arguments>
+ <argument name="position" xsi:type="string">bottom</argument>
+ </arguments>
+ </block>
+ </referenceContainer>
+ </body>
+</page>
diff --git a/view/frontend/templates/map.phtml b/view/frontend/templates/map.phtml
@@ -20,6 +20,7 @@
  */
 
 /** @var \Mageplaza\GoogleMaps\Block\Map $block */
+$position = $block->getPosition();
 ?>
 <?php if ($block->isEnabled()): ?>
  <?php if ((int)$block->getProtocol() === Mageplaza\GoogleMaps\Model\Config\Source\System\Protocol::API): ?>
@@ -63,9 +64,25 @@
  markerMap(latitude, longitude);
  });
  </script>
+ <script type="text/javascript">
+ var position = '<?= $position ?>';
+ if (position === 'top') {
+ document.getElementsByClassName('mpgooglemaps_map')[1].style.display = 'none';
+ } else {
+ document.getElementsByClassName('mpgooglemaps_map')[0].style.display = 'none';
+ }
+ </script>
  <?php else: ?>
  <div class="mpgooglemaps_review_map" style="float: left;width: 100%;margin: 15px 0;">
  <?= /** @noEscape */ $block->getEmbedCode() ?>
  </div>
+ <script type="text/javascript">
+ var position = '<?= $position ?>';
+ if (position === 'top') {
+ document.getElementsByClassName('mpgooglemaps_map')[1].style.display = 'none';
+ } else {
+ document.getElementsByClassName('mpgooglemaps_map')[0].style.display = 'none';
+ }
+ </script>
  <?php endif; ?>
 <?php endif; ?>
diff --git a/view/frontend/templates/map/widget_position.phtml b/view/frontend/templates/map/widget_position.phtml
@@ -0,0 +1,28 @@
+<?php
+/**
+ * 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
+ */
+
+/** @var \Mageplaza\GoogleMaps\Helper\Data $helperData */
+/** @var \Magento\Framework\View\Element\Template $block */
+$helperData = $this->helper(\Mageplaza\GoogleMaps\Helper\Data::class);
+$position = $helperData->getConfigGeneral('position');
+if ($position == $block->getData('position')): ?>
+ <?= $block->getLayout()->createBlock(\Mageplaza\GoogleMaps\Block\Map::class)->toHtml() ?>
+<?php endif; ?>