- Gutscheine nich einlösbar, wenn Rabatte aktiv (Optional)

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

2 files changed, 17 insertions, 23 deletions

diff --git a/views/mods/mod_discount/settings_edit.phtml b/views/mods/mod_discount/settings_edit.phtml
index ed4ad5f..dbb67e5 100644
--- a/views/mods/mod_discount/settings_edit.phtml
+++ b/views/mods/mod_discount/settings_edit.phtml
@@ -10,6 +10,7 @@
     <ul class="nav nav-tabs" role="tablist">

         <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Produktrabatt', 'wpsg'); ?></a></li>

         <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Warenkorbrabatt', 'wpsg'); ?></a></li>

+		<li role="presentation"><a href="#tab3" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Optionen', 'wpsg'); ?></a></li>

     </ul>

     <div class="tab-content">

         <div role="tabpanel" class="tab-pane active" id="tab1">

@@ -52,13 +53,6 @@
             <a href="#" onclick="return wpsg_mod_discount_restoredefaulthierarchie();"><?php echo __('Standard wiederherstellen', 'wpsg'); ?></a>

 

             <?php echo wpsg_drawForm_TextEnd(__('Rabattreihenfolge (für Berechnung)', 'wpsg'), array('noP' => true)); ?>

-

-            <br />

-

-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_stopRabatt', __('Nur ersten Rabatt berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_discount_stopRabatt'), array('label' => __('Optionen', 'wpsg'))); ?>

-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_showBasket', __('Nächste Staffelung im Warenkorb anpreisen', 'wpsg'), $this->get_option('wpsg_mod_discount_showBasket'), array('help' => 'wpsg_mod_discount_showBasket')); ?>

-

-        	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_voucher', __('Gutscheine bei aktivem Rabatt nicht zulassen', 'wpsg'), $this->get_option('wpsg_mod_discount_voucher'), array('help' => 'wpsg_mod_discount_voucher')); ?>

         

         </div>

         <div role="tabpanel" class="tab-pane" id="tab2">

@@ -88,6 +82,13 @@
 

 

         </div>

+		<div role="tabpanel" class="tab-pane" id="tab3">

+			 

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_stopRabatt', __('Nur ersten Rabatt berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_discount_stopRabatt')); ?>

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_showBasket', __('Nächste Staffelung im Warenkorb anpreisen', 'wpsg'), $this->get_option('wpsg_mod_discount_showBasket'), array('help' => 'wpsg_mod_discount_showBasket')); ?>			

+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount_voucher', __('Gutscheine bei aktivem Rabatt nicht zulassen', 'wpsg'), $this->get_option('wpsg_mod_discount_voucher'), array('help' => 'wpsg_mod_discount_voucher')); ?>

+			

+		</div>

     </div>

 </div>

 

diff --git a/views/mods/mod_gutschein/basket_row_end.phtml b/views/mods/mod_gutschein/basket_row_end.phtml
index 03e9d86..3589d52 100644
--- a/views/mods/mod_gutschein/basket_row_end.phtml
+++ b/views/mods/mod_gutschein/basket_row_end.phtml
@@ -7,22 +7,15 @@
 ?>

 <br />

 <div class="basket_sum_row">

-	<?php /* TODO: Kunden bereits über das Widget eingeloggt (Kundengruppenrabatt)? */ ?>

-	<?php if ($this->hasMod('wpsg_mod_discount') && ($this->get_option('wpsg_mod_discount_voucher') == 1)) { ?>

 		

-		<?php echo __('Aufgrund einer Rabattaktion ist das Hinzufügen eines Gutscheines nicht möglich', 'wpsg'); ?>

+	<div class="codegs">

+		<label class="codegsf" for="wpsg_gutschein_input"><?php echo __('Gutscheincode:', 'wpsg'); ?></label>

+	</div>

+	<div class="codegsl">

+		<input id="wpsg_gutschein_input" class="wpsg_gutschein_input <?php echo ((in_array("gutschein", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg[gutschein]" value="" />

+	</div>

+	<div class="codegsr">

+		<input class="wpsg_button wpsg_gutschein_add" type="submit" name="wpsg_gutschein_add" value="<?php echo '&nbsp;'.__('Einlösen', 'wpsg').'&nbsp;'; ?>" />

+	</div>

 		

-	<?php } else {?>

-	

-		<div class="codegs">

-			<label class="codegsf" for="wpsg_gutschein_input"><?php echo __('Gutscheincode:', 'wpsg'); ?></label>

-		</div>

-		<div class="codegsl">

-			<input id="wpsg_gutschein_input" class="wpsg_gutschein_input <?php echo ((in_array("gutschein", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg[gutschein]" value="" />

-		</div>

-		<div class="codegsr">

-			<input class="wpsg_button wpsg_gutschein_add" type="submit" name="wpsg_gutschein_add" value="<?php echo '&nbsp;'.__('Einlösen', 'wpsg').'&nbsp;'; ?>" />

-		</div>

-	

-	<?php }?>	

 </div>
\ No newline at end of file