From 677c5fa9e3d0f2ec150904995f6c032cbac52f26 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 15 Jan 2020 08:09:10 +0000
Subject: - Feature: Füllmengen überarbeitet (Bezugseinheit und Umrechnung im
 Produkt unterschiedlich und definierbar)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7649 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/form/input.phtml                       |   2 +-
 views/css/admin.css                                |   6 +
 views/mods/mod_fuellmenge/basket_row.phtml         |   2 +-
 views/mods/mod_fuellmenge/overview_row.phtml       |   2 +-
 views/mods/mod_fuellmenge/priceinfo.phtml          |  12 +-
 .../mods/mod_fuellmenge/produkt_edit_sidebar.phtml | 133 ++++++++++++++++++++-
 views/mods/mod_scaleprice/product_bottom.phtml     |   4 +-
 views/produkttemplates/standard.phtml              |  29 +----
 views/produkttemplates/standard2.phtml             |  26 +---
 views/warenkorb/checkout2.phtml                    |   2 +-
 10 files changed, 152 insertions(+), 66 deletions(-)

diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index d8b835c..b6f3dee 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -7,7 +7,7 @@
 		<div class="wpsg_field_wrap">
 			<input 
 				type="<?php echo wpsg_getStr($this->view['field_config']['type'], 'text'); ?>"
-				class="form-control input-sm" 
+				class="form-control input-sm <?php echo wpsg_getStr($this->view['field_config']['input_class']); ?>" 
 				<?php if (!wpsg_isTrue($this->view['field_config']['autocomplete'])) { ?> autocomplete="off" <?php } ?>
 				name="<?php echo $this->view['field_name']; ?>"  
 				tabindex="<?php
diff --git a/views/css/admin.css b/views/css/admin.css
index 0332454..84d3bc8 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -65,6 +65,12 @@
 #wpsg-bs .wpsg-bs-toggle-nav { float:right; line-height:50px; font-size:25px; text-decoration:none; }
 #wpsg-bs .wpsg-wp-header-end { margin-top:-10px !important; }
 #wpsg-bs .wpsg_msg_wrap { margin-right:20px; }
+#wpsg-bs .d-flex { display:flex; }
+#wpsg-bs .w-100 { width:100%; }
+#wpsg-bs .justify-content_center { justify-content:center; }
+#wpsg-bs .align-items_center { align-items:center; }
+#wpsg-bs .justify-content_space-between {justify-content:space-between; }
+#wpsg-bs .grow-1 { flex-grow:1; }
 
 .wp-admin #wpsg-bs select { max-width:100%; padding-right:0; line-height:initial; }
 .wp-admin #wpsg-bs .checkbox input { margin-top:3px; width:15px; height:15px; }
diff --git a/views/mods/mod_fuellmenge/basket_row.phtml b/views/mods/mod_fuellmenge/basket_row.phtml
index c200567..db27717 100644
--- a/views/mods/mod_fuellmenge/basket_row.phtml
+++ b/views/mods/mod_fuellmenge/basket_row.phtml
@@ -12,7 +12,7 @@
         <span class="fa  fa-balance-scale"></span>
             
         <?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?>
-        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['feinheit'], 1]); ?>            
+        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['id'], 1]); ?>            
         
 	</div>
         
diff --git a/views/mods/mod_fuellmenge/overview_row.phtml b/views/mods/mod_fuellmenge/overview_row.phtml
index 9344f37..f889052 100644
--- a/views/mods/mod_fuellmenge/overview_row.phtml
+++ b/views/mods/mod_fuellmenge/overview_row.phtml
@@ -12,7 +12,7 @@
         <span class="fa  fa-balance-scale"></span>
 
         <?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?>
-        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['feinheit'], 1]); ?>
+        <?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$this->view['p']['preis'], $this->view['p']['fmenge'], $this->view['p']['id'], 1]); ?>
 
     </div>
 
diff --git a/views/mods/mod_fuellmenge/priceinfo.phtml b/views/mods/mod_fuellmenge/priceinfo.phtml
index 1fd63f6..f7a6365 100644
--- a/views/mods/mod_fuellmenge/priceinfo.phtml
+++ b/views/mods/mod_fuellmenge/priceinfo.phtml
@@ -3,24 +3,24 @@
 	/**
 	 * Anzeige der Grundpreisinformationen im Produkttemplate
 	 */
