From 0d7371748f4bc6a0505416db47e5bb4575388a27 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Thu, 11 Jan 2018 15:47:30 +0000
Subject: Lieferzeit aus dem Produkt überschreibt Lieferzeit aus dem Modul
 nicht (Ticket #581) Anpassung basket.phtml und alle basket_row.phtml und
 overview_row.phtml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6857 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverytime/basket_row.phtml                | 11 +++--------
 views/mods/mod_deliverytime/overview_row.phtml              |  9 ++-------
 views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml | 11 +++++++++++
 3 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'views/mods/mod_deliverytime')

diff --git a/views/mods/mod_deliverytime/basket_row.phtml b/views/mods/mod_deliverytime/basket_row.phtml
index e920f9f..cbc0a47 100644
--- a/views/mods/mod_deliverytime/basket_row.phtml
+++ b/views/mods/mod_deliverytime/basket_row.phtml
@@ -8,16 +8,10 @@
 <div class="product_info">
 	<div 
 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+		<span class="fa fa-truck"></span>
 		<?php echo __("Lieferzeit", "wpsg"); ?>:
+		<strong><?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?></strong>
 	</div>
-	<div class="valuel">
-		<?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
-	
-	</div>
-	<div class="dummyr">
-		<?php echo __('&nbsp;'); ?>
-	</div>
-	
 </div>
 <?php /* Hinweistext für Verzögerung in der Lieferzeit */ ?>
 <div class="product_info">
@@ -25,4 +19,5 @@
 		<?php echo __($this->view['wpsg_mod_deliverytime']['delaytime'], 'wpsg'); ?>
 
 	</div>
+	<br />
 </div>
diff --git a/views/mods/mod_deliverytime/overview_row.phtml b/views/mods/mod_deliverytime/overview_row.phtml
index 89b5960..b447482 100644
--- a/views/mods/mod_deliverytime/overview_row.phtml
+++ b/views/mods/mod_deliverytime/overview_row.phtml
@@ -8,14 +8,9 @@
 <div class="product_info">
 	<div 
 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>
+		<span class="fa fa-truck"></span>
 		<?php echo __("Lieferzeit", "wpsg"); ?>:
-	</div>
-	<div class="valuel">
-		<?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?>
-
-	</div>
-	<div class="dummyr">
-		<?php echo __('&nbsp;'); ?>
+		<strong><?php echo __($this->view['wpsg_mod_deliverytime']['deliverytime'], 'wpsg'); ?></strong>
 	</div>
 	
 </div>
diff --git a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
index 72ea6e2..f53b258 100644
--- a/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
+++ b/views/mods/mod_deliverytime/produkt_addedit_allgemein.phtml
@@ -8,11 +8,15 @@
 
 <?php echo wpsg_drawForm_AdminboxStart(__('Lieferzeit', 'wpsg')); ?>
 
+	<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_source]', __('Lieferzeit anzeigen von', 'wpsg'), array(0 => 'Moduleinstellungen', 1 => 'Produkt'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_source'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_source')); ?>
+
+	<div class="wpsg_mod_deliverytime_show">
 	<?php if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_SELECT) { ?>
 		<?php echo wpsg_drawForm_Select('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), $this->view['wpsg_mod_deliverytime']['arSelection'], $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime'], array('noIndex' => true, 'help' => 'wpsg_mod_deliverytime_select')); ?>
 	<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode') == wpsg_mod_deliverytime::MODE_DAYS) { ?>
 		<?php echo wpsg_drawForm_Input('wpsg_mod_deliverytime[wpsg_mod_deliverytime_deliverytime]', __('Lieferzeit', 'wpsg'), wpsg_getStr($this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_deliverytime']), array('unit' => __('Tage', 'wpsg'), 'help' => 'wpsg_mod_deliverytime_input')); ?>
 	<?php } ?>
+	</div>
 	<?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_storeproduct1]', __('Als Offlineprodukt anzeigen', 'wpsg'), $this->view['wpsg_mod_deliverytime']['wpsg_mod_deliverytime_storeproduct'], array('help' => 'wpsg_mod_deliverytime_store'));?>
@@ -64,6 +68,13 @@
 			else jQuery('.wpsg_mod_deliverytime_delay_activ').hide();
 			
 		} ).change();
+
+		jQuery('#wpsg_mod_deliverytimewpsg_mod_deliverytime_source').bind('change', function() {
+
+			if (jQuery(this).val() == 1) jQuery('.wpsg_mod_deliverytime_show').show();
+			else jQuery('.wpsg_mod_deliverytime_show').hide();
+			
+		} ).change();
 		
 	} );
 
-- 
cgit v1.2.3