From 820ba2b396b1ea886432b1f7c59c3aacb9e5f40b Mon Sep 17 00:00:00 2001 From: Victor Ndambakuwa Date: Thu, 29 Oct 2020 08:28:15 +0100 Subject: [PATCH] Release 1.1.20 --- README.md | 4 +-- docs/en/documentation.html | 38 +++++++++++++------- inc/Helper.php | 3 +- views/templates/admin/admin_help_buttons.tpl | 2 +- wallee.php | 2 +- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 12ef621..baecc4d 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ 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 @@ -21,7 +21,7 @@ Support queries can be issued on the [wallee support site](https://app-wallee.co ## 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 diff --git a/docs/en/documentation.html b/docs/en/documentation.html index 53e7529..646587e 100644 --- a/docs/en/documentation.html +++ b/docs/en/documentation.html @@ -22,7 +22,7 @@

Documentation

  • - + Source
    • @@ -51,7 +51,7 @@

    1. -

      Download the module.

      +

      Download the module.

    2. Login to the backend of your PrestsShop store.

      @@ -402,16 +402,28 @@

      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’s total calculation matches the actual order total.

    - -
    -
    -

    - 10Support

    +
    +
    +

    + 9.2What happens in a PrestaShop transaction.

    -
    +
    +

    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’s bank statement - Furthermore it will also appear in the merchant’s payout report.

    +
    +

    As a consequence all order attempts will be noted in the order list of Prestashop. +Traceability: 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.

    +
    +

    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.

    +
    +

    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

    +

    If you need help, feel free to contact our support.

    +
    @@ -521,12 +533,12 @@

    9.1 How can I make the payment methods appear in the checkout? - -
  • - - 10 - Support +
  • + + 9.2 + What happens in a PrestaShop transaction. +
    • diff --git a/inc/Helper.php b/inc/Helper.php index 1f0dc9b..4663c53 100644 --- a/inc/Helper.php +++ b/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())); diff --git a/views/templates/admin/admin_help_buttons.tpl b/views/templates/admin/admin_help_buttons.tpl index 27c13ca..3ce825d 100644 --- a/views/templates/admin/admin_help_buttons.tpl +++ b/views/templates/admin/admin_help_buttons.tpl @@ -10,5 +10,5 @@

    {l s='This module requires an %s account.' sprintf='wallee' mod='wallee'}

    -

    {l s='Sign Up' mod='wallee'} {l s='Documentation' mod='wallee'}

    +

    {l s='Sign Up' mod='wallee'} {l s='Documentation' mod='wallee'}

    \ No newline at end of file diff --git a/wallee.php b/wallee.php index 0d50322..8782fdf 100644 --- a/wallee.php +++ b/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');