Changeset 2957720

Timestamp:

08/24/2023 08:27:49 AM (2 years ago)

Author:

mergado

Message:

3.6.3

Location:

mergado-marketing-pack/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/templates/partials/components/wizard/step4a.php (modified) (1 diff)
• mergado-marketing-pack.php (modified) (2 diffs)
• src/Feed/Category/CategoryFeed.php (modified) (1 diff)
• src/Feed/Customer/CustomerFeed.php (modified) (1 diff)
• src/Feed/Stock/StockFeed.php (modified) (3 diffs)

mergado-marketing-pack/trunk/README.txt

@@ -1 +1 @@
 === Mergado Pack ===
-Stable tag: 3.6.2
+Stable tag: 3.6.3
 Contributors: mergado
 Donate link: https://pack.mergado.com/woocommerce
@@ -264 +264 @@
 
 == Changelog ==
+
+= 3.6.3 =
+* FIX: Heureka availability feed - partial generation filename bug
+* FIX: Heureka availability feed - bad button in feed area
+
 = 3.6.2 =
 * FIX: Sklik - type error on PHP 8

mergado-marketing-pack/trunk/admin/templates/partials/components/wizard/step4a.php

@@ -43 +43 @@
                             <div>
                                 <input type="checkbox" id="<?= $wizardData['wpCronActive'] ?>" name="<?= $wizardData['wpCronActive'] ?>"
-                                       <?php if (get_option($wizardData['wpCronActive'], 0) == 1){ ?>checked="checked"<?php } ?>
+                                       <?php if (get_option($wizardData['wpCronActive'], 1) == 1){ ?>checked="checked"<?php } ?>
                                 >
                             </div>

mergado-marketing-pack/trunk/mergado-marketing-pack.php

@@ -17 +17 @@
  * Plugin URI:        https://www.mergado.cz
  * Description:       Earn more on price comparator sites. <strong>REQUIRES: Woocommerce</strong>
- * Version:           3.6.2
+ * Version:           3.6.3
  * Author:            Mergado technologies, s. r. o.
  * Author URI:        https://www.mergado.cz
@@ -44 +44 @@
 }
 
-define('PLUGIN_VERSION', '3.6.2');
+define('PLUGIN_VERSION', '3.6.3');
 define('WOOCOMMERCE_DEPENCENCY_MESSAGE', __('Mergado Pack plugin requires <a href="/wp-admin/plugin-install.php?tab=plugin-information&plugin=woocommerce" target="_top">WooCommerce</a> plugin to be active!', 'mergado-marketing-pack'));
 define( '__MERGADO_DIR__', plugin_dir_path( __FILE__ ) );

mergado-marketing-pack/trunk/src/Feed/Category/CategoryFeed.php

@@ -82 +82 @@
                     // Normal generating
                 } else if ($this->isNormal($categoriesPerStep, $categoryList)) {
-                    $file = $this->xmlOutputDir . 'category_' . $this->token . '.xml';
+                    $file = $this->xmlOutputDir . $this->getFeedFileName();
 
                     $this->logger->info('Category feed generator started');

mergado-marketing-pack/trunk/src/Feed/Customer/CustomerFeed.php

@@ -84 +84 @@
                     // Normal generating
                 } else if ($this->isNormal($customersPerStep, $customerList)) {
-                    $file = $this->xmlOutputDir . $this->name . '_' . $this->token . '.xml';
+                    $file = $this->xmlOutputDir . $this->getFeedFileName();
 
                     $this->logger->info('Customer feed generator started');

mergado-marketing-pack/trunk/src/Feed/Stock/StockFeed.php

@@ -91 +91 @@
                 // Normal generating
                 } else if ($this->isNormal($productsPerStep, $productsList)) {
-                    $file = $this->xmlOutputDir . 'stock_' . $this->token . '.xml';
+                    $file = $this->xmlOutputDir . $this->getFeedFileName();
 
                     $this->logger->info('Stock feed generator started');
@@ -205 +205 @@
     protected function mergeTemporaryFiles() : bool
     {
-        $storage = $this->xmlOutputDir . $this->name . $this->token . '.xml';
+        $storage = $this->xmlOutputDir . $this->getFeedFileName();
         $tmpShopDir = $this->tmpOutputDir;
 
@@ -248 +248 @@
         return $totalProducts;
     }
+
+    public function getDataForTemplates(): array
+    {
+        $result = parent::getDataForTemplates();
+
+        $result['createExportInMergadoUrl'] = false;
+
+        return $result;
+    }
 }