From 5f0b30717b6cdea8a45da546fb4eef587eec14b0 Mon Sep 17 00:00:00 2001
From: Dmitry Fedyuk <dfediuk@gmail.com>
Date: Thu, 14 Nov 2019 19:47:49 +0600
Subject: [PATCH] 1.0.9

---
 Block/Frontend/MagexSync.php                     |  2 +-
 Block/Frontend/Success.php                       |  2 +-
 Block/System/Config/Form/Button.php              |  4 ++--
 Controller/Response/Catalog.php                  |  2 +-
 Controller/Response/Orders.php                   |  2 +-
 Model/Config/Mylist.php                          |  2 +-
 Settings.php                                     |  3 +++
 Setup/InstallData.php                            |  2 +-
 composer.json                                    |  4 ++--
 etc/adminhtml/system.xml                         |  4 ++--
 etc/frontend/di.xml                              | 10 ----------
 .../frontend/layout/checkout_onepage_success.xml |  2 +-
 view/frontend/layout/default.xml                 |  2 +-
 view/frontend/templates/embed.phtml              | 16 +++++++++-------
 view/frontend/templates/magexsync.phtml          |  4 ++--
 view/frontend/templates/order/success.phtml      |  4 ++--
 16 files changed, 30 insertions(+), 35 deletions(-)
 create mode 100644 Settings.php
 delete mode 100644 etc/frontend/di.xml

