Multiple fixes and enhancements #41
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated author information
PHOENIX-MEDIA
suggested changes
Jan 8, 2018
| @@ -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')) { | |||
There was a problem hiding this comment.
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.
| // If order is instance of Phoenix_CashOnDelivery_Model_CashOnDelivery | ||
| if ($order->getPayment()->getMethodInstance()->getCode() == 'phoenix_cashondelivery' && | ||
| // Can be invoiced | ||
| $order->canvoice() && |
There was a problem hiding this comment.
Typo: canvoice() should be canInvoice()
| @@ -48,15 +48,15 @@ | |||
| <show_in_website>1</show_in_website> | |||
| <show_in_store>1</show_in_store> | |||
| <fields> | |||
| <active translate="label"> | |||
| <enable translate="label"> | |||
There was a problem hiding this comment.
Mage_Payment_Model_Method_Abstract::isAvailable() checks for "active" config path, not "enable".
| <frontend_type>multiselect</frontend_type> | ||
| <sort_order>70</sort_order> | ||
| <source_model>adminhtml/system_config_source_country</source_model> | ||
| <show_in_default>1</show_in_default> | ||
| <show_in_website>1</show_in_website> | ||
| <show_in_store>1</show_in_store> | ||
| <depends> | ||
| <enable>1</enable> |
There was a problem hiding this comment.
Hiding config data for the payment method when disabled is not something we want to add. Displaying the configuration is often desired even if the method is (temporarily) disabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix localization issues
Add locale 'en_GB' and 'pt_PT'
SR-714 allow capture offline'
Fixed 'Display Zero Fee' in customer account order view (#21)
Add 'cod_fee', 'base_cod_fee' attributes to webservices (#33)
Update to better fit ECG/PSR-2
Removed not used observer method, Renamed observer methods
Hide config options if module is disabled
Add 'Create Invoice Option'
Improve locale 'it_IT'