Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 6798)
+++ /controller/wpsg_AdminController.class.php	(revision 6799)
@@ -1379,53 +1379,13 @@
 
 		/**
-		 * Wird aufgerufen wenn die Zahlungsart verÀndert wird
-		 */
-		public function paymentDataAction()
-		{
-			$pid = 0;
+		 * Wird aufgerufen wenn eine Mail an den Kunden gesendet werden soll
+		 */
+		public function sendMailAction()
+		{
+			//die('sendMail');
+
 			$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'])) $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';
-
-				$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 ($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
@@ -1434,295 +1394,4 @@
 			$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()
-
-		/**
-		 * Wird aufgerufen wenn die Gutscheine verwaltet werden sollen
-		 */
-		public function voucherDataAction()
-		{
-			$t1 = 0;
-			$oid = 0;
-			$option = $this->shop->get_option('wpsg_preisangaben');
-			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);
-				$sval = 10.0;
-				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` = '".$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, 'price_gs_netto' => 0, 'price_gs_brutto' => 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 }
-				$sval = 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)
-				*/
-				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'])."'");
-
-			}
-
-			// Order-Daten sammeln und Tabelle neu generieren
-			$basket = new wpsg_basket();
-			$basket->initFromDB($oid, true);
-			$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'] ++;
-
-			$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()
-		{
-			$t1 = 0;
-			$oid = 0;
-			$option = $this->shop->get_option('wpsg_preisangaben');
-			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, 'price_rabatt_netto' => 0, 'price_rabatt_brutto' => 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')
-			{
-				$sval = abs(wpsg_tf($_REQUEST['value']));
-
-				$arTaxKey = explode('_', wpsg_q($_REQUEST['mwst']));
-				$country_id = $arTaxKey[1];
-				$country = wpsg_country::getInstance($country_id);
-				$tax_key = $arTaxKey[0];
-				$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_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'])."'");
-			}
-
-			// Order-Daten sammeln und Tabelle neu generieren
-			$basket = new wpsg_basket();
-			$basket->initFromDB($oid, true);
-			$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'] ++;
-
-			$this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml');
-
-			exit;
-
-		} // public function discountDataAction()
-
-		/**
-		 * Wird aufgerufen wenn eine Mail an den Kunden gesendet werden soll
-		 */
-		public function sendMailAction()
-		{
-			//die('sendMail');
-
-			$oid = 0;
-			$option = $this->shop->get_option('wpsg_preisangaben');
-			if (isset($_REQUEST['edit_id'])) $oid = 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);
-
 			if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'send')
 			{
@@ -1747,160 +1416,4 @@
 
 		} // public function sendMailAction()
-
-		/**
-		 * 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']
-				);
-				
-				if ($this->shop->hasMod('wpsg_mod_weight')) $data['weight'] = $arProd['weight'];
-				// FÃŒllmenge nicht in WPSG_TBL_ORDERPRODUCT
-				//if ($this->shop->hasMod('wpsg_mod_fuellmenge')) $data['fmenge'] = $arProd['fmenge'];
-
-				$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;
-
-				$count = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($oid)."' ");
-
-				$data['product_index'] = $count;
-				$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']
-				);
-
-				if ($this->shop->hasMod('wpsg_mod_weight')) $data['weight'] = $arProd['weight'];
-				// FÃŒllmenge nicht in WPSG_TBL_ORDERPRODUCT
-				//if ($this->shop->hasMod('wpsg_mod_fuellmenge')) $data['fmenge'] = $arProd['fmenge'];
-				
-				$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);
-				}
-
-				$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 6798)
+++ /controller/wpsg_OrderController.class.php	(revision 6799)
@@ -12,7 +12,27 @@
 		public function dispatch()
 		{
-			
+			//die('test');
 			parent::dispatch();
 			
+			if (wpsg_isSizedString($_REQUEST['subaction'], 'productData'))
+			{
+				$this->productDataAction();
+			}
+			if (wpsg_isSizedString($_REQUEST['subaction'], 'shippingData'))
+			{
+				$this->shippingDataAction();
+			}
+			if (wpsg_isSizedString($_REQUEST['subaction'], 'paymentData'))
+			{
+				$this->paymentDataAction();
+			}
+			if (wpsg_isSizedString($_REQUEST['subaction'], 'voucherData'))
+			{
+				$this->voucherDataAction();
+			}
+			if (wpsg_isSizedString($_REQUEST['subaction'], 'discountData'))
+			{
+				$this->discountDataAction();
+			}
 			if (wpsg_isSizedString($_REQUEST['action'], 'view'))
 			{
@@ -45,4 +65,574 @@
 			
 		} // public function dispatch()
+		
+		/**
+		 * 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();
+			//$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']
+				);
+				
+				if ($this->shop->hasMod('wpsg_mod_weight')) $data['weight'] = $arProd['weight'];
+				// FÃŒllmenge nicht in WPSG_TBL_ORDERPRODUCT
+				//if ($this->shop->hasMod('wpsg_mod_fuellmenge')) $data['fmenge'] = $arProd['fmenge'];
+				
+				$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;
+				
+				$count = $this->db->fetchOne("SELECT COUNT(*) FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($oid)."' ");
+				
+				$data['product_index'] = $count;
+				$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']
+				//);
+				
+				if ($this->shop->hasMod('wpsg_mod_weight')) $data['weight'] = $arProd['weight'];
+				// FÃŒllmenge nicht in WPSG_TBL_ORDERPRODUCT
+				//if ($this->shop->hasMod('wpsg_mod_fuellmenge')) $data['fmenge'] = $arProd['fmenge'];
+				
+				$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);
+				}
+				
+				$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."'");
+				
+			}
+			
+			$this->correctPrice($oid);
+			
+			// 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()
+		
+		public function correctPrice($oid)
+		{
+
+			// Steuersatz berechnen
+			$oOrder = wpsg_order::getInstance($oid);
+			$country_id = $oOrder->getCustomer()->getCountryId();
+			//$country_id = 1;
+			$country = wpsg_country::getInstance($country_id);
+			
+			// Tabelle Order die Preise korrigieren
+			$arOrderProd = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($oid)."'");
+			
+			$data = array();
+			$data['price_gesamt'] = 0;
+			$data['price_gesamt_netto'] = 0;
+			$data['price_gesamt_brutto'] = 0;
+			
+			foreach ($arOrderProd as $p)
+			{
+				
+				$tax_key = $p['mwst_key'];
+				//if ($noMwSt === true) $tax_value = 0; else $tax_value = $country->getTax($tax_key);
+				$tax_value = $country->getTax($tax_key);
+				
+				if ($option == WPSG_NETTO)
+				{
+					$price = $p['menge'] * $p['price_netto'];
+					$data['price_gesamt'] += $price;
+					$data['price_gesamt_netto'] += $price;
+					$data['price_gesamt_brutto'] += $price * ((100.0 + $tax_value) / 100.0);
+					
+				}
+				else
+				{
+					$price = $p['menge'] * $p['price_brutto'];
+					$data['price_gesamt'] += $price;
+					$data['price_gesamt_netto'] += $price / ((100.0 + $tax_value) / 100.0);
+					$data['price_gesamt_brutto'] += $price;
+					
+				}
+			}
+			
+			// Zusatzkosten (Gutschein, Rabatt, Versand, Zahlung) zusammenfassen
+			$p = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q($oid)."'");
+			$zusatz = $p['price_gs'] * -1;
+			$zusatz_netto = $p['price_gs_netto'] * -1;
+			$zusatz_brutto = $p['price_gs_brutto'] * -1;
+			$zusatz -= $p['price_rabatt'];
+			$zusatz_netto -= $p['price_rabatt_netto'];
+			$zusatz_brutto -= $p['price_rabatt_brutto'];
+			$zusatz += $p['price_shipping'];
+			$zusatz_netto += $p['price_shipping_netto'];
+			$zusatz_brutto += $p['price_shipping_brutto'];
+			$zusatz += $p['price_payment'];
+			$zusatz_netto += $p['price_payment_netto'];
+			$zusatz_brutto += $p['price_payment_brutto'];
+			
+			$data['price_gesamt'] += $zusatz;
+			$data['price_gesamt_netto'] += $zusatz_netto;
+			$data['price_gesamt_brutto'] += $zusatz_brutto;
+			
+			$this->db->UpdateQuery(WPSG_TBL_ORDER, $data, "`id` = '".$oid."'");
+			
+		}
+		
+		/**
+		 * Wird aufgerufen wenn die Zahlungsart verÀndert wird
+		 */
+		public function paymentDataAction()
+		{
+			$pid = 0;
+			$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'])) $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';
+				
+				$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 ($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->correctPrice($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->correctPrice($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()
+		
+		/**
+		 * Wird aufgerufen wenn die Gutscheine verwaltet werden sollen
+		 */
+		public function voucherDataAction()
+		{
+			$t1 = 0;
+			$oid = 0;
+			$option = $this->shop->get_option('wpsg_preisangaben');
+			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);
+				$sval = 10.0;
+				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` = '".$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, 'price_gs_netto' => 0, 'price_gs_brutto' => 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 }
+				$sval = 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)
+				 */
+				 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'])."'");
+				 
+			}
+			
+			// Order-Daten sammeln und Tabelle neu generieren
+			$basket = new wpsg_basket();
+			$basket->initFromDB($oid, true);
+			$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->correctPrice($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 voucherDataAction()
+		
+		/**
+		 * Wird aufgerufen wenn die Rabatte verwaltet werden sollen
+		 */
+		public function discountDataAction()
+		{
+			$t1 = 0;
+			$oid = 0;
+			$option = $this->shop->get_option('wpsg_preisangaben');
+			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']);
+				
+				$sval = 10.0;
+				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` = '".$oid."'");
+				
+			}
+			else if (isset($_REQUEST['do']) && $_REQUEST['do'] == 'remove')
+			{
+				// Rabatt löschen
+				$ogs = array('price_rabatt' => 0, 'price_rabatt_netto' => 0, 'price_rabatt_brutto' => 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')
+			{
+				$sval = abs(wpsg_tf($_REQUEST['value']));
+				
+				$arTaxKey = explode('_', wpsg_q($_REQUEST['mwst']));
+				$country_id = $arTaxKey[1];
+				$country = wpsg_country::getInstance($country_id);
+				$tax_key = $arTaxKey[0];
+				$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_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'])."'");
+			}
+			
+			// Order-Daten sammeln und Tabelle neu generieren
+			$basket = new wpsg_basket();
+			$basket->initFromDB($oid, true);
+			$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->correctPrice($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 discountDataAction()
 		
 		/**
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 6798)
+++ /lib/filter_functions.inc.php	(revision 6799)
@@ -236,4 +236,6 @@
         include WPSG_PATH.'/lib/install.php';
     
+        $GLOBALS['wpsg_sc']->install();
+        
         // Converter aktivieren
         if ($GLOBALS['wpsg_sc']->get_option('wpsg_key', true) !== false && $GLOBALS['wpsg_sc']->get_option('wpsg_mod_converter_done') != 1)
@@ -264,5 +266,5 @@
         }
     
-        $GLOBALS['wpsg_sc']->install();
+        
     
         if ($GLOBALS['wpsg_sc']->get_option('wpsg_installed', true) === false && $GLOBALS['wpsg_sc']->get_option('wpsg_version_installed', true) === false)
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 6798)
+++ /lib/wpsg_basket.class.php	(revision 6799)
@@ -1439,5 +1439,5 @@
 		{
 
-			if ($this->o_id > 0)
+			if ($this->o_id > 0 && false)
 			{
 
Index: /views/order/view.phtml
===================================================================
--- /views/order/view.phtml	(revision 6798)
+++ /views/order/view.phtml	(revision 6799)
@@ -126,5 +126,5 @@
 
 		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=add&edit_id=' + oid + '&noheader=1',
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=discountData&do=add&edit_id=' + oid + '&noheader=1',
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
@@ -146,5 +146,5 @@
 
 		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=add&edit_id=' + oid + '&noheader=1',
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=voucherData&do=add&edit_id=' + oid + '&noheader=1',
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
Index: /views/order/view_orderdata.phtml
===================================================================
--- /views/order/view_orderdata.phtml	(revision 6798)
+++ /views/order/view_orderdata.phtml	(revision 6799)
@@ -204,5 +204,5 @@
 	<?php if ((array_key_exists('gs', $this->view['basket'])) && ($this->view['basket']['gs']['value'] > 0)) { ?>
 
-	jQuery('#gsname_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editname&noheader=1', {
+	jQuery('#gsname_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=voucherData&do=editname&noheader=1', {
 		submitdata: {
     		field: 'code',
@@ -219,5 +219,5 @@
 	});
 
-	jQuery('#gsvalue_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=editvalue&noheader=1', {
+	jQuery('#gsvalue_<?php echo $gs_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=voucherData&do=editvalue&noheader=1', {
 		submitdata: {
     		field: 'value',
@@ -243,5 +243,5 @@
 	<?php if (isset($this->view['basket']['sum']['preis_rabatt']) && $this->view['basket']['sum']['preis_rabatt'] > 0) { ?>
 
-	jQuery('#discountvalue_<?php echo $o_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=editvalue&noheader=1', {
+	jQuery('#discountvalue_<?php echo $o_id; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=discountData&do=editvalue&noheader=1', {
 		submitdata: {
     		field: 'value',
@@ -274,5 +274,5 @@
 
 		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=voucherData&do=remove&gs_id=' + gs_id + '&edit_id=' + o_id +'&noheader=1',
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=voucherData&do=remove&gs_id=' + gs_id + '&edit_id=' + o_id +'&noheader=1',
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
@@ -295,5 +295,5 @@
 
 		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=discountData&do=remove&edit_id=' + o_id +'&noheader=1',
+			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=discountData&do=remove&edit_id=' + o_id +'&noheader=1',
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
@@ -396,5 +396,5 @@
     			//alert('delete : ' + pid + ' / ' + pval);
 
-    			url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=paymentData&do=delete&edit_id=' + this.oid + '&p_id=' + pid + '&noheader=1';
+    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=paymentData&do=delete&edit_id=' + this.oid + '&p_id=' + pid + '&noheader=1';
     			jQuery.ajax( {
     				url: '<?php echo WPSG_URL_WP; ?>' + url1,
@@ -430,5 +430,5 @@
     			//alert('OK neu: ' + pid + ' / ' + pval);
 
-    			url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=paymentData&do=change&edit_id=' + this.oid + '&p_id=' + pid + '&p_value=' + pval + '&noheader=1';
+    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=paymentData&do=change&edit_id=' + this.oid + '&p_id=' + pid + '&p_value=' + pval + '&noheader=1';
     			jQuery.ajax( {
     				url: '<?php echo WPSG_URL_WP; ?>' + url1,
@@ -508,5 +508,5 @@
     			//alert('delete : ' + sid + ' / ' + sval);
 
-    			url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=shippingData&do=delete&edit_id=' + this.oid + '&s_id=' + sid + '&noheader=1';
+    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=shippingData&do=delete&edit_id=' + this.oid + '&s_id=' + sid + '&noheader=1';
     			jQuery.ajax( {
     				url: '<?php echo WPSG_URL_WP; ?>' + url1,
@@ -542,5 +542,5 @@
     			//alert('OK neu: ' + sid + ' / ' + sval);
 
-    			url1 = 'wp-admin/admin.php?page=wpsg-Admin&subaction=shippingData&do=change&edit_id=' + this.oid + '&s_id=' + sid + '&s_value=' + sval + '&noheader=1';
+    			url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=shippingData&do=change&edit_id=' + this.oid + '&s_id=' + sid + '&s_value=' + sval + '&noheader=1';
     			jQuery.ajax( {
     				url: '<?php echo WPSG_URL_WP; ?>' + url1,
@@ -612,5 +612,5 @@
 
     		jQuery.ajax( {
-    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=remove&edit_id=' + o_id + '&op_id=' + op_id + '&noheader=1',
+    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=productData&do=remove&edit_id=' + o_id + '&op_id=' + op_id + '&noheader=1',
     			success: function (data) {
     				jQuery('#wpsg_produkte_table').replaceWith(data);
@@ -729,5 +729,5 @@
 
 			if (this.modus == 0) {
-				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';
+				url1 = 'wp-admin/admin.php?page=wpsg-Order&subaction=productData&do=change&edit_id=' + this.o_id + '&op_id=' + this.op_id + '&p_id=' + pid + '&noheader=1';
 				jQuery.ajax( {
 					url: '<?php echo WPSG_URL_WP; ?>' + url1,
@@ -749,5 +749,5 @@
 				// Neues Produkt hinzufÃŒgen
 	    		jQuery.ajax( {
-	    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=productData&do=add&edit_id=' + this.o_id + '&p_id=' + pid + '&noheader=1',
+	    			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&subaction=productData&do=add&edit_id=' + this.o_id + '&p_id=' + pid + '&noheader=1',
 					data: {
 						p_val: pval,