From 85ff5656660d7a371138fc7972fc5b5c204bc43a Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Mon, 9 Oct 2017 06:38:45 +0000
Subject: Lieferzeit produktspezifisch

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6575 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverytime/basket_row.phtml       | 13 ++----
 views/mods/mod_deliverytime/overview_row.phtml     | 15 ++-----
 .../produkt_addedit_allgemein.phtml                | 49 +++++++++++++++++++++-
 views/produkttemplates/standard.phtml              |  9 ++--
 4 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml
index 694286c..b25db13 100644
--- a/views/mods/mod_deliverytime/basket_row.phtml
+++ b/views/mods/mod_deliverytime/basket_row.phtml
@@ -11,13 +11,8 @@
 		<?php echo __("Lieferzeit", "wpsg"); ?>
 	</div>
 	<div class="valuel">
-		<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
-			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>
-		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
-				<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
-		<?php } else { /* Sonst sofort lieferbar */ ?>
-		 	<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>
-		<?php } ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
+	
 	</div>
 	<div class="dummyr">
 		<?php echo __('&nbsp;'); ?>
@@ -25,11 +20,9 @@
 	
 </div>
 <?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
-<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
 <div class="product_info">
 	<div class="fulll">
-		<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['delaytime'], 'wpsg'); ?>
 
 	</div>
 </div>
-<?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml
index 87ccdc9..f88257e 100644
--- a/views/mods/mod_deliverytime/overview_row.phtml
+++ b/views/mods/mod_deliverytime/overview_row.phtml
@@ -11,13 +11,8 @@
 		<?php echo __("Lieferzeit", "wpsg"); ?>
 	</div>
 	<div class="valuel">
-		<?php if (wpsg_isSizedInt($this->view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?>
-			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime'] ?>
-		<?php } else if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_mode_days_default')) && $this->view['data']['wpsg_mod_deliverytime_deliverytime'] != '0') { /* Lieferzeit > 0 Global */ ?>
-				<?php echo wpsg_translate(__('#1# Tag(e)', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_mode_days_default')); ?>
-		<?php } else { /* Sonst sofort lieferbar */ ?>
-		 	<?php echo wpsg_translate(__('sofort lieferbar (0 Tage)', 'wpsg')); ?>
-		<?php } ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
+
 	</div>
 	<div class="dummyr">
 		<?php echo __('&nbsp;'); ?>
@@ -25,11 +20,9 @@
 	
 </div>
 <?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
-<?php if ($this->get_option('wpsg_mod_deliverytime_delay') == '1') { ?>
 <div class="product_info">
 	<div class="fulll">
-		<?php echo wpsg_translate(__('Aufgrund von #1# kann es zu Verzögerungen von #2# Tage in der Zustellung kommen.', 'wpsg'), $this->get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?>
+		<?php echo __($this->view['wpsg_mod_deliverytime']['delaytime'], 'wpsg'); ?>
 
 	</div>
-</div>
-<?php } ?>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
index da7855a..49d3a34 100644
--- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
+++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
@@ -15,11 +15,56 @@
 	<?php } ?>
 	<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_deliverytime_store'))) {?>
 		<?php if (isset($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct']))
-				echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
+				//echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct1]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
+				<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storeproduct]', __('Als Offlineprodukt anzeigen', 'wpsg'), array(0 => 'Standardeinstellung', 1 => 'Offlineprodukt', 2 => 'Onlineprodukt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_store')); ?>
+
+	<div class="wpsg_mod_deliverytime_store wpsg_mod_deliverytime_store_1">
+	    <?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storetext]', __('Hinweistext', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storetext'], array('help' => 'wpsg_mod_deliverytime_storetext')); ?>
+	    <?php ?>
+	    <?php $arPageWithoutCreate = $this->view['pages']; unset($arPageWithoutCreate['-1']); ?>
+	    <?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_storelink]', __('Seite mit Adressdaten', 'wpsg'), wpsg_array_merge(array(
+	        '0' => __('Keine Verlinkung auf eine Seite anzeigen', 'wpsg')
+	    ), $arPageWithoutCreate), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storelink'], array('help' => 'wpsg_page_mod_deliverytime_storelink')); ?>
+	</div>
+	
+	<br />
+
 	<?php } ?>
 	
+	<?php //echo wpsg_drawForm_Checkbox('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('help' => 'wpsg_mod_deliverytime_delay')); ?>
+	<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delay]', __('Hinweistext bei Verzögerungen anzeigen', 'wpsg'), array(0 => 'Standardeinstellung', 1 => 'Anzeigen', 2 => 'Nicht anzeigen'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delay'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_delay')); ?>
+	<div class="wpsg_mod_deliverytime_delay_activ" style="display:none;">
+	<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytext]', __('Grund für verzögerte Lieferung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytext'], array('help' => 'wpsg_mod_deliverytime_delayText')); ?>
+	<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_delaytime]', __('Zeitangabe der Verzögerung', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_delaytime'], array('help' => 'wpsg_mod_deliverytime_delayTime')); ?>
+	</div>
+	
 	<br />
 
+
 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_deliverytime"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Lieferzeit', 'wpsg'); ?></a>
 	
-<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+        jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_storeproduct').bind('change', function() {
+			//alert('TEST:' + jQuery(this).val());
+            jQuery('.wpsg_mod_deliverytime_store').hide();
+            //if (jQuery(this).prop('checked')) jQuery('.wpsg_mod_deliverytime_store_1').show();
+            if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_store_1').show();
+
+        } ).change();
+
+		jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_delay').bind('change', function() {
+
+			//if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_deliverytime_delay_activ').show();
+			if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_delay_activ').show();
+			else jQuery('.wpsg_mod_deliverytime_delay_activ').hide();
+			
+		} ).change();
+		
+	} );
+
+/* ]]> */</script>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index b9d5e55..e3a5366 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -154,13 +154,14 @@
 			<?php /* Produkt nur im Store, nicht im Onlineshop vorhanden */ ?>
 			<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) { ?>
 
-				<div class="wpsg_product_only_store"><?php echo wpsg_translate($this->get_option('wpsg_mod_deliverytime_storetext')); ?></div>
+				<div class="wpsg_product_only_store"><?php echo __($this->callMod('wpsg_mod_deliverytime', 'displayStoreText', array($this->view['data']['product_key']))); ?></div>
 
-				<?php if (wpsg_isSizedInt($this->get_option('wpsg_page_mod_deliverytime_storelink'))) { ?>
-				&nbsp;<a href="<?php echo get_permalink($this->get_option('wpsg_page_mod_deliverytime_storelink')); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
+				<?php $stl = 0; $stl = $this->callMod('wpsg_mod_deliverytime', 'displayStoreLink', array($this->view['data']['product_key'])) ?>
+				<?php if (wpsg_isSizedInt($stl)) { ?>
+				&nbsp;<a href="<?php echo get_permalink($stl); ?>"><?php echo __('So erreichen Sie uns.'); ?></a>
 				<?php } ?>
 
-			<?php } else {?>
+			<?php } else { ?>
 
 				<div class="wpsg_mod_deliverytime">
 					<span class="label label_deliverytime"><?php echo wpsg_translate(__('Lieferzeit:', 'wpsg')); ?></span>
-- 
cgit v1.2.3