From be36a8b624645bae0cec45c4eb21d20512c65e2f Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Thu, 11 Jul 2019 06:43:43 +0000
Subject: - Einheit im Modul hinterlegbar

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7480 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_scaleprice/product_bottom.phtml |  8 ++++----
 views/mods/mod_scaleprice/scaleList.phtml      | 12 ++++++------
 views/mods/mod_scaleprice/settings_edit.phtml  |  9 +++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 views/mods/mod_scaleprice/settings_edit.phtml

diff --git a/views/mods/mod_scaleprice/product_bottom.phtml b/views/mods/mod_scaleprice/product_bottom.phtml
index a1cb620..e8e86db 100644
--- a/views/mods/mod_scaleprice/product_bottom.phtml
+++ b/views/mods/mod_scaleprice/product_bottom.phtml
@@ -21,12 +21,12 @@
 			<li>
 				<?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>
 			<?php } ?>
@@ -35,12 +35,12 @@
 			<li>		
 				<?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>
 			<?php } ?>
diff --git a/views/mods/mod_scaleprice/scaleList.phtml b/views/mods/mod_scaleprice/scaleList.phtml
index 809c274..1d70e41 100644
--- a/views/mods/mod_scaleprice/scaleList.phtml
+++ b/views/mods/mod_scaleprice/scaleList.phtml
@@ -14,17 +14,17 @@
 		<div class="wpsg_form_field wpsg_mod_scaleprice_row" id="wpsg_mod_scaleprice_row_<?php echo $scale['id']; ?>">
 			<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>
 			</div>
@@ -78,17 +78,17 @@
 	<div class="wpsg_form_field">
 		<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>								 
 		</div>
diff --git a/views/mods/mod_scaleprice/settings_edit.phtml b/views/mods/mod_scaleprice/settings_edit.phtml
new file mode 100644
index 0000000..ed4f3fd
--- /dev/null
+++ b/views/mods/mod_scaleprice/settings_edit.phtml
@@ -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')); ?>
\ No newline at end of file
-- 
cgit v1.2.3