Merge pull request #7 from saleslayer/develop

Develop

Author: moreno24

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [2.6.2] - 2023-07-24
+
+### Added
+
+- Function to obtain a non-used category URL Key when synchronizing category data on each store.
+
+### Changed
+
+- Auto Sync correction for connectors configured with 24h or more.
+- Pagination improvements.
+- Minor fixes.
+
 ## [2.6.1] - 2023-02-17
 
 ### Added

README.md

@@ -63,11 +63,11 @@ php bin/magento cache:clean
 
 ## Version Guidance
 
-| Version | Status         | Magento Version (Adobe Commerce) | Recommended Configuration  |
-|---------|----------------|----------------------------------|----------------------------|
-| 2.5.x   | EOL            | >= 2.4.1, <= 2.4.3               | Magento 2.4.3 / PHP 7.4    |
-| 2.6.0   | Stable         | >= 2.4.3, <= 2.4.5               | Magento 2.4.5-p1 / PHP 8.1 |
-| 2.6.1   | Latest         | >= 2.4.3, <= 2.4.5               | Magento 2.4.5-p1 / PHP 8.1 |
+| Version         | Status         | Magento Version (Adobe Commerce) | Recommended Configuration  |
+|-----------------|----------------|----------------------------------|----------------------------|
+| 2.5.x           | EOL            | >= 2.4.1, <= 2.4.3               | Magento 2.4.3 / PHP 7.4    |
+| 2.6.0 - 2.6.1   | Stable         | >= 2.4.3, <= 2.4.5               | Magento 2.4.5-p1 / PHP 8.1 |
+| 2.6.2           | Latest         | >= 2.4.3, <= 2.4.5               | Magento 2.4.5-p1 / PHP 8.1 |
 
 > **Warning**.
 > Adobe releases frequently new Magento Open Source versions, fixing bugs and/or adding new functionallity. Some of this versions could be in conflict with this plugin. We highly encourage you to set up the configuration recommended in the guidance table for running correctly this extension.

Saleslayer/Synccatalog/Block/Adminhtml/Synccatalog/Edit/Tab/Parameters.php

