Index: /changelog
===================================================================
--- /changelog	(revision 7479)
+++ /changelog	(revision 7480)
@@ -259,2 +259,3 @@
 - Feature: Integration der Sanitize-Funktion zur Sicherung aller EingabemÃ¶glichkeiten 
 - Feature: neues Produtktemplate mit Minigallerie der Produktbilder als Slider 
+- Feature: IntegrationsmÃ¶glichkeit der Einheit fÃŒr die Staffelpreise
Index: /mods/wpsg_mod_scaleprice.class.php
===================================================================
--- /mods/wpsg_mod_scaleprice.class.php	(revision 7479)
+++ /mods/wpsg_mod_scaleprice.class.php	(revision 7480)
@@ -44,5 +44,5 @@
 			$sql = "CREATE TABLE ".WPSG_TBL_PRODUCTS." (
 			  	wpsg_mod_scaleprice_activ int(1) DEFAULT 0 NOT NULL,
-				wpsg_mod_scaleprice_typ int(11) DEFAULT 0 NOT NULL,				
+				wpsg_mod_scaleprice_typ int(11) DEFAULT 0 NOT NULL,	
 				wpsg_mod_scaleprice_calc int(11) DEFAULT 0 NOT NULL
 			) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
@@ -57,4 +57,5 @@
 				product_id int(11) DEFAULT 0 NOT NULL,
 				scale double(10,2) DEFAULT 0 NOT NULL,
+                scaleeinheit varchar(50) NOT NULL,	
 				value double(10,2) DEFAULT 0 NOT NULL,
 				PRIMARY KEY  (id),
@@ -65,6 +66,21 @@
 			
 			$this->shop->checkDefault('wpsg_mod_scaleprice_showProductInfo', '1'); 
+			$this->shop->checkDefault('wpsg_mod_scaleprice_unit', 'StÃŒck');
 			
 		} // public function install()
