- Alte Berechnung Versand- und Zahlungskosten entfernt

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

6 files changed, 113 insertions, 55 deletions

diff --git a/views/css/admin.css b/views/css/admin.css
index da21c71..1d67d0c 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -285,6 +285,7 @@
 .wpsg_order .col_nr .glyphicon.admincomment { color:red; }

 .wpsg_order .wpsg-order-tab { padding-top:15px; padding-bottom:15px; }

 .wpsg_order_view #restored_notice { margin-bottom:15px; color:red; }

+.procent_payship { font-size:0.75em; line-height:0.75em; color:#666666; displaY:block; }

 

 #wpsg-bs.wpsg_order_view .editableform textarea { height:150px;}

 .wpsg_order_view .wpsg_cell_gesamtpreis { text-align:right; }

diff --git a/views/css/frontend.css b/views/css/frontend.css
index e6db2bc..bd0c414 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -69,6 +69,7 @@ input.wpsg_error { border-color:red !important; }
 .basket_sum_wrap .wpsg_mod_basketteaser_row .valuer { width: 20%; display:inline-block; font-weight:normal; text-align:right; }

 .basket_sum_wrap .wpsg_mod_basketteaser_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; }

 .basket_sum_wrap .wpsg_gutschein_add {padding:0.75em 1em;}

+.procent_payship { font-size:0.75em; line-height:0.75em; color:#666666; displaY:block; }

 /* .glyphicon {width:20px !important; text-decoration:none; position:relative; display:inline-block; font-family:'Glyphicons Halflings'; line-height:1rem;} */

 

 .wpsg_basket .wpsg_checkoutbutton { float:right; padding:0.75em 1em; }

diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml
index 4983885..ec67234 100644
--- a/views/mods/mod_userpayment/list.phtml
+++ b/views/mods/mod_userpayment/list.phtml
@@ -82,7 +82,7 @@
         <?php echo wpsg_drawForm_TextStart(); ?>

         <span id="zv_mwst_key_<?php echo $zv['id']; ?>"><?php

         	$tax_groups = wpsg_tax_groups();

-        	echo wpsg_hspc($tax_groups[$zv['mwst_key']]);

+        	echo wpsg_hspc(@$tax_groups[$zv['mwst_key']]);

         ?></span>

 		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>

         <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>

diff --git a/views/order/product_table.phtml b/views/order/product_table.phtml
index dbab77e..abadd4a 100644
--- a/views/order/product_table.phtml
+++ b/views/order/product_table.phtml
@@ -169,6 +169,13 @@
 				<td class="wpsg_cell_shipping_value wpsg_cell_gesamtpreis" colspan="2">

 					<span id="wpsg_cell_shipping_value"><?php echo wpsg_ff($price_shipping); ?> </span>

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

+					

+					<?php if (strpos($arCalculation['shipping'][0]['set'], '%') !== false) { 

+

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

+

+					} ?>

+					

 				</td>

 			</tr>

 		<?php } ?>

@@ -188,6 +195,13 @@
 				<td class="wpsg_cell_payment_value wpsg_cell_gesamtpreis" colspan="2">

 					<span id="wpsg_cell_payment_value"><?php echo wpsg_ff($price_payment); ?> </span>

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

+					

+					<?php if (strpos($arCalculation['payment'][0]['set'], '%') !== false) {

+						

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

+						

+					} ?>

+					

 				</td>

 			</tr>

 		<?php } ?>

diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml
index b4864a1..0f2c471 100644
--- a/views/warenkorb/basket.phtml
+++ b/views/warenkorb/basket.phtml
@@ -235,24 +235,34 @@
 					<?php } ?>

 				</div>

 				<div class="value">

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

-						if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)

-						{

-

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

+						

+						$shipping_tax_key = $this->view['basket']['arCalculation']['shipping'][0]['tax_key'];

+						

+						if ($shipping_tax_key === '0') {

+							

 							echo __('anteilig', 'wpsg');

-

-						}

-						else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))

