Release 1.0.32

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.31/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.32/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.31/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.32/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.31/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.32/">
 			Source
 		</a>
 	</li>
@@ -48,7 +48,7 @@ <h1>
 					<div class="olist arabic">
 <ol class="arabic">
 <li>
-<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.31/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.32/">Download</a> the extension.</p>
 </li>
 <li>
 <p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>

upload/system/library/wallee/service/transaction.php

@@ -4,7 +4,8 @@
 
 use Wallee\Sdk\Service\ChargeAttemptService;
 use Wallee\Sdk\Service\TransactionService;
-use Wallee\Sdk\Model\TransactionPending;
+use Wallee\Sdk\Service\TransactionIframeService;
+use Wallee\Sdk\Service\TransactionPaymentPageService;
 
 /**
  * This service provides functions to deal with Wallee transactions.
@@ -40,12 +41,12 @@ public function getJavascriptUrl(){
 			\Wallee\Sdk\Model\TransactionState::PENDING 
 		));
 		$this->persist($transaction, array());
-		return $this->getTransactionService()->buildJavaScriptUrl($transaction->getLinkedSpaceId(), $transaction->getId());
+		return $this->getIframeService()->javascriptUrl($transaction->getLinkedSpaceId(), $transaction->getId());
 	}
 
 	public function getPaymentPageUrl(\Wallee\Sdk\Model\Transaction $transaction, $paymentCode){
 		$paymentMethodId = \WalleeHelper::extractPaymentMethodId($paymentCode);
-		return $this->getTransactionService()->buildPaymentPageUrl($transaction->getLinkedSpaceId(), $transaction->getId()) .
+		return $this->getPaymentPageService()->paymentPageUrl($transaction->getLinkedSpaceId(), $transaction->getId()) .
 				 '&paymentMethodConfigurationId=' . $paymentMethodId;
 	}
 
@@ -259,6 +260,20 @@ private function assembleTransaction(\Wallee\Sdk\Model\AbstractTransactionPendin
 	 * @var \Wallee\Sdk\Service\ChargeAttemptService
 	 */
 	private $charge_attempt_service;
