From b1cd3f800d12677ffe4b73ab893d02aad20506b0 Mon Sep 17 00:00:00 2001
From: thomas <noreply@maennchen1.de>
Date: Tue, 18 Sep 2018 13:53:46 +0000
Subject: - Füllmenge angepasst an Produktgewicht
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7155 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_fuellmenge/basket_row.phtml       | 33 ++++++++++++++++++++++++
 views/mods/mod_fuellmenge/basket_row_end.phtml   | 18 +++++++++++++
 views/mods/mod_fuellmenge/overview_row.phtml     | 16 ++++++++++++
 views/mods/mod_fuellmenge/overview_row_end.phtml | 18 +++++++++++++
 views/mods/mod_fuellmenge/settings_edit.phtml    | 22 +++++++++++++++-
 5 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 views/mods/mod_fuellmenge/basket_row.phtml
 create mode 100644 views/mods/mod_fuellmenge/basket_row_end.phtml
 create mode 100644 views/mods/mod_fuellmenge/overview_row.phtml
 create mode 100644 views/mods/mod_fuellmenge/overview_row_end.phtml

diff --git a/views/mods/mod_fuellmenge/basket_row.phtml b/views/mods/mod_fuellmenge/basket_row.phtml
new file mode 100644
index 0000000..cc43694
--- /dev/null
+++ b/views/mods/mod_fuellmenge/basket_row.phtml
@@ -0,0 +1,33 @@
+<?php
+
+	/**
+	 * Template für die Anzeige der Füllmenge im Warenkorb
+	 */
+	//wpsg_debug($this->view);
+?>
+<div class="product_info">
+	<div 
+		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+		
+		<?php /* if (($this->view['data']['fmenge']) > '0') { */ ?>
+		
+			<span class="fa  fa-balance-scale"></span>
+				
+			<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 /* ?>
+			
+		<?php  } else { ?>
+				
+			<label><?php echo wpsg_translate(__('', 'wpsg')); ?></label>
+					
+		<?php }  */?>
+	</div>
+	<br />
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/basket_row_end.phtml b/views/mods/mod_fuellmenge/basket_row_end.phtml
new file mode 100644
index 0000000..1ff2648
--- /dev/null
+++ b/views/mods/mod_fuellmenge/basket_row_end.phtml
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Template für die Anzeige der Füllmenge innerhalb des Warenkorbs
+	 */
+
+?>
+<div class="basket_sum_row">
+	<div class="title">
+		<?php echo __('Gesamtfüllmenge', 'wpsg'); ?>:
+	</div>
+	<div class="value">
+		<?php echo wpsg_ff($this->view['wpsg_mod_fuellmenge']['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?>
+	</div>
+    <div class="value">
+        <?php echo __('&nbsp;'); ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/overview_row.phtml b/views/mods/mod_fuellmenge/overview_row.phtml
new file mode 100644
index 0000000..c8490c4
--- /dev/null
+++ b/views/mods/mod_fuellmenge/overview_row.phtml
@@ -0,0 +1,16 @@
+<?php
+
+	/**
+	 * Template für die Integration der Füllmenge in die Bestellzusammenfassung
+	 */
+
+?>
+<div class="product_info">
+	<div 
+		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+		<span class="fa  fa-balance-scale"></span>
+		<?php echo __("Füllmenge", "wpsg"); ?>:
+		<strong><?php echo wpsg_ff($this->view['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?></strong>
+	</div>
+	<br />
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/overview_row_end.phtml b/views/mods/mod_fuellmenge/overview_row_end.phtml
new file mode 100644
index 0000000..1496235
--- /dev/null
+++ b/views/mods/mod_fuellmenge/overview_row_end.phtml
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Template für die Integration der Füllmenge in die Bestellzusammenfassung
+	 */
+
+?>
+<div class="overview_sum_row">
+	<div class="title">
+		<?php echo __('Gesamtfüllmenge', 'wpsg'); ?>:
+	</div>
+	<div class="value">
+		<?php echo wpsg_ff($this->view['wpsg_mod_fuellmenge']['fuellmenge'], $this->get_option('wpsg_mod_fuellmenge_einheit')); ?>
+	</div>
+    <div class="value">
+        <?php echo __('&nbsp;'); ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_fuellmenge/settings_edit.phtml b/views/mods/mod_fuellmenge/settings_edit.phtml
index 3559e1b..5a47e41 100644
--- a/views/mods/mod_fuellmenge/settings_edit.phtml
+++ b/views/mods/mod_fuellmenge/settings_edit.phtml
@@ -8,8 +8,28 @@
 ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_einheit', __('Mögliche Einheiten (Kommagetrennt)', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_bezug', __('Bezugsgröße', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?>
+
+<br />
+
 <?php if ($this->hasMod('wpsg_mod_productindex')) { ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_fmenge', __('Füllmenge auf Produktübersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_fmenge')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_grundpreis', __('Grundpreis auf Produktübersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_grundpreis')); ?>
+<?php } ?>
+
+<br />
+
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showBasket', __('Gesamtfüllmenge im Warenkorbs anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showBasket'), array('help' => 'wpsg_mod_fuellmenge_showBasket')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showBasketProduct', __('Im Warenkorb im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showBasketProduct'), array('help' => 'wpsg_mod_fuellmenge_showBasketProduct')); ?>
+
+<br />
+
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showOverview', __('Gesamtfüllmenge in Zusammenfassung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showOverview'), array('help' => 'wpsg_mod_fuellmenge_showOverview')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showOverviewProduct', __('In Zusammenfassung im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showOverviewProduct'), array('help' => 'wpsg_mod_fuellmenge_showOverviewProduct')); ?>
+
+<br />
+
+<?php if ($this->hasMod('wpsg_mod_request')) { ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showRequestPage', __('Gesamtfüllmenge der vollständigen Anfrage auf Anfrageseite anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showRequestPage'), array('help' => 'wpsg_mod_fuellmenge_showRequestPage')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showRequestPageProduct', __('Auf Anfrageseite im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showRequestPageProduct'), array('help' => 'wpsg_mod_fuellmenge_showRequestPageProduct')); ?>
 <?php } ?>
\ No newline at end of file
-- 
cgit v1.2.3