- Gutschein/Coupon

- Task #681

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

5 files changed, 94 insertions, 3 deletions

diff --git a/views/mods/mod_gutschein/add.phtml b/views/mods/mod_gutschein/add.phtml
index b6b4b6a..3166f21 100644
--- a/views/mods/mod_gutschein/add.phtml
+++ b/views/mods/mod_gutschein/add.phtml
@@ -4,6 +4,16 @@
 	 * Template für die Maske eines neuen Gutscheins

 	 */

  

+	$used = 0;

+	

+	if (wpsg_isSizedInt($_REQUEST['voucher_id'])) {

+		

+		$oVoucher = wpsg_voucher::getInstance($_REQUEST['voucher_id']);

+		

+		$used = $oVoucher->getUsedAmount();

+		

+	}

+	

 ?>

 

 <div class="content form-horizontal">

@@ -13,6 +23,7 @@
 		<?php wpsg_drawForm_AdminboxStart(); ?>

 			

 			<?php echo wpsg_drawForm_Input('wpsg_mod_gutschein_value', __('Betrag', 'wpsg'), wpsg_ff($this->view['mod_gutschein']['value'])); ?>

+			<?php echo wpsg_drawForm_Input(false, __('Bereits verwendet'), wpsg_ff($used), ['field_id' => 'wpsg_voucher_used', 'readonly' => true]); ?>

 		

 			<div style="margin-top:-15px;"> 

 				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_gutschein_coupon', __('Als Wertgutschein behandeln', 'wpsg'), $this->view['mod_gutschein']['coupon']); ?>

diff --git a/views/mods/mod_gutschein/basket_row_end_coupon.phtml b/views/mods/mod_gutschein/basket_row_end_coupon.phtml
index 95f8f43..070f8a7 100644
--- a/views/mods/mod_gutschein/basket_row_end_coupon.phtml
+++ b/views/mods/mod_gutschein/basket_row_end_coupon.phtml
@@ -25,7 +25,7 @@
 		<?php } ?>

 		<div class="value"><?php

 				

-				echo '-'.wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));

+				echo wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));

 				

 				if (strpos($gs['set'], '%') !== false) {

 					

diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml
index 4582533..fd47af7 100644
--- a/views/mods/mod_gutschein/index.phtml
+++ b/views/mods/mod_gutschein/index.phtml
@@ -80,7 +80,8 @@
                         </tr>

                     </thead>

                     <tbody>

-                        <?php foreach ($this->view['arData'] as $oVoucher) { ?>

+                        <?php /** @var wpsg_voucher $oVoucher */

+							foreach ($this->view['arData'] as $oVoucher) { ?>

                         <tr>

                             <td class="col_checkbox">

 

@@ -107,8 +108,10 @@
                             <td class="col_end"><?php echo wpsg_formatTimestamp($oVoucher->end_date, true); ?></td>

                             <td class="col_value"><span><?php

 

-                                if ($oVoucher->calc_typ == 'w') echo wpsg_ff($oVoucher->value, $this->get_option('wpsg_currency'));

+                                if ($oVoucher->calc_typ == 'w') echo wpsg_ff($oVoucher->getFreeAmount(), $this->get_option('wpsg_currency'));

                                 else if ($oVoucher->calc_typ == 'p') echo wpsg_ff($oVoucher->value, '%');

+                                

+                                if ($oVoucher->calc_typ == 'w' && $oVoucher->getUsedAmount() > 0) echo ' <span title="'.__('Original Betrag', 'wpsg').'">('.wpsg_ff($oVoucher->value, $this->get_option('wpsg_currency')).')</span>';

 

                             ?></span><?php 

 							

diff --git a/views/mods/mod_gutschein/mail_order_end.phtml b/views/mods/mod_gutschein/mail_order_end.phtml
new file mode 100644
index 0000000..8289750
--- /dev/null
+++ b/views/mods/mod_gutschein/mail_order_end.phtml
@@ -0,0 +1,27 @@
+<?php

+	 

+	/**

+	 * User: Daschmi (daschmi@daschmi.de)

+	 * Date: 31.07.2019

+	 * Time: 17:15

+	 */ 

+    

+	namespace wpsg;

+	

+	$arCalculation = $this->view['basket']['arCalculation'];

+	

+	if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';

+	else $display_brutto_netto = 'netto';

+	

+	echo "\r\n";

+	

+	foreach ($arCalculation['coupon'] as $gs) {

+	

+		echo '     '.wpsg_pad_right(__('Wertgutschein', 'wpsg').' '.((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''), 37);

+		echo wpsg_pad_left(wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency')), 34)."\r\n";

+		

+	}

+	

+	echo '     '.wpsg_pad_right(__('Zu zahlen', 'wpsg'), 37);

+	echo wpsg_pad_left(wpsg_ff($arCalculation['topay_brutto'], $this->get_option('wpsg_currency')), 34)."\r\n";

+	 
\ No newline at end of file
diff --git a/views/mods/mod_gutschein/mail_order_end_html.phtml b/views/mods/mod_gutschein/mail_order_end_html.phtml
new file mode 100644
index 0000000..fc543aa
--- /dev/null
+++ b/views/mods/mod_gutschein/mail_order_end_html.phtml
@@ -0,0 +1,50 @@
+<?php

+	 

+	/**

+	 * User: Daschmi (daschmi@daschmi.de)

+	 * Date: 31.07.2019

+	 * Time: 17:15

+	 */ 

+    

+	namespace wpsg;

+	

+	$arCalculation = $this->view['basket']['arCalculation'];

+	

+	if ($this->getFrontendTaxView() === WPSG_BRUTTO) $display_brutto_netto = 'brutto';

+	else $display_brutto_netto = 'netto';

+	

+?>

+

+<?php foreach ($arCalculation['coupon'] as $gs) { ?>

+	

+	<tr class="totalrow">

+		<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name" colspan="3"><?php echo __('Wertgutschein', 'wpsg'); ?> <?php echo ((wpsg_isSizedString($gs['code']))?'('.$gs['code'].')':''); ?>:</td>

+		<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>

+			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_mwst"></td>

+		<?php } ?>

+		<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount">&nbsp;</td>

+		<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><?php

+				

+			echo wpsg_ff($gs[$display_brutto_netto], $this->get_option('wpsg_currency'));

+			

+			if (strpos($gs['set'], '%') !== false) {

+				

+				echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($gs['set']), '%').')</span>';

+				

+			}

+		

+		?></td>

+	</tr>

+	

+<?php } ?>

+

+<tr class="totalrow">

+	<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name" colspan="2"><?php echo __('Zu zahlen', 'wpsg'); ?>:</td>

+	<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price">&nbsp;</td>

+	<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?>

+		<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_mwst"></td>

+	<?php } ?>

+	<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount">&nbsp;</td>

+	<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_sum"><strong><?php echo wpsg_ff($this->view['basket']['arCalculation']['topay_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>

+</tr>

+    
\ No newline at end of file