Release 1.1.20

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.19/docs/en/documentation.html)
+* [English](https://plugin-documentation.wallee.com/wallee-payment/prestashop-1.6/1.1.20/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.19/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/prestashop-1.6/blob/1.1.20/LICENSE) for more information.
 
 ## Other PrestaShop Versions
 

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.19/">
+		<a href="https://github.com/wallee-payment/prestashop-1.6/releases/tag/1.1.20/">
 			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.19/">Download</a> the module.</p>
+<p><a href="https://github.com/wallee-payment/prestashop-1.6/releases/tag/1.1.20/">Download</a> the module.</p>
 </li>
 <li>
 <p>Login to the backend of your PrestsShop store.</p>
@@ -402,16 +402,28 @@ <h2>
 <p>If this does not solve the problem, it could be that you use a special fee or coupon module that we do not support. Try to disable this plugin and see if it helps.
 The payment methods are only displayed if the plugin&#8217;s total calculation matches the actual order total.</p>
 </div>					</div>
-</div>			</div>
-</div>	<div class="chapter" id="_support">
-	<div class="chapter-title">
-		<h1>
-			<span class="title-number">10</span>Support					</h1>
+</div>					<div class="section" id="_what_happens_in_a_prestashop_transaction">
+	<div class="section-title">
+		<h2>
+			<span class="title-number">9.2</span>What happens in a PrestaShop transaction.					</h2>
 	</div>
-	<div class="chapter-body">
+	<div class="section-body">
 					<div class="paragraph">
+<p>In the Prestashop standard environment an order is created by default, after a transaction has been successfully completed. In order to pass the order ID from Prestashop through to wallee, the order with a wallee payment-method is created before the transaction has been completed successfully. This order ID will then appear on the buyer&#8217;s bank statement - Furthermore it will also appear in the merchant&#8217;s payout report.</p>
+</div><div class="paragraph">
+<p>As a consequence all order attempts will be noted in the order list of Prestashop.
+<strong>Traceability:</strong> By having the failed order in the PrestaShop database, allows the merchant to directly see when a buyer tried multiple times in the backend of PrestaShop.</p>
+</div><div class="paragraph">
+<p>In the Prestashop standard environment an order is only created if the payment has been completed successfully - therefore, an email is sent to the customer, once an order is created.
+For this to work correctly with our wallee module, the mailhook plugin has to be installed - it will prevent the sending of an email once an order is created.</p>
+</div><div class="paragraph">
+<p>Order Confirmation Email:
+The email notification to the customer will only be sent, when an order/transaction actually succeeded. See: link:https://github.com/wallee-payment/prestashop-mailhook
+== Support</p>
+</div><div class="paragraph">
 <p>If you need help, feel free to contact our <a href="https://app-wallee.com/space/select?target=/support">support</a>.</p>
 </div>					</div>
+</div>			</div>
 </div>																			</div>
 															</div>
 						</div>
@@ -521,12 +533,12 @@ <h1>
 		<span class="item-number">9.1</span>
 		<span class="item-title">How can I make the payment methods appear in the checkout?</span>
 			</a>
-    </li>    		    	</ul>
-    </li>					<li class="nav-level-1">
-	<a href="#_support">
-		<span class="item-number">10</span>
-		<span class="item-title">Support</span>
+    </li>    		    			<li class="nav-level-2">
+	<a href="#_what_happens_in_a_prestashop_transaction">
+		<span class="item-number">9.2</span>
+		<span class="item-title">What happens in a PrestaShop transaction.</span>
 			</a>
+    </li>    		    	</ul>
     </li>			</ul>
 </div>					</div>
 	</div>

inc/Helper.php

@@ -183,13 +183,14 @@ public static function cleanupLineItems(array &$lineItems, $expectedSum, $curren
         	if((int) Configuration::getGlobalValue(WalleeBasemodule::CK_LINE_ITEM_CONSISTENCY)){
 				throw new WalleeExceptionInvalidtransactionamount($effectiveSum, $roundedExpected);
 			}else{
+				$diffAmount = self::roundAmount($diff, $currencyCode);
 				$lineItem = (new \Wallee\Sdk\Model\LineItemCreate())
 					->setName(self::getModuleInstance()->l('Adjustment LineItem', 'helper'))
 					->setUniqueId('Adjustment-Line-Item')
 					->setSku('Adjustment-Line-Item')
 					->setQuantity(1);
 				/** @noinspection PhpParamsInspection */
-				$lineItem->setAmountIncludingTax($diff)->setType(($diff > 0) ? \Wallee\Sdk\Model\LineItemType::FEE : \Wallee\Sdk\Model\LineItemType::DISCOUNT);
+				$lineItem->setAmountIncludingTax($diffAmount)->setType(($diff > 0) ? \Wallee\Sdk\Model\LineItemType::FEE : \Wallee\Sdk\Model\LineItemType::DISCOUNT);
 
 				if (!$lineItem->valid()) {
 					throw new \Exception('Adjustment LineItem payload invalid:' . json_encode($lineItem->listInvalidProperties()));

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.19/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.1.20/docs/en/documentation.html" target="_blank">{l s='Documentation' mod='wallee'}</a></p>
 </div>

wallee.php

@@ -34,7 +34,7 @@ public function __construct()
         $this->author = 'Customweb GmbH';
         $this->bootstrap = true;
         $this->need_instance = 0;
-        $this->version = '1.1.19';
+        $this->version = '1.1.20';
         $this->displayName = 'wallee';
         $this->description = $this->l('This PrestaShop module enables to process payments with %s.');
         $this->description = sprintf($this->description, 'wallee');