Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 8237)
+++ /model/wpsg_product.class.php	(revision 8239)
@@ -175,4 +175,22 @@
 
 			return $this->__get('anr');
+
+		}
+
+		/**
+		 * Gibt die EAN zurÃŒck
+		 */
+		public function getEAN() {
+
+			return $this->__get('ean');
+
+		}
+
+		/**
+		 * Gibt die GTIN zurÃŒck
+		 */
+		public function getGTIN() {
+
+			return $this->__get('gtin');
 
 		}
Index: /mods/wpsg_mod_export.class.php
===================================================================
--- /mods/wpsg_mod_export.class.php	(revision 8237)
+++ /mods/wpsg_mod_export.class.php	(revision 8239)
@@ -1648,5 +1648,6 @@
                         'product_url' => __('Produkt-URL', 'wpsg'),
                         'product_picture_url' => __('Produktbild-URL', 'wpsg'),
-                        //'product_shippingprice' => __('Versandkosten', 'wpsg'),		
+                        'product_google_productfeed_shippingprice' => __('Googel Produktfeed Versandkosten', 'wpsg'),
+                        // 'product_shippingprice' => __('Versandkosten', 'wpsg'),		
                         'produkt_typ' => __('Produkttyp', 'wpsg'),
                         'produkt_preis' => __('Produktpreis', 'wpsg'),
@@ -1664,4 +1665,5 @@
                         'produkt_feinheit' => __('FÃŒllmengeneinheit', 'wpsg'),
                         'produkt_fmenge' => __('FÃŒllmenge', 'wpsg'),
+                        'produkt_reference_fmenge' => __('Referenzwert der FÃŒllmenge', 'wpsg'),
                         'produkt_beschreibung' => __('Beschreibung', 'wpsg'),
                         'produkt_longdescription' => __('Langtext', 'wpsg'),
@@ -2232,4 +2234,11 @@
                     break;
                
+                case 'product_google_productfeed_shippingprice':
+
+                    // $value = 'Bsp.: <LÀnderkÌrzel>:::<Versandkosten> EUR, <LÀnderkÌrzel>:::<Versandkosten> EUR, ...'
+                    // if (wpsg_isSizedString($value)) $return = $value;
+
+                    break;
+
                 case 'produkt_typ': $return = $oProduct->__get('typ'); break;
                 case 'produkt_preis': // Brutto Preis im Produkt
@@ -2282,5 +2291,24 @@
 
                 case 'produkt_feinheit': $return = $oProduct->__get('feinheit'); break;
-                case 'produkt_fmenge': $return = $oProduct->__get('fmenge'); break;
+                case 'produkt_fmenge': 
+
+                    $value = str_replace(' ', '', $oProduct->__get('fmenge')); 
+                    $feinheit = str_replace(' ', '', $oProduct->__get('feinheit'));
+
+                    if ($value > 0) $return = $value.' '.$feinheit;
+                    else $return = '';
+                   
+                    break;
+
+                case 'produkt_reference_fmenge': 
+                    
+                    $value = str_replace(' ', '', $oProduct->getMeta('wpsg_mod_fuellmenge_referencevalue')); 
+                    $feinheit = str_replace(' ', '', $oProduct->getMeta('wpsg_mod_fuellmenge_referenceunit'));
+
+                    if ($value > 0) $return = $value.' '.$feinheit;
+                    else $return = '';
+                   
+                    break;
+
                 case 'produkt_beschreibung': $return = $oProduct->__get('beschreibung'); break;
                 case 'produkt_longdescription': $return = $oProduct->__get('longdescription'); break;
@@ -2298,6 +2326,6 @@
                 case 'produkt_anr': $return = $oProduct->__get('anr'); break;
                 case 'produkt_menge': $return = $oOrderProduct->__get('menge'); break;
-                case 'produkt_ean': $return = $oProduct->__get('ean'); break;
-                case 'produkt_gtin': $return = $oProduct->__get('gtin'); break;
+                case 'produkt_ean': $return = $oProduct->getEAN(); break;
+                case 'produkt_gtin': $return = $oProduct->getGTIN(); break;
 
                 case 'kunde_id': $return = $oCustomer->getId(); break;
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 8237)
+++ /views/produkttemplates/standard.phtml	(revision 8239)
@@ -118,6 +118,8 @@
 
 				<div class="wpsg_produkt_preishinweis">
+
+					<?php $fs = explode(',', $this->view['data']['allowedshipping']); ?>
 					<?php if ($this->getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?>
-						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */?>
+						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (array_search('500', $fs) || array_search('', $fs))) { /* Versandkostenfrei aktiv */?>
 							
 							<?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>
@@ -135,5 +137,5 @@
 						<?php }?>
 					<?php } else { /* Frontend = BRUTTO Preise */ ?>
-						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1') { /* Versandkostenfrei aktiv */ ?>
+						<?php if ($this->hasMod('wpsg_mod_freeshipping') && $this->get_option('wpsg_mod_freeshipping_aktiv') == '1' && (array_search('500', $fs) || array_search('', $fs))) { /* Versandkostenfrei aktiv */ ?>
 							
 							<?php if ($this->get_option('wpsg_mod_freeshipping_minvalue') > 0) { ?>