Release 1.0.21

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.20/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.21/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.20/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.21/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.20/">
+		<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.21/">
 			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.20/">Download</a> the extension.</p>
+<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.21/">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>
@@ -157,6 +157,40 @@ <h2>
 <div class="content">
 <img src="resource/state_graph.svg" alt="state graph"/>
 </div>
+</div><div class="olist glossary">
+<ol class="glossary">
+<li>
+<p>When the transaction is marked as <code>authorized</code> in wallee the order within OpenCart will be marked as <code>Processed</code>. The amount is only reserved at this point. The order is not yet ready to be fulfilled.</p>
+</li>
+<li>
+<p>When the transaction fails during the authorization process the OpenCart order is marked as <code>Failed</code>.</p>
+</li>
+<li>
+<p>In case the delivery indication is pending, the order within OpenCart will move into <code>Processing</code> (in thise case you have to decide the outcome of the delivery indication e.g. You have configured to manually check transactions without 3d Secure). In such situations a manual task is created and an alert appears in the wallee &amp; OpenCart backends. You can then resolve the manual task within the wallee backend. This changes the transaction status, which is transmitted back to OpenCart.  See more details in <a href="#_on_hold_orders">On hold orders</a>.</p>
+</li>
+<li>
+<p>In case the decision about the fulfillment is negative, the order within OpenCart will be marked as <code>Declined</code> and should not be fulfilled.</p>
+</li>
+<li>
+<p>If you decide to void an authorized transaction (in case for example the products ordered are no longer in stock), the order within OpenCart will be marked as <code>Voided</code>.</p>
+</li>
+<li>
+<p>When the transaction is marked in wallee as <code>fulfill</code> the order within OpenCart will be be marked as <code>Complete</code>. This is when you can start the fulfillment process. The plugin will in this case not change the status anymore.</p>
+</li>
+</ol>
+</div><div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+This describes the default state machine of OpenCart orders, however you have the option in the wallee plugin configuration to define different order status.
+</td>
+</tr>
+</table>
+</div><div class="paragraph">
+<p>For information about deferred completion, see <a href="#_complete_capture_an_order">Complete (capture) an order</a></p>
 </div>					</div>
 </div>			</div>
 </div>	<div class="chapter" id="_transaction_management">

docs/en/resource/state_graph.svg

@@ -9,8 +9,9 @@ public function index(){
 			return '';
 		}
 		$this->load->language('payment/wallee');
+		$data = array();
 
-		$data['configuration_id'] = substr($this->getCode(), strlen('wallee_'));
+		$data['configuration_id'] = \WalleeHelper::extractPaymentMethodId($this->getCode());
 
 		$data['button_confirm'] = $this->language->get('button_confirm');
 		$data['text_loading'] = $this->language->get('text_loading');

upload/system/library/wallee/dynamic/catalog/controller.php

@@ -45,7 +45,7 @@ public function getMethod($address, $total){
 			}
 
 			$available_methods = \Wallee\Service\Transaction::instance($this->registry)->getPaymentMethods($order_info);
-			$configuration_id = substr($this->getCode(), strlen('wallee_'));
+			$configuration_id = substr($this->getCode(), \WalleeHelper::extractPaymentMethodId($this->getCode()));
 
 			foreach ($available_methods as $method) {
 				if ($method->getId() == $configuration_id) {

upload/system/library/wallee/dynamic/catalog/model.php

@@ -648,6 +648,10 @@ public static function instance(Registry $registry){
 		}
 		return self::$instance;
 	}
+	
+	public static function extractPaymentMethodId($code) {
+		return substr($code, strlen('wallee_'));
+	}
 
 	public static function exceptionErrorHandler($severity, $message, $file, $line){
 		if (!(error_reporting() & $severity)) {

upload/system/library/wallee/helper.php

@@ -44,10 +44,17 @@ public function getJavascriptUrl(){
 	}
 
 	public function getPaymentPageUrl(\Wallee\Sdk\Model\Transaction $transaction, $paymentCode){
-		$paymentMethodId = substr($paymentCode, strlen('wallee_'));
+		$paymentMethodId = \WalleeHelper::extractPaymentMethodId($paymentCode);
 		return $this->getTransactionService()->buildPaymentPageUrl($transaction->getLinkedSpaceId(), $transaction->getId()) .
 				 '&paymentMethodConfigurationId=' . $paymentMethodId;
 	}
+	
+	protected function getAllowedPaymentMethodConfigurations(array $order_info) {
+		if(isset($order_info['payment_method']) && isset($order_info['payment_method']['code'])){
+			return array(\WalleeHelper::extractPaymentMethodId($order_info['payment_method']['code']));
+		}
+		return null;
+	}
 
 	public function update(array $order_info, $confirm = false){
 		$last = null;
@@ -156,11 +163,9 @@ public function getTransaction($order_info = array(), $cache = true, $allowed_st
 	}
 
 	private function persist($transaction, array $order_info){
-		$id = null;
 		if (isset($order_info['order_id'])) {
-			$id = $order_info['order_id'];  // Todo test
+			$this->updateTransactionInfo($transaction, $order_info['order_id']);
 		}
-		$this->updateTransactionInfo($transaction, $id);
 		$this->storeTransactionIdsInSession($transaction);
 		$this->storeShipping($transaction);
 	}
@@ -219,7 +224,8 @@ private function assembleTransaction(\Wallee\Sdk\Model\AbstractTransactionPendin
 
 		$transaction->setLineItems(LineItem::instance($this->registry)->getItemsFromSession());
 		$transaction->setSuccessUrl(\WalleeHelper::instance($this->registry)->getSuccessUrl());
-		
+		$transaction->setAllowedPaymentMethodConfigurations($this->getAllowedPaymentMethodConfigurations($order_info));
+
 		if ($order_id) {
 			$transaction->setMerchantReference($order_id);
 			$transaction->setFailedUrl(\WalleeHelper::instance($this->registry)->getFailedUrl($order_id));