From 62b8da72308f86a7f3bb90a32d27ffb860c24ae0 Mon Sep 17 00:00:00 2001
From: nickname <support@ecomstyle.de>
Date: Fri, 28 Jun 2013 09:51:58 +0200
Subject: [PATCH 1/2] diffToFree.tpl expanded

---
 .../difftofreeshipping/views/blocks/diffToFree.tpl     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl b/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
index 24ee2c2..79e3855 100644
--- a/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
+++ b/modules/marm/difftofreeshipping/views/blocks/diffToFree.tpl
@@ -1,6 +1,12 @@
 [{$smarty.block.parent}]
+[{if $oxcmp_basket->getPriceUntilFreeShipping() > 0 }]
 <p class="totals">
    Nur noch <strong>[{$oxcmp_basket->getPriceUntilFreeShipping()}]
    [{ $currency->sign}]</strong>
-   und wir schicken Ihnen Ihre Bestellung kostenlos.
-</p>
\ No newline at end of file
+   und wir liefern Ihnen Ihre Bestellung kostenlos.
+</p>
+[{else}]
+<p class="totals">
+    Versandkostenfreie Lieferung!
+</p>
+[{/if}]
\ No newline at end of file

From 1d064219b6e847086cc38de59614556892955626 Mon Sep 17 00:00:00 2001
From: nickname <support@ecomstyle.de>
Date: Fri, 28 Jun 2013 10:26:31 +0200
Subject: [PATCH 2/2] B2B-Mode (net prices are shown) added

---
 modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php b/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
index 8388cb5..ad8a2c3 100644
--- a/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
+++ b/modules/marm/difftofreeshipping/models/marm_diff_oxbasket.php
@@ -30,7 +30,11 @@ class marm_diff_oxbasket extends marm_diff_oxbasket_parent
     public function getPriceUntilFreeShipping()
     {
         if ( $this->_oProductsPriceList ) {
+            if ( !$this->isCalculationModeNetto() ){
             $productsPrice = $this->_oProductsPriceList->getBruttoSum();
+            } else {
+            $productsPrice = $this->_oProductsPriceList->getNettoSum();
+            }
             $oDB = oxDb::getDb();
             $sQ = 'select OXPARAM from oxdelivery where OXADDSUM = 0';
             $freeShippingPrice = oxDb::getDb()->GetOne($sQ);