-
+	
 ?>
 
 <?php if ($this->view['wpsg_mod_fuellmenge']['layout'] === 1) { ?>
 
     <span class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(
         __('#1# (#2# / #3#)', 'wpsg'),
-        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge'], $this->view['wpsg_mod_fuellmenge']['feinheit']),
-        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),
-        wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge'], $this->view['wpsg_mod_fuellmenge']['feinheit'], true, 0),
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency'), true, 0),
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['referencevalue'],$this->view['wpsg_mod_fuellmenge']['referenceunit'], true, 0)
     ); ?></span>
     
 <?php } else { ?>
 
     <div class="wpsg_mod_fuellmenge_info"><?php echo wpsg_translate(
         __('(#1# / #2#)', 'wpsg'),
-        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency')),
-        wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['wpsg_mod_fuellmenge']['feinheit'])
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['fmenge_preis'], $this->get_option('wpsg_currency'), true, 0),
+        wpsg_ff($this->view['wpsg_mod_fuellmenge']['referencevalue'], $this->view['wpsg_mod_fuellmenge']['referenceunit'], true, 0)
     ); ?></div>
 
 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
index 5bc5efa..b89291c 100644
--- a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml
@@ -4,20 +4,141 @@
 	 * Template für die Konfiguration der Füllmenge innerhalb der Produktverwaltung
 	 */
 
+	$fmenge = wpsg_tf(wpsg_getFloat($this->view['data']['fmenge']));
+	
+	$arUnit = $this->view['data']['arFeinheiten'];
+	
+	$feinheit = $arUnit[0];
+	
+	if (is_numeric($this->view['data']['feinheit'])) {
+		
+		// Bis 01/2020 war der Index gespeichert
+		$feinheit_index = intval($this->view['data']['feinheit']);
+		if (isset($arUnit[$feinheit_index])) $feinheit = $arUnit[$feinheit_index];
+		
+	} else if (in_array($this->view['data']['feinheit'], $arUnit)) $feinheit = $this->view['data']['feinheit'];
+			
+	/** @var wpsg_product $oProduct */
+	$oProduct = $this->view['oProduct'];
+	
+	$referenceunit = $oProduct->getMeta('wpsg_mod_fuellmenge_referenceunit');
+	if (!wpsg_isSizedString($referenceunit)) $referenceunit = $feinheit;
+	
+	$referencevalue = $oProduct->getMeta('wpsg_mod_fuellmenge_referencevalue');
+	$conversionvalue = $oProduct->getMeta('wpsg_mod_fuellmenge_conversionvalue');
+	
 ?>
-<div id="wpsg_fuellmenge" class="panel panel-default">
+<div id="wpsg_fuellmenge" class="panel panel-default panel-fuellmenge" style="display:none; position:relative;">
 	<div class="panel-heading clearfix">
 		<h3 class="panel-title">
 			<span><?php echo __('Füllmenge', 'wpsg'); ?> </span>
+
+			<a href="#" data-wpsg-tip="wpsg_mod_fuellmenge_product" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_fuellmenge_product"
+			   class="glyphicon glyphicon glyphicon-question-sign form-control-feedback wpsg_mod_fuellmenge_product-tip" aria-hidden="true"></a>
+			
 		</h3>
 	</div>
 	<div class="panel-body">
