Merge branch 'develop'

Changelog.md

@@ -1,4 +1,8 @@
 # Changelog
+## 1.8.0
+* removed deprecated SOAP API integration
+* improved naming for DHL settings in Admin panel
+
 ## 1 7.7
 * fix category model inheritance
 

LICENSE

@@ -0,0 +1,29 @@
+Combined License "MIT License" with mediaopt's additional condition:
+
+MIT License
+
+Copyright (c) 2024 mediaopt:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+mediaopt's additional condition to use the Software:
+
+The permission to use the Software is granted only under the additional condition that
+mediaopt's API Key `kAPjq3yHFgY6QD3sHEtv61dQCAgoXLyK` (represented by `DHL_DEVELOPER_API_KEY` in `src/modules/mo/mo_dhl/Adapter/DHLConfigurator.php`) is kept not only at the Copyright Notice
+but is forwarded at each deployment of the DHL Oxid module.

composer.json

@@ -18,7 +18,7 @@
         }
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.4",
         "monolog/monolog": "^1.12",
         "guzzlehttp/guzzle": "^7.0",
         "ext-json": "*",

project.json

@@ -4,7 +4,7 @@
     "pathToModule": "copy_this/modules/mo/mo_dhl",
     "prefix": "mo_",
     "suffix": "",
-    "version": "1.7.7",
+    "version": "1.8.0",
     "compatibility": {
         "minimumVersion": "6.0",
         "maximumVersion": null,

src/modules/mo/mo_dhl/Adapter/DHLAdapter.php

@@ -8,7 +8,6 @@
  * @copyright 2016 Mediaopt GmbH
  */
 
-use Mediaopt\DHL\Api\GKV;
 use Mediaopt\DHL\Api\Standortsuche;
 use Mediaopt\DHL\Api\Wunschpaket;
 use Mediaopt\DHL\Main;
@@ -202,14 +201,6 @@ public function buildStandortsuche()
         return $this->getSdk()->buildStandortsuche();
     }
 
-    /**
-     * @return GKV
-     */
-    public function buildGKV()
-    {
-        return $this->getSdk()->buildGKV();
-    }
-
     /**
      * @return \Mediaopt\DHL\Api\ParcelShipping\Client
      */

src/modules/mo/mo_dhl/Adapter/DHLConfigurator.php

@@ -36,9 +36,9 @@ class DHLConfigurator extends \Mediaopt\DHL\Configurator
 
     const TEST_GKV_USERNAME = '2222222222_01';
 
-    const TEST_GKV_PASSWORD = 'pass';
+    const TEST_GKV_PASSWORD = 'SandboxPasswort2023!';
 
-    const TEST_PARCEL_SHIPPING_USERNAME = 'sandy_sandbox';
+    const TEST_PARCEL_SHIPPING_USERNAME = 'user-valid';
 
     const TEST_PARCEL_SHIPPING_PASSWORD = self::TEST_GKV_PASSWORD;