@@ -1,6 +1,8 @@
 <?php
 namespace Saleslayer\Synccatalog\Block\Adminhtml\Synccatalog\Edit\Tab;
 
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+
 // use \Magento\Catalog\Model\Category as categoryModel;
 
 /**
@@ -25,10 +27,12 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Store\Model\System\Store $systemStore,
+        TimezoneInterface $timezone,
         array $data = []
     ) {
         parent::__construct($context, $registry, $formFactory, $data);
         $this->_systemStore = $systemStore;
+        $this->timezone = $timezone;
     }
 
     /**
@@ -55,25 +59,28 @@ protected function _prepareForm()
         $modelData = $model->getData();
 
         if (empty($modelData)){
-            $modelData['store_view_ids'] = array('0') ;
+            $modelData['store_view_ids'] = ['0'] ;
         }else{
             $modelData['store_view_ids'] = json_decode($modelData['store_view_ids'],1);
         }
 
-        $auto_sync_options = array();
-        $auto_sync_values = array(0, 1, 3, 6, 8, 12, 15, 24, 48, 72);
+        $auto_sync_options = [];
+        $auto_sync_values = [0, 1, 3, 6, 8, 12, 15, 24, 48, 72];
+
         foreach ($auto_sync_values as $auto_sync_value) {
             if ($auto_sync_value == 0){
-                array_push($auto_sync_options, array('label' => ' ', 'value' => $auto_sync_value));
+                array_push($auto_sync_options, ['label' => ' ', 'value' => $auto_sync_value]);
             }else{
-                array_push($auto_sync_options, array('label' => $auto_sync_value.'H', 'value' => $auto_sync_value));
+                array_push($auto_sync_options, ['label' => $auto_sync_value.'H', 'value' => $auto_sync_value]);
             }
         }
 
+        $datetime_last_sync = '';
+
         if(!empty($modelData['last_sync'])){
-            $time_lapsed = '<br><small>Since last sync of this connector step: '.$this->elapsed_time(strtotime( $modelData['last_sync'])).'</small>';
-        }else{
-            $time_lapsed = '';
+            $last_sync_timezoned = $this->timezone->date($modelData['last_sync'])->format('M d, Y, H:i:s A');
+            $datetime_last_sync = "<br><small>Connector's last auto-synchronization: ".$last_sync_timezoned."</small>";
+            $datetime_last_sync .= "<br><small><strong>*Note: This synchronization will be executed according to the server time.</strong></small>";
         }
 
         $fieldset->addField(
@@ -87,21 +94,24 @@ protected function _prepareForm()
                 'required' => false,
                 'values' => $auto_sync_options,
                 'disabled' => false,
-                'after_element_html' =>$time_lapsed,
+                'after_element_html' => $datetime_last_sync,
                 'class' => 'conn_field'
             ]
         );
 
-        if(!empty($modelData) && isset($modelData['auto_sync']) && $modelData['auto_sync']>= 24){
+        if (!empty($modelData) && isset($modelData['auto_sync']) && $modelData['auto_sync'] >= 24){
             $hour_input_disabled = false;
         }else{
             $hour_input_disabled = true;
         }
 
-        $auto_sync_hour_options = array();
+        $auto_sync_hour_options = [];
         $hours_range = range(0, 23);
-        foreach($hours_range as $hour){
-            $auto_sync_hour_options[$hour] = array('label' => (strlen($hour) == 1 ? '0'.$hour : $hour).':00', 'value' => $hour);
+        foreach ($hours_range as $hour){
+            $auto_sync_hour_options[$hour] = [
+                'label' => (strlen($hour) == 1 ? '0'.$hour : $hour).':00',
+                'value' => $hour
+            ];
         }
 
         $fieldset->addField(
@@ -152,21 +162,6 @@ protected function _prepareForm()
 
         return parent::_prepareForm();
     }
-    private function elapsed_time($timestamp, $precision = 2) {
-        $time = time() - $timestamp;
-        $result = '';
-        $a = array('decade' => 315576000, 'year' => 31557600, 'month' => 2629800, 'week' => 604800, 'day' => 86400, 'hour' => 3600, 'min' => 60, 'sec' => 1);
-        $i = 0;
-        foreach($a as $k => $v) {
-            $$k = floor($time/$v);
-            if ($$k) $i++;
-            $time = $i >= $precision ? 0 : $time - $$k * $v;
-            $s = $$k > 1 ? 's' : '';
-            $$k = $$k ? $$k.' '.$k.$s.' ' : '';
-            $result .= $$k;
-        }
-        return $result ? $result.'ago' : '1 sec to go';
-    }
 
     /**
      * Prepare label for tab

Saleslayer/Synccatalog/Model/Autosynccron.php

@@ -263,7 +263,7 @@ public function auto_sync_connectors(){
                         if ($connector['auto_sync'] > 0){
 
                             $connector_last_sync = $connector['last_sync'];
-                            $connector_last_sync_unix = strtotime($connector_last_sync);
+                            $connector_last_sync_unix = strtotime($connector_last_sync ?? 0);
 
                             $unix_to_update = $now - ($connector['auto_sync'] * 3600);
 
@@ -278,7 +278,8 @@ public function auto_sync_connectors(){
 
                                     $unix_to_update_hour = mktime($connector['auto_sync_hour'],0,0,date('m', $unix_to_update),date('d', $unix_to_update),date('Y', $unix_to_update));
 
-                                    if ($connector_last_sync_unix < $unix_to_update_hour){
+                                    if ($connector_last_sync_unix < $unix_to_update &&
+                                        $unix_to_update_hour <= $now){
 
                                         $connector['unix_to_update'] = $unix_to_update_hour;
                                         $connectors_to_check[] = $connector;
@@ -307,6 +308,8 @@ public function auto_sync_connectors(){
                             if ($connector['auto_sync'] >= 24){
 
                                 $last_sync_time = mktime($connector['auto_sync_hour'],0,0,date('m', $now),date('d', $now),date('Y', $now));
+                                if ($last_sync_time > $now) $last_sync_time -= ($connector['auto_sync'] * 3600);
+
                                 $last_sync = date('Y-m-d H:i:s', $last_sync_time);
 
                             }else{
@@ -397,8 +400,6 @@ public function auto_sync_connectors(){
     private function delete_sl_logs_since_days(){
 
         if (in_array($this->delete_sl_logs_since_days, array('', null, 0))) return false;
-
-        $time_ini_delete_sl_logs = microtime(1);
 
         $log_folder_files = scandir($this->sl_logs_path);
 
@@ -443,8 +444,6 @@ private function delete_sl_logs_since_days(){
 
         }
 
-        // $this->debbug('##### time_delete_sl_logs: '.(microtime(1) - $time_ini_delete_sl_logs).' seconds');
-
     }
 
 }