Merge pull request #55 from logeecom/dev

Release version 3.2.9

PluginInstallation/CHANGELOG.md

@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [v3.2.9](https://github.com/logeecom/pl_woocommerce_module/compare/v3.2.8...v3.2.9) - 2022-05-30
+### Changed
+- Updated async process wakeup delay for manual sync.
+
+## [v3.2.8](https://github.com/logeecom/pl_woocommerce_module/compare/v3.2.7...v3.2.8) - 2022-05-10
+### Added
+- Added carrier logos for Colis Prive and Shop2Shop shipping services.
+
 ## [v3.2.7](https://github.com/logeecom/pl_woocommerce_module/compare/v3.2.6...v3.2.7) - 2022-04-12
 # Changed
 - Optimized order sync for users experiencing CPU surcharge by adding an option to switch to manual synchronization.

README.md

@@ -65,6 +65,17 @@ or go to the root directory and run:
 
 This command will run unit tests on all supported PHP versions from 5.6 to 7.3.
 
+### Manual synchronization
+
+
+For merchants that have a problem with CPU usage on their servers, there is a manual synchronization configuration option that can be set from the module configuration page.
+
+Note: This “big“ timeout will potentially not always work on the windows system.
+
+If the .ini configuration value of [max_execution_time](https://www.php.net/manual/en/info.configuration.php#ini.max-execution-time) is less than 5 minutes, this will not work on the Windows server due to the following restriction which can be found at the following [link](https://www.php.net/manual/en/info.configuration.php#ini.max-execution-time).
+
+The `set_time_limit()` function and the configuration directive `max_execution_time` only affect the execution time of the script itself. Any time spent on activity that happens outside the execution of the script such as system calls using `system()`, stream operations, database queries, etc. is not included when determining the maximum time that the script has been running. This is not true on Windows where the measured time is real.
+
 ### Releasing a new module version
 
 Please follow instructions provided [here](https://logeecom.atlassian.net/wiki/spaces/PACKLINK/pages/1367179297/WC+-+Plugin+Release+Procedure).

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "packlink/woocommerce-dev",
   "description": "Packlink WooCommerce Integration",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "type": "library",
   "require": {
     "php": ">=5.5",

src/Components/Services/class-config-service.php

@@ -31,10 +31,11 @@ class Config_Service extends Configuration {
 	 */
 	const MAX_TASK_INACTIVITY_PERIOD = 60;
 	const DEFAULT_FOOTER_HEIGHT      = 40;
+
 	/**
-	 * The default async request timeout when manual sync enabled
+	 * Automatic task runner wakeup delay in seconds when manual sync enabled
 	 */
-	const DEFAULT_ASYNC_REQUEST_TIMEOUT_WITH_MANUAL_SYNC = 300000;
+	const DEFAULT_TASK_RUNNER_WAKEUP_DELAY_WITH_MANUAL_SYNC = 300;
 
 	/**
 	 * Singleton instance of this class.
@@ -133,19 +134,6 @@ public function getWebHookUrl() {
 		return Shop_Helper::get_controller_url( 'Web_Hook', 'index' );
 	}
 
-	/**
-	 * Returns async process timeout in milliseconds.
-	 *
-	 * @return int|null
-	 */
-	public function getAsyncRequestTimeout() {
-		if ( $this->is_manual_sync_enabled() ) {
-			return self::DEFAULT_ASYNC_REQUEST_TIMEOUT_WITH_MANUAL_SYNC;
-		}
-
-		return $this->getConfigValue( 'asyncRequestTimeout' );
-	}
-
 	/**
 	 * Sets database version for migration scripts
 	 *
@@ -215,6 +203,16 @@ public function is_manual_sync_enabled() {
 		return $is_manual_sync_enabled ?: false;
 	}
 
+	/** @inheritdoc  */
+	public function getTaskRunnerWakeupDelay()
+	{
+		if ( $this->is_manual_sync_enabled() ) {
+			return self::DEFAULT_TASK_RUNNER_WAKEUP_DELAY_WITH_MANUAL_SYNC;
+		}
+
+		return parent::getTaskRunnerWakeupDelay();
+	}
+
 	/**
 	 * Saves whether manual synchronization is enabled.
 	 *

src/composer.json

@@ -1,7 +1,7 @@
 {
   "name": "packlink/woocommerce",
   "description": "Packlink WooCommerce Integration",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "type": "library",
   "repositories": [
     {

src/packlink-pro-shipping.php

@@ -9,14 +9,14 @@
  * Plugin Name: Packlink PRO Shipping
  * Plugin URI: https://en.wordpress.org/plugins/packlink-pro-shipping/
  * Description: Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.
- * Version: 3.2.8
+ * Version: 3.2.9
  * Author: Packlink Shipping S.L.
  * Author URI: https://pro.packlink.es/
  * License: GPL
  * Text Domain: packlink-pro-shipping
  * Domain Path: /languages
  * WC requires at least: 3.0.0
- * WC tested up to: 6.4.1
+ * WC tested up to: 6.5.0
  */
 
 use Packlink\WooCommerce\Plugin;

src/readme.txt

@@ -4,7 +4,7 @@ Tags: woocommerce, shipment, shipping, packlink
 Requires at least: 4.7
 Requires PHP: 5.5
 Tested up to: 5.9.3
-Stable tag: 3.2.8
+Stable tag: 3.2.9
 License: LICENSE-2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 
@@ -68,6 +68,11 @@ Click <a href="https://support-pro.packlink.com/hc/es-es/articles/210158585" tar
 
 == Changelog ==
 
+#### 3.2.9 - May 30, 2022
+
+**Updates**
+- Updated async process wakeup delay for manual sync.
+
 #### 3.2.8 - May 10, 2022
 
 **Updates**