Release 1.0.45

README.md

@@ -2,7 +2,7 @@
 
 # OXID 4.10
 
-v1.0.44, 2023-3
+v1.0.45, 2023-4
 
 This repository contains the OXID  wallee payment module that enables the shop to process payments with [wallee](https://www.wallee.com).
 
@@ -19,8 +19,8 @@ Support queries can be issued on the [wallee support site](https://app-wallee.co
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/oxid-4.10/1.0.44/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/oxid-4.10/1.0.45/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/oxid-4.10/blob/1.0.44/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/oxid-4.10/blob/1.0.45/LICENSE) for more information.

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/oxid-4.10/releases/tag/1.0.44/">
+		<a href="https://github.com/wallee-payment/oxid-4.10/releases/tag/1.0.45/">
 			Source
 		</a>
 	</li>
@@ -49,7 +49,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/oxid-4.10/releases/tag/1.0.44/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/oxid-4.10/releases/tag/1.0.45/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload them to the <code>modules</code> directory of your store using FTP/SSH.</p>

wle/Wallee/Application/Model/Transaction.php

@@ -20,7 +20,7 @@
 use Wallee\Sdk\Model\Label;
 use Wallee\Sdk\Model\Refund;
 use Wallee\Sdk\Model\TransactionCompletion;
-use Wallee\Sdk\Model\TransactionLineItemUpdateRequest;
+use Wallee\Sdk\Model\TransactionLineItemVersionCreate;
 use Wallee\Sdk\Model\TransactionState;
 use Wallee\Sdk\Model\TransactionVoid;
 use Wallee\Sdk\Service\RefundService;
@@ -514,9 +514,9 @@ class_exists('oxorder');		$order = oxNew('oxorder');
 		}
 		$adapter = new BasketAdapter($order->getWalleeBasket());
 		$adapter->getLineItemData();
-		$update = new TransactionLineItemUpdateRequest();
-		$update->setNewLineItems($adapter->getLineItemData());
-		$update->setTransactionId($this->getTransactionId());
+		$update = new TransactionLineItemVersionCreate();
+		$update->setLineItems($adapter->getLineItemData());
+		$update->setTransaction($this->getTransactionId());
 		TransactionService::instance()->updateLineItems($this->getSpaceId(), $update);
 		$this->pull();
 		WalleeModule::log(Logger::DEBUG, "Complete update line items.");

wle/Wallee/Core/Service/TransactionService.php

@@ -15,12 +15,13 @@
 use Monolog\Logger;
 use Wallee\Sdk\Model\EntityQuery;
 use Wallee\Sdk\Model\TransactionCreate;
-use Wallee\Sdk\Model\TransactionLineItemUpdateRequest;
+use Wallee\Sdk\Model\TransactionLineItemVersionCreate;
 use Wallee\Sdk\Model\TransactionPending;
-use Wallee\Sdk\Service\TransactionInvoiceService;
 use Wle\Wallee\Core\WalleeModule;
 use \Wallee\Sdk\Service\TransactionService as SdkTransactionService;
 use \Wallee\Sdk\Service\TransactionIframeService;
+use Wallee\Sdk\Service\TransactionInvoiceService;
+use Wallee\Sdk\Service\TransactionLineItemVersionService;
 use \Wallee\Sdk\Service\TransactionPaymentPageService;
 
 /**
@@ -34,6 +35,7 @@ class TransactionService extends AbstractService {
 	private $invoiceService;
 	private $paymentPageService;
 	private $iframeService;
+	private $transactionLineItemVersionService;
 
 	protected function getService(){
 		if (!$this->service) {
@@ -42,6 +44,13 @@ protected function getService(){
 		return $this->service;
 	}
 
+	protected function getTransactionLineItemVersionService(){
+	    if (!$this->transactionLineItemVersionService) {
+		$this->transactionLineItemVersionService = new TransactionLineItemVersionService(WalleeModule::instance()->getApiClient());
+	    }
+	    return $this->transactionLineItemVersionService;
+	}
+
 	/**
 	 *
 	 * @return TransactionInvoiceService
@@ -142,9 +151,18 @@ public function update(TransactionPending $transaction, $confirm = false){
 			return $this->getService()->update(WalleeModule::settings()->getSpaceId(), $transaction);
 		}
 	}
-
-	public function updateLineItems($spaceId, TransactionLineItemUpdateRequest $updateRequest){
-		return $this->getService()->updateTransactionLineItems($spaceId, $updateRequest);
+	/**
+	* Create a version of line items
+	*
+	* @param string $spaceId
+	* @param \Wallee\Sdk\Model\TransactionLineItemVersionCreate $lineItemVersion
+	* @return \Wallee\Sdk\Model\TransactionLineItemVersion
+	* @throws \Wallee\Sdk\ApiException
+	* @throws \Wallee\Sdk\Http\ConnectionException
+	* @throws \Wallee\Sdk\VersioningException 
+	*/
+	public function updateLineItems($spaceId, TransactionLineItemVersionCreate $lineItemVersion){
+		return $this->getTransactionLineItemVersionService()->create($spaceId, $lineItemVersion);
 	}
 
 	/**

wle/Wallee/docs/README.md

@@ -2,7 +2,7 @@
 
 # OXID 4.10
 
-v1.0.44, 2023-3
+v1.0.45, 2023-4
 
 This repository contains the OXID  wallee payment module that enables the shop to process payments with [wallee](https://www.wallee.com).
 
@@ -19,8 +19,8 @@ Support queries can be issued on the [wallee support site](https://app-wallee.co
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/oxid-4.10/1.0.44/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/oxid-4.10/1.0.45/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/oxid-4.10/blob/1.0.44/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/oxid-4.10/blob/1.0.45/LICENSE) for more information.

wle/Wallee/metadata.php

@@ -31,7 +31,7 @@
         'en' => 'WLE Wallee Module'
     ),
     'thumbnail' => 'out/pictures/picture.png',
-    'version' => '1.0.44',
+    'version' => '1.0.45',
     'author' => 'customweb GmbH',
     'url' => 'https://www.customweb.com',
     'email' => 'info@customweb.com',

wle/Wallee/wallee-sdk/.travis.yml

@@ -1,6 +1,7 @@
 language: php
 sudo: false
 php:
-    - 5.6
+    - 8.0
+    - 8.1
 before_install: "composer install"
 script: "phpunit --bootstrap autoload.php test/"

wle/Wallee/wallee-sdk/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 wallee AG
+   Copyright 2023 wallee AG
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

wle/Wallee/wallee-sdk/README.md

@@ -113,6 +113,9 @@ $client = new \Wallee\Sdk\ApiClient($userId, $secret);
 $httpClientType = \Wallee\Sdk\Http\HttpClientFactory::TYPE_CURL; // or \Wallee\Sdk\Http\HttpClientFactory::TYPE_SOCKET
 
 $client->setHttpClientType($httpClientType);
+
+//Setup a custom connection timeout if needed. (Default value is: 25 seconds)
+$client->setConnectionTimeout(20);
 ```
 
 You can also specify the HTTP client via the `WLE_HTTP_CLIENT` environment variable. The possible string values are `curl` or `socket`.

wle/Wallee/wallee-sdk/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "wallee/sdk",
-    "version": "2.1.4",
+    "version": "3.2.0",
 	"description": "wallee SDK for PHP",
 	"keywords": [
 		"wallee",
@@ -23,7 +23,7 @@
 		"ext-mbstring": "*"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~4.8"
+		"phpunit/phpunit": "~8"
 	},
 	"autoload": {
 		"psr-4": { "Wallee\\Sdk\\" : "lib/" }