Merge pull request #87 from mageplaza/2.3-develop

2.3-develop
mageplaza · Nov 17, 2021 · 9adc0d2 · 9adc0d2
2 parents 4d3a410 + ffae6cc
commit 9adc0d2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "liquid/liquid": "^1.4.8"
   },
   "type": "magento2-module",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "license": "proprietary",
   "authors": [
     {

diff --git a/view/adminhtml/templates/hook/body.phtml b/view/adminhtml/templates/hook/body.phtml
@@ -18,9 +18,12 @@
  * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
  * @license     https://www.mageplaza.com/LICENSE.txt
  */
-?>
-<?php
-/* @var $block \Mageplaza\WebHook\Block\Adminhtml\Hook\Edit\Tab\Renderer\Body */
+
+use Mageplaza\Webhook\Helper\Data;
+use Magento\Eav\Model\Entity\Attribute;
+use Mageplaza\WebHook\Block\Adminhtml\Hook\Edit\Tab\Renderer\Body;
+
+/* @var $block Body */
 $element            = $block->getElement();
 $note               = $element->getNote() ? '<div class="note">' . $element->getNote() . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
@@ -31,20 +34,19 @@ $fieldClass         .= ($elementBeforeLabel) ? ' choice' : '';
 $fieldClass         .= ($addOn) ? ' with-addon' : '';
 $fieldClass         .= ($element->getRequired()) ? ' _required' : '';
 $fieldClass         .= ($note) ? ' with-note' : '';
-
-$fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' . $block->getUiId('form-field', $element->getId());
-$modifiersData   = $block->getModifier() ? \Mageplaza\Webhook\Helper\Data::jsonEncode($block->getModifier()) : '{}';
+$fieldAttributes    = $fieldId . ' class="' . $fieldClass . '" ' . $block->getUiId('form-field', $element->getId());
+$modifiersData      = $block->getModifier() ? Data::jsonEncode($block->getModifier()) : '{}';
 ?>
 
 <?php if (!$element->getNoDisplay()) : ?>
     <?php if ($element->getType() == 'hidden') : ?>
         <?= $element->getElementHtml() ?>
     <?php else : ?>
-        <div<?= /** @noEscape */ $fieldAttributes ?>>
+        <div <?= /** @noEscape */ $fieldAttributes ?>>
             <?php if ($elementBeforeLabel) : ?>
                 <?= $element->getElementHtml() ?>
                 <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
-                <?= $block->escapeHtml($note) ?>
+                <?= $note ?>
             <?php else : ?>
                 <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
                 <div class="admin__field-control control">
@@ -77,7 +79,7 @@ $modifiersData   = $block->getModifier() ? \Mageplaza\Webhook\Helper\Data::jsonE
                                 <?= $addOn ? '<div class="addon">' . $element->getElementHtml()
                                     . '</div>' : $element->getElementHtml(); ?>
                                 <?= $block->getHintHtml() ?>
-                                <?= $block->escapeHtml($note) ?>
+                                <?= $note ?>
                             </div>
                             <div id="grid_tab_preview_content" style="border-top: 1px solid #adadad;"
                                  aria-labelledby="grid_tab_body" class="ui-widget-content ui-corner-bottom"
@@ -113,7 +115,7 @@ $modifiersData   = $block->getModifier() ? \Mageplaza\Webhook\Helper\Data::jsonE
 
         <fieldset class="config admin__collapsible-block admin__scope-old" id="ox_variable_item">
             <?php foreach ($attrCollection as $attr) : ?>
-                <?php /** @var \Magento\Eav\Model\Entity\Attribute $attr */ ?>
+                <?php /** @var Attribute $attr */ ?>
                 <div class="attr-code" id="<?= $block->escapeHtmlAttr($attr->getName()) ?>" code="<?= $block->escapeHtmlAttr($attr->getName()) ?>">
                     <div class="row">
                         <label class="attr-code-label"><?= $block->escapeHtml($attr->getTitle() . " ({$attr->getName()})") ?></label>
@@ -140,7 +142,7 @@ $modifiersData   = $block->getModifier() ? \Mageplaza\Webhook\Helper\Data::jsonE
 
         <fieldset class="config admin__collapsible-block admin__scope-old" id="ox_variable_shipping_address">
             <?php foreach ($block->getShippingAddressAttrCollection() as $attr) : ?>
-                <?php /** @var \Magento\Eav\Model\Entity\Attribute $attr */ ?>
+                <?php /** @var Attribute $attr */ ?>
                 <div class="attr-code" id="<?= $block->escapeHtmlAttr($attr->getName()) ?>" code="<?= $block->escapeHtmlAttr($attr->getName()) ?>">
                     <div class="row">
                         <label class="attr-code-label"><?= $block->escapeHtml($attr->getTitle() . " ({$attr->getName()})") ?></label>
@@ -167,7 +169,7 @@ $modifiersData   = $block->getModifier() ? \Mageplaza\Webhook\Helper\Data::jsonE
 
         <fieldset class="config admin__collapsible-block admin__scope-old" id="ox_variable_shipping_address">
             <?php foreach ($block->getShippingAddressAttrCollection() as $attr) : ?>
-                <?php /** @var \Magento\Eav\Model\Entity\Attribute $attr */ ?>
+                <?php /** @var Attribute $attr */ ?>
                 <div class="attr-code" id="<?= $block->escapeHtmlAttr($attr->getName()) ?>" code="<?= $block->escapeHtmlAttr($attr->getName()) ?>">
                     <div class="row">
                         <label class="attr-code-label"><?= $block->escapeHtml($attr->getTitle() . " ({$attr->getName()})") ?></label>