-		<?php echo wpsg_drawForm_Input('fmenge', __('Füllmenge', 'wpsg'), wpsg_tf(wpsg_getFloat($this->view['data']['fmenge']))); ?>
-		<?php echo wpsg_drawForm_Select('feinheit', __('Einheit', 'wpsg'), $this->view['data']['arFeinheiten'], wpsg_getStr($this->view['data']['feinheit'])); ?>
+		 
+		<div class="form-group form-group-sm form-select ">
+			<label class="col-sm-6 control-label"><?php echo __('Konfiguration', 'wpsg'); ?></label>
+			<div class="col-sm-6 d-flex align-items_center justify-content_space-between">
+				
+				<input type="text" name="fmenge" value="<?php echo $fmenge; ?>" class="fmenge" />
+				
+				<select name="feinheit" class="unit">
+					<?php foreach ($arUnit as $k => $v) { ?>
+					<option value="<?php echo $v; ?>" <?php echo (($v === $feinheit)?'selected="selected"':''); ?>><?php echo $v; ?></option>
+					<?php } ?>
+				</select>
+				
+			</div>
+			<div class="clearfix wpsg_clear"></div>
+		</div>
+
+		<div class="form-group form-group-sm form-select fmenge_details fmenge_details_1">
+			<label class="col-sm-6 control-label"><?php echo __('Bezugswert', 'wpsg'); ?></label>
+			<div class="col-sm-6 d-flex align-items_center justify-content_space-between">
+
+				<input type="text" name="wpsg_mod_fuellmenge_referencevalue" value="<?php echo $referencevalue; ?>" class="referencevalue fmenge_details fmenge_details_1" />
+
+				<select name="referenceunit" class="unit fmenge_details fmenge_details_1">
+					<?php foreach ($arUnit as $v) { ?>
+						<option value="<?php echo $v; ?>" <?php echo (($v === $referenceunit)?'selected="selected"':''); ?>><?php echo $v; ?></option>
+					<?php } ?>
+				</select>
+				
+				<span class="equal conversion" style="display:none;">≙</span>
+
+				<input type="text" name="wpsg_mod_fuellmenge_conversionvalue" value="<?php echo $conversionvalue; ?>" class="conversion conversionvalue" />
+				
+				<span class="unit conversion conversion_unit" style="display:none;"></span>
+				
+			</div>
+		</div>
+		
+		<?php echo wpsg_drawForm_Checkbox('fmenge_details', __('Erweitert', 'wpsg'), $oProduct->getMeta('fmenge_details')); ?>
 		
-	<br /><br />
+		<br /><br />
 	
-	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_fuellmenge"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Füllmengenmoduls', 'wpsg'); ?></a>	
+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_fuellmenge"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Füllmengenmoduls', 'wpsg'); ?></a>	
 	
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<style>
+	
+	select.unit { width:75px; margin-left:5px; flex-shrink:0; }
+	span.unit { width:66px; margin-left:5px; flex-shrink:0; }
+	input.fmenge { width:100%; }
+	span.equal { padding:0 5px; }
+	input.referencevalue { width:100%; }
+	input.conversionvalue { width:100%; margin-right:9px; }
+	.wpsg_mod_fuellmenge_product-tip { color:#337ab7 !important; }
+	.wpsg_mod_fuellmenge_product-tip:focus, .wpsg_mod_fuellmenge_product-tip:active, .wpsg_mod_fuellmenge_product-tip:hover { text-decoration:none; }
+	
+</style>
+
+<script>
+	
+	jQuery(document).ready(function() {
+		
+		jQuery('select.unit').on('change', function() {
+			
+			var referenceunit = jQuery('select[name="referenceunit"]').val();
+			var unit = jQuery('select[name="feinheit"]').val();
+					 			
+			if (unit !== referenceunit) {
+
+				jQuery('.conversion').show();	
+				jQuery('.conversion_unit').html(unit);
+				
+			} else {
+
+				jQuery('.conversion').hide();
+				
+			}
+			
+		}).change();
+		
+		jQuery('#fmenge_details').on('change', function() {
+
+			jQuery('.fmenge_details').hide();
+			
+			if (jQuery(this).prop('checked')) {
+				
+				jQuery('.fmenge_details_1').show();
+				
+			} else {
+
+				jQuery('.fmenge_details_1').hide();
+				
+			}
+			
+		}).change();
+	
+		jQuery('#wpsg_fuellmenge').show();
+		
+	})
+	
+</script>
\ No newline at end of file
diff --git a/views/mods/mod_scaleprice/product_bottom.phtml b/views/mods/mod_scaleprice/product_bottom.phtml
index 46d34fa..5475190 100644
--- a/views/mods/mod_scaleprice/product_bottom.phtml
+++ b/views/mods/mod_scaleprice/product_bottom.phtml
@@ -27,7 +27,7 @@
 				<?php } ?>
 				<?php echo __(' kostet das Produkt ', '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'])); ?>			
+				<?php $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($this->view['wpsg_mod_scaleprice']['base'], $this->view['data']['fmenge'], $this->view['data']['id'])); ?>			
 			</li>
 			<?php } ?>
 			
@@ -41,7 +41,7 @@
 				<?php } ?>
 				<?php echo __(' kostet das Produkt ', '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'])); ?>
