Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 5932) +++ /controller/wpsg_AdminController.class.php (revision 5934) @@ -1030,18 +1030,12 @@ $oid = 0; $pval = 0.0; + $option = $this->shop->get_option('wpsg_preisangaben'); if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); if (isset($_REQUEST['p_id'])) $pid = wpsg_q($_REQUEST['p_id']); - if (isset($_REQUEST['p_value'])) $pid = wpsg_q($_REQUEST['p_value']); + if (isset($_REQUEST['p_value'])) $pval = wpsg_tf($_REQUEST['p_value']); if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'change') { //'wp-admin/admin.php?page=wpsg-Admin&subaction=paymentData&do=change&edit_id=12&p_id=34&p_value=56&noheader=1'; - //TODO - //price_payment (-/_netto/_brutto) - //type_payment - - - $val = abs(wpsg_tf($_REQUEST['p_value'])); - $arTaxKey = explode('_', wpsg_q($_REQUEST['mwst'])); $country_id = $arTaxKey[1]; @@ -1051,21 +1045,121 @@ if (wpsg_q($_REQUEST['noMwSt']) == 1) $noMwSt = true; if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key); - if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) - { - $val = wpsg_calculatePreis($val, WPSG_BRUTTO, $tax_value); - } - $data = array('price_rabatt' => $val); - $sql = "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"; - - - - //$ogs = array('gs_id' => $gs_id, 'price_gs' => 10.0); - //$this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); - - } - - - + //if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) + /* + if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) + { + $valb = wpsg_calculatePreis($pval, WPSG_BRUTTO, $tax_value); + $valn = $pval; + } + else + { + $valn = wpsg_calculatePreis($pval, WPSG_NETTO, $tax_value); + $valb = $pval; + } + + $data = array('price_payment' => $pval, 'price_payment_brutto' => $valb, 'price_payment_netto' => $valn, + 'type_payment' => $pid); + */ + if ($option == WPSG_NETTO) + { + $data = array('price_payment' => $pval, 'price_payment_netto' => $pval, 'type_payment' => $pid); + } + else + { + $data = array('price_payment' => $pval, 'price_payment_brutto' => $pval, 'type_payment' => $pid); + } + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".$oid."'"); + + } + + // Order-Daten sammeln und Tabelle neu generieren + $basket = new wpsg_basket(); + $basket->initFromDB($oid, true); + $this->shop->view['basket'] = $basket->toArray(true); + + //$pval = 7.9646; + // Aufruf in wpsg_basket mit Wert = 7.9646 ergibt 1.0354 + //$taxp = $this->addMwSt($arReturn, $arReturn['sum']['preis_payment_netto']); + //$taxp = $bc->addMwSt($this->shop->view['basket'], $pval); + //$taxp = abs($taxp); + + if ($option == WPSG_NETTO) + { + $data = array('price_payment_brutto' => $this->shop->view['basket']['sum']['preis_payment_brutto']); + } + else + { + $data = array('price_payment_netto' => $this->shop->view['basket']['sum']['preis_payment_netto']); + } + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".$oid."'"); + + $this->shop->view['colspan'] = 3; + if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++; + + $this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml'); + + exit; + } // public function paymentDataAction() + + /** + * Wird aufgerufen wenn die Versandart verÀndert wird + */ + public function shippingDataAction() + { + $sid = 0; + $oid = 0; + $sval = 0.0; + $option = $this->shop->get_option('wpsg_preisangaben'); + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + if (isset($_REQUEST['s_id'])) $sid = wpsg_q($_REQUEST['s_id']); + if (isset($_REQUEST['s_value'])) $sval = wpsg_tf($_REQUEST['s_value']); + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'change') + { + //'wp-admin/admin.php?page=wpsg-Admin&subaction=shippingData&do=change&edit_id=12&p_id=34&p_value=56&noheader=1'; + + $arTaxKey = explode('_', wpsg_q($_REQUEST['mwst'])); + $country_id = $arTaxKey[1]; + $country = wpsg_country::getInstance($country_id); + $tax_key = 'c'; + $noMwSt = false; + if (wpsg_q($_REQUEST['noMwSt']) == 1) $noMwSt = true; + if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key); + //if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) + if ($option == WPSG_NETTO) + { + $data = array('price_shipping' => $sval, 'price_shipping_netto' => $sval, 'type_shipping' => $sid); + } + else + { + $data = array('price_shipping' => $sval, 'price_shipping_brutto' => $sval, 'type_shipping' => $sid); + } + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".$oid."'"); + + } + + // Order-Daten sammeln und Tabelle neu generieren + $basket = new wpsg_basket(); + $basket->initFromDB($oid, true); + $this->shop->view['basket'] = $basket->toArray(true); + + if ($option == WPSG_NETTO) + { + $data = array('price_shipping_brutto' => $this->shop->view['basket']['sum']['preis_shipping_brutto']); + } + else + { + $data = array('price_shipping_netto' => $this->shop->view['basket']['sum']['preis_shipping_netto']); + } + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".$oid."'"); + + $this->shop->view['colspan'] = 3; + if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++; + + $this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml'); + + exit; + + } // public function shippingDataAction() /** @@ -1077,4 +1171,5 @@ $t1 = 0; $oid = 0; + $option = $this->shop->get_option('wpsg_preisangaben'); if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); @@ -1100,5 +1195,5 @@ // Gutschein löschen $this->db->Query("DELETE FROM `".WPSG_TBL_GUTSCHEIN."` WHERE `id` = '".wpsg_q($_REQUEST['gs_id'])."'"); - $ogs = array('gs_id' => 0, 'price_gs' => 0); + $ogs = array('gs_id' => 0, 'price_gs' => 0, 'price_gs_netto' => 0, 'price_gs_brutto' => 0); $this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); $_REQUEST['gs_id'] = 0; @@ -1117,5 +1212,5 @@ //wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&oid=34&noheader=1 //submitdata: { field: 'code', gs_id: 92 } - $val = abs(wpsg_tf($_REQUEST['value'])); + $sval = abs(wpsg_tf($_REQUEST['value'])); $arTaxKey = explode('_', wpsg_q($_REQUEST['mwst'])); @@ -1126,10 +1221,13 @@ if (wpsg_q($_REQUEST['noMwSt']) == 1) $noMwSt = true; if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key); - if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) - { - //$val = wpsg_calculatePreis($val, WPSG_BRUTTO, $tax_value); - } - $data = array('price_gs' => $val); - $sql = "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"; + //if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) + if ($option == WPSG_NETTO) + { + $data = array('price_gs' => $sval, 'price_gs_netto' => $sval); + } + else + { + $data = array('price_gs' => $sval, 'price_gs_brutto' => $sval); + } $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); @@ -1141,4 +1239,17 @@ $this->shop->view['basket'] = $basket->toArray(true); + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editvalue') + { + if ($option == WPSG_NETTO) + { + $data = array('price_gs_brutto' => $this->shop->view['basket']['sum']['gs_brutto']); + } + else + { + $data = array('price_gs_netto' => $this->shop->view['basket']['sum']['gs_netto']); + } + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); + } + $this->shop->view['colspan'] = 3; if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++; @@ -1158,4 +1269,5 @@ $t1 = 0; $oid = 0; + $option = $this->shop->get_option('wpsg_preisangaben'); if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); @@ -1171,5 +1283,5 @@ { // Rabatt löschen - $ogs = array('price_rabatt' => 0); + $ogs = array('price_rabatt' => 0, 'price_rabatt_netto' => 0, 'price_rabatt_brutto' => 0); $this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); @@ -1184,5 +1296,5 @@ else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editvalue') { - $val = abs(wpsg_tf($_REQUEST['value'])); + $sval = abs(wpsg_tf($_REQUEST['value'])); $arTaxKey = explode('_', wpsg_q($_REQUEST['mwst'])); @@ -1193,10 +1305,13 @@ if (wpsg_q($_REQUEST['noMwSt']) == 1) $noMwSt = true; if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key); - if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) - { - //$val = wpsg_calculatePreis($val, WPSG_BRUTTO, $tax_value); - } - $data = array('price_rabatt' => $val); - $sql = "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"; + //if (wpsg_q($_REQUEST['price_frontend']) == WPSG_NETTO) + if ($option == WPSG_NETTO) + { + $data = array('price_rabatt' => $sval, 'price_rabatt_netto' => $sval); + } + else + { + $data = array('price_rabatt' => $sval, 'price_rabatt_brutto' => $sval); + } $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); @@ -1208,4 +1323,17 @@ $this->shop->view['basket'] = $basket->toArray(true); + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editvalue') + { + if ($option == WPSG_NETTO) + { + $data = array('price_rabatt_brutto' => $this->shop->view['basket']['sum']['preis_rabatt_brutto']); + } + else + { + $data = array('price_rabatt_netto' => $this->shop->view['basket']['sum']['preis_rabatt_netto']); + } + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); + } + $this->shop->view['colspan'] = 3; if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++; @@ -1216,4 +1344,150 @@ } // public function discountDataAction() + + /** + * Wird aufgerufen wenn die Produkte bearbeitet werden + */ + public function productDataAction() + { + + $t1 = 0; + $oid = 0; + $option = $this->shop->get_option('wpsg_preisangaben'); + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + + // Steuersatz berechnen + $oOrder = wpsg_order::getInstance($oid); + $country_id = $oOrder->getCustomer()->getCountryId(); + //TODO + $country_id = 1; + $country = wpsg_country::getInstance($country_id); + + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'add') + { + //url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=add&edit_id=' + this.o_id + '&p_id=' + pid + '&noheader=1', + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + if (isset($_REQUEST['p_id'])) $pid = wpsg_q($_REQUEST['p_id']); + + $arProd = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($pid)."'"); + + $data = array('o_id' => $oid, 'p_id' => $pid, 'productkey' => $pid, + 'menge' => 1, 'mwst_key' => $arProd['mwst_key'], 'mod_vp_varkey' => $pid, + 'allowedpayments' => $arProd['allowedpayments'], + 'allowedshipping' => $arProd['allowedshipping'], 'weight' => $arProd['weight'] + ); + + $noMwSt = false; + if (isset($_REQUEST['noMwSt'])) + { + if (wpsg_q($_REQUEST['noMwSt']) == 1) $noMwSt = true; + $tax_key = $arProd['mwst_key']; + if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key); + } + + $price = $arProd['preis']; + + if ($option == WPSG_NETTO) + { + $netto = $price; + $brutto = $price * ((100.0 + $tax_value) / 100.0); + + } + else + { + $netto = $price / ((100.0 + $tax_value) / 100.0); + $brutto = $price; + + } + $diff = $brutto - $netto; + + $data['price'] = $price; + $data['price_netto'] = $netto; + $data['price_brutto'] = $brutto; + ////$data['mwst_value'] = $diff; + $data['mwst_value'] = $tax_value; + + $op_id = $this->db->ImportQuery(WPSG_TBL_ORDERPRODUCT, $data); + //$this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); + + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'remove') + { + // Order-Produkt löschen + //url: 'wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=remove&edit_id=' + o_id + '&p_id=' + op_id + '&noheader=1', + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + if (isset($_REQUEST['op_id'])) $opid = wpsg_q($_REQUEST['op_id']); + + $this->db->Query("DELETE FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `id` = '".wpsg_q($opid)."' "); + + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'change') + { + //url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=change&edit_id=' + this.o_id + '&op_id=' + this.op_id + '&p_id=' + pid + '&noheader=1'; + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + if (isset($_REQUEST['p_id'])) $pid = wpsg_q($_REQUEST['p_id']); + if (isset($_REQUEST['op_id'])) $opid = wpsg_q($_REQUEST['op_id']); + + $arProd = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_PRODUCTS."` WHERE `id` = '".wpsg_q($pid)."'"); + + $data = array('o_id' => $oid, 'p_id' => $pid, 'productkey' => $pid, + 'mod_vp_varkey' => $pid, + 'allowedpayments' => $arProd['allowedpayments'], + 'allowedshipping' => $arProd['allowedshipping'], 'weight' => $arProd['weight'] + ); + + $pval = abs(wpsg_tf($_REQUEST['p_val'])); + $pme = abs(wpsg_tf($_REQUEST['p_me'])); + + $noMwSt = false; + if (isset($_REQUEST['noMwSt'])) + { + if (wpsg_q($_REQUEST['noMwSt']) == 1) $noMwSt = true; + //$tax_key = $arProd['mwst_key']; + $tax_key = wpsg_q($_REQUEST['p_mwst']); + if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key); + } + //TODO + + $price = $pval; + + if ($option == WPSG_NETTO) + { + $netto = $price; + $brutto = $price * ((100.0 + $tax_value) / 100.0); + + } + else + { + $netto = $price / ((100.0 + $tax_value) / 100.0); + $brutto = $price; + + } + $diff = $brutto - $netto; + + $data['mwst_key'] = wpsg_q($_REQUEST['p_mwst']); + $data['menge'] = $pme; + $data['price'] = $price; + $data['price_netto'] = $netto; + $data['price_brutto'] = $brutto; + ////$data['mwst_value'] = $diff; + $data['mwst_value'] = $tax_value; + + $this->db->UpdateQuery(WPSG_TBL_ORDERPRODUCT, $data, "`id` = '".$opid."'"); + + } + + // Order-Daten sammeln und Tabelle neu generieren + $basket = new wpsg_basket(); + $basket->initFromDB($oid, true); + $this->shop->view['basket'] = $basket->toArray(true); + + $this->shop->view['colspan'] = 3; + if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++; + + $this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml'); + + exit; + + } // public function productDataAction() Index: /controller/wpsg_OrderController.class.php =================================================================== --- /controller/wpsg_OrderController.class.php (revision 5932) +++ /controller/wpsg_OrderController.class.php (revision 5934) @@ -276,5 +276,5 @@ $basket->initFromDB($this->shop->view['data']['id'], true); $this->shop->view['basket'] = $basket->toArray(true); - + $this->shop->view['colspan'] = 3; if ($this->shop->get_option('wpsg_showMwstAlways') == '1' || sizeof($this->shop->view['basket']['mwst']) > 1) $this->shop->view['colspan'] ++; Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5932) +++ /controller/wpsg_ShopController.class.php (revision 5934) @@ -1486,4 +1486,14 @@ } + + // Daten aus Order-Produkt nehmen, da die Bestellung im Backend bearbeitbar ist + if (isset($produkt['op_mwst_key'])) + { + $produkt['mwst_key'] = $produkt['op_mwst_key']; + $produkt['preis'] = $produkt['price']; + $produkt['preis_netto'] = $produkt['price_netto']; + $produkt['preis_brutto'] = $produkt['price_brutto']; + //$produkt['mwst_value'] = $produkt['op_mwst_value']; + } $produkt['product_id'] = $this->getProduktID($produkt_id); @@ -3363,4 +3373,8 @@ if (wpsg_tf($value) <= 0) return 0; + $price_option = WPSG_BRUTTO; //$this->get_option('wpsg_preisangaben'); + //if (isset($arBasket['price_frontend'])) + // $price_option = $arBasket['price_frontend']; + // Anteilig auf die SÀtze verteilen foreach ((array)$arBasket['mwst'] as $mw_id => $mw) @@ -3369,5 +3383,5 @@ if ($mw['base_value'] > 0) { - if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_BRUTTO)) + if (($price_option == WPSG_BRUTTO)) { $proz = $mw['base_value'] / $arBasket['sum']['preis_brutto']; @@ -3377,5 +3391,5 @@ } - else if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_NETTO)) + else { $proz = $mw['base_value'] / $arBasket['sum']['preis_netto']; @@ -3383,12 +3397,4 @@ $arBasket['mwst'][$mw_id]['base_value'] -= $proz * $value; $arBasket['mwst'][$mw_id]['sum'] = wpsg_calculateSteuer($arBasket['mwst'][$mw_id]['base_value'], WPSG_NETTO, $mw['value']); - - } - else - { - $proz = $mw['base_value'] / $arBasket['sum']['preis_brutto']; - - $arBasket['mwst'][$mw_id]['base_value'] -= $proz * $value; - $arBasket['mwst'][$mw_id]['sum'] = wpsg_calculateSteuer($arBasket['mwst'][$mw_id]['base_value'], WPSG_BRUTTO, $mw['value']); } @@ -3424,4 +3430,9 @@ if (wpsg_tf($value) <= 0) return 0; + $price_option = WPSG_BRUTTO; //$this->get_option('wpsg_preisangaben'); + //if (isset($arBasket['price_frontend'])) + // $price_option = $arBasket['price_frontend']; + + // Anteilig auf die SÀtze verteilen foreach ((array)$arBasket['mwst'] as $mw_id => $mw) { @@ -3429,5 +3440,5 @@ if ($mw['base_value'] > 0) { - if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_BRUTTO)) + if (($price_option == WPSG_BRUTTO)) { $proz = $mw['base_value'] / $arBasket['sum']['preis_brutto']; @@ -3437,5 +3448,5 @@ } - else if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_NETTO)) + else { $proz = $mw['base_value'] / $arBasket['sum']['preis_netto']; @@ -3444,12 +3455,4 @@ $arBasket['mwst'][$mw_id]['base_value'] -= $proz * $value; $arBasket['mwst'][$mw_id]['sum'] = wpsg_calculateSteuer($arBasket['mwst'][$mw_id]['base_value'], WPSG_NETTO, $mw['value']); - - } - else - { - $proz = $mw['base_value'] / $arBasket['sum']['preis_brutto']; - - $arBasket['mwst'][$mw_id]['base_value'] -= wpsg_calculatePreis($proz * $value, WPSG_BRUTTO, $mw['value']); - $arBasket['mwst'][$mw_id]['sum'] = wpsg_calculateSteuer($arBasket['mwst'][$mw_id]['base_value'], WPSG_BRUTTO, $mw['value']); } Index: /lib/install.php =================================================================== --- /lib/install.php (revision 5932) +++ /lib/install.php (revision 5934) @@ -121,6 +121,10 @@ price_payment_brutto DOUBLE(10,4) NOT NULL, price_rabatt DOUBLE(10,4) NOT NULL, - price_gs DOUBLE(10,4) NOT NULL, - price_frontend INT(1) NOT NULL, + price_rabatt_netto DOUBLE(10,4) NOT NULL, + price_rabatt_brutto DOUBLE(10,4) NOT NULL, + price_gs DOUBLE(10,4) NOT NULL, + price_gs_netto DOUBLE(10,4) NOT NULL, + price_gs_brutto DOUBLE(10,4) NOT NULL, + price_frontend INT(1) NOT NULL, mwst_payment DOUBLE(10,4) NOT NULL, mwst_shipping DOUBLE(10,4) NOT NULL, Index: /lib/wpsg_basket.class.php =================================================================== --- /lib/wpsg_basket.class.php (revision 5932) +++ /lib/wpsg_basket.class.php (revision 5934) @@ -369,4 +369,5 @@ SELECT OP.`menge`, OP.`price` AS preis_brutto, + OP.`price`, OP.`price_netto`, OP.`price_brutto`, OP.`mwst_key` AS op_mwst_key, OP.`mwst_value` AS `mwst_value`, IF (OP.`productkey` != '', OP.`productkey`, P.`id`) AS `productkey`, @@ -432,5 +433,4 @@ // Gutschein-Wert aus der Order-Tabelle wegen Bearbeitung - //if ($order['price_frontend'] == WPSG_NETTO) if ($backend) { @@ -593,5 +593,5 @@ $arBasket = $this->toArray(); - // Keien Produkte nix speichern + // Keine Produkte nix speichern // Sonst wurden schon beim Betreten des leeren Warenkorb (Bots) leere Bestellungen erzeugt if (!wpsg_isSizedArray($arBasket['produkte'])) return; @@ -805,4 +805,41 @@ } + // Rabatt und Gutschein netto und brutto speichern + $data['price_rabatt_netto'] = $arBasket['sum']['preis_rabatt_netto']; + $data['price_rabatt_brutto'] = $arBasket['sum']['preis_rabatt_brutto']; + if (isset($arBasket['sum']['gs'])) + { + $data['price_gs_netto'] = $arBasket['sum']['gs_netto']; + $data['price_gs_brutto'] = $arBasket['sum']['gs_brutto']; + } + + /* + if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO) + { + $tax = $this->shop->subMwSt($arBasket, $arBasket['sum']['preis_rabatt']); + $data['price_rabatt_netto'] = $arBasket['sum']['preis_rabatt'] - $tax; + $data['price_rabatt_brutto'] = $arBasket['sum']['preis_rabatt']; + if (isset($arBasket['sum']['gs'])) + { + $tax = $this->shop->subMwSt($arBasket, $arBasket['sum']['gs']); + $data['price_gs_netto'] = $arBasket['sum']['gs'] - $tax; + $data['price_gs_brutto'] = $arBasket['sum']['gs']; + } + + } + else + { + $tax = $this->shop->addMwSt($arBasket, $arBasket['sum']['preis_rabatt']); + $data['price_rabatt_netto'] = $arBasket['sum']['preis_rabatt']; + $data['price_rabatt_brutto'] = $arBasket['sum']['preis_rabatt'] + $tax; + if (isset($arBasket['sum']['gs'])) + { + $tax = $this->shop->addMwSt($arBasket, $arBasket['sum']['gs']); + $data['price_gs_netto'] = $arBasket['sum']['gs']; + $data['price_gs_brutto'] = $arBasket['sum']['gs'] + $tax; + } + + } + */ $this->shop->callMods('basket_save_order', array(&$data, &$this->arCheckout, &$arBasket, $finish_order)); @@ -1345,5 +1382,5 @@ } - } + } // if (($this->o_id > 0) && false) $arReturn = array(); @@ -1417,5 +1454,5 @@ unset($b['preis_netto']); unset($b['preis_brutto']); - unset($b['mwst_key']); // Key muss auch gelöscht werden, damit die loadProduktArray den Preis korrekt ermittelt (Sonst funnktioniert es beim 2. Mal nicht) + unset($b['mwst_key']); // Key muss auch gelöscht werden, damit die loadProduktArray den Preis korrekt ermittelt (Sonst funktioniert es beim 2. Mal nicht) // in $b sind eventuell auch Moduldaten drin (Produktvariablen) @@ -1538,5 +1575,5 @@ if (!$noMwSt) { - + /* if ((isset($this->arOrder['price_frontend'])) && ($this->arOrder['price_frontend'] == WPSG_BRUTTO)) { @@ -1551,5 +1588,5 @@ } - else + else */ { wpsg_addSet($arReturn['mwst'][$tax_key_lang]['sum'], $sum_tax_value); @@ -1597,6 +1634,7 @@ $this->shop->callMods('basket_toArray_preshippayment', array(&$this, &$arReturn)); - // Die Versandkosten fÌr den Warenkorb berechnen berechnen + // Die Versandkosten fÌr den Warenkorb berechnen // Dies darf im checkout2 nicht passieren, oder wenn der Parameter auf true +// if (false && $this->o_id > 0) if ($this->o_id > 0) { @@ -1605,5 +1643,11 @@ $price_shipping = $order_data['price_shipping']; $price_payment = $order_data['price_payment']; - + $arReturn['sum']['preis_payment_brutto'] = $order_data['price_payment_brutto']; + $arReturn['sum']['preis_payment_netto'] = $order_data['price_payment_netto']; + $arReturn['sum']['preis_shipping_brutto'] = $order_data['price_shipping_brutto']; + $arReturn['sum']['preis_shipping_netto'] = $order_data['price_shipping_netto']; + + /* +//TODO if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO) { @@ -1626,5 +1670,5 @@ } - + */ } else @@ -1750,5 +1794,5 @@ } - + $this->shop->callMods('calcPayment', array(&$arReturn)); @@ -1756,42 +1800,22 @@ } - + /* // 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) { - - // Preisangaben fÌrs Backend - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) - { - - $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_shipping_netto']; - $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_netto']; - - $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_payment_netto']; - $arReturn['sum']['preis_payment'] = $arReturn['sum']['preis_payment_netto']; - - } - else - { - - $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_shipping_brutto']; - $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_brutto']; - - $arReturn['sum']['preis_gesamt'] += wpsg_getInt($arReturn['sum']['preis_payment_brutto']); - $arReturn['sum']['preis_payment'] = wpsg_getInt($arReturn['sum']['preis_payment_brutto']); - - } - - // Preise so anzeigen wie im Frontend (Firmenkunde/Endkunde) + + // 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 ($arReturn['price_frontend'] == WPSG_NETTO) + if ($price_option == WPSG_NETTO) + { $p['preis'] = $p['preis_netto']; } @@ -1801,6 +1825,72 @@ } } - if ($arReturn['price_frontend'] == WPSG_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']; +*/ + //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 = $this->arOrder['type_payment']; + $tax_keyp = $this->shop->arPayment[$id]['mwst_key']; + $mb->setPaymentKosten($arReturn, $pricep, $tax_keyp); + $taxp = $arReturn['payment']['mwst']; + + $id = $this->arOrder['type_shipping']; + $tax_keys = $this->shop->arShipping[$id]['mwst_key']; + $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']; @@ -1814,6 +1904,58 @@ } - else - { + 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 = $this->arOrder['type_payment']; + $tax_keyp = $this->shop->arPayment[$id]['mwst_key']; + $mb->setPaymentKosten($arReturn, $pricep, $tax_keyp); + $taxp = $arReturn['payment']['mwst']; + + $id = $this->arOrder['type_shipping']; + $tax_keys = $this->shop->arShipping[$id]['mwst_key']; + $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']; @@ -1825,9 +1967,17 @@ $arReturn['sum']['gs'] = $arReturn['sum']['gs_brutto']; } - } - - } - else - { + } // 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 @@ -1853,5 +2003,5 @@ } - } + } // else if ($backend) // Leere MwSt. SÀtze entfernen @@ -1875,4 +2025,63 @@ } // public function toArray() + + /** + * Verteilt den Wert $value auf die MwSt SÀtze in $arBasket + * $value wird Netto Ìbergeben + */ + public function addMwSt(&$arBasket, $value) + { + + if (wpsg_tf($value) <= 0) return 0; + + $price_option = $this->shop->get_option('wpsg_preisangaben'); + + // Anteilig auf die SÀtze verteilen + foreach ((array)$arBasket['mwst'] as $mw_id => $mw) + { + + if ($mw['base_value'] > 0) + { + if (($price_option == WPSG_BRUTTO)) + { + $proz = $mw['base_value'] / $arBasket['sum']['preis_brutto']; + + $arBasket['mwst'][$mw_id]['base_value'] += $proz * $value; + $arBasket['mwst'][$mw_id]['sum'] = wpsg_calculateSteuer($arBasket['mwst'][$mw_id]['base_value'], WPSG_BRUTTO, $mw['value']); + + } + else + { + $proz = $mw['base_value'] / $arBasket['sum']['preis_netto']; + + $arBasket['mwst'][$mw_id]['base_value'] -= wpsg_calculatePreis($proz * $value, WPSG_NETTO, $mw['value']); + //$arBasket['mwst'][$mw_id]['base_value'] += $proz * $value; + $arBasket['mwst'][$mw_id]['sum'] = wpsg_calculateSteuer($arBasket['mwst'][$mw_id]['base_value'], WPSG_NETTO, $mw['value']); + + } + + } + + } + + // Mehrwertsteuer Summe korrigieren + $sum_mwst = 0; + foreach ($arBasket['mwst'] as $mw_id => $mw) + { + + $sum_mwst += $arBasket['mwst'][$mw_id]['sum']; + + } + + $sub = $arBasket['sum']['mwst']; + + $arBasket['sum']['mwst'] = abs($sum_mwst); + + return $sub - $arBasket['sum']['mwst']; + + } // public function addMwSt(&$arBasket, $value) + + + /** * Gibt die Anzahl zurÌck, die im Warenkorb zu einem ProduktKEY enthalten ist Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 5932) +++ /mods/wpsg_mod_basic.class.php (revision 5934) @@ -805,10 +805,10 @@ /** - * Hilfsfunktion, die die Versandkosten auf den Warenkorb Array draufschlÀft + * Hilfsfunktion, die die Versandkosten auf den Warenkorb Array draufschlÀgt * @param $arBasket Der Array des Warenkorbs * @param $shipping_price Die absoluten Versandkosten * @param $mwst_id Die ID der MwSt, 0 fÌr anteilig */ - protected function setShippingKosten(&$arBasket, $shipping_key, $shipping_price, $tax_key) + public function setShippingKosten(&$arBasket, $shipping_key, $shipping_price, $tax_key) { @@ -948,5 +948,5 @@ * @param $mwst_id Die ID der MwSt, 0 fÌr anteilig */ - protected function setPaymentKosten(&$arBasket, $payment_price, $tax_key) + public function setPaymentKosten(&$arBasket, $payment_price, $tax_key) { @@ -982,7 +982,13 @@ wpsg_addSet($arBasket['sum']['mwst'], $payment_mwst); - $arBasket['payment']['mwst'] = $tax_value; // Der Steuersatz der Zahlungsmethode + $arBasket['payment']['mwst'] = $payment_mwst; + $arBasket['payment']['tax_value'] = $tax_value; + $arBasket['payment']['preis_payment_netto'] = $payment_netto; + $arBasket['payment']['preis_payment_brutto'] = $payment_brutto; $arBasket['payment']['tax_rata'] = false; - + + //$arBasket['payment']['mwst'] = $tax_value; // Der Steuersatz der Zahlungsmethode + //$arBasket['payment']['tax_rata'] = false; + } else @@ -1013,6 +1019,17 @@ } - $mwst_sum = 0; - + // Sollte es keine MwSt Verteilung geben, dann auf den ersten Satz draufrechnen + if (!wpsg_isSizedArray($arMwStAnteile) && wpsg_isSizedArray($arBasket['mwst'])) + { + + foreach ((array)$arBasket['mwst'] as $tax_key => $mw) { $arMwStAnteile[$tax_key] = 1; break; } + + } + + $mwst_sum = 0; + $tax_netto_gesamt = 0; + $tax_brutto_gesamt = 0; + $tax_sum = 0; + /* HR foreach ($arMwStAnteile as $tax_key => $mw_anteil) { @@ -1042,7 +1059,42 @@ } - + */ + + foreach ($arMwStAnteile as $tax_key => $mw_anteil) + { + + // Eventuell Nettopreis bestimmen + if ($this->shop->getBackendTaxview() == WPSG_BRUTTO) + { + + $defaultCountry = $this->shop->getDefaultCountry(); + $defaultTax = $defaultCountry->getTax(substr($tax_key, 0, 1)); + + $tax_netto = wpsg_calculatePreis(($payment_price * $mw_anteil), WPSG_NETTO, $defaultTax); // * $mw_anteil; + + } + else + { + + $tax_netto = $payment_price * $mw_anteil; + + } + + $tax_brutto = wpsg_calculatePreis($tax_netto, WPSG_BRUTTO, $arBasket['mwst'][$tax_key]['value']); + + $tax = $tax_brutto - $tax_netto; + $tax_sum += $tax; + + $tax_netto_gesamt += $tax_netto; + $tax_brutto_gesamt += $tax_brutto; + + $arBasket['mwst'][$tax_key]['sum'] += $tax; + $arBasket['mwst'][$tax_key]['base_value'] += $tax_brutto; + + } + wpsg_addSet($arBasket['sum']['mwst'], $mwst_sum); + /* HR if ($this->shop->getFrontendTaxview() == WPSG_NETTO) { @@ -1059,5 +1111,12 @@ } - + */ + + wpsg_addSet($arBasket['sum']['preis_payment_netto'], $tax_netto_gesamt); + wpsg_addSet($arBasket['sum']['preis_payment_brutto'], $tax_brutto_gesamt); + + $arBasket['payment']['mwst'] = $tax_sum; + $arBasket['payment']['preis_payment_netto'] = $tax_netto_gesamt; + $arBasket['payment']['preis_payment_brutto'] = $tax_brutto_gesamt; $arBasket['payment']['tax_rata'] = true; Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 5932) +++ /mods/wpsg_mod_discount.class.php (revision 5934) @@ -511,18 +511,19 @@ { // Im Backend Rabatt nicht neu berechnen aus Bestellung entnehmen - $discount = $arReturn['order_rabatt']; - $discount_value = $discount; - $price_frontend = $arReturn['price_frontend']; + $discount_brutto = $basket->arOrder['price_rabatt_brutto']; + $discount_netto = $basket->arOrder['price_rabatt_netto']; + //$price_option = $arReturn['price_frontend']; + $price_option = $this->shop->get_option('wpsg_preisangaben'); $discount_tax = 0.0; - if ($price_frontend == WPSG_NETTO) + if ($price_option == WPSG_BRUTTO) { if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - - $discount_tax = $this->shop->addMwSt($arReturn, $discount); - //$discount_tax = $this->shop->subMwSt($arReturn, $discount); - //$discount_value = $discount - $discount_tax; - $discount_tax = 0.0; + + // Rabatt auf die verschiedenen Produkte aufteilen. + //$discount_tax = $this->shop->addMwSt($arReturn, $discount); + $discount_tax = $this->shop->subMwSt($arReturn, $discount_brutto); + } @@ -530,6 +531,6 @@ { - $discount_brutto = round($discount_value + $discount_tax, 2); - $discount_netto = round($discount_value, 2); + $discount_brutto = round($discount_brutto, 2); + $discount_netto = round($discount_brutto - $discount_tax, 2); } @@ -537,19 +538,17 @@ { - $discount_brutto = $discount_value + $discount_tax; - $discount_netto = $discount_value; - - } - - } - else - { - - $discount_value = $discount; + $discount_brutto = $discount_brutto; + $discount_netto = $discount_brutto - $discount_tax; + + } + + } + else // if ($price_option == WPSG_BRUTTO) + { if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - $discount_tax = $this->shop->subMwSt($arReturn, $discount); + $discount_tax = $this->shop->addMwSt($arReturn, $discount_netto); } @@ -558,6 +557,6 @@ { - $discount_brutto = round($discount_value, 2); - $discount_netto = round($discount_value - $discount_tax, 2); + $discount_brutto = round($discount_netto + $discount_tax, 2); + //$discount_netto = round($discount_value - $discount_tax, 2); } @@ -565,9 +564,10 @@ { - $discount_brutto = $discount_value; - $discount_netto = $discount_value - $discount_tax; - - } - } // if ($price_frontend == WPSG_NETTO) + //$discount_brutto = $discount_value; + $discount_netto = $discount_brutto - $discount_tax; + + } + + } // else if ($price_option == WPSG_BRUTTO) Index: /mods/wpsg_mod_gutschein.class.php =================================================================== --- /mods/wpsg_mod_gutschein.class.php (revision 5932) +++ /mods/wpsg_mod_gutschein.class.php (revision 5934) @@ -519,5 +519,6 @@ $product_allowed = wpsg_explode(',', $gs_db['products']); - if (wpsg_isSizedArray(wpsg_explode(',', $gs_db['productgroups']))) + $temp = wpsg_explode(',', $gs_db['productgroups']); + if (wpsg_isSizedArray($temp)) { @@ -590,35 +591,59 @@ $gs_tax = 0; - if ((isset($arReturn['price_frontend'])) && ($arReturn['price_frontend'] == WPSG_BRUTTO)) - { - //$gs_value = $basket->gs_value; + $gs_brutto = $basket->arOrder['price_gs_brutto']; + $gs_netto = $basket->arOrder['price_gs_netto']; + $gs_tax = $gs_brutto - $gs_netto; + $gs_value = $gs_brutto; + + //if ((isset($arReturn['price_frontend'])) && ($arReturn['price_frontend'] == WPSG_BRUTTO)) + $price_option = $this->shop->get_option('wpsg_preisangaben'); + + if ($price_option == WPSG_NETTO) + { + $gs_value = $basket->gs_value; if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - $gs_tax = $this->shop->subMwSt($arReturn, $basket->gs_value); + $gs_tax = $this->shop->addMwSt($arReturn, $gs_netto); } - $gs_brutto = $gs_value; - $gs_netto = $gs_value - $gs_tax; - - } - - if ((isset($arReturn['price_frontend'])) && ($arReturn['price_frontend'] == WPSG_NETTO)) + $gs_brutto = $gs_netto + $gs_tax; + + $arReturn['sum']['gs'] = $gs_netto; + $arReturn['sum']['gs_netto'] = $gs_netto; + $arReturn['sum']['gs_brutto'] = $gs_brutto; + $arReturn['sum']['preis'] = $arReturn['sum']['preis_netto']; + $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_netto']; + + } + + //if ((isset($arReturn['price_frontend'])) && ($arReturn['price_frontend'] == WPSG_NETTO)) + if ($price_option == WPSG_BRUTTO) { if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - $gs_tax = $this->shop->addMwSt($arReturn, $basket->gs_value); + $gs_tax = $this->shop->subMwSt($arReturn, $gs_brutto); } //$gs_value = $basket->gs_value + $gs_tax; - $gs_brutto = $gs_value + $gs_tax; - $gs_netto = $gs_value; - - } - - } - else + $gs_netto = $gs_brutto - $gs_tax; + + $arReturn['sum']['gs'] = $gs_brutto; + $arReturn['sum']['gs_netto'] = $gs_netto; + $arReturn['sum']['gs_brutto'] = $gs_brutto; + $arReturn['sum']['preis'] = $arReturn['sum']['preis_brutto']; + $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_brutto']; + + } + + $arReturn['sum']['preis_brutto'] -= $gs_brutto; + $arReturn['sum']['preis_netto'] -= $gs_netto; + $arReturn['sum']['preis_gesamt_brutto'] -= $gs_brutto; + $arReturn['sum']['preis_gesamt_netto'] -= $gs_netto; + + } + else // if ((isset($arReturn['backend'])) && $arReturn['backend']) { $arReturn['gs'] = array( @@ -680,33 +705,32 @@ $gs_netto = $gs_value - $gs_tax; - } - - - $arReturn['sum']['preis_brutto'] -= $gs_brutto; - $arReturn['sum']['preis_netto'] -= $gs_netto; - $arReturn['sum']['preis_gesamt_brutto'] -= $gs_brutto; - $arReturn['sum']['preis_gesamt_netto'] -= $gs_netto; - - if ($this->shop->getFrontendTaxview() == WPSG_NETTO) - { - - $arReturn['sum']['gs'] = $gs_netto; - $arReturn['sum']['gs_netto'] = $gs_netto; - $arReturn['sum']['gs_brutto'] = $gs_brutto; - $arReturn['sum']['preis'] = $arReturn['sum']['preis_netto']; - $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_netto']; - - } - else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO) - { - - $arReturn['sum']['gs'] = $gs_brutto; - $arReturn['sum']['gs_netto'] = $gs_netto; - $arReturn['sum']['gs_brutto'] = $gs_brutto; - $arReturn['sum']['preis'] = $arReturn['sum']['preis_brutto']; - $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_brutto']; - - } - + $arReturn['sum']['preis_brutto'] -= $gs_brutto; + $arReturn['sum']['preis_netto'] -= $gs_netto; + $arReturn['sum']['preis_gesamt_brutto'] -= $gs_brutto; + $arReturn['sum']['preis_gesamt_netto'] -= $gs_netto; + + if ($this->shop->getFrontendTaxview() == WPSG_NETTO) + { + + $arReturn['sum']['gs'] = $gs_netto; + $arReturn['sum']['gs_netto'] = $gs_netto; + $arReturn['sum']['gs_brutto'] = $gs_brutto; + $arReturn['sum']['preis'] = $arReturn['sum']['preis_netto']; + $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_netto']; + + } + else if ($this->shop->getFrontendTaxview() == WPSG_BRUTTO) + { + + $arReturn['sum']['gs'] = $gs_brutto; + $arReturn['sum']['gs_netto'] = $gs_netto; + $arReturn['sum']['gs_brutto'] = $gs_brutto; + $arReturn['sum']['preis'] = $arReturn['sum']['preis_brutto']; + $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_brutto']; + + } + + } // else if ((isset($arReturn['backend'])) && $arReturn['backend']) + } // gs_value Index: /mods/wpsg_mod_kundenverwaltung.class.php =================================================================== --- /mods/wpsg_mod_kundenverwaltung.class.php (revision 5932) +++ /mods/wpsg_mod_kundenverwaltung.class.php (revision 5934) @@ -134,5 +134,5 @@ $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutLogout', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutLogout']); $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegister', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegister']); - $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand']); + $this->shop->update_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang', $_REQUEST['wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang']); $this->shop->update_option('wpsg_mod_kundenverwaltung_loginZwang', $_REQUEST['wpsg_mod_kundenverwaltung_loginZwang']); $this->shop->update_option('wpsg_mod_kundenverwaltung_preisAnzeige', $_REQUEST['wpsg_mod_kundenverwaltung_preisAnzeige']); @@ -237,5 +237,5 @@ // Registrierungszwang und leer - if ((isset($_REQUEST['wpsg_mod_kundenverwaltung_register']) || $this->shop->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') && trim($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd1']) == '' && $_REQUEST['wpsg']['mod_kundenverwaltung']['pwd2'] == '') + if ((isset($_REQUEST['wpsg_mod_kundenverwaltung_register']) || $this->shop->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwang') == '1') && trim($_REQUEST['wpsg']['mod_kundenverwaltung']['pwd1']) == '' && $_REQUEST['wpsg']['mod_kundenverwaltung']['pwd2'] == '') { Index: /mods/wpsg_mod_prepayment.class.php =================================================================== --- /mods/wpsg_mod_prepayment.class.php (revision 5932) +++ /mods/wpsg_mod_prepayment.class.php (revision 5934) @@ -104,5 +104,5 @@ 'name' => __($this->shop->get_option('wpsg_mod_prepayment_bezeichnung'), 'wpsg'), 'preis' => $this->shop->get_option('wpsg_mod_prepayment_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_prepayment_mwst'), + 'mwst_key' => $this->shop->get_option('wpsg_mod_prepayment_mwst'), 'mwst_value' => $mwst_value, 'mwst_null' => $this->shop->get_option('wpsg_mod_prepayment_mwstland'), Index: /mods/wpsg_mod_rechnungen.class.php =================================================================== --- /mods/wpsg_mod_rechnungen.class.php (revision 5932) +++ /mods/wpsg_mod_rechnungen.class.php (revision 5934) @@ -857,10 +857,10 @@ $this->shop->view['basket'] = $custom_data['basket']; - if (!is_array($custom_data['basket'])) + ////if (!is_array($custom_data['basket'])) { $basket = new wpsg_basket(); - $basket->initFromDB($order_id); - $this->shop->view['basket'] = $basket->toArray(); + $basket->initFromDB($order_id, true); + $this->shop->view['basket'] = $basket->toArray(true); } Index: /mods/wpsg_mod_targo.class.php =================================================================== --- /mods/wpsg_mod_targo.class.php (revision 5932) +++ /mods/wpsg_mod_targo.class.php (revision 5934) @@ -142,5 +142,5 @@ 'name' => __($this->shop->get_option('wpsg_mod_targo_bezeichnung'), 'wpsg'), 'preis' => $this->shop->get_option('wpsg_mod_targo_gebuehr'), - 'mwst' => $this->shop->get_option('wpsg_mod_targo_mwst'), + 'mwst_key' => $this->shop->get_option('wpsg_mod_targo_mwst'), 'mwst_value' => $mwst_value, 'mwst_null' => $this->shop->get_option('wpsg_mod_targo_mwstland'), @@ -195,5 +195,5 @@ if ($arBasket['checkout']['payment'] == $this->id) { - + $payment_price = $this->getPreis($this->shop->get_option('wpsg_mod_targo_gebuehr'), $arBasket['sum']['preis']); Index: /mods/wpsg_mod_userpayment.class.php =================================================================== --- /mods/wpsg_mod_userpayment.class.php (revision 5932) +++ /mods/wpsg_mod_userpayment.class.php (revision 5934) @@ -194,5 +194,5 @@ 'mwst_value' => $mwst_value, 'mwst_null' => $zv['mwst_laender'], - 'deleted' => $zv['deleted'] + 'deleted' => wpsg_getInt($zv['deleted']) ); Index: /views/admin/form/text.phtml =================================================================== --- /views/admin/form/text.phtml (revision 5932) +++ /views/admin/form/text.phtml (revision 5934) @@ -23,5 +23,5 @@ jQuery(document).ready(function() { - jQuery('#view['field_id']; ?>').wspg_editable('view['field_config']['inlineEdit_url']; ?>', { + jQuery('#view['field_id']; ?>').wpsg_editable('view['field_config']['inlineEdit_url']; ?>', { 'placement': 'bottom' view['field_config']['inlineEdit_type'])) { ?> Index: /views/admin/kundendaten_tab2.phtml =================================================================== --- /views/admin/kundendaten_tab2.phtml (revision 5932) +++ /views/admin/kundendaten_tab2.phtml (revision 5934) @@ -48,5 +48,5 @@ - + + + + + + + + + @@ -446,5 +931,5 @@
- @@ -465,5 +950,5 @@
- +