[Done v2.0.0] freeoptions shows up even when not applicable, if icon has been enabled

[kands]

Hi
I set up the free shipping option (freeoptions) to offer free shipping on orders over 3 items and added an icon in the class constructor as follows
$this->icon = (( defined('DIR_WS_ICONS') ? DIR_WS_ICONS : 'images/icons/' ) . 'shipping_ukrm.jpg');//~~Added icon

Now the problem is when an order is placed which does not qualify for free shipping, on the checkout_shipping under the Shipping Methods shown, an empty fieldset is shown with only the icon in the legend .

To correct this I had to modify the the freeoptins.php as follows in the
function quote($method = '')
at line 193 which is
if (zen_not_null($this->icon)) $this->quotes['icon'] = zen_image($this->icon, $this->title);
To the following
if ($this->enabled) {
if (zen_not_null($this->icon)) $this->quotes['icon'] = zen_image($this->icon, $this->title);
}
Now the reason I am asking if this is a bug is I have heavily modified the installation and this may be due to something else I have done however I don't think so but thought I would mention it here and let the experts determine if it is a bug or not

[DrByte]

That solution should work fine.

I'd be more inclined to move the closing } from the existing if($this->enabled) a from a few lines up such that it also includes the lines you mention and those above it.

[kands]

Hi DrByte
I had thought of that but wasn't sure if including the lines
if ($this->tax_class > 0) {
$this->quotes['tax'] = zen_get_tax_rate($this->tax_class, $order->delivery['country']['id'], $order->delivery['zone_id']);
}
would have any side effects.
Many thanks for your reply
Steven

[DrByte]

Indeed, having the quote['tax'] section (ie: setting the default tax class for the module to other than default) would cause the same problem, so it should all be wrapped in the same condition.