-						{

-

-							echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');

-

+							

+						} else {

+							

+							echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$shipping_tax_key]['tax_value'], '%');

+							

 						}

-				 	}

-					?>

+						 						

+				 	} ?>

 				</div>

 				<div class="value">

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

+					<?php 

+						

+						echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency'));

+						

+						if (strpos($this->view['basket']['arCalculation']['shipping'][0]['set'], '%') !== false) {

+							

+							echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['shipping'][0]['set']), '%').')</span>';

+							

+						}

+						

+					?>

 				</div>

 			</div>

 

@@ -276,24 +286,33 @@
 					</div>

 					<div class="value">

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

-

-							if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)

-							{

-

+							

+							$payment_tax_key = $this->view['basket']['arCalculation']['payment'][0]['tax_key'];

+							

+							if ($payment_tax_key === '0') {

+								

 								echo __('anteilig', 'wpsg');

-

+								

+							} else {

+								

+								echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$payment_tax_key]['tax_value'], '%');

+								

 							}

-							else if (array_key_exists(wpsg_getStr($this->view['basket']['checkout']['payment']), $this->arPayment))

-							{

-

-								echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');

-

-							}

-

+							 

 						} ?>

 					</div>

 					<div class="value">

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

+						<?php 

+							

+							echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); 

+						

+							if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) {

+								

+								echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')</span>';

+								

+							}

+							

+						?>

 					</div>

 				</div>

 			<?php } ?>

diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 1456ad4..a691164 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -337,24 +337,36 @@
 

 				</div>

 				<div class="value">

+					

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

-						if (isset($this->view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true)

-						{

-

+						

+						$shipping_tax_key = $this->view['basket']['arCalculation']['shipping'][0]['tax_key'];

+						

+						if ($shipping_tax_key === '0') {

+							

 							echo __('anteilig', 'wpsg');

-

+							

+						} else {

+							

+							echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$shipping_tax_key]['tax_value'], '%');

+							

 						}

-						else if (array_key_exists($this->view['basket']['checkout']['shipping'], $this->arShipping))

-						{

-

-							echo wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%');

-

-						}

-				 	}

-					?>

+						

+					} ?>

+					

 				</div>

 				<div class="value">

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

+					<?php 

+						

+						echo wpsg_ff($this->view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency'));

+						

+						if (strpos($this->view['basket']['arCalculation']['shipping'][0]['set'], '%') !== false) {

+							

+							echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['shipping'][0]['set']), '%').')</span>';

+							

+						}

+						

+					?>

 				</div>

 			</div>

 			<?php } ?>

@@ -366,25 +378,36 @@
 						<?php echo wpsg_translate(__('Zahlungsart (#1#)', 'wpsg'), $this->arPayment[$this->view['basket']['checkout']['payment']]['name']); ?>:

 					</div>

 					<div class="value">

+						

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

-

-							if (isset($this->view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true)

-							{

-

+							

+							$payment_tax_key = $this->view['basket']['arCalculation']['payment'][0]['tax_key'];

+							

+							if ($payment_tax_key === '0') {

+								

 								echo __('anteilig', 'wpsg');

-

+								

+							} else {

+								

+								echo wpsg_ff($this->view['basket']['arCalculation']['tax'][$payment_tax_key]['tax_value'], '%');

+								

 							}

-							else if (array_key_exists(wpsg_getStr($this->view['basket']['checkout']['payment']), $this->arPayment))

-							{

-

-								echo wpsg_ff($this->arPayment[$this->view['basket']['checkout']['payment']]['mwst_value'], '%');

-

-							}

-

-						} ?>

+							

+						} ?> 

+						

 					</div>

 					<div class="value">

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

+						<?php 

+							

+							echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency'));

+							

+							if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) {

+								

+								echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')</span>';

+								

+							}

+							

+						?>

 					</div>

 				</div>

 			<?php } ?>