diff --git a/Block/Frontend/MagexSync.php b/Block/Frontend/MagexSync.php
index 5fd21fc..07ea327 100644
--- a/Block/Frontend/MagexSync.php
+++ b/Block/Frontend/MagexSync.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Block\Frontend;
+namespace Justuno\M2\Block\Frontend;
 use Magento\Checkout\Model\Cart;
 use Magento\Framework\View\Element\Template;
 class MagexSync extends Template {
diff --git a/Block/Frontend/Success.php b/Block/Frontend/Success.php
index a254cd4..c8124db 100644
--- a/Block/Frontend/Success.php
+++ b/Block/Frontend/Success.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Block\Frontend;
+namespace Justuno\M2\Block\Frontend;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\View\Element\Template;
 use Magento\Sales\Api\OrderRepositoryInterface;
diff --git a/Block/System/Config/Form/Button.php b/Block/System/Config/Form/Button.php
index 68569e8..c64d801 100644
--- a/Block/System/Config/Form/Button.php
+++ b/Block/System/Config/Form/Button.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Block\System\Config\Form;
+namespace Justuno\M2\Block\System\Config\Form;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 class Button extends \Magento\Config\Block\System\Config\Form\Field {
 	 const BUTTON_TEMPLATE = 'system/config/button/button.phtml';
@@ -44,7 +44,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
 				'id'        => 'justuno_token_button',
 				/**
 				 * 2019-10-245 Dmitry Fedyuk https://www.upwork.com/fl/mage2pro
-				 * «Call to undefined function Justuno\Jumagext\Block\System\Config\Form\_()
+				 * «Call to undefined function Justuno\M2\Block\System\Config\Form\_()
 				 * in vendor/justuno.com/m2/Block/System/Config/Form/Button.php:48»:
 				 * https://github.com/justuno-com/m2/issues/2
 				 */
diff --git a/Controller/Response/Catalog.php b/Controller/Response/Catalog.php
index ae4f994..72fd59d 100644
--- a/Controller/Response/Catalog.php
+++ b/Controller/Response/Catalog.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Controller\Response;
+namespace Justuno\M2\Controller\Response;
 use Magento\Catalog\Model\Category;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
diff --git a/Controller/Response/Orders.php b/Controller/Response/Orders.php
index 14fee9c..6f60f4a 100644
--- a/Controller/Response/Orders.php
+++ b/Controller/Response/Orders.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Controller\Response;
+namespace Justuno\M2\Controller\Response;
 use Magento\Framework\App\RequestInterface;
 use Magento\Sales\Model\Order;
 use Magento\Store\Model\StoreManagerInterface;
diff --git a/Model/Config/Mylist.php b/Model/Config/Mylist.php
index c25ffc3..49df682 100644
--- a/Model/Config/Mylist.php
+++ b/Model/Config/Mylist.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Model\Config;
+namespace Justuno\M2\Model\Config;
 class Mylist implements \Magento\Framework\Option\ArrayInterface {
 	/**
 	 * {@inheritdoc}
diff --git a/Settings.php b/Settings.php
new file mode 100644
index 0000000..50cce95
--- /dev/null
+++ b/Settings.php
@@ -0,0 +1,3 @@
+<?php
+
+
diff --git a/Setup/InstallData.php b/Setup/InstallData.php
index a789ba7..8ecb82d 100644
--- a/Setup/InstallData.php
+++ b/Setup/InstallData.php
@@ -1,5 +1,5 @@
 <?php
-namespace Justuno\Jumagext\Setup;
+namespace Justuno\M2\Setup;
 use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
 use Magento\Authorization\Model\ResourceModel\Role\Collection;
 use Magento\Authorization\Model\Role;
diff --git a/composer.json b/composer.json
index 9982a08..50e2bc2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "justuno.com/m2"
-	,"version": "1.0.8"
+	,"version": "1.0.9"
 	,"description": "Justuno module for Magento 2"
 	,"type": "magento2-module"
 	,"homepage": "https://github.com/justuno-com/m2"
@@ -12,6 +12,6 @@
 		,"role": "Developer"
 	}]
 	,"require": {"mage2pro/core": ">=5.4.4"}
-	,"autoload": {"files": ["registration.php"], "psr-4": {"Justuno\\Jumagext\\": ""}}
+	,"autoload": {"files": ["registration.php"], "psr-4": {"Justuno\\M2\\": ""}}
 	,"keywords": ["Magento 2"]
 }
\ No newline at end of file
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2462b13..e3323fe 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -25,7 +25,7 @@
 
 				<field id='brand_attribute' translate='label' type='select' sortOrder='11' showInDefault='1' showInWebsite='0' showInStore='0'>
 					<label>Choose Brand Attribute</label>
-					<source_model>Justuno\Jumagext\Model\Config\Mylist</source_model>
+					<source_model>Justuno\M2\Model\Config\Mylist</source_model>
 				</field>
 
 				<field id='token_key' translate='label' type='text' sortOrder='12' showInDefault='1' showInWebsite='0' showInStore='0'>
@@ -36,7 +36,7 @@
 
 
 				<field id='listbutton' translate='label' sortOrder='20' showInDefault='1' showInWebsite='1' showInStore='1'>
-					<frontend_model>Justuno\Jumagext\Block\System\Config\Form\Button</frontend_model>
+					<frontend_model>Justuno\M2\Block\System\Config\Form\Button</frontend_model>
 				</field>
 
 			</group>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
deleted file mode 100644
index 303ba64..0000000
--- a/etc/frontend/di.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0'?>
-<config
-	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-	xsi:noNamespaceSchemaLocation='urn:magento:framework:ObjectManager/etc/config.xsd'
->
-<!-- 2019-11-13
-For backward compatibility when using in CMS:
-{{block class="Magento\Framework\View\Element\Template" template="Justuno_Jumagext::embed.phtml"}} -->
-	<virtualType name='Justuno\Jumagext\Block\Frontend\Embed' type='Magento\Framework\View\Element\Template'/>
-</config>
\ No newline at end of file
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
index ef4bd97..7f7363f 100644
--- a/view/frontend/layout/checkout_onepage_success.xml
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <body>
 	<referenceBlock name='head.additional'>
-		<block class='Justuno\Jumagext\Block\Frontend\Success' name='justuno.order.success'
+		<block class='Justuno\M2\Block\Frontend\Success' name='justuno.order.success'
 			   template='Justuno_Jumagext::order/success.phtml'>
 		</block>
 	</referenceBlock>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 763d104..bdfbcf6 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -6,7 +6,7 @@
 	<body>
 		 <referenceBlock name='head.additional'>
 			<block class='Magento\Framework\View\Element\Template' template='Justuno_Jumagext::embed.phtml'/>
-			<block class='Justuno\Jumagext\Block\Frontend\MagexSync' template='Justuno_Jumagext::magexsync.phtml'/>
+			<block class='Justuno\M2\Block\Frontend\MagexSync' template='Justuno_Jumagext::magexsync.phtml'/>
 		</referenceBlock>
 	</body>
 </page>
\ No newline at end of file
diff --git a/view/frontend/templates/embed.phtml b/view/frontend/templates/embed.phtml
index 6fc5578..093699b 100644
--- a/view/frontend/templates/embed.phtml
+++ b/view/frontend/templates/embed.phtml
@@ -1,13 +1,15 @@
-<?php
-// 2019-11-13 {{block class="Magento\Framework\View\Element\Template" template="Justuno_Jumagext::embed.phtml"}}
-/** @var \Magento\Framework\View\Element\Template $block */
-$merchantId = df_cfg('justuno_settings/options_interface/accid'); /** @var string $merchantId */
-if (preg_match("/^[{]?[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}[}]?$/", $merchantId)) { ?>
-	<script>window.ju_num='<?= $merchantId ?>';</script>
-	<?= df_widget('embed', '', ['message' => "ju_num loaded ({$block->escapeHtml(substr($merchantId, -6))})"]) ?>
+<?php /** @var \Magento\Framework\View\Element\Template $block */
+$id = df_cfg('justuno_settings/options_interface/accid'); /** @var string $merchantId */
+// 2019-11-14 https://support.justuno.com/install-justuno-general-embed-instructions
+if (!preg_match("/^[{]?[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}[}]?$/", $id)) { ?>
+	<script>window.ju_num='<?= $id ?>';</script>
+	<?= df_tag('div', df_widget('embed', '', ['message' => sprintf(
+		'ju_num loaded (%s)', substr($id, -6
+	))])) ?>
 <?php } else { ?>
 	<script>console.log('JU_ERROR: Justuno Account ID (ACCID) Was Not Set Correctly...');</script>
 <?php }
+/** 2019-11-14 @used-by view/frontend/web/js/magexsync.js */
 if (df_is_catalog_product_view()) { ?>
 	<script>
 		setTimeout(function(){
diff --git a/view/frontend/templates/magexsync.phtml b/view/frontend/templates/magexsync.phtml
index 2166a63..807a035 100644
--- a/view/frontend/templates/magexsync.phtml
+++ b/view/frontend/templates/magexsync.phtml
@@ -1,8 +1,8 @@
  <?php
 /**
  * shortcode for cms pages / blocks
- * {{block class="Justuno\Jumagext\Block\Frontend\MagexSync" template="Justuno\Jumagext::MagexSync.phtml"}}
- * @var Justuno\Jumagext\Block\Frontend\MagexSync $block\
+ * {{block class="Justuno\M2\Block\Frontend\MagexSync" template="Justuno\M2::MagexSync.phtml"}}
+ * @var Justuno\M2\Block\Frontend\MagexSync $block\
  */
 ?>
 <script type='text/x-magento-init'>{"*" : {"magexsync": {"message": "magexsync done."}}}</script
\ No newline at end of file
diff --git a/view/frontend/templates/order/success.phtml b/view/frontend/templates/order/success.phtml
index d9b2aa2..3007390 100644
--- a/view/frontend/templates/order/success.phtml
+++ b/view/frontend/templates/order/success.phtml
@@ -1,9 +1,9 @@
 <?php
 /**
  * shortcode for cms pages / blocks
- * {{block class='Justuno\Jumagext\Block\Frontend\Success' template='Justuno_Jumagext::success.phtml' }}
+ * {{block class='Justuno\M2\Block\Frontend\Success' template='Justuno_Jumagext::success.phtml' }}
  *
- * @var Justuno\Jumagext\Block\Frontend\Success $block
+ * @var Justuno\M2\Block\Frontend\Success $block
  *
  *
  */