Merge pull request #442 from myparcelnl/fix-delivery-to-eu-country-er…

…ror-no-shipping-method-selected Fix delivery to eu country error no shipping method selected
myparcelnl · Nov 22, 2018 · 59f2fd9 · 59f2fd9
2 parents f60a154 + ee808fc
commit 59f2fd9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <TIG_MyParcel2014>
-            <version>1.17.0</version>
+            <version>1.17.1</version>
         </TIG_MyParcel2014>
     </modules>
     <global>

diff --git a/...d/base/default/template/TIG/MyParcel2014/checkout/onepage/shipping_method/available.phtml b/...d/base/default/template/TIG/MyParcel2014/checkout/onepage/shipping_method/available.phtml
@@ -102,32 +102,29 @@ $toggleOptions = $helper->getConfig('toggle_options', 'checkout') == '1' ? true
                                         </li>
                                     </ul>
                                 <?php else: ?>
-                                <?php if ($_sole) : ?>
-                                    <span class="no-display"><input name="shipping_method" type="radio"
-                                                                    value="<?php echo $_rate->getCode() ?>"
-                                                                    id="s_method_<?php echo $_rate->getCode() ?>"
-                                                                    checked="checked"/></span>
-                                <?php else: ?>
-                                <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>"
-                                       id="s_method_<?php echo $_rate->getCode() ?>"<?php if ($_rate->getCode() === $this->getAddressShippingMethod()) echo ' checked="checked"' ?>
-                                       class="radio <?php
-                                       if ($code == 'myparcel') {
-                                           if ($_rate->getMethod() != 'flatrate' && $_rate->getMethod() != 'tablerate') {
-                                               echo 'myparcel_method myparcel_extra_method';
-                                           } else {
-                                               echo 'myparcel_method myparcel_base_method';
+                                    <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>"
+                                           id="s_method_<?php echo $_rate->getCode() ?>"
+                                        <?php if ($_rate->getCode() === $this->getAddressShippingMethod() || $_sole) echo ' checked="checked"' ?>
+                                           class="radio <?php
+                                           if ($code == 'myparcel') {
+                                               if ($_rate->getMethod() != 'flatrate' && $_rate->getMethod() != 'tablerate') {
+                                                   echo 'myparcel_method myparcel_extra_method';
+                                               } else {
+                                                   echo 'myparcel_method myparcel_base_method';
+                                               }
+                                           }
+                                           if ($_sole) {
+                                               echo ' no-display';
                                            }
-                                       }
-                                       ?>"/>
+                                           ?>"/>
 
-                                <?php if ($_rate->getCode() === $this->getAddressShippingMethod()): ?>
-                                    <script type="text/javascript">
-                                        //<![CDATA[
-                                        lastPrice = <?php echo (float)$_rate->getPrice(); ?>;
-                                        //]]>
-                                    </script>
-                                <?php endif; ?>
-                                <?php endif; ?>
+                                    <?php if ($_rate->getCode() === $this->getAddressShippingMethod()): ?>
+                                        <script type="text/javascript">
+                                            //<![CDATA[
+                                            lastPrice = <?php echo (float)$_rate->getPrice(); ?>;
+                                            //]]>
+                                        </script>
+                                    <?php endif; ?>
                                     <label for="s_method_<?php echo $_rate->getCode() ?>">
                                         <?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
                                         <?php if ($code != 'myparcel'):?>