- Feature: Suche nach Bestellungen eines speziellen Gutscheins im Backend

- Bugfix: Korrektur Gutschein mit % Wert auf Rechnung

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

3 files changed, 5 insertions, 10 deletions

diff --git a/views/css/frontend.css b/views/css/frontend.css
index e63ba95..70da2f2 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 .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; }

 .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 { display:flex; width:100%; justify-content:space-between; align-items:center; margin-bottom:0.25rem; }

 .basket_product_wrap .basket_product_row .product_upload {  }

 .basket_product_wrap .basket_product_row .product_upload .wpsg_mod_orderupload_target { margin-left:15px; flex-grow:1; }

 .basket_product_wrap .basket_product_row .product_upload .wpsg_mod_orderupload_target ul { margin:0px; }

@@ -44,7 +44,7 @@ input.wpsg_error { border-color:red !important; }
 .basket_product_wrap .basket_product_row .product_upload .wpsg_mod_orderupload_target li a.removeLink { text-decoration:none; box-shadow:none; align-self:center; }

 .basket_product_wrap .basket_product_row .product_upload ul li { list-style:none; }

 .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 .title { 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; }

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

@@ -165,7 +165,7 @@ input.wpsg_error { border-color:red !important; }
 .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 { 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 .title { 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; }

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

diff --git a/views/mods/mod_productvars/basket_row.phtml b/views/mods/mod_productvars/basket_row.phtml
index da8716b..7bcae7d 100644
--- a/views/mods/mod_productvars/basket_row.phtml
+++ b/views/mods/mod_productvars/basket_row.phtml
@@ -11,7 +11,7 @@
 	<div class="title">

 		<?php echo __($pv['name'], 'wpsg'); ?><?php if ($pv['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>

 	</div>

-	<div class="valuel">

+	<div class="value">

 		<?php if ($pv['typ'] == '1') { // Auswahlfeld ?>		

 		<select class="<?php echo ((in_array("wpsg_mod_productvars_".$pv['id']."_".$this->view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg_mod_productvars[<?php echo $pv['id']; ?>][<?php echo $this->view['wpsg_mod_productvars']['p']['product_index']; ?>]">

 			<option value="not_set"><?php echo __('Bitte wählen', 'wpsg'); ?></option>

@@ -31,6 +31,5 @@
                 class="<?php echo ((in_array("wpsg_mod_productvars_".$pv['id']."_".$this->view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>"><?php echo @wpsg_hspc($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']]); ?></textarea>

         <?php } ?>

 	</div>

-

 </div>

 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_productvars/overview_row.phtml b/views/mods/mod_productvars/overview_row.phtml
index 99d020f..2247072 100644
--- a/views/mods/mod_productvars/overview_row.phtml
+++ b/views/mods/mod_productvars/overview_row.phtml
@@ -13,7 +13,7 @@
 	<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

 		<?php echo __($pv['name'], 'wpsg'); ?><?php if ($pv['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>

 	</div>

-	<div class="valuel">

+	<div class="value">

 		<?php if ($pv['typ'] == '1') { // Auswahlfeld ?>		

 			<?php if ($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == 'not_set') { ?>

 			<?php echo __('Nicht angegeben', 'wpsg'); ?>

@@ -32,10 +32,6 @@
 			<?php echo nl2br(wpsg_hspc($this->view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']])); ?>

 		<?php } ?>

 	</div>

-	<div class="dummyr">

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

-	</div>

-	

 </div>

 <?php } ?>

 <?php } ?>
\ No newline at end of file