Merge pull request #93 from EmicoEcommerce/beta

Merge beta into master

Author: ahuininga-orisha

composer.json

@@ -11,7 +11,7 @@
         "hyva-themes/magento2-compat-module-fallback": "*",
         "hyva-themes/magento2-default-theme": "^1.3.15",
         "php": "^8.1",
-        "tweakwise/magento2-tweakwise": ">=8.9.0."
+        "tweakwise/magento2-tweakwise": ">=8.11.0"
     },
     "autoload": {
         "files": [

src/view/frontend/templates/analytics.phtml

@@ -8,12 +8,14 @@ use Tweakwise\Magento2Tweakwise\Model\NavigationConfig;
 
 /** @var \Tweakwise\Magento2Tweakwise\ViewModel\PersonalMerchandisingAnalytics $viewModel */
 $viewModel = $block->getData('viewModel');
-$analyticsTypes = $block->getData('analyticsTypes');
-$eventsData = $viewModel->getEventsData($analyticsTypes);
 
 /** @var NavigationConfig $tweakwiseNavigationConfig */
 $tweakwiseNavigationConfig = $block->getData('tweakwise_navigation_config');
 $jsFormConfig = $tweakwiseNavigationConfig ? json_decode($tweakwiseNavigationConfig->getJsFormConfig()) : [];
+$twRequestId = $jsFormConfig->tweakwiseNavigationForm->twRequestId ?? '';
+
+$analyticsTypes = $block->getData('analyticsTypes');
+$eventsData = $viewModel->getEventsData($analyticsTypes, $twRequestId);
 ?>
 
 <div x-data='{
@@ -22,7 +24,7 @@ $jsFormConfig = $tweakwiseNavigationConfig ? json_decode($tweakwiseNavigationCon
         productListSelector: ".products.wrapper",
         productSelector: ".product-item",
         analyticsEndpoint: "<?= /* @noEscape */ $jsFormConfig->tweakwiseNavigationForm->analyticsEndpoint ?? ''; ?>",
-        twRequestId: "<?= $escaper->escapeHtmlAttr($jsFormConfig->tweakwiseNavigationForm->twRequestId ?? ''); ?>"
+        twRequestId: "<?= $escaper->escapeHtmlAttr($twRequestId); ?>"
     }
 }' x-init='() => {
     Tweakwise_Hyva_Analytics({

src/view/frontend/templates/product/layered/default.phtml

@@ -20,7 +20,7 @@ $hasAlternateSortOrder = $block->hasAlternateSortOrder();
 ?>
 <div x-data="initTweakwiseNavigationItems()" x-init='sortItems(<?= (int)$hasAlternateSortOrder ?>)'>
     <?php if ($block->isSearchable()): ?>
-        <input aria-hidden="true" tabindex="-1" @keyUp="filterSearch()" x-ref="tw_filtersearch" x-data="initFilterSearch()" data-max-visible="<?= $escaper->escapeHtmlAttr($block->getMaxItemsShown())?>" type="text" class="tw_filtersearch js-skip-submit" name="tw_filtersearch" placeholder="<?= $escaper->escapeHtmlAttr($block->getSearchPlaceholder()); ?>" >
+        <input aria-hidden="true" tabindex="-1" @keyup="filterSearch()" x-ref="tw_filtersearch" x-data="initFilterSearch()" data-max-visible="<?= $escaper->escapeHtmlAttr($block->getMaxItemsShown())?>" type="text" class="tw_filtersearch js-skip-submit" name="tw_filtersearch" placeholder="<?= $escaper->escapeHtmlAttr($block->getSearchPlaceholder()); ?>" >
         <div x-ref="search_no_results" style="display: none" class="search_no_results empty"><?= $escaper->escapeHtml($block->getSearchNoResultsText()); ?></div>
     <?php endif; ?>
     <ol class="items" x-ref="items">

src/view/frontend/templates/product/layered/swatch.phtml

@@ -96,7 +96,7 @@ if (!$swatchData['swatches']) {
      data-attribute-code="<?= $escaper->escapeHtmlAttr($swatchData['attribute_code']) ?>"
      data-attribute-id="<?= $escaper->escapeHtmlAttr($swatchData['attribute_id']) ?>">
     <?php if ($block->isSearchable()): ?>
-        <input tabindex="-1" @keyUp="filterSearch()" x-ref="tw_filtersearch" x-data="initFilterSearch()" data-max-visible="<?= $escaper->escapeHtmlAttr($block->getMaxItemsShown())?>" type="text" class="tw_filtersearch js-skip-submit" name="tw_filtersearch" placeholder="<?= $escaper->escapeHtmlAttr($block->getSearchPlaceholder()); ?>" >
+        <input tabindex="-1" @keyup="filterSearch()" x-ref="tw_filtersearch" x-data="initFilterSearch()" data-max-visible="<?= $escaper->escapeHtmlAttr($block->getMaxItemsShown())?>" type="text" class="tw_filtersearch js-skip-submit" name="tw_filtersearch" placeholder="<?= $escaper->escapeHtmlAttr($block->getSearchPlaceholder()); ?>" >
         <div x-ref="search_no_results" style="display: none" class="search_no_results empty"><?= $escaper->escapeHtml($block->getSearchNoResultsText()); ?></div>
     <?php endif; ?>
     <div class="swatch-attribute-options clearfix flex flex-row flex-wrap" x-ref="swatch">