+	
+	/**
+	 * The iframe API service, to retrieve JS url
+	 *
+	 * @var \Wallee\Sdk\Service\TransactionIframeService
+	 */
+	private $transaction_iframe_service;
+	
+	/**
+	 * The payment page API service, tro retrieve pp URL
+	 * 
+	 * @var \Wallee\Sdk\Service\TransactionPaymentPageService
+	 */
+	private $transaction_payment_page_service;
 
 	/**
 	 * Returns the transaction API service.
@@ -283,7 +298,31 @@ private function getChargeAttemptService(){
 		}
 		return $this->charge_attempt_service;
 	}
-
+	
+	/**
+	 * Returns the transaction API service.
+	 *
+	 * @return \Wallee\Sdk\Service\TransactionIframeService
+	 */
+	private function getIframeService(){
+		if ($this->transaction_iframe_service === null) {
+			$this->transaction_iframe_service = new TransactionIframeService(\WalleeHelper::instance($this->registry)->getApiClient());
+		}
+		return $this->transaction_iframe_service;
+	}
+	
+	/**
+	 * Returns the transaction API service.
+	 *
+	 * @return \Wallee\Sdk\Service\TransactionPaymentPageService
+	 */
+	private function getPaymentPageService(){
+		if ($this->transaction_payment_page_service === null) {
+			$this->transaction_payment_page_service = new TransactionPaymentPageService(\WalleeHelper::instance($this->registry)->getApiClient());
+		}
+		return $this->transaction_payment_page_service;
+	}
+	
 	/**
 	 * Updates the line items to be in line with the current order.
 	 *

upload/system/library/wallee/wallee-sdk/.php_cs

@@ -0,0 +1,23 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(true)
+    ->setRules([
+        '@PSR2' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'array_syntax' => [ 'syntax' => 'short' ],
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'no_trailing_whitespace' => false,
+        'no_trailing_whitespace_in_comment' => false,
+        'braces' => false,
+        'single_blank_line_at_eof' => false,
+        'blank_line_after_namespace' => false,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+        ->exclude('test')
+        ->exclude('tests')
+        ->in(__DIR__)
+    );

upload/system/library/wallee/wallee-sdk/.travis.yml

@@ -1,9 +1,6 @@
 language: php
 sudo: false
 php:
-	- 5.4
     - 5.6
-    - 7.0
-    - 7.1
 before_install: "composer install"
-script: "phpunit --bootstrap autoload.php test/"
+script: "phpunit --bootstrap autoload.php test/"

upload/system/library/wallee/wallee-sdk/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2019 customweb GmbH
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    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.
+   limitations under the License.

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

@@ -1,16 +1,17 @@
 [![Build Status](https://travis-ci.org/wallee-payment/php-sdk.svg?branch=master)](https://travis-ci.org/wallee-payment/php-sdk)
 
-# wallee SDK for PHP
+# wallee PHP Library
 
-This repository contains the open source PHP SDK that allows you to access wallee from your PHP app.
+The wallee PHP library wraps around the wallee API. This library facilitates your interaction with various services such as transactions, accounts, and subscriptions.
 
-## Requirements
-
-* [PHP 5.6.0 and later](http://www.php.net/)
 
 ## Documentation
 
-https://app-wallee.com/doc/api/web-service
+[wallee Web Service API](https://app-wallee.com/doc/api/web-service)
+
+## Requirements
+
+- PHP 5.6.0 and above
 
 ## Installation
 
@@ -39,24 +40,44 @@ require_once '/path/to/php-sdk/autoload.php';
 ```
 
 ## Usage
+The library needs to be configured with your account's space id, user id, and secret key which are available in your [wallee
+account dashboard](https://app-wallee.com/account/select). Set `space_id`, `user_id`, and `api_secret` to their values.
 
-### Basic Example
+### Configuring a Service
 
 ```php
-<?php
+require_once(__DIR__ . '/autoload.php');
+
+// Configuration
+$spaceId = 405;
+$userId = 512;
+$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);
+
+```
+
+To get started with sending transactions, please review the example below:
 
+```php
 require_once(__DIR__ . '/autoload.php');
 
 // Configuration
 $spaceId = 405;
 $userId = 512;
-$secret = "FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=";
+$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();
@@ -69,19 +90,44 @@ $lineItem->setType(\Wallee\Sdk\Model\LineItemType::PRODUCT);
 
 
 $transaction = new \Wallee\Sdk\Model\TransactionCreate();
-$transaction->setCurrency("EUR");
+$transaction->setCurrency('EUR');
 $transaction->setLineItems(array($lineItem));
 $transaction->setAutoConfirmationEnabled(true);
 
 $createdTransaction = $transactionService->create($spaceId, $transaction);
 
 // Create Payment Page URL:
-$redirectionUrl = $transactionService->buildPaymentPageUrl($spaceId, $createdTransaction->getId());
+$redirectionUrl = $transactionPaymentPageService->paymentPageUrl($spaceId, $createdTransaction->getId());
 
 header('Location: ' . $redirectionUrl);
 
+```
+### HTTP Client
+You can either use `php curl` or `php socket` extentions. It is recommend you install the necessary extentions and enable them on your system.
+
+You have to ways two specify which HTTP client you prefer.
+
+```php
+$userId = 512;
+$secret = 'FKrO76r5VwJtBrqZawBspljbBNOxp5veKQQkOnZxucQ=';
+
+// Setup API client
+$client = new \Wallee\Sdk\Sdk\ApiClient($userId, $secret);
+
+$httpClientType = \Wallee\Sdk\Sdk\Http\HttpClientFactory::TYPE_CURL; // or \Wallee\Sdk\Sdk\Http\HttpClientFactory::TYPE_SOCKET
+
+$client->setHttpClientType($httpClientType);
+```
+
+You can also specify the HTTP client via the `WLE_HTTP_CLIENT` environment variable. The possible string values are `curl` or `socket`.
+
+
+```php
+<?php
+putenv('WLE_HTTP_CLIENT=curl');
+?>
 ```
 
 ## License
 
-Please see the [license file](LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/php-sdk/blob/master/LICENSE) for more information.

upload/system/library/wallee/wallee-sdk/autoload.php

@@ -1,9 +1,9 @@
 <?php
 /**
- * wallee SDK
+ *  SDK
  *
- * This library allows to interact with the wallee payment service.
- * wallee SDK: 1.0.0
+ * This library allows to interact with the  payment service.
+ *  SDK: 2.0.4
  * 
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +22,8 @@
 /**
  * Autoload function.
  *
+ * @author   customweb GmbH
+ 
  * After registering this autoload function with SPL, the following line
  * would cause the function to attempt to load the \Wallee\Sdk\Baz\Qux class
  * from /path/to/project/lib/Baz/Qux.php:

upload/system/library/wallee/wallee-sdk/composer.json

@@ -1,5 +1,6 @@
 {
-	"name": "wallee/sdk",
+    "name": "wallee/sdk",
+    "version": "2.0.4",
 	"description": "wallee SDK for PHP",
 	"keywords": [
 		"wallee",
@@ -8,7 +9,7 @@
 		"sdk",
 		"api"
 	],
-	"homepage": "https://www.wallee.com",
+	"homepage": "http://github.com/wallee-payment/php-sdk",
 	"license": "Apache-2.0",
 	"authors": [
 		{
@@ -17,7 +18,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4",
+		"php": ">=5.6",
 		"ext-json": "*",
 		"ext-mbstring": "*"
 	},
@@ -30,4 +31,4 @@
 	"autoload-dev": {
 		"psr-4": { "Wallee\\Sdk\\" : "test/" }
 	}
-}
+}