Lieferzeit aus dem Produkt überschreibt Lieferzeit aus dem Modul nicht (Ticket #581)

Anpassung basket.phtml und alle basket_row.phtml und overview_row.phtml

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6857 0d5edaf7-2b12-4e95-93f4-047927463d4b

10 files changed, 49 insertions, 58 deletions

diff --git a/views/css/frontend.css b/views/css/frontend.css
index e344714..ea41924 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -36,7 +36,7 @@ input.wpsg_error { border-color:red !important; }
 .basket_product_wrap .basket_product_row .product_action .price { width: 39%; display:inline-block; text-align:right; }

 .basket_product_wrap .basket_product_row .product_action .price_total { width: 39%; display:inline-block; font-weight:bold; text-align:right; }

 .basket_product_wrap .basket_product_row .product_info { display:flex; width:100%; justify-content:space-between; align-items:center; }

-.basket_product_wrap .basket_product_row .product_info .titlep { width: 20%; min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

+.basket_product_wrap .basket_product_row .product_info .titlep { min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

 .basket_product_wrap .basket_product_row .product_info .title { width: 30%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

 .basket_product_wrap .basket_product_row .product_info .valuel { width: 50%; display:inline-block; font-weight:normal; text-align:left; }

 .basket_product_wrap .basket_product_row .product_info .valuer { width: 50%; display:inline-block; font-weight:normal; text-align:right; }

@@ -141,7 +141,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_overview .wpsg_table_wrap .overview_product_row .product_action .price { width: 39%; display:inline-block; text-align:right; }

 .wpsg_overview .wpsg_table_wrap .overview_product_row .product_action .price_total { width: 39%; display:inline-block; font-weight:bold; text-align:right; }

 .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info { display:flex; width:100%; justify-content:space-between; align-items:center; }

-.wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .titlep { width: 20%; min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

+.wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .titlep { min-width:120px; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

 .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .title { width: 30%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

 .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .valuel { width: 50%; display:inline-block; font-weight:normal; text-align:left; }

 .wpsg_overview .wpsg_table_wrap .overview_product_row .product_info .valuer { width: 50%; display:inline-block; font-weight:normal; text-align:right; }

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();

 		

 	} );

 

diff --git a/views/mods/mod_productvariants/basket_row.phtml b/views/mods/mod_productvariants/basket_row.phtml
index d94c395..0311179 100644
--- a/views/mods/mod_productvariants/basket_row.phtml
+++ b/views/mods/mod_productvariants/basket_row.phtml
@@ -9,13 +9,17 @@
 <div class="product_info">

 	<div 

 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+		<span class="fa  fa-share-alt"></span>

 		<?php echo __("Variante", "wpsg"); ?>:

 	</div>

 	<div class="valuel">

 		<?php if (get_option('wpsg_vp_detailview') == 1) { ?>

 		<?php foreach ($this->view['variante'] as $vari => $value) { ?>

+		

 		<?php if (is_numeric($vari)) { ?>

-		<?php echo $value['name'] ?>: <?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; 

+		<?php echo $value['name'] ?>: 

+		<strong>

+		<?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; 

 		<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($value['preis']))) { ?>

 			(<?php echo wpsg_ff($value['preis'], $this->get_option('wpsg_currency')); ?>)

 		<?php } ?>

@@ -25,9 +29,7 @@
 		<?php } else { ?>

 		<?php echo $this->view['variante']['key']; ?>

 		<?php } ?>

+		</strong>

 	</div>

-	<div class="dummyr">

-		<?php echo __('&nbsp;'); ?>

-	</div>

-	

+	<br />

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_productvariants/overview_row.phtml b/views/mods/mod_productvariants/overview_row.phtml
index 9f6b954..4ea8850 100644
--- a/views/mods/mod_productvariants/overview_row.phtml
+++ b/views/mods/mod_productvariants/overview_row.phtml
@@ -9,13 +9,17 @@
 <div class="product_info">

 	<div 

 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+		<span class="fa  fa-share-alt"></span>

 		<?php echo __("Variante", "wpsg"); ?>:

 	</div>

 	<div class="valuel">

 		<?php if (get_option('wpsg_vp_detailview') == 1) { ?>

 		<?php foreach ($this->view['variante'] as $vari => $value) { ?>

+		

 		<?php if (is_numeric($vari)) { ?>

-		<?php echo $value['name'] ?>: <?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; 

+		<?php echo $value['name'] ?>: 

+		<strong>

+		<?php echo $value['value'] ?>; <?php echo __('Art. Nr.', 'wpsg').': '.$value['artnr'] ?>; 

 		<?php if ($this->callMod('wpsg_mod_productvariants', 'showVariPrice', array($value['preis']))) { ?>

 			(<?php echo wpsg_ff($value['preis'], $this->get_option('wpsg_currency')); ?>)

 		<?php } ?>

@@ -25,9 +29,8 @@
 		<?php } else { ?>

 		<?php echo $this->view['variante']['key']; ?>

 		<?php } ?>

+		</strong>

 	</div>

-	<div class="dummyr">

-		<?php echo __('&nbsp;'); ?>

-	</div>

+	<br/>

 	

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_produktattribute/basket_row.phtml b/views/mods/mod_produktattribute/basket_row.phtml
index 5ad6e81..cb8dcfe 100644
--- a/views/mods/mod_produktattribute/basket_row.phtml
+++ b/views/mods/mod_produktattribute/basket_row.phtml
@@ -10,14 +10,10 @@
 <div class="product_info">

 	<div 

 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

-		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>

+		<span class="fa fa-ellipsis-v"></span>

+		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>:

+		<strong><?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?></strong>

 	</div>

-	<div class="valuel">

-		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?>

-	</div>

-	<div class="dummyr">

-		<?php echo __('&nbsp;'); ?>

-	</div>

-	

+	<br />

 </div>

 <?php }?>
\ No newline at end of file
diff --git a/views/mods/mod_produktattribute/overview_row.phtml b/views/mods/mod_produktattribute/overview_row.phtml
index 13389a0..f06cad2 100644
--- a/views/mods/mod_produktattribute/overview_row.phtml
+++ b/views/mods/mod_produktattribute/overview_row.phtml
@@ -10,14 +10,11 @@
 <div class="product_info">

 	<div 

 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

-		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>

+		<span class="fa fa-ellipsis-v"></span>

+		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?>:

+		<strong><?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?></strong>

 	</div>

-	<div class="valuel">

-		<?php echo $this->callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?>

-	</div>

-	<div class="dummyr">

-		<?php echo __('&nbsp;'); ?>

-	</div>

-	

+	<br />

+

 </div>

 <?php }?>
\ No newline at end of file
diff --git a/views/mods/mod_weight/basket_row.phtml b/views/mods/mod_weight/basket_row.phtml
index 05ede5d..b2f301b 100644
--- a/views/mods/mod_weight/basket_row.phtml
+++ b/views/mods/mod_weight/basket_row.phtml
@@ -7,14 +7,10 @@
 ?>

 <div class="product_info">

 	<div 

-	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+		<span class="fa  fa-balance-scale"></span>

 		<?php echo __("Gewicht", "wpsg"); ?>:

+		<strong><?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?></strong>

 	</div>

-	<div class="valuer">

-		<?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>	

-	</div>

-	<div class="dummyr">

-		<?php echo __('&nbsp;'); ?>

-	</div>

-	

+	<br />

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_weight/overview_row.phtml b/views/mods/mod_weight/overview_row.phtml
index 619642b..8eb50ac 100644
--- a/views/mods/mod_weight/overview_row.phtml
+++ b/views/mods/mod_weight/overview_row.phtml
@@ -7,14 +7,10 @@
 ?>

 <div class="product_info">

 	<div 

-	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

+		<span class="fa  fa-balance-scale"></span>

 		<?php echo __("Gewicht", "wpsg"); ?>:

+		<strong><?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?></strong>

 	</div>

-	<div class="valuer">

-		<?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>	

-	</div>

-	<div class="dummyr">

-		<?php echo __('&nbsp;'); ?>

-	</div>

-	

+	<br />

 </div>
\ No newline at end of file