Index: /mods/wpsg_mod_basketteaser.class.php =================================================================== --- /mods/wpsg_mod_basketteaser.class.php (revision 6329) +++ /mods/wpsg_mod_basketteaser.class.php (revision 6330) @@ -96,5 +96,5 @@ } // public function basket_row_afterproducts(&$p, $i) - + public function product_addedit_content(&$product_content, &$product_data) { Index: /mods/wpsg_mod_deliverytime.class.php =================================================================== --- /mods/wpsg_mod_deliverytime.class.php (revision 6329) +++ /mods/wpsg_mod_deliverytime.class.php (revision 6330) @@ -16,5 +16,5 @@ /** - * Costructor + * Constructor */ public function __construct() Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 6329) +++ /mods/wpsg_mod_discount.class.php (revision 6330) @@ -77,5 +77,6 @@ // Den Nullwert speichern $data_rabatt[0]['rabatt'] = wpsg_tf($_REQUEST['value'][0]['rabatt'], true); - + $data_rabatt[0]['value'] = 0; + $insert = 0; Index: /mods/wpsg_mod_produktattribute.class.php =================================================================== --- /mods/wpsg_mod_produktattribute.class.php (revision 6329) +++ /mods/wpsg_mod_produktattribute.class.php (revision 6330) @@ -547,5 +547,5 @@ $pa = $this->db->fetchRow(" SELECT - PA.`value`, A.`typ` + PA.`value`, A.`typ`, A.`auswahl` FROM `".WPSG_TBL_PRODUCTS_AT."` AS PA @@ -562,5 +562,5 @@ // Filter auf Feld anwenden (RTE) - // Den wpsgContentFilter deaktivieren um rekursion zu vermeiden + // Den wpsgContentFilter deaktivieren um Rekursion zu vermeiden remove_filter('the_content', array($GLOBALS['wpsg_sc'], 'content_filter')); $value = apply_filters('the_content', $pa['value']); @@ -576,8 +576,14 @@ } + else if ($pa['typ'] == '2') + { + // Auswahl + $arAuswahl = explode('|', $pa['auswahl']); + $value = $arAuswahl[$pa['value']]; + } else { - // Auswahl oder normales Textfeld + // Normales Textfeld $value = $pa['value']; } Index: /mods/wpsg_mod_weight.class.php =================================================================== --- /mods/wpsg_mod_weight.class.php (revision 6329) +++ /mods/wpsg_mod_weight.class.php (revision 6330) @@ -112,5 +112,5 @@ } // public function basket_row(&$p, $i) - + public function basket_row_end(&$basket_view) { Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 6329) +++ /views/css/frontend.css (revision 6330) @@ -32,6 +32,40 @@ .basket_product_wrap .basket_product_row .product_content { width:100%; display:flex; flex-direction:column; justify-content:space-between; } .basket_product_wrap .basket_product_row .product_action { display:flex; width:100%; justify-content:space-between; align-items:center; } -.basket_product_wrap .basket_product_row .product_action .amount { margin-top:0.5em; margin-bottom:0.5em; } -.basket_product_wrap .basket_product_row .product_action .price_total { font-weight:bold; } +.basket_product_wrap .basket_product_row .product_action .amount { width:80px; margin-top:0.5em; margin-bottom:0.5em; text-align:center;} +.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 .titlep { width: 20%; 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 .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; } +.basket_product_wrap .basket_product_row .product_info .dummyr { width: 19%; display:inline-block; font-weight:normal; text-align:right; } +.basket_product_wrap .basket_product_row .product_info .dummy { flex-grow:1; width:90px; } +.basket_product_wrap .basket_product_row .product_info .dummyp { flex-grow:1; width:110px; } +.basket_sum_wrap .basket_sum_row { display:flex; width:100%; justify-content:space-between; align-items:center; } +.basket_sum_wrap .basket_sum_row .title { width: 60%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.basket_sum_wrap .basket_sum_row .title2 { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.basket_sum_wrap .basket_sum_row .value { width: 20%; display:inline-block; font-weight:normal; text-align:right; } +.basket_sum_wrap .basket_sum_row .valuel { width: 20%; display:inline-block; font-weight:normal; text-align:left; } +.basket_sum_wrap .basket_sum_row .sum { width: 20%; display:inline-block; font-weight:bold; text-align:right; } +.basket_sum_wrap .basket_sum_row .delgs { width: 20%; display:inline-block; font-weight:normal; text-align:right; } +.basket_sum_wrap .basket_sum_row .codegs { width: 34%; display:inline-block; font-weight:normal; text-align:left; } +.basket_sum_wrap .basket_sum_row .codegsl { width: 33%; display:inline-block; font-weight:normal; text-align:left; } +.basket_sum_wrap .basket_sum_row .codegsr { width: 33%; display:inline-block; font-weight:normal; text-align:right; } +.basket_sum_wrap .basket_sum_row .colgsl { width: 20%; display:inline-block; font-weight:normal; text-align:left; } +.basket_sum_wrap .basket_sum_row .colgsr { width: 20%; display:inline-block; font-weight:normal; text-align:right; } +.basket_sum_wrap .basket_sum_row .titlegs { width: 80%; display:inline-block; margin-top:0.3em; margin-bottom:0.3em; } +.basket_sum_wrap .wpsg_mod_basketteaser_row { display:flex; width:100%; justify-content:space-between; align-items:center; } +.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; } + +.wpsg_basket .wpsg_basket_removelink { float:right; text-decoration:none; border:0px !important; } +.wpsg_basket .wpsg_checkoutbutton { float:right; } +.wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; } +.wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; } +.wpsg_basket .wpsg_basket_weiter_shoppen2 {background:#1a1a1a none repeat scroll 0 0; border:0 none; border-radius:2px; color:#fff; font-weight:700; line-height:1; text-transform:uppercase; padding:0.85em 0.875em 0.78em;} + /* Checkout + Request*/ @@ -138,4 +172,10 @@ .wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; margin-left:-8px; top:50%; margin-top:-5px; } .wpsg_productform .wpsg_produkt_produktbilder { max-width:200px; } +.wpsg_productform label { + color: #333; + display: block; + font-weight: 800; + margin-bottom: 0.5em; +} @media (max-width:400px) { Index: /views/mods/mod_abo/basket_row.phtml =================================================================== --- /views/mods/mod_abo/basket_row.phtml (revision 6329) +++ /views/mods/mod_abo/basket_row.phtml (revision 6330) @@ -6,11 +6,15 @@ ?> - - - - - : - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
view['wpsg_mod_abo']['order']['onr'], $this->view['wpsg_mod_abo']['wpsg_mod_abo_durration_menge']); ?> - - +
+
+ +
+ +
Index: /views/mods/mod_basketteaser/basket_row.phtml =================================================================== --- /views/mods/mod_basketteaser/basket_row.phtml (revision 6329) +++ /views/mods/mod_basketteaser/basket_row.phtml (revision 6330) @@ -6,7 +6,6 @@ ?> - -   - +
+
getProduktLink($this->view['data'])) { ?> view['data']['detailname'] != '')?$this->view['data']['detailname']:$this->view['data']['name'])); ?> @@ -14,12 +13,20 @@ view['data']['detailname'] != '')?$this->view['data']['detailname']:$this->view['data']['name'])); ?> - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - view['data']['mwst_value'], '%'); ?> - - - +
+
+ view['data']['preis'], $this->get_option('wpsg_currency')); ?> +
+
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> + view['data']['mwst_value'], '%'); ?> + +
+
+ +
+
- - +
+ +
+
Index: /views/mods/mod_deliverytime/basket_row.phtml =================================================================== --- /views/mods/mod_deliverytime/basket_row.phtml (revision 6329) +++ /views/mods/mod_deliverytime/basket_row.phtml (revision 6330) @@ -6,7 +6,10 @@ ?> - - : - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
view['data']['wpsg_mod_deliverytime_deliverytime'])) { /* Lieferzeit > 0 im Produkte */ ?> view['wpsg_mod_deliverytime']['deliverytime'] ?> @@ -16,15 +19,17 @@ - - - +
+
+ +
+ +
get_option('wpsg_mod_deliverytime_delay') == '1') { ?> - - -
- get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> -
- - +
+
+ get_option('wpsg_mod_deliverytime_delayText'), $this->get_option('wpsg_mod_deliverytime_delayTime')); ?> + +
+
Index: /views/mods/mod_gutschein/basket_row_end.phtml =================================================================== --- /views/mods/mod_gutschein/basket_row_end.phtml (revision 6329) +++ /views/mods/mod_gutschein/basket_row_end.phtml (revision 6330) @@ -6,12 +6,14 @@ ?> - - - +
+
+
- - +
+
view['error']))?'wpsg_error':''); ?>" type="text" name="wpsg[gutschein]" value="" /> - - - +
+
+ +
+
Index: /views/mods/mod_productvariants/basket_row.phtml =================================================================== --- /views/mods/mod_productvariants/basket_row.phtml (revision 6329) +++ /views/mods/mod_productvariants/basket_row.phtml (revision 6330) @@ -6,8 +6,11 @@ ?> -view['variante']) ?> - - : - +view['variante']) ?> +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
view['variante'] as $vari => $value) { ?> @@ -20,4 +23,8 @@ view['variante']['key']; ?> - - +
+
+ +
+ +
Index: /views/mods/mod_productvars/basket_row.phtml =================================================================== --- /views/mods/mod_productvars/basket_row.phtml (revision 6329) +++ /views/mods/mod_productvars/basket_row.phtml (revision 6330) @@ -7,12 +7,15 @@ ?> view['wpsg_mod_productvars']['data'] as $pv) { ?> - - *: - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + * +
+
@@ -21,7 +24,11 @@ - view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']] == '1')?'checked="checked"':''); ?> class="view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" type="checkbox" value="1" name="wpsg_mod_productvars[][view['wpsg_mod_productvars']['p']['product_index']; ?>]" /> + view['wpsg_mod_productvars']['p']['wpsg_mod_productvars'][$pv['id']]) == '1')?'checked="checked"':''); ?> class="view['wpsg_mod_productvars']['p']['product_index'], (array)$this->view['error']))?'wpsg_error':''); ?>" type="checkbox" value="1" name="wpsg_mod_productvars[][view['wpsg_mod_productvars']['p']['product_index']; ?>]" /> - - +
+
+ +
+ +
Index: /views/mods/mod_produktattribute/basket_row.phtml =================================================================== --- /views/mods/mod_produktattribute/basket_row.phtml (revision 6329) +++ /views/mods/mod_produktattribute/basket_row.phtml (revision 6330) @@ -8,10 +8,16 @@ view['wpsg_mod_produktattribute']['data'] as $pa_id) { ?> - - - : - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + callMod('wpsg_mod_produktattribute', 'getAttributeLabel', array($pa_id)); ?> +
+
callMod('wpsg_mod_produktattribute', 'getAttributeValue', array($this->view['wpsg_mod_produktattribute']['id'], $pa_id)); ?> - - +
+
+ +
+ +
Index: /views/mods/mod_weight/basket_row.phtml =================================================================== --- /views/mods/mod_weight/basket_row.phtml (revision 6329) +++ /views/mods/mod_weight/basket_row.phtml (revision 6330) @@ -6,8 +6,15 @@ //wpsg_debug($this->view); ?> - - : - +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> - - +
+
+ +
+ +
Index: /views/mods/mod_weight/basket_row_end.phtml =================================================================== --- /views/mods/mod_weight/basket_row_end.phtml (revision 6329) +++ /views/mods/mod_weight/basket_row_end.phtml (revision 6330) @@ -6,10 +6,13 @@ ?> - - +
+
: - - +
+
view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?> - - +
+
+ +
+
Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 6329) +++ /views/warenkorb/basket.phtml (revision 6330) @@ -24,9 +24,9 @@ hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?> - + render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?> - - - view['noFormTag'])) { ?> + + + view['noFormTag'])) { ?>
@@ -38,16 +38,42 @@
- view['basket']['produkte'] as $k => $product_data) { ?> + view['basket']['produkte'] as $k => $product_data) { $i ++; ?> +
- callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_data['product_id'])); if (!wpsg_isSizedArray($arImages)) $arImages = array(); ?> - + view['$bPicture'] = false; ?> + + get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { + + if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']); + else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); + + ?>
- - - + + + callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($product_data['product_key'])); + if (wpsg_isSizedArray($arr)) + { + $ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail'); + $url = $ais[0]; + } + else + { + $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail')); + } + } else { + $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($product_data['productkey'], 'thumbnail')); + } + if (wpsg_isSizedString($url)) $this->view['$bPicture'] = true; + echo ""; + ?> + +
- +
@@ -63,7 +89,14 @@ + + <?php echo __('Löschen', 'wpsg'); ?> + +
+
+ +
@@ -71,7 +104,17 @@
+
+
+
+ +
get_option('wpsg_currency')); ?>
+
+
+
+ +
get_option('wpsg_currency')); ?> @@ -79,144 +122,109 @@
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> +
+
view['$bPicture'] == true) { ?>class="titlep">class="title"> + +
+
+ +
+
+ +
+ +
+ + + callMods('basket_row', array(&$product_data, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?> + +
+ + +
+ +
+ + callMods('basket_row_afterproducts', array(&$p, $i)); ?> + + + view['basket']['gs'])) { $bLine = true; ?> +
+
+ view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?> +
+
+ + <?php echo __('Löschen', 'wpsg'); ?> + +
+
+
+
 
+
1
+
+ view['basket']['gs']['calc'] == 'p') { ?> + view['basket']['gs']['value'], '%'); ?> + + view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?> + +
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> +
+ +
view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
+
-
- - - - - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - view['basket']['produkte'] as $k => $p) { $i ++; ?> - callMods('basket_row', array(&$p, $i)); $strBasketRow = ob_get_contents(); ob_end_clean(); ?> - - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - + +
+ view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?> +
+ : +
+ view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> +
+ +
+ +
+ view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> +
-
- - - - - - - callMods('basket_row_afterproducts', array(&$p, $i)); ?> - view['basket']['gs'])) { ?> - - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - - - view['basket']['sum']['preis_rabatt']) && wpsg_tf($this->view['basket']['sum']['preis_rabatt']) > 0) { ?> - - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - - - - - - - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - */?> - - - + + hasMod('wpsg_mod_crefopay')) { ?> - - - view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1') { ?> - - - - +
+
+ + arPayment) > 1) { ?> + + arPayment) || !array_key_exists($this->view['basket']['checkout']['payment'], $this->arPayment)) { ?> + + + arPayment[$this->view['basket']['checkout']['payment']]['name']; ?> + +
+
+ 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) + { + + echo __('anteilig', 'wpsg'); + + } + 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'], '%'); + + } + + } ?> +
+
+ view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?> +
+
- + - - - - - - - - - - - - - view['basket']['mwst'] as $mwst) { ?> - - - - + + + + view['basket']['mwst'] as $mwst) { ?> +
+
+ : +
+
+ get_option('wpsg_currency'); ?> +
+
- - - - + + +
+ callMods('basket_row_end', array(&$this->view)); ?> -
 
- - - <?php echo __('Löschen', 'wpsg'); ?> - - - - value="" size="3" /> - get_option('wpsg_currency'); ?> % get_option('wpsg_currency'); ?>
- get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { - - if (wpsg_isSizedString($p['varianten_image'])) $arBilder = array($p['varianten_image']); - else $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($p['id']))); - - ?> -
- - - callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['product_key'], 'medium')); - $arr = $this->callMod('wpsg_mod_productvariants', 'getKombiVariImages', array($p['product_key'])); - $ais = wp_get_attachment_image_src($arr[0]['post_id'], 'thumbnail'); - $url = $ais[0]; - } else { - $url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($p['productkey'], 'medium')); - } - echo ""; - ?> - - -
- - getProduktLink($p)) { ?> - + + + +
+ + +
+
+ get_option("wpsg_kleinunternehmer") == "1") { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - - -
- - <?php echo __('Löschen', 'wpsg'); ?> - - 1 - view['basket']['gs']['calc'] == 'p') { ?> - view['basket']['gs']['value'], '%'); ?> - - view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?> - - view['basket']['sum']['gs'], $this->get_option('wpsg_currency')); ?>
- view['basket']['gs']['code'] != '')? '('.$this->view['basket']['gs']['code'].')':'' ?> -
- - - view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> - - view['basket']['sum']['preis_rabatt'], $this->get_option('wpsg_currency')); ?> -
- get_option("wpsg_kleinunternehmer") == "1") { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - - getFrontendTaxview() == WPSG_NETTO) { ?> - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - - getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: - - - + getFrontendTaxview() == WPSG_NETTO) { ?> + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: + + getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').''); ?>: + + + +
view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?> -
+ + + +
+
Versandkosten:', 'wpsg'), $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN) ); ?> - arShipping) > 1) { ?> + arShipping) > 1) { ?> + -
view['basket']['shipping']['tax_rata']) && $this->view['basket']['shipping']['tax_rata'] === true) - { - - 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'], '%'); - - } - - ?>arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'] > 0)?wpsg_ff($this->arShipping[$this->view['basket']['checkout']['shipping']]['mwst_value'], '%'):__('anteilig', 'wpsg')); ?> + +
+ 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) + { + + 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'], '%'); + + } + } + ?> +
+
view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?> -
- - arPayment) > 1) { ?> - - arPayment) || !array_key_exists($this->view['basket']['checkout']['payment'], $this->arPayment)) { ?> - - - arPayment[$this->view['basket']['checkout']['payment']]['name']; ?> - - view['basket']['payment']['tax_rata']) && $this->view['basket']['payment']['tax_rata'] === true) - { - - echo __('anteilig', 'wpsg'); - - } - 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'], '%'); - - } - - ?> - view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?> -
- : - - view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> -
+
+
+ +
+
+ +
+
+ +
+
+ : +
+
+ view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> +
+
+ + +
+
: -
+ +
view['basket']['sum']['preis_gesamt_netto'], $this->get_option('wpsg_currency')); ?> -
- : - - get_option('wpsg_currency'); ?> -
+
+
+
: -
+ +
view['basket']['sum']['preis_gesamt_brutto'], $this->get_option('wpsg_currency')); ?> -
- - callMods('basket_inner_prebutton', array(&$this->view)); ?> - -
+ +
+
+ +
+
+ +
+
+ +
+
+ + callMods('basket_inner_prebutton', array(&$this->view)); ?> + + @@ -361,15 +389,18 @@ - +
- + ClearSessionErrors(); ?> - - view['noFormTag'])) { ?> -
- - + + view['noFormTag'])) { ?> + + + +
callMods('basket_after', array(&$this->view)); ?> - + +
+