Index: /controller/wpsg_AdminController.class.php =================================================================== --- /controller/wpsg_AdminController.class.php (revision 5921) +++ /controller/wpsg_AdminController.class.php (revision 5922) @@ -1021,4 +1021,201 @@ } // private function loadStandardLaenderVz() + + /** + * Wird aufgerufen wenn die Zahlungsart verÀndert wird + */ + public function paymentDataAction() + { + $pid = 0; + $oid = 0; + $pval = 0.0; + 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['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]; + $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) + { + $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."'"); + + } + + + + } // public function paymentDataAction() + + /** + * Wird aufgerufen wenn die Gutscheine verwaltet werden sollen + */ + public function voucherDataAction() + { + //die('voucher'); + $t1 = 0; + $oid = 0; + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'add') + { + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + //wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=add&oid=34&noheader=1 + $dt = new DateTime(); + $dt1 = $dt->format('Y-m-d H:i:s'); + $dt = date_modify($dt, '+1 year'); + $dt2 = $dt->format('Y-m-d H:i:s'); + $gs = array('value' => '10.00', 'calc_typ' => 'w', 'code' => 'Gutschein', 'o_id' => $oid, + 'cdate' => $dt1, 'start_date' => $dt1, 'end_date' => $dt2); + $gs_id = $this->db->ImportQuery(WPSG_TBL_GUTSCHEIN, $gs); + + $ogs = array('gs_id' => $gs_id, 'price_gs' => 10.0); + $this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); + $_REQUEST['gs_id'] = $gs_id; + + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'remove') + { + // 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); + $this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); + $_REQUEST['gs_id'] = 0; + + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editname') + { + //wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&oid=34&noheader=1 + //submitdata: { field: 'code', gs_id: 92 } + $data = array(wpsg_q($_REQUEST['field']) => wpsg_q($_REQUEST['value'])); + + $this->db->UpdateQuery(WPSG_TBL_GUTSCHEIN, $data, "`id` = '".wpsg_q($_REQUEST['gs_id'])."'"); + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editvalue') + { + //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'])); + + $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) + { + //$val = wpsg_calculatePreis($val, WPSG_BRUTTO, $tax_value); + } + $data = array('price_gs' => $val); + $sql = "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"; + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); + + } + + // 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 voucherDataAction() + + /** + * Wird aufgerufen wenn die Rabatte verwaltet werden sollen + */ + public function discountDataAction() + { + //die('voucher'); + $t1 = 0; + $oid = 0; + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + + if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'add') + { + if (isset($_REQUEST['edit_id'])) $oid = wpsg_q($_REQUEST['edit_id']); + + $ogs = array('price_rabatt' => 10.0); + $this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); + + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'remove') + { + // Rabatt löschen + $ogs = array('price_rabatt' => 0); + $this->db->UpdateQuery(WPSG_TBL_ORDER, $ogs, "`id` = '".$oid."'"); + + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editname') + { + //submitdata: { field: 'code', gs_id: 92 } + $data = array(wpsg_q($_REQUEST['field']) => wpsg_q($_REQUEST['value'])); + + //$this->db->UpdateQuery(WPSG_TBL_GUTSCHEIN, $data, "`id` = '".wpsg_q($_REQUEST['gs_id'])."'"); + } + else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'editvalue') + { + $val = abs(wpsg_tf($_REQUEST['value'])); + + $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) + { + //$val = wpsg_calculatePreis($val, WPSG_BRUTTO, $tax_value); + } + $data = array('price_rabatt' => $val); + $sql = "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"; + $this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".wpsg_q($_REQUEST['edit_id'])."'"); + + } + + // 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 discountDataAction() + + /** * Wird aufgerufen wenn die Pflichtfelder verwaltet werden sollen @@ -1068,5 +1265,6 @@ { - if ($c['del'] == '1') unset($this->shop->view['pflicht']['custom'][$c_id]); + if (wpsg_getInt($c['del']) == '1') + unset($this->shop->view['pflicht']['custom'][$c_id]); else { Index: /controller/wpsg_BasketController.class.php =================================================================== --- /controller/wpsg_BasketController.class.php (revision 5921) +++ /controller/wpsg_BasketController.class.php (revision 5922) @@ -598,5 +598,6 @@ // ProduktgÌltigkeit prÌfen - if (wpsg_isSizedArray(wpsg_explode(',', $gs_db['products']))) + $tarr = wpsg_explode(',', $gs_db['products']); + if (wpsg_isSizedArray($tarr)) { @@ -611,5 +612,6 @@ // ProduktgruppengÌltigkeit prÌfen - if (wpsg_isSizedArray(wpsg_explode(',', $gs_db['productgroups']))) + $tarr = wpsg_explode(',', $gs_db['productgroups']); + if (wpsg_isSizedArray($tarr)) { Index: /controller/wpsg_ShopController.class.php =================================================================== --- /controller/wpsg_ShopController.class.php (revision 5921) +++ /controller/wpsg_ShopController.class.php (revision 5922) @@ -3369,9 +3369,28 @@ if ($mw['base_value'] > 0) { - - $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']); + if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == 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 if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_NETTO)) + { + $proz = $mw['base_value'] / $arBasket['sum']['preis_netto']; + + $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']); + + } } @@ -3380,4 +3399,5 @@ // Mehrwertsteuer Summe korrigieren + $sum_mwst = 0; foreach ($arBasket['mwst'] as $mw_id => $mw) { @@ -3409,9 +3429,29 @@ if ($mw['base_value'] > 0) { - - $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']); + if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_BRUTTO)) + { + $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']); + + } + else if ((isset($arBasket['price_frontend'])) && ($arBasket['price_frontend'] == WPSG_NETTO)) + { + $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']); + + } + 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']); + + } } @@ -3420,4 +3460,5 @@ // Mehrwertsteuer Summe korrigieren + $sum_mwst = 0.0; foreach ($arBasket['mwst'] as $mw_id => $mw) { Index: /lib/functions.inc.php =================================================================== --- /lib/functions.inc.php (revision 5921) +++ /lib/functions.inc.php (revision 5922) @@ -1021,5 +1021,5 @@ * Gibt die Numerische Entsprechung einer Variable zurÌck oder $default */ - function wpsg_getInt(&$value, $default = false) + function wpsg_getInt(&$value, $default = 0) { Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 5921) +++ /lib/helper_functions.inc.php (revision 5922) @@ -1135,4 +1135,19 @@ } // function wpsg_drawForm_Date($field_name, $field_label, $field_value, $conf = array()) + + function wpsg_drawForm_Link($field_name, $field_label, $field_link, $conf = array()) + { + + $TC = new wpsg_SystemController(); + + $TC->view['field_name'] = $field_name; + $TC->view['field_label'] = $field_label; + $TC->view['field_id'] = wpsg_drawForm_getID($field_name); + $TC->view['field_link'] = $field_link; + $TC->view['field_config'] = $conf; + + return $TC->render(WPSG_PATH_VIEW.'admin/form/link.phtml', false); + + } // function wpsg_drawForm_Link($field_name, $field_label, $field_link, $conf = array()) ?> Index: /lib/install.php =================================================================== --- /lib/install.php (revision 5921) +++ /lib/install.php (revision 5922) @@ -122,4 +122,5 @@ price_rabatt DOUBLE(10,4) NOT NULL, price_gs 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 5921) +++ /lib/wpsg_basket.class.php (revision 5922) @@ -362,5 +362,7 @@ 'datum' => strftime($order['cdate']) ); - + + $this->arOrder = $order; + // Produkte $arProdukte = $this->db->fetchAssoc(" @@ -419,5 +421,5 @@ if ($order['gs_id'] > 0) { - + $gs = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_GUTSCHEIN."` WHERE `id` = '".wpsg_q($order['gs_id'])."'"); @@ -426,4 +428,13 @@ $this->gs_code = $gs['code']; $this->gs_id = $gs['id']; + + } + + // Gutschein-Wert aus der Order-Tabelle wegen Bearbeitung + //if ($order['price_frontend'] == WPSG_NETTO) + if ($backend) + { + $val = abs($order['price_gs']); + $this->gs_value = $val; } @@ -723,5 +734,5 @@ // Produkte letztmalig ÌberprÌfen - foreach ($arBasket['produkte'] as $p_id => &$p) + foreach ($arBasket['produkte'] as $p_id => $p) { @@ -755,5 +766,6 @@ 'price_payment_netto' => wpsg_getFloat($arBasket['sum']['preis_payment_netto']), 'price_payment_brutto' => wpsg_getFloat($arBasket['sum']['preis_payment_brutto']), - 'price_rabatt' => wpsg_tf($arBasket['sum']['preis_rabatt']), + 'price_rabatt' => wpsg_tf($arBasket['sum']['preis_rabatt']), + 'price_frontend' => $this->shop->getFrontendTaxview(), 'mwst_payment' => wpsg_tf(wpsg_getFloat($arBasket['payment']['preis_payment_brutto']) - wpsg_getFloat($arBasket['payment']['preis_payment_netto'])), 'mwst_shipping' => wpsg_tf(wpsg_getFloat($arBasket['shipping']['preis_shipping_brutto']) - wpsg_getFloat($arBasket['shipping']['preis_shipping_netto'])), @@ -795,4 +807,10 @@ $this->shop->callMods('basket_save_order', array(&$data, &$this->arCheckout, &$arBasket, $finish_order)); + $data['custom_data']['basket']['oOrder'] = Array(); + //unset($data['custom_data']['basket']['oOrder']['shop']); + + $sw = wpsg_q(serialize($data['custom_data'])); + $sl = strlen($sw); + //echo "wpsg_q:
".$sw; $data['custom_data'] = wpsg_q(serialize($data['custom_data'])); @@ -1277,5 +1295,5 @@ { - if ($this->o_id > 0) + if (($this->o_id > 0) && false) { @@ -1520,7 +1538,23 @@ if (!$noMwSt) { - - wpsg_addSet($arReturn['mwst'][$tax_key_lang]['sum'], $sum_tax_value); - wpsg_addSet($arReturn['mwst'][$tax_key_lang]['base_value'], $sum_brutto); + + if ((isset($this->arOrder['price_frontend'])) && ($this->arOrder['price_frontend'] == WPSG_BRUTTO)) + { + wpsg_addSet($arReturn['mwst'][$tax_key_lang]['sum'], $sum_tax_value); + wpsg_addSet($arReturn['mwst'][$tax_key_lang]['base_value'], $sum_brutto); + + } + else if ((isset($this->arOrder['price_frontend'])) && ($this->arOrder['price_frontend'] == WPSG_NETTO)) + { + wpsg_addSet($arReturn['mwst'][$tax_key_lang]['sum'], $sum_tax_value); + wpsg_addSet($arReturn['mwst'][$tax_key_lang]['base_value'], $sum_netto); + + } + else + { + wpsg_addSet($arReturn['mwst'][$tax_key_lang]['sum'], $sum_tax_value); + wpsg_addSet($arReturn['mwst'][$tax_key_lang]['base_value'], $sum_brutto); + + } } @@ -1542,10 +1576,19 @@ } - + + if ($backend) + { + $arReturn['backend'] = $backend; + $arReturn['price_frontend'] = $this->arOrder['price_frontend']; + $arReturn['order_rabatt'] = $this->arOrder['price_rabatt']; + $arReturn['gs_value'] = $this->arOrder['price_gs']; + + } + // Gutschein einberechnen $this->shop->callMod('wpsg_mod_gutschein', 'basket_toArray_gs', array(&$this, &$arReturn)); // Staffelrabatt - $this->shop->callMod('wpsg_mod_discount', 'basket_toArray_discount', arraY(&$this, &$arReturn)); + $this->shop->callMod('wpsg_mod_discount', 'basket_toArray_discount', array(&$this, &$arReturn)); // Kundendaten einfÌgen @@ -1742,7 +1785,44 @@ $arReturn['sum']['preis_shipping'] = $arReturn['sum']['preis_shipping_brutto']; - $arReturn['sum']['preis_gesamt'] += $arReturn['sum']['preis_payment_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) + foreach ($arReturn['produkte'] as $produkt_key => &$p) { + if ($arReturn['price_frontend'] == WPSG_NETTO) + { + $p['preis'] = $p['preis_netto']; + } + else + { + $p['preis'] = $p['preis_brutto']; + } + } + if ($arReturn['price_frontend'] == WPSG_NETTO) + { + $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 + { + $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'] = $arReturn['sum']['preis_rabatt_brutto']; + if (array_key_exists('gs', $arReturn['sum'])) + { + $arReturn['sum']['gs'] = $arReturn['sum']['gs_brutto']; + } } Index: /model/wpsg_country.class.php =================================================================== --- /model/wpsg_country.class.php (revision 5921) +++ /model/wpsg_country.class.php (revision 5922) @@ -29,4 +29,15 @@ } // public function load($deliverynote_id) + /** + * Gibt das Kuerzel des Landes zurÌck + * @return mixed|null + */ + public function getShorttext() + { + + return __($this->kuerzel, 'wpsg'); + + } // public function getShorttext() + /** * Löscht das Land Index: /mods/wpsg_mod_addressvalidation.class.php =================================================================== --- /mods/wpsg_mod_addressvalidation.class.php (revision 5921) +++ /mods/wpsg_mod_addressvalidation.class.php (revision 5922) @@ -53,6 +53,6 @@ public function wpsg_enqueue_scripts() { - - if (!is_admin() && wpsg_isSizedInt(get_the_ID()) && ( + $id = get_the_ID(); + if (!is_admin() && wpsg_isSizedInt($id) && ( get_the_ID() == $this->shop->get_option('wpsg_page_basket') || get_the_ID() == $this->shop->get_option('wpsg_page_mod_kundenverwaltung_profil') || @@ -111,5 +111,5 @@ } - if ($astr != $_SESSION['wpsg']['Adressstring1']) + if ((array_key_exists('Adressstring1', $_SESSION['wpsg'])) && ($astr != $_SESSION['wpsg']['Adressstring1'])) { $_SESSION['wpsg']['Adressstring1'] = $astr; @@ -194,5 +194,5 @@ } - if ($astr != $_SESSION['wpsg']['Adressstring2']) + if ((array_key_exists('Adressstring2', $_SESSION['wpsg'])) && ($astr != $_SESSION['wpsg']['Adressstring2'])) { $_SESSION['wpsg']['Adressstring2'] = $astr; @@ -241,5 +241,5 @@ $this->shop->addFrontendError(__('Probleme mit dem Server (Adressvalidation)'.' ('.$result->{'status'}.')', 'wpsg')); - $error = true; + //$error = true; } Index: /mods/wpsg_mod_discount.class.php =================================================================== --- /mods/wpsg_mod_discount.class.php (revision 5921) +++ /mods/wpsg_mod_discount.class.php (revision 5922) @@ -78,4 +78,6 @@ $data_rabatt[0]['rabatt'] = wpsg_tf($_REQUEST['value'][0]['rabatt'], true); + $insert = 0; + if (wpsg_tf($_REQUEST['neu']['value']) > 0 && wpsg_tf($_REQUEST['neu']['rabatt']) > 0) { @@ -116,7 +118,10 @@ $find = false; foreach ($data_rabatt as $k2 => $v2) - { - if ( wpsg_tf($v2['value']) == wpsg_tf($v['value']) && - wpsg_tf($v2['value']) != $insert ) + { + $vval = wpsg_getInt($v['value']); + $v2val = wpsg_getInt($v2['value']); + + if ( wpsg_tf($v2val) == wpsg_tf($vval) && + wpsg_tf($v2val) != $insert ) { @@ -128,5 +133,6 @@ if ($find !== false) { - if ($v['del'] == 1) unset($data_rabatt[$find]); + $vdel = wpsg_getInt($v['del']); + if ($vdel == 1) unset($data_rabatt[$find]); else $data_rabatt[$find]['rabatt'] = wpsg_tf($v['rabatt'], true); } @@ -428,4 +434,6 @@ private function cmp($a, $b) { + $aval = wpsg_getInt($a['value']); + $bval = wpsg_getInt($b['value']); if ($a['value'] == $b['value']) return 0; @@ -484,9 +492,12 @@ $value = $arReturn['sum']['preis_gesamt_brutto']; + if ($value == 0) return; + + foreach ((array)$data_rabatt as $k => $v) { - if (!isset($v['value']) or $value >= $v['value'] && wpsg_tf($v['rabatt']) > 0) + if (!isset($v['value']) || $value >= $v['value'] && wpsg_tf($v['rabatt']) > 0) { @@ -496,54 +507,193 @@ } - - if ($discount !== false) - { - - $discount = wpsg_tf($discount, true); - - if (strpos($discount, "%") !== false) - { - - $discount_value = $arReturn['sum']['preis_gesamt_brutto'] / 100 * wpsg_tf($discount); - + + if ((isset($arReturn['backend'])) && ($arReturn['backend'] == true)) + { + // Im Backend Rabatt nicht neu berechnen aus Bestellung entnehmen + $discount = $arReturn['order_rabatt']; + $discount_value = $discount; + $price_frontend = $arReturn['price_frontend']; + $discount_tax = 0.0; + if ($price_frontend == WPSG_NETTO) + { + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - - $discount_tax = $this->shop->subMwSt($arReturn, $discount_value); - - } - - } - else if ($discount) - { - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) - { - + + $discount_tax = $this->shop->addMwSt($arReturn, $discount); + //$discount_tax = $this->shop->subMwSt($arReturn, $discount); + //$discount_value = $discount - $discount_tax; + $discount_tax = 0.0; + } + + if ($this->shop->addRoundedValues === true) + { + + $discount_brutto = round($discount_value + $discount_tax, 2); + $discount_netto = round($discount_value, 2); + + } + else + { + + $discount_brutto = $discount_value + $discount_tax; + $discount_netto = $discount_value; + + } + + } + else + { + + $discount_value = $discount; + + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') + { + + $discount_tax = $this->shop->subMwSt($arReturn, $discount); + + } + + if ($this->shop->addRoundedValues === true) + { + + $discount_brutto = round($discount_value, 2); + $discount_netto = round($discount_value - $discount_tax, 2); + + } + else + { + + $discount_brutto = $discount_value; + $discount_netto = $discount_value - $discount_tax; + + } + } // if ($price_frontend == WPSG_NETTO) + + + $arReturn['sum']['preis_brutto'] -= $discount_brutto; + $arReturn['sum']['preis_netto'] -= $discount_netto; + $arReturn['sum']['preis_gesamt_brutto'] -= $discount_brutto; + $arReturn['sum']['preis_gesamt_netto'] -= $discount_netto; + $arReturn['sum']['preis_rabatt_netto'] = $discount_netto; + $arReturn['sum']['preis_rabatt_brutto'] = $discount_brutto; + + if ($this->shop->getFrontendTaxview() == WPSG_NETTO) + { + + $arReturn['sum']['preis_rabatt'] = $discount_netto; + $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']['preis_rabatt'] = $discount_brutto; + $arReturn['sum']['preis'] = $arReturn['sum']['preis_brutto']; + $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_brutto']; + + } + + + + } + else // if ($arReturn['backend'] == true) + { + + if ($discount !== false) + { + + $discount = wpsg_tf($discount, true); + + if (strpos($discount, "%") !== false) + { + + $discount_value = $arReturn['sum']['preis_gesamt_brutto'] / 100 * wpsg_tf($discount); + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - - $discount_tax = $this->shop->addMwSt($arReturn, $discount); - - } - - $discount_value = $discount + $discount_tax; - + + $discount_tax = $this->shop->subMwSt($arReturn, $discount_value); + + } + + } + else if ($discount) + { + + if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) + { + + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') + { + + $discount_tax = $this->shop->addMwSt($arReturn, $discount); + + } + + $discount_value = $discount + $discount_tax; + + } + else + { + + $discount_value = $discount; + + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') + { + + $discount_tax = $this->shop->subMwSt($arReturn, $discount); + + } + + } + + } + + if ($this->shop->addRoundedValues === true) + { + + $discount_brutto = round($discount_value, 2); + $discount_netto = round($discount_value - $discount_tax, 2); + } else { - - $discount_value = $discount; - - if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') - { - - $discount_tax = $this->shop->subMwSt($arReturn, $discount); - - } - - } - - } + + $discount_brutto = $discount_value; + $discount_netto = $discount_value - $discount_tax; + + } + + $arReturn['sum']['preis_brutto'] -= $discount_brutto; + $arReturn['sum']['preis_netto'] -= $discount_netto; + $arReturn['sum']['preis_gesamt_brutto'] -= $discount_brutto; + $arReturn['sum']['preis_gesamt_netto'] -= $discount_netto; + $arReturn['sum']['preis_rabatt_netto'] = $discount_netto; + $arReturn['sum']['preis_rabatt_brutto'] = $discount_brutto; + + if ($this->shop->getFrontendTaxview() == WPSG_NETTO) + { + + $arReturn['sum']['preis_rabatt'] = $discount_netto; + $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']['preis_rabatt'] = $discount_brutto; + $arReturn['sum']['preis'] = $arReturn['sum']['preis_brutto']; + $arReturn['sum']['preis_gesamt'] = $arReturn['sum']['preis_gesamt_brutto']; + + } + + } + } // else if ($arReturn['backend'] == true) + /* + if ($discount !== false) + { if ($this->shop->addRoundedValues === true) @@ -586,5 +736,5 @@ } - } + } */ } // public function basket_toArray_discount(&$basket, &$arBasket) Index: /mods/wpsg_mod_gutschein.class.php =================================================================== --- /mods/wpsg_mod_gutschein.class.php (revision 5921) +++ /mods/wpsg_mod_gutschein.class.php (revision 5922) @@ -577,63 +577,110 @@ if ($basket->gs_value !== false) { - - $arReturn['gs'] = array( - 'value' => $basket->gs_value, - 'calc' => $basket->gs_calc, - 'code' => $basket->gs_code - ); - - $gs_value = $basket->gs_value; - $gs_tax = 0; - - // Bruttopreis des Gutscheins bestimmen - if ($basket->gs_calc == 'p') - { - - $gs_value = $arReturn['sum']['preis_gesamt_brutto'] / 100 * $basket->gs_value; - - if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') - { - - $gs_tax = $this->shop->subMwSt($arReturn, $gs_value); - - } - - } - else - { - - if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) - { - + if ((isset($arReturn['backend'])) && $arReturn['backend']) + { + // Berechnung Gutschein im Backend je nach netto/brutto im Frontend + + $arReturn['gs'] = array( + 'value' => $arReturn['gs_value'], + 'calc' => $basket->gs_calc, + 'code' => $basket->gs_code + ); + + $gs_value = $arReturn['gs_value']; + $gs_tax = 0; + + if ((isset($arReturn['price_frontend'])) && ($arReturn['price_frontend'] == WPSG_BRUTTO)) + { + //$gs_value = $basket->gs_value; + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { - - $gs_tax = $this->shop->addMwSt($arReturn, $basket->gs_value); - - } - - $gs_value = $basket->gs_value + $gs_tax; - - } - else - { - - $gs_value = $basket->gs_value; - + + $gs_tax = $this->shop->subMwSt($arReturn, $basket->gs_value); + + } + $gs_brutto = $gs_value; + $gs_netto = $gs_value - $gs_tax; + + } + + if ((isset($arReturn['price_frontend'])) && ($arReturn['price_frontend'] == WPSG_NETTO)) + { if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') { + + $gs_tax = $this->shop->addMwSt($arReturn, $basket->gs_value); + + } + //$gs_value = $basket->gs_value + $gs_tax; + $gs_brutto = $gs_value + $gs_tax; + $gs_netto = $gs_value; + + } + + } + else + { + $arReturn['gs'] = array( + 'value' => $basket->gs_value, + 'calc' => $basket->gs_calc, + 'code' => $basket->gs_code + ); + + $gs_value = $basket->gs_value; + $gs_tax = 0; + + // Bruttopreis des Gutscheins bestimmen + if ($basket->gs_calc == 'p') + { - $gs_tax = $this->shop->subMwSt($arReturn, $basket->gs_value); + $gs_value = $arReturn['sum']['preis_gesamt_brutto'] / 100 * $basket->gs_value; + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') + { + + $gs_tax = $this->shop->subMwSt($arReturn, $gs_value); + } - //die($gs_tax."=".$gs_value); - } - - } - - $gs_brutto = $gs_value; - $gs_netto = $gs_value - $gs_tax; - + + } + else + { + + if ($this->shop->get_option('wpsg_preisangaben') == WPSG_NETTO) + { + + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') + { + + $gs_tax = $this->shop->addMwSt($arReturn, $basket->gs_value); + + } + + $gs_value = $basket->gs_value + $gs_tax; + + } + else + { + + $gs_value = $basket->gs_value; + + if ($this->shop->get_option('wpsg_kleinunternehmer') != '1') + { + + $gs_tax = $this->shop->subMwSt($arReturn, $basket->gs_value); + + } + //die($gs_tax."=".$gs_value); + } + + } + + $gs_brutto = $gs_value; + $gs_netto = $gs_value - $gs_tax; + + } + + $arReturn['sum']['preis_brutto'] -= $gs_brutto; $arReturn['sum']['preis_netto'] -= $gs_netto; Index: /mods/wpsg_mod_targo.class.php =================================================================== --- /mods/wpsg_mod_targo.class.php (revision 5921) +++ /mods/wpsg_mod_targo.class.php (revision 5922) @@ -48,5 +48,8 @@ $this->shop->checkDefault('wpsg_mod_targo_success', ''); $this->shop->checkDefault('wpsg_mod_targo_error', ''); - + + $this->shop->checkDefault('wpsg_mod_targo_dealerShopURL', ''); + $this->shop->checkDefault('wpsg_mod_targo_dealerAbortURL', ''); + $this->shop->checkDefault('wpsg_mod_targo_bezeichnung', 'Targobank'); $this->shop->checkDefault('wpsg_mod_targo_hint', 'Ermöglicht die Zahlungsabwicklung mit der Targobank'); @@ -95,4 +98,7 @@ $this->shop->update_option('wpsg_mod_targo_hashkey', $_REQUEST['wpsg_mod_targo_hashkey']); + $this->shop->update_option('wpsg_mod_targo_dealerShopURL', $_REQUEST['wpsg_mod_targo_dealerShopURL']); + $this->shop->update_option('wpsg_mod_targo_dealerAbortURL', $_REQUEST['wpsg_mod_targo_dealerAbortURL']); + $this->shop->update_option('wpsg_mod_targo_bezeichnung', $_REQUEST['wpsg_mod_targo_bezeichnung']); $this->shop->update_option('wpsg_mod_targo_hint', $_REQUEST['wpsg_mod_targo_hint']); Index: /views/admin/form/link.phtml =================================================================== --- /views/admin/form/link.phtml (revision 5922) +++ /views/admin/form/link.phtml (revision 5922) @@ -0,0 +1,42 @@ +
+ + + +
+ +
+ view['field_link']; ?> + + view['field_config']['help'])) { ?> + + +
+ +
+ +
+ +
Index: /views/admin/kundendaten_tab2.phtml =================================================================== --- /views/admin/kundendaten_tab2.phtml (revision 5921) +++ /views/admin/kundendaten_tab2.phtml (revision 5922) @@ -25,6 +25,6 @@ - - + + + +
view['o_id']; $k_id = $this->view['k_id']; @@ -46,8 +52,12 @@ $nr = $oOrder-> getInvoiceStreetNr(); - ?> - +

@@ -62,6 +72,6 @@ Optionale Daten fÃŒr Targobank
-
-
+
+
(hashkey)

@@ -69,17 +79,41 @@ Adressdaten aus Kundendaten
-
-
-
-
-
-
+getTitle(); +$isotitel = ''; +if (($titel == "Herr") || ($titel == "Frau")) $isotitel = toIso($titel); +?> +
+
+
+
+
+
+

-
-" placeholder="birthday">
-
+
+geb == '0000-00-00' || strtotime($dt) === false) + { + + echo ''; + + } + else + { + + echo $oCustomer->getBirthdate("Y-m-d"); + + } + +?>" placeholder="birthday">
+
+
@@ -90,5 +124,6 @@ jQuery(document).ready(function() { window.setTimeout(function() { - location.href = ""; + //location.href = ""; + jQuery('#submit').trigger("click"); }, 1000); } ); Index: /views/mods/mod_targo/settings_edit.phtml =================================================================== --- /views/mods/mod_targo/settings_edit.phtml (revision 5921) +++ /views/mods/mod_targo/settings_edit.phtml (revision 5922) @@ -32,4 +32,9 @@
+get_option('wpsg_mod_targo_dealerShopURL'), array('help' => 'wpsg_mod_targo_dealerShopURL')); ?> +get_option('wpsg_mod_targo_dealerAbortURL'), array('help' => 'wpsg_mod_targo_dealerAbortURL')); ?> + +
+ get_option('wpsg_mod_targo_gebuehr'), true), array('help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %')); ?> get_option('wpsg_mod_targo_mwst'), array('help' => 'wpsg_shippay_mwst')); ?> Index: /views/order/index.phtml =================================================================== --- /views/order/index.phtml (revision 5921) +++ /views/order/index.phtml (revision 5922) @@ -239,5 +239,6 @@ - getOrderProducts() as $oOrderProduct) { ?> + getOrderProducts(); + foreach ($oOrderProducts as $oOrderProduct) { ?> #3# fÃŒr je #4#', 'wpsg'), $oOrderProduct->getCount(), Index: /views/order/view.phtml =================================================================== --- /views/order/view.phtml (revision 5921) +++ /views/order/view.phtml (revision 5922) @@ -39,5 +39,23 @@
+ hasMod('wpsg_mod_gutschein')) { ?> + view['basket'])) && ($this->view['basket']['gs']['value'] == 0))) { ?> +   + +
+ + + hasMod('wpsg_mod_discount')) { ?> + view['basket']['sum'])) && ($this->view['basket']['sum']['preis_rabatt'] == 0))) { ?> +   + +
+ + + + +
+
@@ -57,4 +75,48 @@ + + + + + + + Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 5921) +++ /views/produkttemplates/standard.phtml (revision 5922) @@ -74,5 +74,5 @@ view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - hasMod('wpsg_mod_discount') && $this->view['data']['preis_prediscount'] > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> + hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?>
: view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> Index: /views/warenkorb/checkout.phtml =================================================================== --- /views/warenkorb/checkout.phtml (revision 5921) +++ /views/warenkorb/checkout.phtml (revision 5922) @@ -282,4 +282,20 @@ } ); + + hasMod('wpsg_mod_addressvalidation')) { ?> + validateAddressBind( { + Strasse: '#strasse', + Nr: '#nr', + Ort: '#ort', + PLZ: '#plz', + Land: '#wpsg_land', + Key: 'get_option('wpsg_mod_addressvalidation_apikey');?>', + StorageKey: 'KundenAddress', + MsgTeil1: 'Kundenadresse' + } ); + + + //} ); + /* ]]> */