Release 1.0.4

Author: sbossert

README.md

@@ -11,8 +11,8 @@ This repository contains the OpenCart  wallee payment module that enables the sh
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.3/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.4/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.3/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.4/LICENSE) for more information.

docs/en/documentation.html

@@ -21,7 +21,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.3/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.4/">
 			Source
 		</a>
 	</li>
@@ -37,7 +37,7 @@ <h1>
 	</div>
 	<div class="chapter-body">
 					<div class="paragraph">
-<p>If you don&#8217;t already have one, create a <a href="https://www.wallee.com/">wallee</a> account and set up a space by following the setup assistant.</p>
+<p>If you don&#8217;t already have one, create a <a href="https://www.wallee.com/">wallee</a> account.</p>
 </div>					</div>
 </div>	<div class="chapter" id="_installation">
 	<div class="chapter-title">
@@ -54,7 +54,7 @@ <h2>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.3/">Download</a> the extension (wallee.zip).</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.4/">Download</a> the extension (wallee.zip).</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the 'upload' directory to your store&#8217;s root directory using FTP/SSH.</p>
@@ -73,7 +73,7 @@ <h2>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.3/">Download</a> the extension (wallee.ocmod.zip). TODO</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.4/">Download</a> the extension (wallee.ocmod.zip). TODO</p>
 </li>
 <li>
 <p>Navigate to Extensions &#8594; Extension Installer, and upload the previously downloaded zip file.</p>

upload/system/library/wallee/wallee-sdk/README.md

@@ -30,7 +30,7 @@ composer require wallee/sdk
 
 ### Manual Installation
 
-Alternatively you can download the package in its entirety. The [Releases](/releases) page lists all stable versions.
+Alternatively you can download the package in its entirety. The [Releases](../../releases) page lists all stable versions.
 
 Uncompress the zip file you download, and include the autoloader in your project:
 
@@ -46,25 +46,30 @@ require_once '/path/to/php-sdk/autoload.php';
 <?php
 require_once(__DIR__ . '/autoload.php');
 
-
 // Setup API client
 $client = new \Wallee\Sdk\ApiClient('YOUR_USER_ID', 'YOUR_API_KEY');
 
 // Create API service instance
-$service = new \Wallee\Sdk\Service\AccountService($apiClient);
-// The filter which restricts the entities which are used to calculate the count.
+$service = new \Wallee\Sdk\Service\SpaceService($client);
+
+// The query restricts the spaces which are returned by the search.
 $filter = new \Wallee\Sdk\Model\EntityQueryFilter();
+$filter->setType(\Wallee\Sdk\Model\EntityQueryFilterType::LEAF);
+$filter->setOperator(\Wallee\Sdk\Model\CriteriaOperator::EQUALS);
+$filter->setFieldName('state');
+$filter->setValue(\Wallee\Sdk\Model\CreationEntityState::ACTIVE);
+
+$query = new \Wallee\Sdk\Model\EntityQuery();
+$query->setFilter($filter);
 
 try {
-    $result = $apiService->count($filter);
+    $result = $service->search($query);
     print_r($result);
 } catch (Exception $e) {
-    echo 'Exception when calling AccountService->count: ', $e->getMessage(), PHP_EOL;
+    echo 'Exception when calling SpaceService->search: ', $e->getMessage(), PHP_EOL;
 }
