- Gutschein/Coupon

- Task #681

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

4 files changed, 51 insertions, 26 deletions

diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index 60d1b2b..9832fba 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -131,7 +131,7 @@
 	</tr>

 	<tr>

 		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Rechnungsbetrag', 'wpsg'); ?>:</td>

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

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

 	</tr>

 	<?php if ($this->get_option('wpsg_kleinunternehmer') != '1') { ?>

 	<tr>

diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml
index 0b5bfbd..efc3e19 100644
--- a/views/mailtemplates/html/order.phtml
+++ b/views/mailtemplates/html/order.phtml
@@ -1,4 +1,9 @@
-<div class="baskettable_wrap">

+<?php

+	

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

+	else $display_brutto_netto = 'netto';

+	

+?><div class="baskettable_wrap">

 	<table class="baskettable" cellpadding="2" cellspacing="0" style="cell-padding:4px;">

 		<tr class="head">

 			<th valign="middle" style="cell-padding:4px; padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"><?php echo __('Pos', 'wpsg'); ?></th>

@@ -69,18 +74,20 @@
 		</tr>

 		<?php } ?>

 		<?php } ?>

-		<?php if (isset($this->view['basket']['gs'])) { ?>

-		<tr class="voucherrow">

-			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"><?php echo $i + 1; ?>.</td>

-			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_name"><?php echo wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $this->view['basket']['gs']['code']); ?></td>

-			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price"><?php echo wpsg_ff($this->view['basket']['gs']['value'], (($this->view['basket']['gs']['calc'] == 'w')?$this->get_option('wpsg_currency'):'%')); ?></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"><?php echo __('anteilig', 'wpsg'); ?></td>		

+		<?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) { $bLine = true; ?>		

+			<?php foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) { ?>

+				<tr class="voucherrow">

+					<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_pos"> <?php print_r($gs); ?></td>

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

+					<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_price"><?php echo wpsg_ff($gs['set'], ((strpos($gs['set'], '%') !== false)?'%':$this->get_option('wpsg_currency'))); ?></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"><?php echo __('Anteilig', 'wpsg'); ?></td>

+					<?php } ?>

+					<td style="padding:4px; line-height:100%; vertical-align:middle;" class="col_amount">1</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')); ?></td>

+				</tr>

 			<?php } ?>

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

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

-		</tr>

-		<?php } ?>

+		<?php } ?>		

 		<tr class="spacer">

 			<td style="padding:4px; line-height:100%; vertical-align:middle;" class="td_bt" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'6':'5'); ?>">&nbsp;</td>

 		</tr>

@@ -188,6 +195,7 @@
 			<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']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?></strong></td>

 		</tr>

+		<?php $this->callMods('mail_order_end', [$this->view['basket']['arCalculation'], true]); ?>	

 	</table>

 </div>

 	

diff --git a/views/mailtemplates/kundenmail.phtml b/views/mailtemplates/kundenmail.phtml
index f219fae..dababfc 100644
--- a/views/mailtemplates/kundenmail.phtml
+++ b/views/mailtemplates/kundenmail.phtml
@@ -63,7 +63,7 @@
 <?php echo wpsg_pad_right(__('Kundennummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['knr']; ?> 

 <?php echo wpsg_pad_right(__('Bestellnummer', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['onr']; ?> 

 <?php echo wpsg_pad_right(__('Bestelldatum', 'wpsg').':', 35); ?><?php echo date("d.m.Y H:i:s", $this->view['basket']['checkout']['datum']); ?> 

-<?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> 

+<?php echo wpsg_pad_right(__('Rechnungsbetrag', 'wpsg').':', 35); ?><?php echo wpsg_ff($this->view['basket']['arCalculation']['topay_brutto'], $this->get_option('wpsg_currency')); ?> 

 <?php if ($this->get_option('wpsg_kleinunternehmer')) { ?>

 

 <?php echo $this->get_option('wpsg_kleinunternehmer_text'); ?>

diff --git a/views/mailtemplates/order.phtml b/views/mailtemplates/order.phtml
index a174502..68ace58 100644
--- a/views/mailtemplates/order.phtml
+++ b/views/mailtemplates/order.phtml
@@ -1,4 +1,9 @@
-<?php if (sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { $prod_col = 25; } else { $prod_col = 35; } ?>

+<?php

+	

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

+	else $display_brutto_netto = 'netto';

+

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

 

 <?php echo wpsg_pad_right(__('Pos', 'wpsg'), 5); ?>

 <?php echo wpsg_pad_right(__('Produkt', 'wpsg'), $prod_col); ?>

@@ -29,16 +34,27 @@
 <?php } ?>

 <?php } ?>

  

-<?php if (isset($this->view['basket']['gs'])) { ?>

-<?php echo wpsg_pad_right(($i + 1).'.', 5); ?>

-<?php echo wpsg_pad_right(wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $this->view['basket']['gs']['code']), $prod_col); ?>

-<?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['gs']['value'], (($this->view['basket']['gs']['calc'] == 'w')?$this->get_option('wpsg_currency'):'%')).' ', 15); ?>

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

-<?php echo wpsg_pad_left(__('anteilig', 'wpsg').' ', 10); ?>

-<?php } ?>

-<?php echo wpsg_pad_left('1', 6); ?>

-<?php echo wpsg_pad_left('-'.wpsg_ff($this->view['basket']['sum']['gs'], $this->get_option('wpsg_currency')), 15); ?> 

-<?php } ?>

+<?php if (wpsg_isSizedArray($this->view['basket']['arCalculation']['voucher'])) {

+	

+	foreach ($this->view['basket']['arCalculation']['voucher'] as $gs) {

+		

+		echo wpsg_pad_right(' ', 5);

+		echo wpsg_pad_right(wpsg_translate(__('Gutschein (#1#)', 'wpsg'), $gs['code']), $prod_col);

+		echo wpsg_pad_left(wpsg_ff($gs['set'], ((strpos($gs['set'], '%') !== false)?'%':$this->get_option('wpsg_currency'))).' ', 15);

+		

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

+			

+			echo wpsg_pad_left(__('anteilig', 'wpsg').' ', 10);

+			

+		}

+		

+		echo wpsg_pad_left('1', 6);

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

+		echo "\r\n";

+		

+	}

+

+} ?>

 <?php if (isset($this->view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?>

      <?php echo wpsg_pad_right(__('Abzüglich Rabatt', 'wpsg'), 40); ?>

 <?php echo wpsg_pad_left('-'.wpsg_ff($this->view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')), 31); ?> 

@@ -102,6 +118,7 @@
  

 <?php echo wpsg_pad_left(' ', 61); ?>---------------

      <?php echo wpsg_pad_right(__('Gesamtpreis:', 'wpsg'), 37); ?>

-<?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')), 34); ?> 

+<?php echo wpsg_pad_left(wpsg_ff($this->view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')), 34); ?>

+<?php $this->callMods('mail_order_end', [$this->view['basket']['arCalculation'], false]); ?>

  

 <?php $this->callMods('mail_aftercalculation', array(&$this->view['basket']['checkout']['o_id'])); ?>
\ No newline at end of file