Release 1.2.0

wallee-payment · Nov 27, 2020 · 6473b16 · 6473b16
1 parent 820ba2b
commit 6473b16
Show file tree

Hide file tree

Showing 479 changed files with 11,590 additions and 1,402 deletions.
diff --git a/README.md b/README.md
@@ -13,15 +13,15 @@ This repository contains the PrestaShop wallee payment module that enables the s
 
 ## Documentation
 
-* [English](https://plugin-documentation.wallee.com/wallee-payment/prestashop-1.6/1.1.20/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/prestashop-1.6/1.2.0/docs/en/documentation.html)
 
 ## Support
 
 Support queries can be issued on the [wallee support site](https://app-wallee.com/space/select?target=/support).
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/prestashop-1.6/blob/1.1.20/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/prestashop-1.6/blob/1.2.0/LICENSE) for more information.
 
 ## Other PrestaShop Versions
 

diff --git a/docs/en/documentation.html b/docs/en/documentation.html
@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/prestashop-1.6/releases/tag/1.1.20/">
+		<a href="https://github.com/wallee-payment/prestashop-1.6/releases/tag/1.2.0/">
 			Source
 		</a>
 	</li>
@@ -51,7 +51,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/prestashop-1.6/releases/tag/1.1.20/">Download</a> the module.</p>
+<p><a href="https://github.com/wallee-payment/prestashop-1.6/releases/tag/1.2.0/">Download</a> the module.</p>
 </li>
 <li>
 <p>Login to the backend of your PrestsShop store.</p>

diff --git a/inc/Service/Transaction.php b/inc/Service/Transaction.php
@@ -370,9 +370,10 @@ public function getPossiblePaymentMethods(Cart $cart)
             self::$possiblePaymentMethodCache[$currentCartId] == null) {
             $transaction = $this->getTransactionFromCart($cart);
             try {
-                $paymentMethods = $this->getTransactionService()->fetchPossiblePaymentMethods(
+                $paymentMethods = $this->getTransactionService()->fetchPaymentMethods(
                     $transaction->getLinkedSpaceId(),
-                    $transaction->getId()
+                    $transaction->getId(),
+                    'iframe'
                 );
             } catch (\Wallee\Sdk\ApiException $e) {
                 self::$possiblePaymentMethodCache[$currentCartId] = array();

diff --git a/views/templates/admin/admin_help_buttons.tpl b/views/templates/admin/admin_help_buttons.tpl
@@ -10,5 +10,5 @@
 <div class="alert alert-info">
 <img src="../modules/wallee/logo.png" style="float:left; margin-right:15px;" height="50">
 <p><strong>{l s='This module requires an %s account.' sprintf='wallee' mod='wallee'}</strong></p>
-<p><a class="btn btn-default" href="https://app-wallee.com/user/signup" target="_blank">{l s='Sign Up' mod='wallee'}</a> <a class="btn btn-default" href="https://plugin-documentation.wallee.com/wallee-payment/prestashop-1.6/1.1.20/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='wallee'}</a></p>
+<p><a class="btn btn-default" href="https://app-wallee.com/user/signup" target="_blank">{l s='Sign Up' mod='wallee'}</a> <a class="btn btn-default" href="https://plugin-documentation.wallee.com/wallee-payment/prestashop-1.6/1.2.0/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='wallee'}</a></p>
 </div>
diff --git a/wallee-sdk/LICENSE b/wallee-sdk/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 customweb GmbH
+   Copyright 2020 wallee AG
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/wallee-sdk/README.md b/wallee-sdk/README.md
@@ -56,9 +56,9 @@ $secret = 'FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=';
 // Setup API client
 $client = new \Wallee\Sdk\ApiClient($userId, $secret);
 
-// Create API service instance
-$transactionService = new \Wallee\Sdk\Service\TransactionService($client);
-$transactionPaymentPageService = new \Wallee\Sdk\Service\TransactionPaymentPageService($client);
+// Get API service instance
+$client->getTransactionService();
+$client->getTransactionPaymentPageService();
 
 ```
 
@@ -75,10 +75,6 @@ $secret = 'FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=';
 // Setup API client
 $client = new \Wallee\Sdk\ApiClient($userId, $secret);
 
-// Create API service instance
-$transactionService = new \Wallee\Sdk\Service\TransactionService($client);
-$transactionPaymentPageService = new \Wallee\Sdk\Service\TransactionPaymentPageService($client);
-
 // Create transaction
 $lineItem = new \Wallee\Sdk\Model\LineItemCreate();
 $lineItem->setName('Red T-Shirt');
@@ -89,15 +85,15 @@ $lineItem->setAmountIncludingTax(29.95);
 $lineItem->setType(\Wallee\Sdk\Model\LineItemType::PRODUCT);
 
 
-$transaction = new \Wallee\Sdk\Model\TransactionCreate();
-$transaction->setCurrency('EUR');
-$transaction->setLineItems(array($lineItem));
-$transaction->setAutoConfirmationEnabled(true);
+$transactionPayload = new \Wallee\Sdk\Model\TransactionCreate();
+$transactionPayload->setCurrency('EUR');
+$transactionPayload->setLineItems(array($lineItem));
+$transactionPayload->setAutoConfirmationEnabled(true);
 
-$createdTransaction = $transactionService->create($spaceId, $transaction);
+$transaction = $client->getTransactionService()->create($spaceId, $transactionPayload);
 
 // Create Payment Page URL:
-$redirectionUrl = $transactionPaymentPageService->paymentPageUrl($spaceId, $createdTransaction->getId());
+$redirectionUrl = $client->getTransactionPaymentPageService()->paymentPageUrl($spaceId, $transaction->getId());
 
 header('Location: ' . $redirectionUrl);
 
@@ -112,9 +108,9 @@ $userId = 512;
 $secret = 'FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=';
 
 // Setup API client
-$client = new \Wallee\Sdk\Sdk\ApiClient($userId, $secret);
+$client = new \Wallee\Sdk\ApiClient($userId, $secret);
 
-$httpClientType = \Wallee\Sdk\Sdk\Http\HttpClientFactory::TYPE_CURL; // or \Wallee\Sdk\Sdk\Http\HttpClientFactory::TYPE_SOCKET
+$httpClientType = \Wallee\Sdk\Http\HttpClientFactory::TYPE_CURL; // or \Wallee\Sdk\Http\HttpClientFactory::TYPE_SOCKET
 
 $client->setHttpClientType($httpClientType);
 ```

diff --git a/wallee-sdk/composer.json b/wallee-sdk/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "wallee/sdk",
-    "version": "2.0.17",
+    "version": "2.1.4",
 	"description": "wallee SDK for PHP",
 	"keywords": [
 		"wallee",
@@ -13,8 +13,8 @@
 	"license": "Apache-2.0",
 	"authors": [
 		{
-			"name": "customweb GmbH",
-			"homepage": "https://customweb.com"
+			"name": "wallee AG",
+			"homepage": "https://wallee.com"
 		}
 	],
 	"require": {