# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/richardwebfrisch/NetBeansProjects/regame-X2/httpdocs/core
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: oxdelivery.php
--- oxdelivery.php Base (BASE)
+++ oxdelivery.php Locally Modified (Based On LOCAL)
@@ -224,9 +224,13 @@
 
         // mark free shipping products
         if ( $oProduct->oxarticles__oxfreeshipping->value ) {
-            $this->_blFreeShipping = true;
+            //#M3486: No shipping costs if last item in basket is marked "free shipping"
+            //$this->_blFreeShipping = true;
         } else {
+            //#M3486: No shipping costs if last item in basket is marked "free shipping"
+            $this->_blFreeShipping = false;
 
+            
             $blExclNonMaterial = $this->getConfig()->getConfigParam( 'blExclNonMaterialFromDelivery' );
             if ( !( $oProduct->oxarticles__oxnonmaterial->value && $blExclNonMaterial ) ) {
                 $this->_blFreeShipping = false;