Skip to content

Multiple fixes and enhancements #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaWoScha wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Multiple fixes and enhancements #41

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9fcb845
Fix localization issues - Version 1.0.11
MaWoScha Dec 6, 2017
b3f9acf
Add locale 'en_GB' and 'pt_PT' - Version 1.0.11
MaWoScha Dec 6, 2017
13a7bcd
SR-714 allow capture offline' - Version 1.0.12
MaWoScha Dec 6, 2017
9960001
Fixed 'Display Zero Fee' in customer account order view (#21) - Versi…
MaWoScha Dec 6, 2017
95ed1cb
Add 'cod_fee', 'base_cod_fee' attributes to webservices (#33) - Versi…
MaWoScha Dec 6, 2017
6e35aa3
Update to better fit ECG/PSR-2 - Version 1.0.12
MaWoScha Dec 6, 2017
9c07413
Hide config options if module is disabled - Version 1.0.12
MaWoScha Dec 6, 2017
8be3d1b
Add 'Create Invoice Option' - Version 1.0.12
MaWoScha Dec 6, 2017
4848ec8
Improve locale 'it_IT' - Version 1.0.12
MaWoScha Dec 6, 2017
30e003f
README.md - Version 1.0.12
MaWoScha Dec 6, 2017
b6c4054
Add locale 'fr_FR' - Version 1.0.13
MaWoScha Dec 7, 2017
53370b3
Fix issue #42: 'foreigncosts' to 'foreigncountrycosts' - Version 1.0.14
Dec 12, 2017
218887a
Update Phoenix_CashOnDelivery.xml
Jan 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Changelog

1.0.12
- "SR-714 allow capture offline" (Thanks to Pascal Querner)
- Fixed "Display Zero Fee" in customer account order view" (Thanks to [idziakjakub](https://github.com/idziakjakub) (#21))

1.0.11
- Add locale "en_GB" and "pt_PT"
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/CashOnDelivery/Block/Totals/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function initTotals()
{
$this->_prepareTotals();

if ($this->_totalObject && $this->_totalObject->getCodFee()) {
if ($this->_totalObject && $this->_totalObject->getCodFee() && Mage::getStoreConfigFlag('payment/phoenix_cashondelivery/display_zero_fee')) {
Copy link
Collaborator

@PHOENIX-MEDIA PHOENIX-MEDIA Jan 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will not work... If codFee check returns false the last && will not be validated. If the codFee Check returns true and display_zero_fee is set to false the total block is not added even if a fee is set.

$label = $this->__('Cash on Delivery fee');
$value = $this->_totalObject->getCodFee();
$baseValue = $this->_totalObject->getBaseCodFee();
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Phoenix/CashOnDelivery/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<config>
<modules>
<Phoenix_CashOnDelivery>
<version>1.0.11</version>
<version>1.0.12</version>
</Phoenix_CashOnDelivery>
</modules>

Expand Down
2 changes: 1 addition & 1 deletion var/connect/Phoenix_CashOnDelivery.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<description>Cash on Delivery allows to book additional fee on delivery depending on national or international delivery.</description>
<license>OSL</license>
<license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
<version>1.0.11</version>
<version>1.0.12</version>
<stability>stable</stability>
<notes>Offizielle Version</notes>
<authors>
Expand Down