From 3bb768320b5f47cef8a1dc694259f82e60fc2e30 Mon Sep 17 00:00:00 2001
From: mommaroodles <melanie@webwolf.co.za>
Date: Fri, 26 Sep 2014 19:31:32 +0200
Subject: [PATCH 1/3] fixes php notice undefined variable: pass

---
 catalog/includes/modules/order_total/ot_shipping.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catalog/includes/modules/order_total/ot_shipping.php b/catalog/includes/modules/order_total/ot_shipping.php
index 5ba120032..95648452c 100644
--- a/catalog/includes/modules/order_total/ot_shipping.php
+++ b/catalog/includes/modules/order_total/ot_shipping.php
@@ -27,6 +27,7 @@ function process() {
       global $order, $currencies;
 
       if (MODULE_ORDER_TOTAL_SHIPPING_FREE_SHIPPING == 'true') {
+      	$pass = false;
         switch (MODULE_ORDER_TOTAL_SHIPPING_DESTINATION) {
           case 'national':
             if ($order->delivery['country_id'] == STORE_COUNTRY) $pass = true; break;

From 05e3799150efceb202e77753ed0a9b7680dd233f Mon Sep 17 00:00:00 2001
From: mommaroodles <melanie@webwolf.co.za>
Date: Fri, 26 Sep 2014 20:10:52 +0200
Subject: [PATCH 2/3] repositioned table tags and for loop closing curly braces

---
 catalog/checkout_shipping.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/catalog/checkout_shipping.php b/catalog/checkout_shipping.php
index f0ebcc3ca..2194f8055 100644
--- a/catalog/checkout_shipping.php
+++ b/catalog/checkout_shipping.php
@@ -238,13 +238,9 @@
 ?>
 
   <div class="contentText">
-    <table class="table table-striped table-condensed table-hover">
-      <tbody>
-
 <?php
     if ($free_shipping == true) {
 ?>
-
       <div class="contentText">
         <div class="panel panel-success">
           <div class="panel-heading"><strong><?php echo FREE_SHIPPING_TITLE; ?></strong>&nbsp;<?php echo $quotes[$i]['icon']; ?></div>
@@ -255,7 +251,11 @@
       </div>
 
 <?php
-    } else {
+  } else {
+ ?>
+    <table class="table table-striped table-condensed table-hover">
+      <tbody>
+ <?php
       for ($i=0, $n=sizeof($quotes); $i<$n; $i++) {
         for ($j=0, $n2=sizeof($quotes[$i]['methods']); $j<$n2; $j++) {
 // set the radio button to be checked if it is the method chosen
@@ -304,16 +304,19 @@
             }
 ?>
 
-      </tr>
+        </tr>
+<?php
+     }
+?>
 
+      </tbody>
+    </table>
 <?php
-        }
       }
     }
 ?>
 
-      </tbody>
-    </table>
+
   </div>
 
 <?php

From 6163f50231e2fe914dfafb7a5cf460d916a61148 Mon Sep 17 00:00:00 2001
From: mommaroodles <melanie@webwolf.co.za>
Date: Fri, 26 Sep 2014 20:22:18 +0200
Subject: [PATCH 3/3] reposition for loop closing curly brace

---
 catalog/checkout_shipping.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalog/checkout_shipping.php b/catalog/checkout_shipping.php
index 2194f8055..e28ee9422 100644
--- a/catalog/checkout_shipping.php
+++ b/catalog/checkout_shipping.php
@@ -307,12 +307,13 @@
         </tr>
 <?php
      }
+   }
 ?>
 
       </tbody>
     </table>
 <?php
-      }
+
     }
 ?>