+				<?php $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', array($scale['value'], $this->view['data']['fmenge'] , $this->view['data']['id'])); ?>
 			</li>
 			<?php } ?>
 		</ul>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 5ea3e4c..3456fc9 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -10,6 +10,9 @@
 	// Damit keine Zubehörprodukte ausgegeben werden
 	//$this->noReleatedProducts = true;
 
+	/** @var wpsg_product $oProduct */
+	$oProduct = $this->view['oProduct'];
+	
 ?>
 
 <div class="wpsg_produkt_wrapper">
@@ -158,7 +161,7 @@
 		</div>
 
 		<div class="wpsg_clear"></div>
-
+ 		
 		<?php /* Lagerbestand START*/?>
 		<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?>
 		
@@ -180,29 +183,7 @@
 		<?php /* Lagerbestand ENDE*/?>
 
 		<?php /* Füllmengenanzeige START */ ?>
-		<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
-		
-			<div class="wpsg_produkt_fuellmenge">
-			
-				<?php if (($this->view['data']['fmenge']) > '0') { ?>
-				
-					<span class="label label_fuellmenge"><?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?></span>
-					
-					<?php echo wpsg_translate(__('#1# (#2# / #3#)', 'wpsg'),							
-						'<span class="wpsg_fmenge">'.wpsg_ff($this->view['data']['fmenge'], '', true).'</span> '.$this->view['data']['feinheit'],
-						'<span class="fmenge_preis">'.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).'</span> ',
-						wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
-					); ?>
-					
-				<?php } else { ?>
-				
-					<label><?php echo wpsg_translate(__('', 'wpsg')); ?></label>
-					
-				<?php } ?>
-				
-			</div>
-
-		<?php } ?>
+		<?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$oProduct->getPrice($this->view['data']['product_key']), $this->view['data']['fmenge'], $oProduct->getId()]); ?>
 		<?php /* Füllmengenanzeige ENDE */ ?>
 
 		<?php /* Gewichtsanzeige START */ ?>
diff --git a/views/produkttemplates/standard2.phtml b/views/produkttemplates/standard2.phtml
index 9f49862..316360f 100644
--- a/views/produkttemplates/standard2.phtml
+++ b/views/produkttemplates/standard2.phtml
@@ -194,31 +194,9 @@
 		</div>
 		<?php } ?>
 		<?php /* Lagerbestand ENDE*/?>
-
-		<?php /* Füllmengenanzeige START */ ?>
-		<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
 		
-			<div class="wpsg_produkt_fuellmenge">
-			
-				<?php if (($this->view['data']['fmenge']) > '0') { ?>
-				
-					<span class="label label_fuellmenge"><?php echo wpsg_translate(__('Füllmenge:', 'wpsg')); ?></span>
-					
-					<?php echo wpsg_translate(__('#1# (#2# / #3#)', 'wpsg'),							
-						'<span class="wpsg_fmenge">'.wpsg_ff($this->view['data']['fmenge'], '', true).'</span> '.$this->view['data']['feinheit'],
-						'<span class="fmenge_preis">'.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).'</span> ',
-						wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit'])
-					); ?>
-					
-				<?php } else { ?>
-				
-					<label><?php echo wpsg_translate(__('', 'wpsg')); ?></label>
-					
-				<?php } ?>
-				
-			</div>
-
-		<?php } ?>
+		<?php /* Füllmengenanzeige START */ ?>
+		<?php echo $this->callMod('wpsg_mod_fuellmenge', 'renderPriceInfo', [$oProduct->getPrice($this->view['data']['product_key']), $this->view['data']['fmenge'], $oProduct->getId()]); ?>
 		<?php /* Füllmengenanzeige ENDE */ ?>
 
 		<?php /* Gewichtsanzeige START */ ?>
diff --git a/views/warenkorb/checkout2.phtml b/views/warenkorb/checkout2.phtml
index 41cac3c..adf49c2 100644
--- a/views/warenkorb/checkout2.phtml
+++ b/views/warenkorb/checkout2.phtml
@@ -49,7 +49,7 @@
  			</div>
 		
 		</div>
-						
+						 
 		<?php if ($this->callMods('checkout_handlePayment') === true) { ?>
 				
 			<?php if (!$this->hasMod('wpsg_mod_crefopay')) { ?>
-- 
cgit v1.2.3