-
-?>
 ```
 
 ## License
 
-Please see the [license file](/blob/master/LICENSE) for more information.
+Please see the [license file](LICENSE) for more information.

upload/system/library/wallee/wallee-sdk/lib/Http/SocketHttpClient.php

@@ -299,10 +299,17 @@ private function createSocketStream(ApiClient $apiClient, HttpRequest $request)
 		if ($proxyUrl !== null) {
 			$host = parse_url($proxyUrl, PHP_URL_HOST);
 			$port = parse_url($proxyUrl, PHP_URL_PORT);
+			if(empty($port)){
+				throw new ConnectionException($request->getUrl(), $request->getLogToken(), "The Proxy URL must contain a port number.");
+			}
+			
 		} else {
 			$host = ($request->isSecureConnection() ? $this->getSslProtocol() . '://' : '') . $request->getHost();
 			$port = $request->getPort();
-		}
+			if(empty($port)){
+				$port = $request->isSecureConnection() ? 443 : 80;
+			}	
+		}			
 		$socket = $host . ':' . $port;
 
 		$filePointer = @stream_socket_client($socket, $errno, $errstr, $apiClient->getConnectionTimeout(), STREAM_CLIENT_CONNECT,

upload/system/library/wallee/wallee-sdk/lib/Model/AbstractSubscriptionAffiliateUpdate.php

@@ -0,0 +1,244 @@
+<?php
+/**
+ * wallee SDK
+ *
+ * This library allows to interact with the wallee payment service.
+ * wallee SDK: 1.0.0
+ * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Wallee\Sdk\Model;
+
+use Wallee\Sdk\ValidationException;
+
+/**
+ * AbstractSubscriptionAffiliateUpdate model
+ *
+ * @category    Class
+ * @package     Wallee\Sdk
+ * @author      customweb GmbH
+ * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache License v2
+ */
+class AbstractSubscriptionAffiliateUpdate  {
+
+	/**
+	 * The original name of the model.
+	 *
+	 * @var string
+	 */
+	private static $swaggerModelName = 'Abstract.SubscriptionAffiliate.Update';
+
+	/**
+	 * An array of property to type mappings. Used for (de)serialization.
+	 *
+	 * @var string[]
+	 */
+	private static $swaggerTypes = array(
+		'language' => 'string',
+		'metaData' => 'map[string,string]',
+		'name' => 'string',
+		'state' => '\Wallee\Sdk\Model\CreationEntityState'	);
+
+	/**
+	 * Returns an array of property to type mappings.
+	 *
+	 * @return string[]
+	 */
+	public static function swaggerTypes() {
+		return self::$swaggerTypes;
+	}
+
+	
+
+	/**
+	 * 
+	 *
+	 * @var string
+	 */
+	private $language;
+
+	/**
+	 * Meta data allow to store additional data along the object.
+	 *
+	 * @var map[string,string]
+	 */
+	private $metaData;
+
+	/**
+	 * 
+	 *
+	 * @var string
+	 */
+	private $name;
+
+	/**
+	 * 
+	 *
+	 * @var \Wallee\Sdk\Model\CreationEntityState
+	 */
+	private $state;
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param mixed[] $data an associated array of property values initializing the model
+	 */
+	public function __construct(array $data = null) {
+		if (isset($data['language'])) {
+			$this->setLanguage($data['language']);
+		}
+		if (isset($data['metaData'])) {
+			$this->setMetaData($data['metaData']);
+		}
+		if (isset($data['name'])) {
+			$this->setName($data['name']);
+		}
+		if (isset($data['state'])) {
+			$this->setState($data['state']);
+		}
+	}
+
+
+	/**
+	 * Returns language.
+	 *
+	 * 
+	 *
+	 * @return string
+	 */
+	public function getLanguage() {
+		return $this->language;
+	}
+
+	/**
+	 * Sets language.
+	 *
+	 * @param string $language
+	 * @return AbstractSubscriptionAffiliateUpdate
+	 */
+	public function setLanguage($language) {
+		$this->language = $language;
+
+		return $this;
+	}
+
+	/**
+	 * Returns metaData.
+	 *
+	 * Meta data allow to store additional data along the object.
+	 *
+	 * @return map[string,string]
+	 */
+	public function getMetaData() {
+		return $this->metaData;
+	}
+
+	/**
+	 * Sets metaData.
+	 *
+	 * @param map[string,string] $metaData
+	 * @return AbstractSubscriptionAffiliateUpdate
+	 */
+	public function setMetaData($metaData) {
+		$this->metaData = $metaData;
+
+		return $this;
+	}
+
+	/**
+	 * Returns name.
+	 *
+	 * 
+	 *
+	 * @return string
+	 */
+	public function getName() {
+		return $this->name;
+	}
+
+	/**
+	 * Sets name.
+	 *
+	 * @param string $name
+	 * @return AbstractSubscriptionAffiliateUpdate
+	 */
+	public function setName($name) {
+		$this->name = $name;
+
+		return $this;
+	}
+
+	/**
+	 * Returns state.
+	 *
+	 * 
+	 *
+	 * @return \Wallee\Sdk\Model\CreationEntityState
+	 */
+	public function getState() {
+		return $this->state;
+	}
+
+	/**
+	 * Sets state.
+	 *
+	 * @param \Wallee\Sdk\Model\CreationEntityState $state
+	 * @return AbstractSubscriptionAffiliateUpdate
+	 */
+	public function setState($state) {
+		$this->state = $state;
+
+		return $this;
+	}
+
+	/**
+	 * Validates the model's properties and throws a ValidationException if the validation fails.
+	 *
+	 * @throws ValidationException
+	 */
+	public function validate() {
+
+	}
+
+	/**
+	 * Returns true if all the properties in the model are valid.
+	 *
+	 * @return boolean
+	 */
+	public function isValid() {
+		try {
+			$this->validate();
+			return true;
+		} catch (ValidationException $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns the string presentation of the object.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		if (defined('JSON_PRETTY_PRINT')) { // use JSON pretty print
+			return json_encode(\Wallee\Sdk\ObjectSerializer::sanitizeForSerialization($this), JSON_PRETTY_PRINT);
+		}
+
+		return json_encode(\Wallee\Sdk\ObjectSerializer::sanitizeForSerialization($this));
+	}
+
+}
+