diff --git a/PluginInstallation/3.2.4/packlink.zip b/PluginInstallation/3.2.4/packlink.zip new file mode 100644 index 0000000..214557b Binary files /dev/null and b/PluginInstallation/3.2.4/packlink.zip differ diff --git a/PluginInstallation/CHANGELOG.md b/PluginInstallation/CHANGELOG.md index 5a81153..a739746 100644 --- a/PluginInstallation/CHANGELOG.md +++ b/PluginInstallation/CHANGELOG.md @@ -3,6 +3,10 @@ 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/). +## [3.2.4](https://github.com/packlink-dev/prestashop_module/compare/v3.2.3...v3.2.4) +# Added +- Added carrier logos for Colis Prive and Shop2Shop shipping services. + ## [3.2.3](https://github.com/packlink-dev/prestashop_module/compare/v3.2.2...v3.2.3) # Changed - Updated to the latest Core changes regarding changing the value of the marketing calls flag. diff --git a/src/classes/Utility/SystemInfoUtility.php b/src/classes/Utility/SystemInfoUtility.php index eca6b0b..0c16c81 100644 --- a/src/classes/Utility/SystemInfoUtility.php +++ b/src/classes/Utility/SystemInfoUtility.php @@ -102,6 +102,13 @@ protected static function getPrestaShopInfo() $result['Plugin version'] = $packlink->version; $result['Async process URL'] = $configService->getAsyncProcessUrl('test'); $result['Auto-test URL'] = \Context::getContext()->link->getAdminLink('PacklinkAutoTest'); + $result['Test cURL URL'] = \Context::getContext()->link->getAdminLink('Debug') . '&' . + http_build_query( + array( + 'ajax' => true, + 'action' => 'testCurl', + ) + ); return json_encode($result, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); } diff --git a/src/composer.json b/src/composer.json index 1b94a44..29ea983 100755 --- a/src/composer.json +++ b/src/composer.json @@ -2,7 +2,7 @@ "name": "packlink/prestashop", "description": "Packlink Shipping PrestaShop plugin", "type": "library", - "version": "3.2.3", + "version": "3.2.4", "repositories": [ { "type": "vcs", @@ -13,7 +13,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.3", - "packlink/integration-core": "3.3.6", + "packlink/integration-core": "3.3.8", "ext-json": "*", "ext-curl": "*", "ext-zip": "*", diff --git a/src/composer.lock b/src/composer.lock index e99a9b6..ad25d45 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "805bc96f3e8f15a449f1a5f27d3f11f2", + "content-hash": "a17143de2a1200e8aae5829e3e4116ed", "packages": [ { "name": "iio/libmergepdf", @@ -58,16 +58,16 @@ }, { "name": "packlink/integration-core", - "version": "3.3.6", + "version": "3.3.8", "source": { "type": "git", "url": "git@github.com:packlink-dev/ecommerce_module_core.git", - "reference": "f09134b77dd8e2263f25b9ce2995c2d5c7def1ba" + "reference": "2762650a01458b862a8af55c83dcbe02b6410ac5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/f09134b77dd8e2263f25b9ce2995c2d5c7def1ba", - "reference": "f09134b77dd8e2263f25b9ce2995c2d5c7def1ba", + "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/2762650a01458b862a8af55c83dcbe02b6410ac5", + "reference": "2762650a01458b862a8af55c83dcbe02b6410ac5", "shasum": "" }, "require": { @@ -106,7 +106,7 @@ "proprietary" ], "description": "Packlink integrations core library", - "time": "2022-02-09T12:03:02+00:00" + "time": "2022-05-09T14:40:09+00:00" }, { "name": "setasign/fpdf", @@ -1288,5 +1288,5 @@ "platform-overrides": { "php": "5.3.29" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "1.1.0" } diff --git a/src/controllers/admin/DebugController.php b/src/controllers/admin/DebugController.php index 2c989f5..8b52aff 100644 --- a/src/controllers/admin/DebugController.php +++ b/src/controllers/admin/DebugController.php @@ -1,5 +1,6 @@ getAsyncProcessUrl( 'test' ); + + $curl = curl_init(); + $verbose = fopen( 'php://temp', 'wb+' ); + /** @noinspection CurlSslServerSpoofingInspection */ + curl_setopt_array( + $curl, + array( + CURLOPT_URL => $url, + CURLOPT_RETURNTRANSFER => true, + CURLOPT_SSL_VERIFYHOST => false, + CURLOPT_SSL_VERIFYPEER => false, + CURLOPT_HEADER => true, + // CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1_0, + // CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_TIMEOUT => 2, + CURLOPT_CUSTOMREQUEST => 'POST', + CURLOPT_VERBOSE => true, + CURLOPT_STDERR => $verbose, + // CURLOPT_SSL_CIPHER_LIST => 'TLSv1.2', + CURLOPT_HTTPHEADER => array( + 'Cache-Control: no-cache', + ), + ) + ); + + $response = curl_exec( $curl ); + + rewind( $verbose ); + echo '
', stream_get_contents( $verbose );
+
+        curl_close( $curl );
+
+        echo $response;
+
+        echo '
'; + exit; + } } diff --git a/src/packlink.php b/src/packlink.php index 0c6de18..1f611e2 100644 --- a/src/packlink.php +++ b/src/packlink.php @@ -46,7 +46,7 @@ public function __construct() $this->module_key = 'a7a3a395043ca3a09d703f7d1c74a107'; $this->name = 'packlink'; $this->tab = 'shipping_logistics'; - $this->version = '3.2.3'; + $this->version = '3.2.4'; $this->author = $this->l('Packlink Shipping S.L.'); $this->need_instance = 0; $this->ps_versions_compliancy = array('min' => '1.6.0.14', 'max' => _PS_VERSION_);