From 094e38206ccdfb703655c923ffe18fc7e430776f Mon Sep 17 00:00:00 2001
From: David Gasperoni <mcdado@gmail.com>
Date: Thu, 6 Dec 2012 14:46:40 +0100
Subject: [PATCH 1/4] order carrier more compatible with opc

The carriers' block didnt't have the 'opc-main-block' in the order-opc page.
---
 themes/default/order-carrier.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index ee951a798..4bb422ed2 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -22,7 +22,11 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<div id="carrier_area">
+{if}
+	<div id="carrier_area">
+{else}
+	<div id="carrier_area" class="opc-main-block">
+{/if}
 {if !$opc}
 	<script type="text/javascript">
 	//<![CDATA[

From 497968fd7a64bd1e54703b500c2b1b8df16e8bd8 Mon Sep 17 00:00:00 2001
From: David Gasperoni <mcdado@gmail.com>
Date: Thu, 6 Dec 2012 14:52:14 +0100
Subject: [PATCH 2/4] order-carrier more compatible with order-opc

carriers' block didn't have the opc-main-block when in opc-order
---
 themes/default/order-carrier.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index 4bb422ed2..f00059aea 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if}
+{if $opc}
 	<div id="carrier_area">
 {else}
 	<div id="carrier_area" class="opc-main-block">

From 3b9b19ec48f87b7cbe4ecc9aadcea84bc22ee7fb Mon Sep 17 00:00:00 2001
From: David Gasperoni <mcdado@gmail.com>
Date: Thu, 6 Dec 2012 14:56:06 +0100
Subject: [PATCH 3/4] order-carrier more compatible with order-opc

carriers' block didn't have the opc-main-block when in opc-order
---
 themes/default/order-carrier.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index f00059aea..280a010b1 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if $opc}
+{if !$opc}
 	<div id="carrier_area">
 {else}
 	<div id="carrier_area" class="opc-main-block">

From 310dbaaf2492042953c5e65ffb7fa1c6afd0b0a8 Mon Sep 17 00:00:00 2001
From: David Gasperoni <mcdado@gmail.com>
Date: Thu, 6 Dec 2012 15:06:08 +0100
Subject: [PATCH 4/4] move header tag out of carrier block

---
 themes/default/order-carrier.tpl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index 280a010b1..fa75f58f0 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -22,11 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if !$opc}
-	<div id="carrier_area">
-{else}
-	<div id="carrier_area" class="opc-main-block">
-{/if}
 {if !$opc}
 	<script type="text/javascript">
 	//<![CDATA[
@@ -83,7 +78,11 @@
 {else}
 	<h2><span>2</span> {l s='Delivery methods'}</h2>
 {/if}
-
+{if !$opc}
+	<div id="carrier_area">
+{else}
+	<div id="carrier_area" class="opc-main-block">
+{/if}
 {if !$opc}
 	{assign var='current_step' value='shipping'}
 	{include file="$tpl_dir./order-steps.tpl"}