Skip to content

Commit

Permalink
v1.1.2 Return action fixed in PS 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
PayXpert Integration committed Aug 21, 2018
1 parent eb7fb07 commit 59ac9eb
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1
1.1.2
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The author of this plugin can NEVER be held responsible for this software.
There is no warranty what so ever. You accept this by using this software.

## Changelog
* 1.1.2 - Return action fixed in PS 1.6
* 1.1.1 - Setting module name in payment options selection
* 1.1.0 - Added iframe option
* 1.0.7 - Supports Prestashop 1.7
Expand Down
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<module>
<name>payxpert</name>
<displayName><![CDATA[PayXpert Payment Solutions]]></displayName>
<version><![CDATA[1.1.1]]></version>
<version><![CDATA[1.1.2]]></version>
<description><![CDATA[Accept payments today with PayXpert]]></description>
<author><![CDATA[PayXpert]]></author>
<tab><![CDATA[payments_gateways]]></tab>
Expand Down
6 changes: 5 additions & 1 deletion controllers/front/return.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public function initContent()
) /* */
);

$this->setTemplate('module:' . $this->module->name . '/views/templates/hook/return.tpl');
if (version_compare(_PS_VERSION_, '1.7', '>=')) {
$this->setTemplate('module:' . $this->module->name . '/views/templates/front/payment_return.tpl');
} else {
$this->setTemplate('payment_return.tpl');
}
}
}
2 changes: 1 addition & 1 deletion payxpert.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class PayXpert extends PaymentModule
public function __construct()
{
$this->name = 'payxpert';
$this->version = '1.1.1';
$this->version = '1.1.2';
$this->module_key = '36f0012c50e666c56801493e0ad709eb';

$this->tab = 'payments_gateways';
Expand Down
File renamed without changes.

0 comments on commit 59ac9eb

Please sign in to comment.