+		
+		public function settings_edit()
+		{
+		    
+		    $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_scaleprice/settings_edit.phtml');
+		    
+		} // public function settings_edit()
+		
+		public function settings_save()
+		{
+		    
+		    $this->shop->update_option('wpsg_mod_scaleprice_unit', $_REQUEST['wpsg_mod_scaleprice_unit'], false, false, WPSG_SANITIZE_TEXTFIELD);
+		
+		} // public function settings_save()
 		
 		/*
Index: /views/mods/mod_scaleprice/product_bottom.phtml
===================================================================
--- /views/mods/mod_scaleprice/product_bottom.phtml	(revision 7479)
+++ /views/mods/mod_scaleprice/product_bottom.phtml	(revision 7480)
@@ -22,10 +22,10 @@
 				<?php echo __('Bis ', 'wpsg'); ?>
 				<?php if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?>
-					<?php echo $this->view['wpsg_mod_scaleprice']['scale'][0]['scale'].' '.__('StÃŒck', 'wpsg'); ?>
+					<?php echo wpsg_ff($this->view['wpsg_mod_scaleprice']['scale'][0]['scale'], $this->get_option('wpsg_mod_scaleprice_unit')); ?>
 				<?php } else if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?>
 					<?php echo wpsg_ff($this->view['wpsg_mod_scaleprice']['scale'][0]['scale'], $this->get_option('wpsg_mod_weight_unit')); ?>
 				<?php } ?>
 				<?php echo __(' kostet das Produkt ', 'wpsg'); ?>
-				<?php echo wpsg_ff($this->view['wpsg_mod_scaleprice']['base'], $this->get_option('wpsg_currency')); ?> <?php echo __('je StÃŒck', 'wpsg'); ?>
+				<?php echo wpsg_ff($this->view['wpsg_mod_scaleprice']['base'], $this->get_option('wpsg_currency')); ?> <?php // echo $this->get_option('wpsg_mod_scaleprice_unit'); ?>
 				<?php $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($this->view['wpsg_mod_scaleprice']['base'], $this->view['data']['fmenge'], $this->view['data']['feinheit'])); ?>			
 			</li>
@@ -36,10 +36,10 @@
 				<?php echo __('Ab ', 'wpsg'); ?>
 				<?php if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?>
-					<?php echo $scale['scale'].' '.__('StÃŒck', 'wpsg'); ?>
+					<?php echo wpsg_ff($scale['scale'], $this->get_option('wpsg_mod_scaleprice_unit')); ?>
 				<?php } else if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?>
 					<?php echo wpsg_ff($scale['scale'], $this->get_option('wpsg_mod_weight_unit')); ?>
 				<?php } ?>
 				<?php echo __(' kostet das Produkt ', 'wpsg'); ?>
-				<?php echo wpsg_ff($scale['value'], $this->get_option('wpsg_currency')); ?> <?php echo __('je StÃŒck', 'wpsg'); ?>
+				<?php echo wpsg_ff($scale['value'], $this->get_option('wpsg_currency')); ?> <?php //echo $this->get_option('wpsg_mod_scaleprice_unit'); ?>
 				<?php $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($scale['value'], $this->view['data']['fmenge'] , $this->view['data']['feinheit'])); ?>
 			</li>
Index: /views/mods/mod_scaleprice/scaleList.phtml
===================================================================
--- /views/mods/mod_scaleprice/scaleList.phtml	(revision 7479)
+++ /views/mods/mod_scaleprice/scaleList.phtml	(revision 7480)
@@ -15,15 +15,15 @@
 			<div class="wpsg_form_left">
 				<div class="wpsg_mod_scaleprice_label_scale" style="width:30px; float:left; font-size:12px;"><?php echo __('ab', 'wpsg'); ?></div>
-				<div class="wpsg_editable" style="width:90px; float:left; text-align:right; padding-top:4px" id="wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_scale"><?php echo wpsg_ff($scale['scale']); ?></div>
+				<div class="wpsg_editable" style="width:75px; float:left; text-align:right; padding-top:4px" id="wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_scale"><?php echo wpsg_ff($scale['scale']); ?></div>
 				<div class="wpsg_mod_scaleprice_label_value" style="float:left; margin:0 0 0 10px; font-size:12px;">
 					<?php if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?>
 					<?php echo $this->get_option('wpsg_mod_weight_unit'); ?>
 					<?php } else if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?>
-					<?php echo __('StÃŒck', 'wpsg'); ?>
+					<?php echo $this->get_option('wpsg_mod_scaleprice_unit'); ?>
 					<?php } ?>
 				</div>		
 			</div>
 			<div class="wpsg_form_right">
-				<div style="width:90px; float:left; padding-top:4px; text-align:right;" class="wpsg_editable" id="wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_value"><?php echo wpsg_ff($scale['value']); ?></div>
+				<div style="width:75px; float:left; padding-top:4px; text-align:right;" class="wpsg_editable" id="wpsg_mod_scaleprice_<?php echo $scale['id']; ?>_value"><?php echo wpsg_ff($scale['value']); ?></div>
 				<p style="float:left; margin:0 0 0 10px; font-size:12px;" class="waehrung"><?php echo $this->get_option('wpsg_currency'); ?></p>
 				<a style="float:right; margin-top:4px;" class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="" onclick="return wpsg_mod_scaleprice_remove(<?php echo $scale['id']; ?>);" title=""></a>
@@ -79,15 +79,15 @@
 		<div class="wpsg_form_left">									
 			<div class="wpsg_mod_scaleprice_label_scale" style="width:30px; float:left; font-size:12px;"><?php echo __('ab', 'wpsg'); ?></div>
-			<input type="text" class="wpsg_mod_scaleprice_scale" style="width:90px; float:left;" name="wpsg_mod_scaleprice_scale" value="" id="wpsg_mod_scaleprice_scale" />
+			<input type="text" class="wpsg_mod_scaleprice_scale" style="width:75px; float:left;" name="wpsg_mod_scaleprice_scale" value="" id="wpsg_mod_scaleprice_scale" />
 			<div class="wpsg_mod_scaleprice_label_value" style="float:left; margin:0 0 0 10px; font-size:12px;">
 				<?php if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_WEIGHT) { ?>
 				<?php echo $this->get_option('wpsg_mod_weight_unit'); ?>
 				<?php } else if ($this->view['wpsg_mod_scaleprice']['typ'] == wpsg_mod_scaleprice::TYP_QUANTITY) { ?>
-				<?php echo __('StÃŒck', 'wpsg'); ?>
+				<?php echo $this->get_option('wpsg_mod_scaleprice_unit'); ?>
 				<?php } ?>
 			</div>						
 		</div>
 		<div class="wpsg_form_right">						
-			<input type="text" class="wpsg_mod_scaleprice_value" style="width:90px; float:left;" name="wpsg_mod_scaleprice_value" value="" id="wpsg_mod_scaleprice_value">
+			<input type="text" class="wpsg_mod_scaleprice_value" style="width:75px; float:left;" name="wpsg_mod_scaleprice_value" value="" id="wpsg_mod_scaleprice_value">
 			<p class="waehrung" style="float:left; margin:0 0 0 10px; font-size:12px;"><?php echo $this->get_option('wpsg_currency'); ?></p>
 			<a style="float:right; margin-top:4px;" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" href="" onclick="return wpsg_mod_scaleprice_add();" title=""></a>								 
Index: /views/mods/mod_scaleprice/settings_edit.phtml
===================================================================
--- /views/mods/mod_scaleprice/settings_edit.phtml	(revision 7480)
+++ /views/mods/mod_scaleprice/settings_edit.phtml	(revision 7480)
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * Template fÃŒr die Einstellungen des Staffelpreismoduls
+ * Sollte nicht verÃ€ndert werden
+ */
+
+?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_scaleprice_unit', __('Staffeleinheit', 'wpsg'), $this->get_option('wpsg_mod_scaleprice_unit'), array('help' => 'wpsg_mod_scaleprice_unit')); ?>
