Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 7346) +++ /lib/wpsg_basket.class.php (revision 7347) @@ -1643,231 +1643,10 @@ } - $this->shop->callMods('calcPayment', array(&$arReturn)); - - } - - } - /* - // Zahlungskosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_payment_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_payment_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_payment_brutto']; - - // Versandkosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_shipping_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_shipping_brutto']; - */ - if ($backend) - { - - // Preise so anzeigen wie im Backend eingestellt - $price_option = $this->shop->get_option('wpsg_preisangaben'); - foreach ($arReturn['produkte'] as $produkt_key => &$p) { - //if ($arReturn['price_frontend'] == WPSG_NETTO) - if ($price_option == WPSG_NETTO) - { - $p['preis'] = $p['preis_netto']; - } - else - { - $p['preis'] = $p['preis_brutto']; - } - } - - /* - // Zahlungskosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_payment_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_payment_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_payment_brutto']; - - // Versandkosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_shipping_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_shipping_brutto']; - */ - //if ($arReturn['price_frontend'] == WPSG_NETTO) - if ($price_option == WPSG_NETTO) - { - $taxp = 0.0; - //$taxp = $this->addMwSt($arReturn, $arReturn['sum']['preis_payment_netto']); - //$taxs = $this->addMwSt($arReturn, $arReturn['sum']['preis_shipping_netto']); - //$taxp = abs($taxp); - //$taxs = abs($taxs); - - $mb = new wpsg_mod_basic; - //$t = $this->shop->get_option('wpsg_mod_targo_mwst'); // 0=anteilig, sonst a,b,c,d,e - $pricep = $arReturn['sum']['preis_payment_brutto']; - $prices = $arReturn['sum']['preis_shipping_brutto']; - unset($arReturn['sum']['preis_payment_netto']); - unset($arReturn['sum']['preis_payment_brutto']); - unset($arReturn['sum']['preis_shipping_netto']); - unset($arReturn['sum']['preis_shipping_brutto']); - - $id = $arReturn['checkout']['payment']; - $tax_keyp = $this->shop->arPayment[$id]['mwst']; - $mb->setPaymentKosten($arReturn, $pricep, $tax_keyp); - $taxp = $arReturn['payment']['mwst']; - - $id = $arReturn['checkout']['shipping']; - $tax_keys = $this->shop->arShipping[$id]['mwst']; - $mb->setShippingKosten($arReturn, 'x', $prices, $tax_keys); - $taxs = $arReturn['shipping']['mwst']; - - if ($this->shop->addRoundedValues === true) - { - - $arReturn['sum']['preis_payment_brutto'] = round($arReturn['sum']['preis_payment_brutto'], 2); - $arReturn['sum']['preis_payment_netto'] = round($arReturn['sum']['preis_payment_netto'], 2); - $arReturn['sum']['preis_shipping_brutto'] = round($arReturn['sum']['preis_shipping_brutto'], 2); - $arReturn['sum']['preis_shipping_netto'] = round($arReturn['sum']['preis_shipping_netto'], 2); - - } - else - { - - $arReturn['sum']['preis_payment_brutto'] = $arReturn['sum']['preis_payment_netto'] + $taxp; - $arReturn['sum']['preis_payment_netto'] = $arReturn['sum']['preis_payment_netto']; - $arReturn['sum']['preis_shipping_brutto'] = $arReturn['sum']['preis_shipping_netto'] + $taxs; - $arReturn['sum']['preis_shipping_netto'] = $arReturn['sum']['preis_shipping_netto']; - - } - - // Zahlungskosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_payment_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_payment_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_payment_brutto']; - - // Versandkosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_shipping_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_shipping_brutto']; - - foreach ($arReturn['mwst'] as $key => $value) { - $arReturn['sum']['preis_gesamt_netto'] += $value['sum']; - } - $arReturn['sum']['preis'] = $arReturn['sum']['preis_netto']; - $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_netto']; - $arReturn['sum']['preis_payment'] = $arReturn['sum']['preis_payment_netto']; - $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_netto']; - $arReturn['sum']['preis_rabatt'] = $arReturn['sum']['preis_rabatt_netto']; - if (array_key_exists('gs', $arReturn['sum'])) - { - $arReturn['sum']['gs'] = $arReturn['sum']['gs_netto']; - } - - } - else // if ($price_option == WPSG_NETTO) - { - $taxp = 0; - $mb = new wpsg_mod_basic; - //$t = $this->shop->get_option('wpsg_mod_targo_mwst'); // 0=anteilig, sonst a,b,c,d,e - $pricep = $arReturn['sum']['preis_payment_brutto']; - $prices = $arReturn['sum']['preis_shipping_brutto']; - unset($arReturn['sum']['preis_payment_netto']); - unset($arReturn['sum']['preis_payment_brutto']); - unset($arReturn['sum']['preis_shipping_netto']); - unset($arReturn['sum']['preis_shipping_brutto']); - - $id = $arReturn['checkout']['payment']; - $tax_keyp = wpsg_getStr($this->shop->arPayment[$id]['mwst']); - $mb->setPaymentKosten($arReturn, $pricep, $tax_keyp); - $taxp = $arReturn['payment']['mwst']; - - $id = $arReturn['checkout']['shipping']; - $tax_keys = wpsg_getStr($this->shop->arShipping[$id]['mwst']); - $mb->setShippingKosten($arReturn, 'x', $prices, $tax_keys); - $taxs = $arReturn['shipping']['mwst']; - - //$taxp = $this->addMwSt($arReturn, $arReturn['sum']['preis_payment_brutto']); - //$taxs = $this->addMwSt($arReturn, $arReturn['sum']['preis_shipping_brutto']); - //$taxp = abs($taxp); - //$taxs = abs($taxs); - - if ($this->shop->addRoundedValues === true) - { - - $arReturn['sum']['preis_payment_brutto'] = round($arReturn['sum']['preis_payment_brutto'], 2); - $arReturn['sum']['preis_payment_netto'] = round($arReturn['sum']['preis_payment_brutto'] - $taxp, 2); - $arReturn['sum']['preis_shipping_brutto'] = round($arReturn['sum']['preis_shipping_brutto'], 2); - $arReturn['sum']['preis_shipping_netto'] = round($arReturn['sum']['preis_shipping_brutto'] - $taxs, 2); - - } - else - { - - $arReturn['sum']['preis_payment_brutto'] = $arReturn['sum']['preis_payment_netto']; - $arReturn['sum']['preis_payment_netto'] = $arReturn['sum']['preis_payment_brutto'] - $taxp; - $arReturn['sum']['preis_shipping_brutto'] = $arReturn['sum']['preis_shipping_brutto']; - $arReturn['sum']['preis_shipping_netto'] = $arReturn['sum']['preis_shipping_brutto'] - $taxs; - - } - - // Zahlungskosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_payment_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_payment_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_payment_brutto']; - - // Versandkosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_shipping_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_shipping_brutto']; - - $arReturn['sum']['preis'] = $arReturn['sum']['preis_brutto']; - $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_brutto']; - $arReturn['sum']['preis_payment'] = $arReturn['sum']['preis_payment_brutto']; - $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_brutto']; - $arReturn['sum']['preis_rabatt'] = wpsg_getFloat($arReturn['sum']['preis_rabatt_brutto']); - if (array_key_exists('gs', $arReturn['sum'])) - { - $arReturn['sum']['gs'] = $arReturn['sum']['gs_brutto']; - } - } // else if ($price_option == WPSG_NETTO) - - } - else // if ($backend) - { - - // Zahlungskosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_payment_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_payment_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_payment_brutto']; - - // Versandkosten der Summe hinzurechnen - if (isset($arReturn['sum']['preis_shipping_netto'])) $arReturn['sum']['preis_gesamt_netto'] += $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt_brutto'] += $arReturn['sum']['preis_shipping_brutto']; - - // Preisangaben fÌrs Frontend - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_payment_netto']; - - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_netto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_payment'] = $arReturn['sum']['preis_payment_netto']; - - } - else - { - - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_shipping_brutto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_payment_brutto']; - - if (isset($arReturn['sum']['preis_shipping_brutto'])) $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_brutto']; - if (isset($arReturn['sum']['preis_payment_brutto'])) $arReturn['sum']['preis_payment'] = $arReturn['sum']['preis_payment_brutto']; - - } - - } // else if ($backend) - - // Leere MwSt. SÀtze entfernen - foreach ((array)$arReturn['mwst'] as $k => $v) - { - if ($v['sum'] <= 0) unset($arReturn['mwst'][$k]); - } - - // Negative Bestellungen Verhindern - if (isset($arReturn['sum']['preis_netto']) && $arReturn['sum']['preis_netto'] < 0) $arReturn['sum']['preis_netto'] = 0; - if (isset($arReturn['sum']['preis_brutto']) && $arReturn['sum']['preis_brutto'] < 0) $arReturn['sum']['preis_brutto'] = 0; - if (isset($arReturn['sum']['preis']) && $arReturn['sum']['preis'] < 0) $arReturn['sum']['preis'] = 0; - if (isset($arReturn['sum']['preis_gesamt_netto']) && $arReturn['sum']['preis_gesamt_netto'] < 0) $arReturn['sum']['preis_gesamt_netto'] = 0; - if (isset($arReturn['sum']['preis_gesamt_brutto']) && $arReturn['sum']['preis_gesamt_brutto'] < 0) $arReturn['sum']['preis_gesamt_brutto'] = 0; - if (isset($arReturn['sum']['preis_gesamt']) && $arReturn['sum']['preis_gesamt'] < 0) $arReturn['sum']['preis_gesamt'] = 0; + } + + } $this->shop->callMods('basket_toArray_final', array(&$this, &$arReturn)); - - + // LÀnderdetails laden if (wpsg_isSizedInt($arReturn['checkout']['land'])) { @@ -1978,4 +1757,6 @@ //$this->shop->arShipping[$arCalculation['shipping'][0]['shipping_key']]['mwst_value'] = $arCalculation['tax'][$arCalculation['shipping'][0]['tax_key']]['tax_value']; + $arReturn['arCalculation'] = $arCalculation; + return $arReturn; Index: /lib/wpsg_calculation.class.php =================================================================== --- /lib/wpsg_calculation.class.php (revision 7346) +++ /lib/wpsg_calculation.class.php (revision 7347) @@ -315,5 +315,5 @@ $tax_key = $this->normalizeTaxKey($tax_key); - + $this->arCalculationRow['shipping'] = [ 'type' => 'shipping', @@ -337,5 +337,5 @@ $tax_key = $this->normalizeTaxKey($tax_key); - + $this->arCalculationRow['payment'] = [ 'type' => 'payment', @@ -940,5 +940,5 @@ $this->shop->callMods('calculation_fromSession',[&$this, true, false]); - + // Payment if (isset($_SESSION['wpsg']['checkout']['payment']) && array_key_exists($_SESSION['wpsg']['checkout']['payment'], $this->shop->arPayment)) { @@ -946,5 +946,5 @@ $payment = $this->shop->arPayment[$_SESSION['wpsg']['checkout']['payment']]; - if (wpsg_isSizedArray($payment)) $this->addPayment(wpsg_getFloat($payment['price']), $this->shop->getBackendTaxview(), @$payment['mwst_key'], $_SESSION['wpsg']['checkout']['payment']); + if (wpsg_isSizedArray($payment)) $this->addPayment($payment['price'], $this->shop->getBackendTaxview(), @$payment['tax_key'], $_SESSION['wpsg']['checkout']['payment']); } @@ -955,5 +955,5 @@ $shipping = $this->shop->arShipping[$_SESSION['wpsg']['checkout']['shipping']]; - if (wpsg_isSizedArray($shipping)) $this->addShipping(wpsg_getFloat($shipping['price']), $this->shop->getBackendTaxview(), @$shipping['mwst_key'], $_SESSION['wpsg']['checkout']['shipping']); + if (wpsg_isSizedArray($shipping)) $this->addShipping($shipping['price'], $this->shop->getBackendTaxview(), $shipping['tax_key'], $_SESSION['wpsg']['checkout']['shipping']); } Index: /mods/wpsg_mod_amazon.class.php =================================================================== --- /mods/wpsg_mod_amazon.class.php (revision 7346) +++ /mods/wpsg_mod_amazon.class.php (revision 7347) @@ -405,94 +405,20 @@ { - if (is_admin() || $this->shop->get_option('wpsg_mod_amazon_aktiv') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_amazon_mwst'), $this->shop->getDefaultCountry()); + if (is_admin() || $this->shop->get_option('wpsg_mod_amazon_aktiv') == '1') { $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_amazon_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_amazon_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_amazon_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_amazon_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_amazon_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_amazon_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_amazon_hint'), 'wpsg'), 'logo' => $this->shop->getRessourceURL('mods/mod_amazon/gfx/logo_100x25.png') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_amazon_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_amazon_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($this->id == $arBasket['checkout']['payment']) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_amazon_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_amazon_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_amazon_mwstland')); - - } - - } - - } // public function calcPayment(&$arBasket) - + /* Redirect */ Index: /mods/wpsg_mod_autodebit.class.php =================================================================== --- /mods/wpsg_mod_autodebit.class.php (revision 7346) +++ /mods/wpsg_mod_autodebit.class.php (revision 7347) @@ -168,114 +168,23 @@ } // public function be_ajax() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { //if (!is_admin() && $this->shop->get_option('wpsg_mod_autodebit_aktiv') != '1') return; - if (is_admin() || $this->shop->get_option('wpsg_mod_autodebit_aktiv') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_autodebit_mwst'), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_autodebit_aktiv') == '1') { + $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_autodebit_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_autodebit_gebuehr'), - 'mwst_key' => $this->shop->get_option('wpsg_mod_autodebit_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_autodebit_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_autodebit_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_autodebit_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_autodebit_hint')), 'logo' => $this->shop->getRessourceURL('mods/mod_autodebit/gfx/logo_100x25.png') ); - - // Ging leider nicht anders, da die ID der onepagecheckoutseite noch nicht abgefragt werden kann - // Sollte denk ich nicht zu problemen fÌhren wenn die Abfrage immer im hint drin ist, er wird ohnehin nur im checkout verwendet - if ( - isset($_REQUEST['wpsg_checkout2']) || - (isset($_REQUEST['wpsg_checkout']) && $this->shop->hasMod('wpsg_mod_onepagecheckout')) || - true - ) - { - - $this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']); - $this->shop->view['wpsg_mod_autodebit']['name'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_name']); - $this->shop->view['wpsg_mod_autodebit']['blz'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_blz']); - $this->shop->view['wpsg_mod_autodebit']['bic'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_bic']); - $this->shop->view['wpsg_mod_autodebit']['inhaber'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_inhaber']); - $this->shop->view['wpsg_mod_autodebit']['knr'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_knr']); - $this->shop->view['wpsg_mod_autodebit']['iban'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_autodebit_iban']); - - $arPayment[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_autodebit/paymenthint.phtml', false); - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_autodebit_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_autodebit_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 7346) +++ /mods/wpsg_mod_basic.class.php (revision 7347) @@ -612,8 +612,5 @@ /** Berechnet die Kosten fÌr den Versand innerhalb des Warenkorbes */ public function calcShipping(&$arBasket, $shipping_key) { } - - /** Berechnet die Kosten fÌr die Zahlungsart innerhalb des Warenkorbes */ - public function calcPayment(&$arBasket) { } - + /** * Wird vor der Ausgabe des Contents aufgerufen @@ -1209,47 +1206,4 @@ } // protected function setPaymentKosten(&$arBasket, $payment_price, $mwst_id) - /** - * Erweitert den Payment/Shipping Array um die GebÌhr - */ - protected function setPayShipPrice($geb, $mwst_value, &$arPayShip, $id) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($geb, $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($geb, $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayShip[$id]['price_brutto'] = $payment_brutto; - $arPayShip[$id]['price_netto'] = $payment_netto; - $arPayShip[$id]['price'] = $payment_netto; - - } - else - { - - $arPayShip[$id]['price_brutto'] = $payment_brutto; - $arPayShip[$id]['price_netto'] = $payment_netto; - $arPayShip[$id]['price'] = $payment_brutto; - - } - - } // protected function setPayShipPrice(&$geb, &$arPayShip, &$id) - /* * Gibt den Absoluten Pfad zurÌck wo temporÀre wpsg Dateien gespeichert sind Index: /mods/wpsg_mod_billsafe.class.php =================================================================== --- /mods/wpsg_mod_billsafe.class.php (revision 7346) +++ /mods/wpsg_mod_billsafe.class.php (revision 7347) @@ -133,150 +133,15 @@ if (!is_admin() && $this->shop->get_option('wpsg_mod_billsafe_aktiv') != '1'); - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_billsafe_mwst'), $this->shop->getDefaultCountry()); - + $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_billsafe_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_billsafe_gebuehr'), - 'mwst_key' => $this->shop->get_option('wpsg_mod_billsafe_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_billsafe_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_billsafe_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_billsafe_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_billsafe_hint')), 'logo' => $this->shop->getRessourceURL('mods/mod_billsafe/gfx/logo_100x25.png'), ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - /* - * VorabprÌfung ob Zahlungsart möglich ist (Wenn Option "VorabprÌfung" aktiviert ist) - */ - if ($this->shop->get_option('wpsg_mod_billsafe_precheck') == '1') - { - - require_once dirname(__FILE__).'/mod_billsafe/Billsafe/Sdk.php'; - - $strLand = $this->db->fetchOne("SELECT L.`kuerzel` FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($arBasket['checkout']['land'])."'"); - - $shipping_firma = $arBasket['checkout']['firma']; - $shipping_firstname = $arBasket['checkout']['vname']; - $shipping_lastname = $arBasket['checkout']['name']; - $shipping_street = $arBasket['checkout']['strasse']; - $shipping_postcode = $arBasket['checkout']['plz']; - $shipping_city = $arBasket['checkout']['ort']; - $shipping_country = $strLand; - - if - ( - $this->shop->hasMod('wpsg_mod_shippingadress') && - ( - $_SESSION['wpsg']['checkout']['shipping_firma'] != '' && $_SESSION['wpsg']['checkout']['shipping_firma'] != $shipping_firma && - $_SESSION['wpsg']['checkout']['shipping_name'] != '' && $_SESSION['wpsg']['checkout']['shipping_name'] != $shipping_lastname && - $_SESSION['wpsg']['checkout']['shipping_vname'] != '' && $_SESSION['wpsg']['checkout']['shipping_vname'] != $shipping_firstname - ) - ) - { - - $shipping_firma = $_SESSION['wpsg']['checkout']['shipping_firma']; - $shipping_firstname = $_SESSION['wpsg']['checkout']['shipping_name']; - $shipping_lastname = $_SESSION['wpsg']['checkout']['shipping_vname']; - $shipping_street = $_SESSION['wpsg']['checkout']['shipping_strasse']; - $shipping_postcode = $_SESSION['wpsg']['checkout']['shipping_plz']; - $shipping_city = $_SESSION['wpsg']['checkout']['shipping_ort']; - - if ($_SESSION['wpsg']['checkout']['shipping_land'] > 0) - $shipping_country = $this->db->fetchOne("SELECT L.`kuerzel` FROM `".WPSG_TBL_LAND."` AS L WHERE L.`id` = '".wpsg_q($_SESSION['wpsg']['checkout']['shipping_land'])."'"); - - } - - $arParam = array( - 'isLiveMode' => (($this->shop->get_option('wpsg_mod_billsafe_sandbox') == 1)?false:true), - 'isUtf8Mode' => true, - 'apiVersion' => '206', - 'gatewayVersion' => '200', - - 'order_amount' => wpsg_round($arBasket['sum']['preis_gesamt_brutto'], 2), - 'order_currencyCode' => 'EUR', - 'customer_company' => $arBasket['checkout']['firma'], - 'customer_firstname' => $arBasket['checkout']['vname'], - 'customer_lastname' => $arBasket['checkout']['name'], - 'customer_street' => $arBasket['checkout']['strasse'], - 'customer_postcode' => $arBasket['checkout']['plz'], - 'customer_city' => $arBasket['checkout']['ort'], - 'customer_email' => $arBasket['checkout']['email'], - 'customer_phone' => $arBasket['checkout']['tel'], - 'customer_country' => $strLand, - - 'deliveryAddress_company' => $shipping_firma, - 'deliveryAddress_firstname' => $shipping_firstname, - 'deliveryAddress_lastname' => $shipping_lastname, - 'deliveryAddress_street' => $shipping_street, - 'deliveryAddress_postcode' => $shipping_postcode, - 'deliveryAddress_city' => $shipping_city, - 'deliveryAddress_country' => $shipping_country - ); - - $bs = new Billsafe_Sdk(); - - $bs->setCredentials( - array( - 'merchantId' => $this->shop->get_option('wpsg_mod_billsafe_vendorID'), - 'merchantLicenseSandbox' => $this->shop->get_option('wpsg_mod_billsafe_licencesandbox'), - 'merchantLicenseLive' => $this->shop->get_option('wpsg_mod_billsafe_licence'), - 'applicationSignature' => $this->applicationSignature, - 'applicationVersion' => 'wpShopGermany Versio '.WPSG_VERSION - ) - ); - - $bs->setUtf8Mode(true); - $bs->setMode(((get_option('wpsg_mod_billsafe_sandbox') == 1)?false:Billsafe_Sdk::LIVE)); - - $response = $bs->callMethod('prevalidateOrder', $arParam); - - if ($response->invoice->isAvailable != "TRUE") - { - - unset($arPayment[$this->id]); - - return false; - - } - - } - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_billsafe_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_billsafe_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } // public function addPayment(&$arPayment) @@ -305,38 +170,4 @@ } // public function checkPaymentAvailable(&$arPayment, &$arBasket) - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_billsafe_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_billsafe_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_billsafe_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - public function order_ajax() { Index: /mods/wpsg_mod_creditcard.class.php =================================================================== --- /mods/wpsg_mod_creditcard.class.php (revision 7346) +++ /mods/wpsg_mod_creditcard.class.php (revision 7347) @@ -75,115 +75,23 @@ } // public function settings_save() - - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { //if (!is_admin() && $this->shop->get_option('wpsg_mod_creditcard_aktiv') != '1') return; - if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1') - { - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_creditcard_mwst'), $this->shop->getDefaultCountry()); + if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1') { $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_creditcard_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_creditcard_gebuehr'), - 'mwst_key' => $this->shop->get_option('wpsg_mod_creditcard_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_creditcard_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_creditcard_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_creditcard_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_creditcard_hint')), 'logo' => $this->shop->getRessourceURL('mods/mod_creditcard/gfx/logo_100x25.png') ); - - // Ging leider nicht anders, da die ID der onepagecheckoutseite noch nicht abgefragt werden kann - // Sollte denk ich nicht zu problemen fÌhren wenn die Abfrage immer im hint drin ist, er wird ohnehin nur im checkout verwendet - if ( - isset($_REQUEST['wpsg_checkout2']) || - (isset($_REQUEST['wpsg_checkout']) && $this->shop->hasMod('wpsg_mod_onepagecheckout')) || - true - ) - { - - $this->shop->view['error'] = wpsg_getArray($_SESSION['wpsg']['errorFields']); - $this->shop->view['wpsg_mod_creditcard']['typ'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_typ']); - $this->shop->view['wpsg_mod_creditcard']['pruefz'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_pruefz']); - $this->shop->view['wpsg_mod_creditcard']['gueltigm'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigm']); - $this->shop->view['wpsg_mod_creditcard']['gueltigj'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_gueltigj']); - $this->shop->view['wpsg_mod_creditcard']['inhaber'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_inhaber']); - $this->shop->view['wpsg_mod_creditcard']['knr'] = wpsg_getStr($_SESSION['wpsg']['checkout']['mod_creditcard_knr']); - - $arPayment[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_creditcard/paymenthint.phtml', false); - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_creditcard_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_creditcard_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_creditcard_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - - + public function checkCheckout(&$state, &$error, &$arCheckout) { Index: /mods/wpsg_mod_crefopay.class.php =================================================================== --- /mods/wpsg_mod_crefopay.class.php (revision 7346) +++ /mods/wpsg_mod_crefopay.class.php (revision 7347) @@ -134,16 +134,12 @@ } // public function settings_save() - public function addPayment(&$arPayment) - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_crefopay_mwst'), $this->shop->getDefaultCountry()); - + public function addPayment(&$arPayment) { + $arPayment = array(); $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __('CrefoPay', 'wpsg'), - 'preis' => 0, - 'mwst' => 0, - 'mwst_value' => 0, + 'price' => 0, + 'tax_key' => 0, 'mwst_null' => $this->shop->get_option('wpsg_mod_crefopay_mwstland'), 'hint' => '', Index: /mods/wpsg_mod_customerbudget.class.php =================================================================== --- /mods/wpsg_mod_customerbudget.class.php (revision 7346) +++ /mods/wpsg_mod_customerbudget.class.php (revision 7347) @@ -89,15 +89,12 @@ } // public function wpsg_mod_customer_save(&$customer_data) - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { $arPayment[$this->id] = array( - 'id' => $this->id, - 'name' => __($this->shop->get_option('wpsg_mod_customerbudget_name'), 'wpsg'), - 'preis' => 0, - 'preis_calc' => 0, - 'mwst' => 0, - 'mwst_value' => 0, - 'hint' => __($this->shop->get_option('wpsg_mod_customerbudget_hint'), 'wpsg') + 'id' => $this->id, + 'name' => __($this->shop->get_option('wpsg_mod_customerbudget_name'), 'wpsg'), + 'price' => 0, + 'tax_key' => 0, + 'hint' => __($this->shop->get_option('wpsg_mod_customerbudget_hint'), 'wpsg') ); @@ -151,20 +148,4 @@ } - - public function calcPayment(&$arBasket) { - - - if ($arBasket['checkout']['payment'] == $this->id && $this->shop->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && !is_admin() && isset($_REQUEST['wpsg_checkout2'])) - { - - $kunde = $this->shop->cache->loadKunden($_SESSION['wpsg']['checkout']['id']); - - if (trim($this->shop->arPayment[$this->id]['hint']) != '') $this->shop->arPayment[$this->id]['hint'] .= '
'; - - $this->shop->arPayment[$this->id]['hint'] .= wpsg_translate(__('Kontostand: #1#', 'wpsg'), wpsg_ff($kunde['budget'], $this->shop->get_option('wpsg_currency'))); - - } - - } // public function calcPayment(&$arBasket) } // class wpsg_mod_customerbudget extends wpsg_mod_basic Index: /mods/wpsg_mod_debitpayment.class.php =================================================================== --- /mods/wpsg_mod_debitpayment.class.php (revision 7346) +++ /mods/wpsg_mod_debitpayment.class.php (revision 7347) @@ -60,93 +60,19 @@ } // public function settings_save() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_debitpayment_aktiv') != '1') return; - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_debitpayment_mwst'), $this->shop->getDefaultCountry()); - + $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_debitpayment_name'), 'wpsg'), 'hint' => __($this->shop->get_option('wpsg_mod_debitpayment_hint')), - 'preis' => $this->shop->get_option('wpsg_mod_debitpayment_rabgeb'), - 'mwst' => $this->shop->get_option('wpsg_mod_debitpayment_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_debitpayment_rabgeb'), + 'tax_key' => $this->shop->get_option('wpsg_mod_debitpayment_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_debitpayment_mwstland') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_debitpayment_rabgeb'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_debitpayment_rabgeb'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_debitpayment_rabgeb'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_debitpayment_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_debitpayment_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + } // class wpsg_mod_debitpayment extends wpsg_mod_payment Index: /mods/wpsg_mod_downloadplus.class.php =================================================================== --- /mods/wpsg_mod_downloadplus.class.php (revision 7346) +++ /mods/wpsg_mod_downloadplus.class.php (revision 7347) @@ -634,10 +634,8 @@ $arShipping[$this->id] = array( - 'id' => $this->id, - 'name' => __('Versand per Mail', 'wpsg'), - 'preis' => 0, - 'preis_calc' => 0, - 'mwst' => 0, - 'mwst_value' => 0 + 'id' => $this->id, + 'name' => __('Versand per Mail', 'wpsg'), + 'price' => 0, + 'tax_key' => 0 ); Index: /mods/wpsg_mod_downloadprodukte.class.php =================================================================== --- /mods/wpsg_mod_downloadprodukte.class.php (revision 7346) +++ /mods/wpsg_mod_downloadprodukte.class.php (revision 7347) @@ -317,10 +317,8 @@ $arShipping[$this->id] = array( - 'id' => $this->id, - 'name' => __('Versand per Mail', 'wpsg'),//$this->shop->get_option('wpsg_mod_freeshipping_bezeichnung'), - 'preis' => 0, - 'preis_calc' => 0, - 'mwst' => 0, - 'mwst_value' => 0 + 'id' => $this->id, + 'name' => __('Versand per Mail', 'wpsg'),//$this->shop->get_option('wpsg_mod_freeshipping_bezeichnung'), + 'price' => 0, + 'tax_key' => 0 ); Index: /mods/wpsg_mod_flexipay.class.php =================================================================== --- /mods/wpsg_mod_flexipay.class.php (revision 7346) +++ /mods/wpsg_mod_flexipay.class.php (revision 7347) @@ -120,65 +120,22 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { - - if (is_admin() || $this->shop->get_option('wpsg_mod_flexipay_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_flexipay_mwst'), $this->shop->getDefaultCountry()); + public function addPayment(&$arPayment) { + + if (is_admin() || $this->shop->get_option('wpsg_mod_flexipay_activ') == '1') { $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_flexipay_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_flexipay_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_flexipay_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_flexipay_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_flexipay_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_flexipay_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_flexipay_hint'), 'wpsg'), 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_flexipay_logo')))?$this->shop->get_option('wpsg_mod_flexipay_logo'):$this->shop->getRessourceURL('mods/mod_flexipay/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_flexipay_gebuehr'), $mwst_value, $arPayment, $this->id); - + } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($this->id == $arBasket['checkout']['payment']) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_flexipay_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_flexipay_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_flexipay_mwst'); - - if ($mwstland == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $mwst); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_freeshipping.class.php =================================================================== --- /mods/wpsg_mod_freeshipping.class.php (revision 7346) +++ /mods/wpsg_mod_freeshipping.class.php (revision 7347) @@ -64,8 +64,6 @@ 'id' => $this->id, 'name' => $this->shop->get_option('wpsg_mod_freeshipping_bezeichnung'), - 'preis' => 0, - 'preis_calc' => 0, - 'mwst' => 0, - 'mwst_value' => 0 + 'price' => 0, + 'tax_key' => 0 ); Index: /mods/wpsg_mod_giropay.class.php =================================================================== --- /mods/wpsg_mod_giropay.class.php (revision 7346) +++ /mods/wpsg_mod_giropay.class.php (revision 7347) @@ -130,134 +130,50 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { - - if (is_admin() || $this->shop->get_option('wpsg_mod_giropay_giropay_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_giropay_giropay_mwst'), $this->shop->getDefaultCountry()); + public function addPayment(&$arPayment) { + + if (is_admin() || $this->shop->get_option('wpsg_mod_giropay_giropay_activ') == '1') { $arPayment[$this->id.'_1'] = array( - 'id' => $this->id.'_1', - 'name' => __($this->shop->get_option('wpsg_mod_giropay_giropay_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_giropay_giropay_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_giropay_giropay_mwst'), - 'mwst_value' => $mwst_value, - 'mwst_null' => $this->shop->get_option('wpsg_mod_giropay_giropay_mwstland'), - 'hint' => __($this->shop->get_option('wpsg_mod_giropay_giropay_hint')), - 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_giropay_giropay_logo')))?$this->shop->get_option('wpsg_mod_giropay_giropay_logo'):$this->shop->getRessourceURL('mods/mod_giropay/gfx/logo_100x25.png')) + 'id' => $this->id.'_1', + 'name' => __($this->shop->get_option('wpsg_mod_giropay_giropay_name'), 'wpsg'), + 'price' => $this->shop->get_option('wpsg_mod_giropay_giropay_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_giropay_giropay_mwst'), + 'mwst_null' => $this->shop->get_option('wpsg_mod_giropay_giropay_mwstland'), + 'hint' => __($this->shop->get_option('wpsg_mod_giropay_giropay_hint')), + 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_giropay_giropay_logo')))?$this->shop->get_option('wpsg_mod_giropay_giropay_logo'):$this->shop->getRessourceURL('mods/mod_giropay/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_giropay_giropay_gebuehr'), $mwst_value, $arPayment, $this->id.'_1'); - + } - if (is_admin() || $this->shop->get_option('wpsg_mod_giropay_creditcard_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_giropay_giropay_mwst'), $this->shop->getDefaultCountry()); + if (is_admin() || $this->shop->get_option('wpsg_mod_giropay_creditcard_activ') == '1') { $arPayment[$this->id.'_2'] = array( - 'id' => $this->id.'_2', - 'name' => __($this->shop->get_option('wpsg_mod_giropay_creditcard_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_giropay_creditcard_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_giropay_creditcard_mwst'), - 'mwst_value' => $mwst_value, - 'mwst_null' => $this->shop->get_option('wpsg_mod_giropay_creditcard_mwstland'), - 'hint' => __($this->shop->get_option('wpsg_mod_giropay_creditcard_hint')), - 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_giropay_creditcard_logo')))?$this->shop->get_option('wpsg_mod_giropay_creditcard_logo'):$this->shop->getRessourceURL('mods/mod_giropay/gfx/logo_100x25.png')) + 'id' => $this->id.'_2', + 'name' => __($this->shop->get_option('wpsg_mod_giropay_creditcard_name'), 'wpsg'), + 'price' => $this->shop->get_option('wpsg_mod_giropay_creditcard_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_giropay_creditcard_mwst'), + 'mwst_null' => $this->shop->get_option('wpsg_mod_giropay_creditcard_mwstland'), + 'hint' => __($this->shop->get_option('wpsg_mod_giropay_creditcard_hint')), + 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_giropay_creditcard_logo')))?$this->shop->get_option('wpsg_mod_giropay_creditcard_logo'):$this->shop->getRessourceURL('mods/mod_giropay/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_giropay_creditcard_gebuehr'), $mwst_value, $arPayment, $this->id.'_2'); - - } - - if (is_admin() || $this->shop->get_option('wpsg_mod_giropay_directdebit_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_giropay_giropay_mwst'), $this->shop->getDefaultCountry()); - + + } + + if (is_admin() || $this->shop->get_option('wpsg_mod_giropay_directdebit_activ') == '1') { + $arPayment[$this->id.'_3'] = array( - 'id' => $this->id.'_3', - 'name' => __($this->shop->get_option('wpsg_mod_giropay_directdebit_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_giropay_directdebit_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_giropay_directdebit_mwst'), - 'mwst_value' => $mwst_value, - 'mwst_null' => $this->shop->get_option('wpsg_mod_giropay_directdebit_mwstland'), - 'hint' => __($this->shop->get_option('wpsg_mod_giropay_directdebit_hint')), - 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_giropay_directdebit_logo')))?$this->shop->get_option('wpsg_mod_giropay_directdebit_logo'):$this->shop->getRessourceURL('mods/mod_giropay/gfx/logo_100x25.png')) + 'id' => $this->id.'_3', + 'name' => __($this->shop->get_option('wpsg_mod_giropay_directdebit_name'), 'wpsg'), + 'price' => $this->shop->get_option('wpsg_mod_giropay_directdebit_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_giropay_directdebit_mwst'), + 'mwst_null' => $this->shop->get_option('wpsg_mod_giropay_directdebit_mwstland'), + 'hint' => __($this->shop->get_option('wpsg_mod_giropay_directdebit_hint')), + 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_giropay_directdebit_logo')))?$this->shop->get_option('wpsg_mod_giropay_directdebit_logo'):$this->shop->getRessourceURL('mods/mod_giropay/gfx/logo_100x25.png')) ); - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_giropay_directdebit_gebuehr'), $mwst_value, $arPayment, $this->id.'_3'); - } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if (preg_match('/^'.$this->id.'_\d+$/', $arBasket['checkout']['payment'])) - { - - $subPayTyp = preg_replace('/^\d+_/', '', $arBasket['checkout']['payment']); - - switch ($subPayTyp) - { - - case '1': // Giropay - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_giropay_giropay_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_giropay_giropay_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_giropay_giropay_mwst'); - - break; - - case '2': // Kreditkarte - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_giropay_creditcard_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_giropay_creditcard_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_giropay_creditcard_mwst'); - - break; - - case '3': // Lastschrift - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_giropay_directdebit_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_giropay_directdebit_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_giropay_directdebit_mwst'); - - break; - - default: throw new \wpsg\Exception(__('GebÃŒhr konnte nicht berechnet werden, da eine ungÃŒltige Zahlungsart verwendet wurde', 'wpsg')); - - } - - if ($mwstland == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $mwst); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_icp.class.php =================================================================== --- /mods/wpsg_mod_icp.class.php (revision 7346) +++ /mods/wpsg_mod_icp.class.php (revision 7347) @@ -120,18 +120,13 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { - - if (is_admin() || $this->shop->get_option('wpsg_mod_icp_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_icp_mwst'), $this->shop->getDefaultCountry()); - + public function addPayment(&$arPayment) { + + if (is_admin() || $this->shop->get_option('wpsg_mod_icp_activ') == '1') { + $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_icp_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_icp_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_icp_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_icp_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_icp_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_icp_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_icp_hint'), 'wpsg'), @@ -139,46 +134,8 @@ ); - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_icp_gebuehr'), $mwst_value, $arPayment, $this->id); - } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($this->id == $arBasket['checkout']['payment']) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_icp_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_icp_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_icp_mwst'); - - if ($mwstland == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $mwst); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_klarna.class.php =================================================================== --- /mods/wpsg_mod_klarna.class.php (revision 7346) +++ /mods/wpsg_mod_klarna.class.php (revision 7347) @@ -92,17 +92,13 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_klarna_aktiv') != '1'); - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_klarna_mwst'), $this->shop->getDefaultCountry()); - $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_klarna_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_klarna_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_klarna_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_klarna_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_klarna_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_klarna_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_klarna_hint')), @@ -111,39 +107,5 @@ } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_klarna_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_klarna_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_klarna_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function basket_save_done_array(&$order_id, &$kunde_id, &$arBasket) { Index: /mods/wpsg_mod_micropayment.class.php =================================================================== --- /mods/wpsg_mod_micropayment.class.php (revision 7346) +++ /mods/wpsg_mod_micropayment.class.php (revision 7347) @@ -246,6 +246,5 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { // Neue ZustÀnde hinzufÃŒgen @@ -253,108 +252,72 @@ $this->shop->arStatus['701'] = __('Reservierung eingelöst', 'wpsg'); - $arBasket = $this->shop->cache->getShopBasketArray(); - // Kreditkarte - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_creditcard_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_creditcard_mwst'), $this->shop->getDefaultCountry(), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_creditcard_activ') == '1') { + $arPayment[$this->id.'_1'] = array( 'id' => $this->id.'_1', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_creditcard_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_creditcard_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_creditcard_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_creditcard_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_creditcard_hint')), 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_micropayment_creditcard_logo')))?$this->shop->get_option('wpsg_mod_micropayment_creditcard_logo'):$this->shop->getRessourceURL('mods/mod_micropayment/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), $mwst_value, $arPayment, $this->id.'_1'); - - //if (!is_admin() && isset($arBasket['sum']['preis_gesamt_brutto']) && $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_1']['price_brutto'] < 2.50 || $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_1']['price_brutto'] > 500) unset($arPayment[$this->id.'_1']); - + } // Kreditkartenreservierung - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_activ')) - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_mwst'), $this->shop->getDefaultCountry()); + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_activ')) { $arPayment[$this->id.'_7'] = array( 'id' => $this->id.'_7', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_hint')), 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_logo')))?$this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_logo'):$this->shop->getRessourceURL('mods/mod_micropayment/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), $mwst_value, $arPayment, $this->id.'_7'); - - //if (!is_admin() && isset($arBasket['sum']['preis_gesamt_brutto']) && $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_7']['price_brutto'] < 2.50 || $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_7']['price_brutto'] > 1000) unset($arPayment[$this->id.'_7']); } // Lastschrift - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_directdebit_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_directdebit_mwst'), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_directdebit_activ') == '1') { + $arPayment[$this->id.'_2'] = array( 'id' => $this->id.'_2', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_directdebit_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_directdebit_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_directdebit_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_directdebit_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_directdebit_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_directdebit_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_directdebit_hint')), 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_micropayment_directdebit_logo')))?$this->shop->get_option('wpsg_mod_micropayment_directdebit_logo'):$this->shop->getRessourceURL('mods/mod_micropayment/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_directdebit_gebuehr'), $mwst_value, $arPayment, $this->id.'_2'); - + } // eBank2Pay - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwst'), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_activ') == '1') { + $arPayment[$this->id.'_3'] = array( 'id' => $this->id.'_3', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_hint')), 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_logo')))?$this->shop->get_option('wpsg_mod_micropayment_ebank2pay_logo'):$this->shop->getRessourceURL('mods/mod_micropayment/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_gebuehr'), $mwst_value, $arPayment, $this->id.'_3'); - - //if (!is_admin() && isset($arBasket['sum']['preis_gesamt_brutto']) && $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_3']['price_brutto'] < 0.50 || $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_3']['price_brutto'] > 500) unset($arPayment[$this->id.'_3']); - + } // Vorkasse - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_prepayment_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwst'), $this->shop->getDefaultCountry()); + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_prepayment_activ') == '1') { $arPayment[$this->id.'_4'] = array( 'id' => $this->id.'_4', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_prepayment_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_prepayment_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_prepayment_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_prepayment_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_prepayment_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_prepayment_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_prepayment_hint')), @@ -362,43 +325,30 @@ ); - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_prepayment_gebuehr'), $mwst_value, $arPayment, $this->id.'_4'); - } // Call2Pay - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_call2pay_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_call2pay_mwst'), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_call2pay_activ') == '1') { + $arPayment[$this->id.'_5'] = array( 'id' => $this->id.'_5', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_call2pay_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_call2pay_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_call2pay_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_call2pay_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_call2pay_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_call2pay_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_call2pay_hint')), 'logo' => ((wpsg_isSizedString($this->shop->get_option('wpsg_mod_micropayment_call2pay_logo')))?$this->shop->get_option('wpsg_mod_micropayment_call2pay_logo'):$this->shop->getRessourceURL('mods/mod_micropayment/gfx/logo_100x25.png')) ); - - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_call2pay_gebuehr'), $mwst_value, $arPayment, $this->id.'_5'); - - //if (!is_admin() && isset($arBasket['sum']['preis_gesamt_brutto']) && $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_5']['price_brutto'] < 0.05 || $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_5']['price_brutto'] > 50) unset($arPayment[$this->id.'_5']); - + } // HandyPay - if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_handypay_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_micropayment_handypay_mwst'), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_micropayment_handypay_activ') == '1') { + + $arPayment[$this->id.'_6'] = array( 'id' => $this->id.'_6', 'name' => __($this->shop->get_option('wpsg_mod_micropayment_handypay_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_micropayment_handypay_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_micropayment_handypay_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_micropayment_handypay_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_micropayment_handypay_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_micropayment_handypay_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_micropayment_handypay_hint')), @@ -406,109 +356,8 @@ ); - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_micropayment_handypay_gebuehr'), $mwst_value, $arPayment, $this->id.'_6'); - - //if (!is_admin() && isset($arBasket['sum']['preis_gesamt_brutto']) && $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_6']['price_brutto'] < 0.49 || $arBasket['sum']['preis_gesamt_brutto'] + $arPayment[$this->id.'_6']['price_brutto'] > 9.99) unset($arPayment[$this->id.'_6']); - } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if (preg_match('/^'.$this->id.'_\d+$/', $arBasket['checkout']['payment'])) - { - - $subPayTyp = preg_replace('/^\d+_/', '', $arBasket['checkout']['payment']); - - switch ($subPayTyp) - { - - case '1': // Kreditkarte - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_creditcard_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_creditcard_mwst'); - - break; - - case '7': // Kreditkarte mit Reservierung - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_creditcardreservation_mwst'); - - break; - - case '2': // Lastschrift - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_directdebit_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_directdebit_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_directdebit_mwst'); - - break; - - case '3': // eBankPay - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_ebank2pay_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_ebank2pay_mwst'); - - break; - - case '4': // Vorkasse - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_prepayment_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_prepayment_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_prepayment_mwst'); - - break; - - case '5': // Call2Pay - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_call2pay_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_call2pay_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_call2pay_mwst'); - - break; - - case '6': // HandyPay - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_micropayment_handypay_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_micropayment_handypay_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_micropayment_handypay_mwst'); - - break; - - default: throw new \wpsg\Exception(__('Im Basket Array war eine Micropayment Zahlungsart die nicht definiert ist (Innerhalb calcPayment)', 'wpsg')); - - } - - if ($mwstland == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $mwst); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_paypal.class.php =================================================================== --- /mods/wpsg_mod_paypal.class.php (revision 7346) +++ /mods/wpsg_mod_paypal.class.php (revision 7347) @@ -168,94 +168,20 @@ } // public function checkGeneralBackendError() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_paypal_aktiv') != '1') return; - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_paypal_mwst'), $this->shop->getDefaultCountry()); - $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_paypal_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_paypal_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_paypal_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_paypal_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_paypal_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_paypal_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_paypal_hint')), 'logo' => $this->shop->getRessourceURL('mods/mod_paypal/gfx/logo_100x25.png') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_paypal_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_paypal_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_paypal_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_paypal_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_paypal_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function setOrderStatus($order_id, $status_id, $inform) { Index: /mods/wpsg_mod_paypalapi.class.php =================================================================== --- /mods/wpsg_mod_paypalapi.class.php (revision 7346) +++ /mods/wpsg_mod_paypalapi.class.php (revision 7347) @@ -187,97 +187,22 @@ } - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { - if (is_admin() || $this->shop->get_option('wpsg_mod_paypalapi_aktiv') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_paypalapi_mwst'), $this->shop->getDefaultCountry()); - + if (is_admin() || $this->shop->get_option('wpsg_mod_paypalapi_aktiv') == '1') { + $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_paypalapi_paypalexpress_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_paypalapi_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_paypalapi_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_paypalapi_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_paypalapi_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_paypalapi_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_paypalapi_plus_hint'), 'wpsg'), 'logo' => $this->shop->getRessourceURL('mods/mod_paypalapi/gfx/logo_100x25.png') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_paypalapi_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_paypalapi_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if (isset($arBasket['checkout']['payment']) && $this->id == $arBasket['checkout']['payment']) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_paypalapi_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_paypalapi_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_paypalapi_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function checkout_handlePayment() { Index: /mods/wpsg_mod_prepayment.class.php =================================================================== --- /mods/wpsg_mod_prepayment.class.php (revision 7346) +++ /mods/wpsg_mod_prepayment.class.php (revision 7347) @@ -93,94 +93,20 @@ } // public function checkGeneralBackendError() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_prepayment_aktiv') != '1') return; - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_prepayment_mwst'), $this->shop->getDefaultCountry()); $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_prepayment_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_prepayment_gebuehr'), - 'mwst_key' => $this->shop->get_option('wpsg_mod_prepayment_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_prepayment_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_prepayment_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_prepayment_mwstland'), 'hint' => $this->shop->get_option('wpsg_mod_prepayment_hint'), 'logo' => $this->shop->getRessourceURL('mods/mod_prepayment/gfx/logo_100x25.png') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_prepayment_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_prepayment_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } // public function addPayment(&$arShipping) - - public function calcPayment(&$arBasket) - { - - if (wpsg_isSizedInt($arBasket['checkout']['payment'], $this->id)) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_prepayment_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_prepayment_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_prepayment_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_securepay.class.php =================================================================== --- /mods/wpsg_mod_securepay.class.php (revision 7346) +++ /mods/wpsg_mod_securepay.class.php (revision 7347) @@ -121,18 +121,13 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { - - if (is_admin() || $this->shop->get_option('wpsg_mod_securepay_activ') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_securepay_mwst'), $this->shop->getDefaultCountry()); + public function addPayment(&$arPayment) { + + if (is_admin() || $this->shop->get_option('wpsg_mod_securepay_activ') == '1') { $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_securepay_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_securepay_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_securepay_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_securepay_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_securepay_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_securepay_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_securepay_hint'), 'wpsg'), @@ -140,46 +135,8 @@ ); - $this->setPayShipPrice($this->shop->get_option('wpsg_mod_securepay_gebuehr'), $mwst_value, $arPayment, $this->id); - } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($this->id == $arBasket['checkout']['payment']) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_securepay_gebuehr'), $arBasket['sum']['preis']); - $mwstland = $this->shop->get_option('wpsg_mod_securepay_mwstland'); - $mwst = $this->shop->get_option('wpsg_mod_securepay_mwst'); - - if ($mwstland == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $mwst); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_shs.class.php =================================================================== --- /mods/wpsg_mod_shs.class.php (revision 7346) +++ /mods/wpsg_mod_shs.class.php (revision 7347) @@ -159,9 +159,6 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_shs_mwst'), $this->shop->getDefaultCountry()); - + public function addPayment(&$arPayment) { + $nSHS = 0; if ($this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') $nSHS ++; @@ -169,13 +166,11 @@ if ($this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') $nSHS ++; - if (is_admin() || $this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') - { + if (is_admin() || $this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') { $arPayment[$this->id.'_1'] = array( 'id' => $this->id.'_1', 'name' => __($this->shop->get_option('wpsg_mod_shs_bezeichnung_creditcard'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_shs_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_shs_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_shs_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_shs_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_shs_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_shs_hint_creditcard')), @@ -185,13 +180,11 @@ } - if (is_admin() || $this->shop->get_option('wpsg_mod_shs_aktiv_maestro') == '1') - { + if (is_admin() || $this->shop->get_option('wpsg_mod_shs_aktiv_maestro') == '1') { $arPayment[$this->id.'_2'] = array( 'id' => $this->id.'_2', 'name' => __($this->shop->get_option('wpsg_mod_shs_bezeichnung_maestro'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_shs_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_shs_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_shs_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_shs_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_shs_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_shs_hint_maestro')), @@ -201,13 +194,11 @@ } - if (is_admin() || $this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') - { + if (is_admin() || $this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') { $arPayment[$this->id.'_3'] = array( 'id' => $this->id.'_3', 'name' => __($this->shop->get_option('wpsg_mod_shs_bezeichnung_directdebit'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_shs_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_shs_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_shs_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_shs_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_shs_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_shs_hint_directdebit')), @@ -216,107 +207,7 @@ } - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_shs_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_shs_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if (method_exists($this->shop, 'getFrontendTaxview')) - { - - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - if ($this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') $arPayment[$this->id.'_1']['price'] = $payment_netto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_maestro') == '1') $arPayment[$this->id.'_2']['price'] = $payment_netto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') $arPayment[$this->id.'_3']['price'] = $payment_netto; - - } - else - { - - if ($this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') $arPayment[$this->id.'_1']['price'] = $payment_brutto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_maestro') == '1') $arPayment[$this->id.'_2']['price'] = $payment_brutto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') $arPayment[$this->id.'_3']['price'] = $payment_brutto; - - } - - } - else - { - - if ($this->shop->get_option('wpsg_preisangaben_frontend') == WPSG_NETTO) - { - - if ($this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') $arPayment[$this->id.'_1']['price'] = $payment_netto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_maestro') == '1') $arPayment[$this->id.'_2']['price'] = $payment_netto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') $arPayment[$this->id.'_3']['price'] = $payment_netto; - - } - else - { - - if ($this->shop->get_option('wpsg_mod_shs_aktiv_creditcard') == '1') $arPayment[$this->id.'_1']['price'] = $payment_brutto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_maestro') == '1') $arPayment[$this->id.'_2']['price'] = $payment_brutto; - if ($this->shop->get_option('wpsg_mod_shs_aktiv_directdebit') == '1') $arPayment[$this->id.'_3']['price'] = $payment_brutto; - - } - - } - - } - + } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if (preg_match('/^'.$this->id.'_\d$/', $arBasket['checkout']['payment'])) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_shs_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_shs_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_shs_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_skrill.class.php =================================================================== --- /mods/wpsg_mod_skrill.class.php (revision 7346) +++ /mods/wpsg_mod_skrill.class.php (revision 7347) @@ -109,10 +109,7 @@ } // public function wpsg_deinstall_sites() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_skrill_aktiv') != '1') return; - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_skrill_mwst'), $this->shop->getDefaultCountry()); $arPayment[$this->id] = array( @@ -120,83 +117,12 @@ 'name' => __($this->shop->get_option('wpsg_mod_skrill_bezeichnung'), 'wpsg'), 'hint' => __($this->shop->get_option('wpsg_mod_skrill_hint'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_skrill_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_skrill_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_skrill_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_skrill_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_skrill_mwstland'), 'logo' => $this->shop->getRessourceURL('mods/mod_skrill/gfx/logo_100x25.png') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_skrill_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_skrill_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_skrill_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_skrill_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_skrill_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function template_redirect() { Index: /mods/wpsg_mod_su.class.php =================================================================== --- /mods/wpsg_mod_su.class.php (revision 7346) +++ /mods/wpsg_mod_su.class.php (revision 7347) @@ -132,10 +132,7 @@ } // public function settings_save() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_su_aktiv') != '1') return; - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_su_mwst'), $this->shop->getDefaultCountry()); $arPayment[$this->id] = array( @@ -143,83 +140,12 @@ 'name' => __($this->shop->get_option('wpsg_mod_su_bezeichnung'), 'wpsg'), 'hint' => __($this->shop->get_option('wpsg_mod_su_hint')), - 'preis' => $this->shop->get_option('wpsg_mod_su_gebuehr'), - 'mwst_key' => $this->shop->get_option('wpsg_mod_su_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_su_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_su_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_su_mwstland'), 'logo' => $this->shop->getRessourceURL('mods/mod_su/gfx/logo_100x25.png') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_su_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_su_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_su_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_su_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_su_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /mods/wpsg_mod_targo.class.php =================================================================== --- /mods/wpsg_mod_targo.class.php (revision 7346) +++ /mods/wpsg_mod_targo.class.php (revision 7347) @@ -114,115 +114,41 @@ } // public function settings_save() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { $this->shop->arStatus[self::STATUS_CREDIT_ACCEPTED] = __('Kreditvertrag angenommen', 'wpsg'); //if (!is_admin() && $this->shop->get_option('wpsg_mod_targo_aktiv') != '1') return; - if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1') - { - //$arBasket = $this->shop->basket->toArray(); - $arBasket = $this->shop->cache->getShopBasketArray(); + if (is_admin() || $this->shop->get_option('wpsg_mod_targo_aktiv') == '1') { + + $country_id = false; + + if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['land'])) $country_id = $_SESSION['wpsg']['checkout']['land']; + + if ($country_id !== false) { - // Bestellungen außerhalb der Targo-Bestimmungen geben nix aus - $gesamt = $arBasket['sum']['preis_gesamt_brutto']; - $min = $this->shop->get_option('wpsg_mod_targo_summe_min'); - $max = $this->shop->get_option('wpsg_mod_targo_summe_max'); - if ((!is_admin()) && (($gesamt <= $min) || ($gesamt >= $max))) return; - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_targo_mwst'), $this->shop->getDefaultCountry()); - - // Array umsortieren Targo als erstes - // bei Land != DE Targobank ausblenden - $land = wpsg_getStr($arBasket['land']['kuerzel']); - if (is_admin() || ($land == "DE")) - { - - $arPaymentTB[$this->id] = array( - 'id' => $this->id, - 'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'), - 'mwst_key' => $this->shop->get_option('wpsg_mod_targo_mwst'), - 'mwst_value' => $mwst_value, - 'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'), - 'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')), - 'logo' => $this->shop->getRessourceURL('mods/mod_targo/gfx/logo_100x25.png') - ); - $arPayment = wpsg_array_merge($arPaymentTB, $arPayment); - - } - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; + $oCountry = wpsg_country::getInstance($country_id); + + if ($oCountry->getShorttext() === 'DE') { + + $arPaymentTB[$this->id] = array( + 'id' => $this->id, + 'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'), + 'price' => $this->shop->get_option('wpsg_mod_targo_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_targo_mwst'), + 'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'), + 'hint' => __($this->shop->get_option('wpsg_mod_targo_hint')), + 'logo' => $this->shop->getRessourceURL('mods/mod_targo/gfx/logo_100x25.png') + ); + + $arPayment = wpsg_array_merge($arPaymentTB, $arPayment); } } - + } } // public function addPayment(&$arPayment) - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_targo_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_targo_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - public function order_view_afterpayment(&$order_id) { Index: /mods/wpsg_mod_userpayment.class.php =================================================================== --- /mods/wpsg_mod_userpayment.class.php (revision 7346) +++ /mods/wpsg_mod_userpayment.class.php (revision 7347) @@ -162,25 +162,13 @@ } // public function be_ajax() - public function addPayment(&$arPayment) - { - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - } - - // Im Checkout2 wird der Wert berechnet und eventuell nicht verfÃŒgbare ZV ausgeschlossen + public function addPayment(&$arPayment) { + $arZV = $this->db->fetchAssoc(" SELECT * FROM `".WPSG_TBL_ZV."` ORDER BY `name` ASC "); - foreach ((array)$arZV as $zv) - { + foreach ((array)$arZV as $zv) { if (!is_admin() && $zv['aktiv'] != '1') continue; - - $mwst_value = $this->getTaxValue($zv['mwst_key'], $this->shop->getDefaultCountry()); $hint = $zv['hint']; @@ -191,85 +179,14 @@ 'name' => __($zv['name'], 'wpsg'), 'hint' => __($hint, 'wpsg'), - 'preis' => $zv['rabgeb'], - 'mwst_key' => $zv['mwst_key'], - 'mwst_value' => $mwst_value, + 'price' => $zv['rabgeb'], + 'tax_key' => $zv['mwst_key'], 'mwst_null' => $zv['mwst_laender'], 'deleted' => wpsg_getInt($zv['deleted']) ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($zv['rabgeb'], $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($zv['rabgeb'], $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id.'_'.$zv['id']]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id.'_'.$zv['id']]['price'] = $payment_brutto; - - } - - } - + } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if (preg_match('/'.$this->id.'_\d+/', $arBasket['checkout']['payment'])) - { - - $zv = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ZV."` WHERE `id` = '".wpsg_q(preg_replace('/^\d*_/', '', $arBasket['checkout']['payment']))."'"); - - $payment_price = $this->getPreis($zv['rabgeb'], $arBasket['sum']['preis']); - - if ($arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $zv['mwst_key']); - - } - - } - - } // public function calcPayment(&$arBasket) - + /* ---- */ Index: /mods/wpsg_mod_versandarten.class.php =================================================================== --- /mods/wpsg_mod_versandarten.class.php (revision 7346) +++ /mods/wpsg_mod_versandarten.class.php (revision 7347) @@ -220,25 +220,23 @@ } // public function be_ajax() - public function addShipping(&$arShipping, $va_active = false) - { + public function addShipping(&$arShipping, $va_active = false) { - // Im Checkout2 wird der Wert berechnet und eventuell nicht verfÃŒgbare VA ausgeschlossen - //if (isset($_REQUEST['wpsg_checkout2'])) - if (!wpsg_is_admin() && !$va_active) - { - - $arBasket = $this->shop->basket->toArray(); + if (!wpsg_is_admin() && !$va_active) { - if (isset($arBasket['checkout']['shipping_land']) && $arBasket['checkout']['shipping_land'] > 0) - { - $land = $arBasket['checkout']['shipping_land']; - } - else - { - $land = $arBasket['checkout']['land']; - } - - $vz = $this->db->fetchOne("SELECT `vz` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($land)."'"); - + $land = false; + + if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['shipping_land'])) $land = $_SESSION['wpsg']['checkout']['shipping_land']; + else if (wpsg_isSizedInt($_SESSION['wpsg']['checkout']['land'])) $land = $_SESSION['wpsg']['checkout']['land']; + + $strQueryWHERE = ""; + + if ($land !== false) { + + $vz = $this->db->fetchOne("SELECT `vz` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($land)."'"); + + $strQueryWHERE .= " AND (`vz` <= 0 OR `vz` = '".wpsg_q($vz)."') "; + + } else $strQueryWHERE .= " AND (`vh` <= 0) "; + $strQuery = " SELECT @@ -246,7 +244,7 @@ FROM `".WPSG_TBL_VA."` - WHERE - (`vz` <= 0 OR `vz` = '".wpsg_q($vz)."') AND - `deleted` != '1' + WHERE + `deleted` != '1' + ".$strQueryWHERE." ORDER BY `name` ASC @@ -255,7 +253,5 @@ $arVersandarten = $this->db->fetchAssoc($strQuery); - } - else - { + } else { $arVersandarten = $this->db->fetchAssoc(" @@ -265,19 +261,9 @@ } - foreach ($arVersandarten as $va) - { + foreach ($arVersandarten as $va) { if (!is_admin() && $va['aktiv'] != '1') continue; $va = $this->getVaKosten($arBasket, $va); - - //if (wpsg_isSizedInt($this->shop->country)) $oCountry = wpsg_country::getInstance($this->shop->country); - //if (wpsg_isSizedInt($this->shop->basket->arCheckout['land'])) $oCountry = wpsg_country::getInstance($this->shop->basket->arCheckout['land']); - //if (!isset($oCountry)) $oCountry = $this->shop->getDefaultCountry(); - //$mwst_value = $this->getTaxValue($va['mwst_key'], $this->shop->getDefaultCountry()); - - $oCountry = $this->shop->getDefaultCountry(); - - $mwst_value = $this->getTaxValue($va['mwst_key'], $oCountry); $hint = $va['hint']; @@ -288,132 +274,17 @@ 'va_id' => $va['id'], 'name' => __($va['name'], 'wpsg'), - 'mwst_key' => $va['mwst_key'], - 'hint' => __($hint, 'wpsg'), - 'mwst_value' => $mwst_value, + 'tax_key' => $va['mwst_key'], + 'hint' => __($hint, 'wpsg'), 'mwst_null' => $va['mwst_laender'], - 'deleted' => $va['deleted'] + 'deleted' => $va['deleted'], + 'price' => $va['kosten'] ); - if (!empty($va['plz'])) - $arShipping[$this->id.'_'.$va['id']]['plz'] = __($va['plz'], 'wpsg'); - - if (true || isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - if ($this->shop->getBackendTaxview() == WPSG_BRUTTO) - { - - $shipping_brutto = $this->calculatePreis($va, $arBasket); - $shipping_netto = wpsg_calculatePreis($shipping_brutto, WPSG_NETTO, $mwst_value); - $arShipping[$this->id.'_'.$va['id']]['price_backend'] = $shipping_brutto; - - } - else - { - - $shipping_netto = $this->calculatePreis($va, $arBasket); - $shipping_brutto = wpsg_calculatePreis($shipping_netto, WPSG_BRUTTO, $mwst_value); - $arShipping[$this->id.'_'.$va['id']]['price_backend'] = $shipping_netto; - - } - - $arShipping[$this->id.'_'.$va['id']]['price_netto'] = $shipping_netto; - $arShipping[$this->id.'_'.$va['id']]['price_brutto'] = $shipping_brutto; - - if ($arBasket['noMwSt'] == '1') $shipping_brutto = $shipping_netto; - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO || @$arBasket['noMwst'] == '1') - { - - $arShipping[$this->id.'_'.$va['id']]['price'] = $shipping_netto; - - } - else - { - - $arShipping[$this->id.'_'.$va['id']]['price'] = $shipping_brutto; - - } - - } - + if (!empty($va['plz'])) $arShipping[$this->id.'_'.$va['id']]['plz'] = __($va['plz'], 'wpsg'); + } } // public function addShipping(&$arShipping) - - public function calcShipping(&$arBasket, $shipping_key) - { - - // Hier war die ÜberprÃŒfung drin ob die Versandart ÃŒberhaupt erlaubt ist nur dann wurde berechnet. - // Ich habe es rausnehmen mÃŒssen, da sonst bei Kombinationen die Kosten nicht berechnet wurden. Bin mir aber nicht ganz sicher ob es nicht negative Folgen an anderer Stelle hat - //if (preg_match('/'.$this->id.'_\d*/', $shipping_key) && array_key_exists($shipping_key, $this->shop->arShipping)) - if (preg_match('/'.$this->id.'_\d*/', $shipping_key)) - { - - $va = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_VA."` WHERE `id` = '".wpsg_q(preg_replace('/^\d*_/', '', $shipping_key))."'"); - - $va = $this->getVaKosten($arBasket, $va); - - if (wpsg_isSizedInt($this->shop->country)) $oCountry = wpsg_country::getInstance($this->shop->country); - if (wpsg_isSizedInt($this->shop->basket->arCheckout['land'])) $oCountry = wpsg_country::getInstance($this->shop->basket->arCheckout['land']); - if (!isset($oCountry)) $oCountry = $this->shop->getDefaultCountry(); - //$mwst_value = $this->getTaxValue($va['mwst_key'], $this->shop->getDefaultCountry()); - $mwst_value = $this->getTaxValue($va['mwst_key'], $oCountry); - - if ($this->shop->getBackendTaxview() == WPSG_BRUTTO) - { - - $shipping_brutto = $this->calculatePreis($va, $arBasket); - $shipping_netto = wpsg_calculatePreis($shipping_brutto, WPSG_NETTO, $mwst_value); - - } - else - { - - $shipping_netto = $this->calculatePreis($va, $arBasket); - $shipping_brutto = wpsg_calculatePreis($shipping_netto, WPSG_BRUTTO, $mwst_value); - - } - - if ($arBasket['noMwSt'] == '1') $shipping_brutto = $shipping_netto; - - if ($arBasket['noMwSt'] == '1') - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_shipping'] = $shipping_netto; - $arBasket['sum']['preis_shipping_brutto'] = $shipping_netto; - $arBasket['sum']['preis_shipping_netto'] = $shipping_netto; - - $arBasket['shipping']['mwst'] = 0; - if (array_key_exists($arBasket['checkout']['shipping'], $this->shop->arShipping)) $this->shop->arShipping[$arBasket['checkout']['shipping']]['mwst_value'] = 0; - - $arBasket['shipping']['tax_rata'] = false; - - } - else - { - - // Hier muss ins Backend geschaut werden! - if ($this->shop->getBackendTaxView() == WPSG_BRUTTO) - { - - $this->setShippingKosten($arBasket, $shipping_key, $shipping_brutto, $va['mwst_key']); - - } - else - { - - $this->setShippingKosten($arBasket, $shipping_key, $shipping_netto, $va['mwst_key']); - - } - - } - - } - - } // public function calcShipping(&$arBasket) - + public function checkCheckout(&$state, &$error, &$arCheckout) { Index: /mods/wpsg_mod_voucherproduct.class.php =================================================================== --- /mods/wpsg_mod_voucherproduct.class.php (revision 7346) +++ /mods/wpsg_mod_voucherproduct.class.php (revision 7347) @@ -162,5 +162,7 @@ { - if ($status_id == 100 && !M1::isTrue($GLOBALS['wpsg_mod_voucher_send'])) // Zahlung eingegangen { + if ($status_id == 100 && !M1::isTrue($GLOBALS['wpsg_mod_voucher_send'])) { + + // Zahlung eingegangen $GLOBALS['wpsg_mod_voucher_send'] = true; Index: /mods/wpsg_mod_willcollect.class.php =================================================================== --- /mods/wpsg_mod_willcollect.class.php (revision 7346) +++ /mods/wpsg_mod_willcollect.class.php (revision 7347) @@ -134,195 +134,37 @@ } - public function addPayment(&$arPayment) - { - - if (is_admin() || $this->shop->get_option('wpsg_mod_willcollect_payment') == '1') - { - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_willcollect_mwst'), $this->shop->getDefaultCountry()); - + public function addPayment(&$arPayment) { + + if (is_admin() || $this->shop->get_option('wpsg_mod_willcollect_payment') == '1') { + $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_willcollect_payment_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_willcollect_payment_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_willcollect_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_willcollect_payment_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_willcollect_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_willcollect_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_willcollect_payment_hint'), 'wpsg') ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } } // public function addPayment(&$arPayment) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_willcollect_payment_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_willcollect_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_willcollect_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - - public function addShipping(&$arShipping, $va_active = false) - { + + public function addShipping(&$arShipping, $va_active = false) { if (!is_admin() && $this->shop->get_option('wpsg_mod_willcollect_aktiv') != '1') return; - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_willcollect_mwst'), $this->shop->getDefaultCountry()); - $arShipping[$this->id] = array( 'id' => $this->id, 'active' => $this->shop->get_option('wpsg_mod_willcollect_aktiv'), 'name' => __($this->shop->get_option('wpsg_mod_willcollect_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_willcollect_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_willcollect_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_willcollect_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_willcollect_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_willcollect_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_willcollect_hint'), 'wpsg') ); - - if (isset($_REQUEST['wpsg_checkout2'])) - { - - $this->shop->view['error'] = $_SESSION['wpsg']['errorFields']; - $this->shop->view['wpsg_mod_willcollect']['adress'] = $this->shop->get_option('wpsg_mod_willcollect_adress'); - $this->shop->view['wpsg_mod_willcollect']['street'] = $this->shop->get_option('wpsg_mod_willcollect_street'); - $this->shop->view['wpsg_mod_willcollect']['plzort'] = $this->shop->get_option('wpsg_mod_willcollect_plzort'); - - $arShipping[$this->id]['hint'] .= $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_willcollect/shippinghint.phtml', false); - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $shipping_netto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - $shipping_brutto = wpsg_calculatePreis($shipping_netto, WPSG_BRUTTO, $mwst_value); - $arShipping[$this->id]['price_backend'] = $shipping_netto; - - } - else - { - - $shipping_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_autodebit_gebuehr'), $arBasket['sum']['preis']); - $shipping_netto = wpsg_calculatePreis($shipping_brutto, WPSG_NETTO, $mwst_value); - $arShipping[$this->id]['price_backend'] = $shipping_brutto; - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arShipping[$this->id]['price'] = $shipping_netto; - - } - else - { - - $arShipping[$this->id]['price'] = $shipping_brutto; - - } - - } - + } // public function addShipping(&$arShipping) - - public function calcShipping(&$arBasket, $shipping_key) - { - - if ($arBasket['checkout']['shipping'] == $this->id) - { - - $shipping_price = $this->getPreis($this->shop->get_option('wpsg_mod_willcollect_gebuehr'), $arBasket['sum']['preis']); - - if ($arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_shipping'] = $shipping_price; - $arBasket['sum']['preis_shipping_brutto'] = $shipping_price; - $arBasket['sum']['preis_shipping_netto'] = $shipping_price; - - $arBasket['shipping']['mwst'] = 0; - $this->shop->arShipping[$arBasket['checkout']['shipping']]['mwst_value'] = 0; - - $arBasket['shipping']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setShippingKosten($arBasket, $this->id, $shipping_price, $this->shop->get_option('wpsg_mod_willcollect_mwst')); - - } - - } - - } // public function calcShipping(&$arBasket) - + /** * Fehlermeldung wird in der setBasketData geschrieben, Index: /mods/wpsg_mod_wirecard.class.php =================================================================== --- /mods/wpsg_mod_wirecard.class.php (revision 7346) +++ /mods/wpsg_mod_wirecard.class.php (revision 7347) @@ -146,17 +146,13 @@ } // public function checkGeneralBackendError() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_wirecard_activ') != '1') return; - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_wirecard_activ'), $this->shop->getDefaultCountry()); - $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_wirecard_name'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_wirecard_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_wirecard_mwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_wirecard_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_wirecard_mwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_wirecard_mwstland'), 'logo' => $this->shop->getRessourceURL('mods/mod_wirecard/gfx/logo_100x25.png') @@ -165,6 +161,5 @@ $this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'] = $this->getWirecardPaymentTypes(); - foreach ($this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'] as $k => $v) - { + foreach ($this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'] as $k => $v) { if (!in_array($k, (array)explode(',', $this->shop->get_option('wpsg_mod_wirecard_paymenttype')))) unset($this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'][$k]); @@ -173,6 +168,5 @@ // Fallback auf SELECT wenn nichts definiert wurde - if (!wpsg_isSizedArray($this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'])) - { + if (!wpsg_isSizedArray($this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'])) { $this->shop->view['wpsg_mod_wirecard']['arPaymentTypes'] = array( @@ -182,6 +176,5 @@ } - if (wpsg_isSizedString($_SESSION['wpsg']['checkout']['wpsg_mod_wirecard_paymentType'])) - { + if (wpsg_isSizedString($_SESSION['wpsg']['checkout']['wpsg_mod_wirecard_paymentType'])) { $this->shop->view['wpsg_mod_wirecard']['paymentTypeSet'] = $_SESSION['wpsg']['checkout']['wpsg_mod_wirecard_paymentType']; @@ -190,41 +183,5 @@ $arPayment[$this->id]['hint'] = $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_wirecard/paymenthint.phtml', false); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_wirecard_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_wirecard_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } // public function addPayment(&$arPayment) @@ -264,39 +221,5 @@ } // public function checkCheckout(&$state, &$error, &$arCheckout) - - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_wirecard_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_wirecard_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_paypal_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - + public function order_done(&$order_id, &$done_view) { Index: /system/intern/mods/wpsg_mod_cab.class.php =================================================================== --- /system/intern/mods/wpsg_mod_cab.class.php (revision 7346) +++ /system/intern/mods/wpsg_mod_cab.class.php (revision 7347) @@ -151,58 +151,18 @@ } // public function settings_save() - public function addPayment(&$arPayment) - { + public function addPayment(&$arPayment) { if (!is_admin() && $this->shop->get_option('wpsg_mod_cab_aktiv') != '1') return; - - $mwst_value = $this->getTaxValue($this->shop->get_option('wpsg_mod_cab_mwst'), $this->shop->getDefaultCountry()); $arPayment[$this->id] = array( 'id' => $this->id, 'name' => __($this->shop->get_option('wpsg_mod_cab_bezeichnung'), 'wpsg'), - 'preis' => $this->shop->get_option('wpsg_mod_cab_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_cabmwst'), - 'mwst_value' => $mwst_value, + 'price' => $this->shop->get_option('wpsg_mod_cab_gebuehr'), + 'tax_key' => $this->shop->get_option('wpsg_mod_cabmwst'), 'mwst_null' => $this->shop->get_option('wpsg_mod_cab_mwstland'), 'hint' => __($this->shop->get_option('wpsg_mod_cab_hint')), 'logo' => WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/views/gfx/cab.png' ); - - if (isset($_REQUEST['wpsg_checkout2']) || ($this->shop->hasMod('wpsg_mod_onepagecheckout') && isset($_REQUEST['wpsg_checkout']))) - { - - $arBasket = $this->shop->basket->toArray(); - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO || $arBasket['noMwSt']) - { - - $payment_netto = $this->getPreis($this->shop->get_option('wpsg_mod_cab_gebuehr'), $arBasket['sum']['preis']); - $payment_brutto = wpsg_calculatePreis($payment_netto, WPSG_BRUTTO, $mwst_value); - - } - else - { - - $payment_brutto = $this->getPreis($this->shop->get_option('wpsg_mod_cab_gebuehr'), $arBasket['sum']['preis']); - $payment_netto = wpsg_calculatePreis($payment_brutto, WPSG_NETTO, $mwst_value); - - } - - // Entsprechenden Preis anzeigen - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arPayment[$this->id]['price'] = $payment_netto; - - } - else - { - - $arPayment[$this->id]['price'] = $payment_brutto; - - } - - } - + } // public function addPayment(&$arPayment) @@ -436,38 +396,4 @@ } // public function template_redirect() - public function calcPayment(&$arBasket) - { - - if ($arBasket['checkout']['payment'] == $this->id) - { - - $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_cab_gebuehr'), $arBasket['sum']['preis']); - - if ($this->shop->get_option('wpsg_mod_cab_mwstland') == '1' && $arBasket['noMwSt']) - { - - // Keine MwSt. berechnen ! - $arBasket['sum']['preis_payment'] = $payment_price; - $arBasket['sum']['preis_payment_brutto'] = $payment_price; - $arBasket['sum']['preis_payment_netto'] = $payment_price; - - $arBasket['payment']['mwst'] = 0; - $this->shop->arPayment[$arBasket['checkout']['payment']]['mwst_value'] = 0; - - $arBasket['payment']['tax_rata'] = false; - - } - else - { - - // MwSt berechnen (Angaben im Backend sind immer Brutto) - $this->setPaymentKosten($arBasket, $payment_price, $this->shop->get_option('wpsg_mod_cab_mwst')); - - } - - } - - } // public function calcPayment(&$arBasket) - public function basket_save_done_array(&$order_id, &$kunde_id, &$arBasket) { Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 7346) +++ /views/css/admin.css (revision 7347) @@ -286,4 +286,5 @@ .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;} Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 7346) +++ /views/css/frontend.css (revision 7347) @@ -70,4 +70,5 @@ .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;} */ Index: /views/mods/mod_userpayment/list.phtml =================================================================== --- /views/mods/mod_userpayment/list.phtml (revision 7346) +++ /views/mods/mod_userpayment/list.phtml (revision 7347) @@ -83,5 +83,5 @@ Index: /views/order/product_table.phtml =================================================================== --- /views/order/product_table.phtml (revision 7346) +++ /views/order/product_table.phtml (revision 7347) @@ -170,4 +170,11 @@ get_option('wpsg_currency'); ?> + + ('.wpsg_ff(wpsg_tf($arCalculation['shipping'][0]['set']), '%').')'; + + } ?> + @@ -189,4 +196,11 @@ get_option('wpsg_currency'); ?> + + ('.wpsg_ff(wpsg_tf($arCalculation['payment'][0]['set']), '%').')'; + + } ?> + Index: /views/warenkorb/basket.phtml =================================================================== --- /views/warenkorb/basket.phtml (revision 7346) +++ /views/warenkorb/basket.phtml (revision 7347) @@ -236,22 +236,32 @@
- 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) - { - + 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 { + + 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'], '%'); - + + } ?> +
+
+ view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); + + if (strpos($this->view['basket']['arCalculation']['shipping'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['shipping'][0]['set']), '%').')'; + } - } + ?> -
-
- view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
@@ -277,22 +287,31 @@
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'], '%'); - + + } ?> +
+
+ view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); + + if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')'; + } - - } ?> -
-
- view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?> + + ?>
Index: /views/warenkorb/overview.phtml =================================================================== --- /views/warenkorb/overview.phtml (revision 7346) +++ /views/warenkorb/overview.phtml (revision 7347) @@ -338,22 +338,34 @@
+ 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'], '%'); - + + } ?> + +
+
+ view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); + + if (strpos($this->view['basket']['arCalculation']['shipping'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['shipping'][0]['set']), '%').')'; + } - } + ?> -
-
- view['basket']['sum']['preis_shipping'], $this->get_option('wpsg_currency')); ?>
@@ -367,23 +379,34 @@
+ 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'], '%'); - + + } ?> + +
+
+ view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); + + if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) { + + echo '('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')'; + } - - } ?> -
-
- view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency')); ?> + + ?>