Просмотр исходного кода

Half way through consolidation of database classes

Johannes Zellner 5 лет назад
Родитель
Сommit
300f409814
39 измененных файлов с 139 добавлено и 417 удалено
  1. 1 1
      website/DataBase/Assistant.php
  2. 1 1
      website/DataBase/Bill.php
  3. 6 6
      website/DataBase/Bill_Product.php
  4. 1 2
      website/DataBase/Category.php
  5. 1 1
      website/DataBase/Customer.php
  6. 1 1
      website/DataBase/Customer_Template.php
  7. 1 1
      website/DataBase/Group.php
  8. 1 1
      website/DataBase/Price.php
  9. 1 1
      website/DataBase/Priceset.php
  10. 1 1
      website/DataBase/Product.php
  11. 1 1
      website/DataBase/Tax.php
  12. 1 3
      website/DataBase/Tour.php
  13. 0 85
      website/app/DataBase/Assistant.php
  14. 1 1
      website/app/DataBase/Bill.php
  15. 2 2
      website/app/DataBase/Bill_Product.php
  16. 31 2
      website/app/DataBase/Category.php
  17. 1 1
      website/app/DataBase/Customer.php
  18. 1 1
      website/app/DataBase/Group.php
  19. 1 1
      website/app/DataBase/Price.php
  20. 1 1
      website/app/DataBase/Priceset.php
  21. 1 1
      website/app/DataBase/Product.php
  22. 0 71
      website/app/DataBase/Tax.php
  23. 0 83
      website/app/DataBase/Tour.php
  24. 0 65
      website/app/DataBase/database.php
  25. 1 1
      website/app/Modules/Assistant/db_action.php
  26. 3 3
      website/app/Modules/Bill/db_action.php
  27. 1 1
      website/app/Modules/Customer/db_action.php
  28. 1 1
      website/app/Modules/Product/db_action.php
  29. 2 2
      website/app/Modules/Tour/db_action.php
  30. 2 2
      website/app/configuration.php
  31. 14 14
      website/app/print.php
  32. 2 2
      website/app/print_bill.php
  33. 15 15
      website/app/print_dialog.php
  34. 1 1
      website/app/print_tour.php
  35. 7 7
      website/app/stat_bill_merge.php
  36. 9 9
      website/app/stat_customer_list.php
  37. 2 2
      website/app/stat_product_date_count.php
  38. 21 21
      website/app/stat_product_list.php
  39. 2 2
      website/app/tour.php

+ 1 - 1
website/DataBase/Assistant.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Assistant
 {

+ 1 - 1
website/DataBase/Bill.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Bill
 {

+ 6 - 6
website/DataBase/Bill_Product.php

@@ -1,12 +1,12 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
-require_once("DataBase/Customer.php");
-require_once("DataBase/Bill.php");
-require_once("DataBase/Product.php");
-require_once("DataBase/Price.php");
-require_once("DataBase/Tax.php");
+require_once(__DIR__."/Customer.php");
+require_once(__DIR__."/Bill.php");
+require_once(__DIR__."/Product.php");
+require_once(__DIR__."/Price.php");
+require_once(__DIR__."/Tax.php");
 
 class Bill_Product
 {

+ 1 - 2
website/DataBase/Category.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Category
 {
@@ -66,7 +66,6 @@ class Category
 		}
 	}
 
-
 	function getABC($category_id = "", $row_names = array(), $search = "")
 	{
 		if($category_id == "")

+ 1 - 1
website/DataBase/Customer.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Customer
 {

+ 1 - 1
website/DataBase/Customer_Template.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Customer_Template
 {

+ 1 - 1
website/DataBase/Group.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Group
 {

+ 1 - 1
website/DataBase/Price.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Price
 {

+ 1 - 1
website/DataBase/Priceset.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Priceset
 {

+ 1 - 1
website/DataBase/Product.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Product
 {

+ 1 - 1
website/DataBase/Tax.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Tax
 {

+ 1 - 3
website/DataBase/Tour.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once(__DIR__."/database.php");
 
 class Tour
 {
@@ -75,8 +75,6 @@ class Tour
 			$query .= " WHERE assistant_id='".$assistant_id."' ";
 			$query .= " ORDER BY tour_id ASC";
 
-			echo $query;
-
 			return $this->db->fetchRows($this->db->query($query));
 		}
 	}

+ 0 - 85
website/app/DataBase/Assistant.php

@@ -1,85 +0,0 @@
-<?php
-
-require_once("DataBase/database.php");
-
-class Assistant
-{
-	function Assistant()
-	{
-		$this->db = new Database();
-	}
-
-	function create($assistant_id, $value)
-	{
-		$query = "INSERT INTO ".$this->db->assistant_table." VALUES('".$assistant_id."'";
-		for($i = 0; $i < count($value); $i++)
-			$query .= ", '".$value[$i]."'";
-		$query .= ")";
-
-		$this->db->query($query);
-	}
-
-	function update($assistant_id, $value)
-	{
-		$query = "UPDATE ".$this->db->assistant_table." SET ";
-		$query .= "prename='".$value[0]."', ";
-		$query .= "postname='".$value[1]."', ";
-		$query .= "street='".$value[2]."', ";
-		$query .= "streetnumber='".$value[3]."', ";
-		$query .= "plz='".$value[4]."', ";
-		$query .= "city='".$value[5]."', ";
-		$query .= "telephone='".$value[6]."', ";
-		$query .= "telefax='".$value[7]."', ";
-		$query .= "email='".$value[8]."', ";
-		$query .= "tax_number='".$value[9]."', ";
-		$query .= "blz='".$value[10]."', ";
-		$query .= "bank_account='".$value[11]."', ";
-		$query .= "additional='".$value[12]."', ";
-		$query .= "utax_id='".$value[13]."', ";
-		$query .= "bank_name='".$value[14]."', ";
-		$query .= "bill_ext='".$value[15]."' ";
-
-		$query .= "WHERE assistant_id='".$assistant_id."'";
-
-		$this->db->query($query);
-	}
-
-	function delete($assistant_id)
-	{
-		$query = "DELETE FROM ".$this->db->assistant_table." WHERE assistant_id='$assistant_id'";
-
-		$this->db->query($query);
-	}
-
-	function get($assistant_id = "", $row_names = array(), $search = "")
-	{
-		if($assistant_id == "")
-		{
-			if(count($row_names) == 0)
-				$query = "SELECT * FROM ".$this->db->assistant_table;
-			else
-			{
-				$query = "SELECT ".$row_names[0];
-				for($i = 1; $i < count($row_names); $i++)
-					$query .= ", ".$row_names[$i];
-				$query .= " FROM ".$this->db->assistant_table;
-			}
-
-			if($search != "")
-				$query .= " WHERE ".$search;
-
-			$query .= " ORDER BY assistant_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-		else
-		{
-			$query = "SELECT * FROM ".$this->db->assistant_table." WHERE assistant_id='".$assistant_id."'";
-			$query .= " ORDER BY assistant_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-	}
-}
-
-?>

+ 1 - 1
website/app/DataBase/Bill.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Bill
 {

+ 2 - 2
website/app/DataBase/Bill_Product.php

@@ -1,12 +1,12 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 require_once("DataBase/Customer.php");
 require_once("DataBase/Bill.php");
 require_once("DataBase/Product.php");
 require_once("DataBase/Price.php");
-require_once("DataBase/Tax.php");
+require_once("../DataBase/Tax.php");
 
 class Bill_Product
 {

+ 31 - 2
website/app/DataBase/Category.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Category
 {
@@ -13,7 +13,7 @@ class Category
 	{
 		$query = "INSERT INTO ".$this->db->category_table." VALUES('".$value[0]."'";
 		for($i = 1; $i < count($value); $i++)
-			$query .= ", '".$value[$i]."'";
+			$query .= ", '".str_replace("'", "\'", $value[$i])."'";
 		$query .= ")";
 
 		$this->db->query($query);
@@ -65,6 +65,35 @@ class Category
 			return $this->db->fetchRows($this->db->query($query));
 		}
 	}
+
+	function getABC($category_id = "", $row_names = array(), $search = "")
+	{
+		if($category_id == "")
+		{
+			if(count($row_names) == 0)
+				$query = "SELECT * FROM ".$this->db->category_table;
+			else
+			{
+				$query = "SELECT ".$row_names[0];
+				for($i = 1; $i < count($row_names); $i++)
+					$query .= ", ".$row_names[$i];
+				$query .= " FROM ".$this->db->category_table;
+			}
+
+			if($search != "")
+				$query .= " WHERE ".$search;
+
+			$query .= " ORDER BY name ASC";
+
+			return $this->db->fetchRows($this->db->query($query));
+		}
+		else
+		{
+			$query = "SELECT * FROM ".$this->db->category_table." WHERE category_id='".$category_id."' ORDER BY category_id ASC";
+
+			return $this->db->fetchRows($this->db->query($query));
+		}
+	}
 }
 
 ?>

+ 1 - 1
website/app/DataBase/Customer.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Customer
 {

+ 1 - 1
website/app/DataBase/Group.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Group
 {

+ 1 - 1
website/app/DataBase/Price.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Price
 {

+ 1 - 1
website/app/DataBase/Priceset.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Priceset
 {

+ 1 - 1
website/app/DataBase/Product.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once("DataBase/database.php");
+require_once("../DataBase/database.php");
 
 class Product
 {

+ 0 - 71
website/app/DataBase/Tax.php

@@ -1,71 +0,0 @@
-<?php
-
-require_once("DataBase/database.php");
-
-class Tax
-{
-	function Tax()
-	{
-		$this->db = new Database();
-	}
-
-	function create($tax_id, $value)
-	{
-		$query = "INSERT INTO ".$this->db->tax_table." VALUES('".$tax_id."'";
-		for($i = 0; $i < count($value); $i++)
-			$query .= ", '".$value[$i]."'";
-		$query .= ")";
-
-		$this->db->query($query);
-	}
-
-	function update($tax_id, $value)
-	{
-		$query = "UPDATE ".$this->db->tax_table." SET ";
-		$query .= "name='".$value[0]."', ";
-		$query .= "tax_rate='".$value[1]."' ";
-
-		$query .= "WHERE tax_id='".$tax_id."'";
-
-		$this->db->query($query);
-	}
-
-	function delete($tax_id)
-	{
-		$query = "DELETE FROM ".$this->db->tax_table." WHERE tax_id='$tax_id'";
-
-		$this->db->query($query);
-	}
-
-	function get($tax_id = "", $row_names = array(), $search = "")
-	{
-		if($tax_id == "")
-		{
-			if(count($row_names) == 0)
-				$query = "SELECT * FROM ".$this->db->tax_table;
-			else
-			{
-				$query = "SELECT ".$row_names[0];
-				for($i = 1; $i < count($row_names); $i++)
-					$query .= ", ".$row_names[$i];
-				$query .= " FROM ".$this->db->tax_table;
-			}
-
-			if($search != "")
-				$query .= " WHERE ".$search;
-
-			$query .= " ORDER BY tax_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-		else
-		{
-			$query = "SELECT * FROM ".$this->db->tax_table." WHERE tax_id='".$tax_id."'";
-			$query .= " ORDER BY tax_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-	}
-}
-
-?>

+ 0 - 83
website/app/DataBase/Tour.php

@@ -1,83 +0,0 @@
-<?php
-
-require_once("DataBase/database.php");
-
-class Tour
-{
-	function Tour()
-	{
-		$this->db = new Database();
-	}
-
-	function create($value)
-	{
-		$query = "INSERT INTO ".$this->db->tour_table." VALUES(''";
-		for($i = 0; $i < count($value); $i++)
-			$query .= ", '".$value[$i]."'";
-		$query .= ")";
-
-		$this->db->query($query);
-	}
-
-	function update($tour_id, $value)
-	{
-		$query = "UPDATE ".$this->db->tour_table." SET ";
-		$query .= "name='".$value[0]."', ";
-		$query .= "assistant_id='".$value[1]."' ";
-
-		$query .= "WHERE tour_id='".$tour_id."'";
-
-		$this->db->query($query);
-	}
-
-	function delete($tour_id)
-	{
-		$query = "DELETE FROM ".$this->db->tour_table." WHERE tour_id='$tour_id'";
-
-		$this->db->query($query);
-	}
-
-	function get($tour_id = "", $row_names = array(), $search = "")
-	{
-		if($tour_id == "")
-		{
-			if(count($row_names) == 0)
-				$query = "SELECT * FROM ".$this->db->tour_table;
-			else
-			{
-				$query = "SELECT ".$row_names[0];
-				for($i = 1; $i < count($row_names); $i++)
-					$query .= ", ".$row_names[$i];
-				$query .= " FROM ".$this->db->tour_table;
-			}
-
-			if($search != "")
-				$query .= " WHERE ".$search;
-
-			$query .= " ORDER BY tour_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-		else
-		{
-			$query = "SELECT * FROM ".$this->db->tour_table." WHERE tour_id='".$tour_id."'";
-			$query .= " ORDER BY tour_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-	}
-
-	function getByAssistant($assistant_id)
-	{
-		if($assistant_id == "")
-		{
-			$query = "SELECT * FROM ".$this->db->tour_table;
-			$query .= " WHERE assistant_id='".$assistant_id."' ";
-			$query .= " ORDER BY tour_id ASC";
-
-			return $this->db->fetchRows($this->db->query($query));
-		}
-	}
-}
-
-?>

+ 0 - 65
website/app/DataBase/database.php

@@ -1,65 +0,0 @@
-<?php
-
-class Database
-{
-	function __construct()
-	{
-		$this->customer_table = "customer";
-		$this->category_table = "category";
-		$this->product_table = "product";
-		$this->price_table = "price";
-		$this->priceset_table = "priceset";
-		$this->tax_table = "tax";
-		$this->bill_table = "bill";
-		$this->bill_product_table = "bill_product";
-		$this->tour_table = "tour";
-		$this->assistant_table = "assistant";
-		$this->group_table = "`group`";
-		$this->customer_template_table = "customer_template";
-		$this->ready = False;
-	}
-
-	function connectToDb()
-	{
-        $host = getenv('CLOUDRON_MYSQL_HOST');
-        $user = getenv('CLOUDRON_MYSQL_USERNAME');
-        $password = getenv('CLOUDRON_MYSQL_PASSWORD');
-        $db = getenv('CLOUDRON_MYSQL_DATABASE');
-        $port = getenv('CLOUDRON_MYSQL_PORT');
-
-		$this->db_link = mysqli_connect($host, $user, $password, $db, $port);
-
-		if(!$this->db_link)
-			exit("Error: ".mysqli_connect_error());
-
-        mysqli_set_charset($this->db_link, "latin1");
-
-		$this->ready = True;
-	}
-
-	function query($query)
-	{
-		if(!$this->ready)
-			$this->connectToDb();
-
-		if(!($result = mysqli_query($this->db_link, $query)))
-			echo "Error: ".mysqli_error($this->db_link);
-
-		return $result;
-	}
-
-	function fetchRows($result)
-	{
-		if(!$this->ready)
-			$this->connectToDb();
-
-		$all_rows = array();
-
-		while($row = mysqli_fetch_row($result))
-				$all_rows[] =	$row;
-
-		return $all_rows;
-	}
-}
-
-?>

+ 1 - 1
website/app/Modules/Assistant/db_action.php

@@ -2,7 +2,7 @@
 
 require_once("util.php");
 
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Assistant.php");
 
 $db_action = var_get_post("db_action", "");
 

+ 3 - 3
website/app/Modules/Bill/db_action.php

@@ -2,12 +2,12 @@
 
 require_once("DataBase/Bill.php");
 require_once("DataBase/Bill_Product.php");
-require_once("DataBase/Tour.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tour.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Product.php");
 require_once("DataBase/Customer.php");
 require_once("DataBase/Price.php");
-require_once("DataBase/Tax.php");
+require_once("../DataBase/Tax.php");
 
 $db_action = var_get_post("db_action", "");
 

+ 1 - 1
website/app/Modules/Customer/db_action.php

@@ -3,7 +3,7 @@
 require_once("util.php");
 
 require_once("DataBase/Customer.php");
-require_once("DataBase/Tour.php");
+require_once("../DataBase/Tour.php");
 require_once("DataBase/Priceset.php");
 
 $db_action = var_get_post("db_action", "");

+ 1 - 1
website/app/Modules/Product/db_action.php

@@ -3,7 +3,7 @@
 require_once("util.php");
 
 require_once("DataBase/Product.php");
-require_once("DataBase/Tax.php");
+require_once("../DataBase/Tax.php");
 require_once("DataBase/Category.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Group.php");

+ 2 - 2
website/app/Modules/Tour/db_action.php

@@ -3,9 +3,9 @@
 require_once("util.php");
 require_once("NTK/NTK.php");
 
-require_once("DataBase/Tour.php");
+require_once("../DataBase/Tour.php");
 require_once("DataBase/Bill.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Bill_Product.php");
 
 $db_action = var_get_post("db_action", "");

+ 2 - 2
website/app/configuration.php

@@ -3,7 +3,7 @@
 require_once("util.php");
 require_once("NTK/NTK.php");
 
-require_once("DataBase/Tax.php");
+require_once("../DataBase/Tax.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Group.php");
 
@@ -12,7 +12,7 @@ require_once("DataBase/Group.php");
 <html>
 <head>
 	<title> Index </title>
-	
+
 <?php
 
 echo getHead();

+ 14 - 14
website/app/print.php

@@ -8,8 +8,8 @@ require_once("DataBase/Group.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Price.php");
 require_once("DataBase/Category.php");
-require_once("DataBase/Tax.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tax.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Bill.php");
 require_once("DataBase/Bill_Product.php");
 
@@ -40,7 +40,7 @@ $var_date_to = var_post("date_to", "");
 if($var_print == "print")
 {
 	$search = "";
-	
+
 	if(!$var_group_all)
 	{
 		if($search)
@@ -56,7 +56,7 @@ if($var_print == "print")
 		else
 			$search .= "category_id='".$var_category."' ";
 	}
-		
+
 	if($var_available && !$var_not_available)
 	{
 		if($search)
@@ -64,7 +64,7 @@ if($var_print == "print")
 		else
 			$search .= "available='1' ";
 	}
-			
+
 	if(!$var_available && $var_not_available)
 	{
 		if($search)
@@ -72,7 +72,7 @@ if($var_print == "print")
 		else
 			$search .= "available='0' ";
 	}
-			
+
 	if($var_product_id_from)
 	{
 		if($search)
@@ -80,7 +80,7 @@ if($var_print == "print")
 		else
 			$search .= "(product_id >=".$var_product_id_from.") ";
 	}
-			
+
 	if($var_product_id_to)
 	{
 		if($search)
@@ -88,22 +88,22 @@ if($var_print == "print")
 		else
 			$search .= "(product_id <=".$var_product_id_to.") ";
 	}
-	
+
 	$product_data = $product->get('', array(), $search);
-	
+
 	$assistant_data = $assistant->get($var_assistant);
-	
+
 	$priceset = new Priceset();
 	$tmp = $priceset->get($var_priceset);
 	$priceset_data = $tmp[0];
-			
+
 	include("Druckvorlagen/zeilen.php");
 	include("Druckvorlagen/list.php");
 }
 elseif($var_print == "print_re")
 {
 	$search = "";
-	
+
 	if($var_product_id)
 	{
 		if($search)
@@ -125,14 +125,14 @@ elseif($var_print == "print_re")
 		else
 			$search .= "(date <='".$var_date_to."') ";
 	}
-	
+
 	$bill_data = $bill->get("", array("bill_id"), $search);
 
 
 	$bill_product = new Bill_Product();
 
 	$tour_data[1] = "( Alle Touren )";
-	
+
 	$product = new Product();
 	$product_data = $product->get();
 

+ 2 - 2
website/app/print_bill.php

@@ -3,13 +3,13 @@
 require_once("util.php");
 
 require_once("DataBase/Bill.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Customer.php");
 require_once("DataBase/Product.php");
 require_once("DataBase/Bill_Product.php");
 require_once("DataBase/Price.php");
 require_once("DataBase/Priceset.php");
-require_once("DataBase/Tax.php");
+require_once("../DataBase/Tax.php");
 
 $bill_id = var_get_post("bill_id", "");
 

+ 15 - 15
website/app/print_dialog.php

@@ -8,8 +8,8 @@ require_once("DataBase/Group.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Price.php");
 require_once("DataBase/Category.php");
-require_once("DataBase/Tax.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tax.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Bill.php");
 require_once("DataBase/Bill_Product.php");
 
@@ -40,7 +40,7 @@ $var_date_to = var_post("date_to", "");
 if($var_print == "print")
 {
 	$search = "";
-	
+
 	if(!$var_group_all)
 	{
 		if($search)
@@ -48,7 +48,7 @@ if($var_print == "print")
 		else
 			$search .= "group_id='".$var_group."' ";
 	}
-		
+
 	if(!$var_category_all)
 	{
 		if($search)
@@ -56,7 +56,7 @@ if($var_print == "print")
 		else
 			$search .= "category_id='".$var_category."' ";
 	}
-		
+
 	if($var_available && !$var_not_available)
 	{
 		if($search)
@@ -64,7 +64,7 @@ if($var_print == "print")
 		else
 			$search .= "available='1' ";
 	}
-			
+
 	if(!$var_available && $var_not_available)
 	{
 		if($search)
@@ -72,7 +72,7 @@ if($var_print == "print")
 		else
 			$search .= "available='0' ";
 	}
-			
+
 	if($var_product_id_from)
 	{
 		if($search)
@@ -80,7 +80,7 @@ if($var_print == "print")
 		else
 			$search .= "(product_id >=".$var_product_id_from.") ";
 	}
-			
+
 	if($var_product_id_to)
 	{
 		if($search)
@@ -88,22 +88,22 @@ if($var_print == "print")
 		else
 			$search .= "(product_id <=".$var_product_id_to.") ";
 	}
-	
+
 	$product_data = $product->get('', array(), $search);
-	
+
 	$assistant_data = $assistant->get($var_assistant);
-	
+
 	$priceset = new Priceset();
 	$tmp = $priceset->get($var_priceset);
 	$priceset_data = $tmp[0];
-			
+
 	include("Druckvorlagen/zeilen.php");
 	include("Druckvorlagen/list.php");
 }
 elseif($var_print == "print_re")
 {
 	$search = "";
-	
+
 	if($var_date_from)
 	{
 		if($search)
@@ -118,14 +118,14 @@ elseif($var_print == "print_re")
 		else
 			$search .= "(date <='".$var_date_to."') ";
 	}
-	
+
 	$bill_data = $bill->get("", array("bill_id"), $search);
 
 
 	$bill_product = new Bill_Product();
 
 	$tour_data[1] = "( Alle Touren )";
-	
+
 	$product = new Product();
 	$product_data = $product->get();
 

+ 1 - 1
website/app/print_tour.php

@@ -4,7 +4,7 @@ require_once("util.php");
 
 require_once("DataBase/Product.php");
 require_once("DataBase/Bill.php");
-require_once("DataBase/Tour.php");
+require_once("../DataBase/Tour.php");
 require_once("DataBase/Bill_Product.php");
 
 $tour_id = var_get("tour_id", "");

+ 7 - 7
website/app/stat_bill_merge.php

@@ -8,8 +8,8 @@ require_once("DataBase/Group.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Price.php");
 require_once("DataBase/Category.php");
-require_once("DataBase/Tax.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tax.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Bill.php");
 require_once("DataBase/Bill_Product.php");
 
@@ -26,7 +26,7 @@ $bill = new Bill();
 if(var_post("print", "") == "print_re")
 {
 	$search = "";
-	
+
 	if(var_post("product_id", ""))
 	{
 		if($search)
@@ -48,14 +48,14 @@ if(var_post("print", "") == "print_re")
 		else
 			$search .= "(date <='".var_post("date_to", "")."') ";
 	}
-	
+
 	$bill_data = $bill->get("", array("bill_id"), $search);
 
 
 	$bill_product = new Bill_Product();
 
 	$tour_data[1] = "( Alle Touren )";
-	
+
 	$product = new Product();
 	$product_data = $product->get();
 
@@ -64,7 +64,7 @@ if(var_post("print", "") == "print_re")
 else
 {
 	$toolbar_box = new NTKVBox("toolbar_box", 0, 0, False);
-	
+
 	$main_box = new NTKTable("main_box", 5, 4, False);
 	$main_box->setStyle("background-color: #dfe7f3;");
 
@@ -80,7 +80,7 @@ else
 	$form->addAttribute("print", "print_re");
 
 	$toolbar_box->add($form, 0, 0);
-	
+
 	echo getHead();
 	echo $toolbar_box->getHtml();
 }

+ 9 - 9
website/app/stat_customer_list.php

@@ -4,7 +4,7 @@ require_once("util.php");
 require_once("NTK/NTK.php");
 
 require_once("DataBase/Customer.php");
-require_once("DataBase/Tour.php");
+require_once("../DataBase/Tour.php");
 
 $customer = new Customer();
 $tour = new Tour();
@@ -13,36 +13,36 @@ if(var_post("print", "") == "print")
 {
 	$search = "";
 	$tour_data = "";
-	
+
 	if(!var_post("tour_all", "")) {
 		$search = " tour_id='".var_post("tour", "")."' ";
 		$tour_data = $tour->get(var_post("tour", ''), array());
-	} 
+	}
 
 	$customer_data = $customer->get('', array(), $search);
-	
+
 	include("Druckvorlagen/zeilen.php");
 	include("Druckvorlagen/customer_list.php");
 }
 else
 {
 	$toolbar_box = new NTKVBox("toolbar_box", 0, 0, False);
-	
+
 	$main_box = new NTKTable("main_box", 3, 2, False);
 	$main_box->setStyle("background-color: #dfe7f3;");
-	
+
 	$main_box->add(new NTKLabel("", "alle Touren"), 0, 0);
 	$main_box->add(new NTKCheckbox("tour_all", 1, False), 0, 1);
 	$main_box->add(new NTKLabel("", "aus Tour"), 1, 0);
 	$main_box->add(new NTKComboBox("tour", $tour->get("")), 1, 1);
-	
+
 	$main_box->add(new NTKButton("submit", "Druckvorschau", "document.forms['print'].submit();"), 2, 1);
-	
+
 	$form = new NTKForm("print", "stat_customer_list.php", $main_box);
 	$form->addAttribute("print", "print");
 
 	$toolbar_box->add($form, 0, 0);
-	
+
 	echo getHead();
 	echo $toolbar_box->getHtml();
 

+ 2 - 2
website/app/stat_product_date_count.php

@@ -8,8 +8,8 @@ require_once("DataBase/Group.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Price.php");
 require_once("DataBase/Category.php");
-require_once("DataBase/Tax.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tax.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Bill.php");
 require_once("DataBase/Bill_Product.php");
 

+ 21 - 21
website/app/stat_product_list.php

@@ -8,8 +8,8 @@ require_once("DataBase/Group.php");
 require_once("DataBase/Priceset.php");
 require_once("DataBase/Price.php");
 require_once("DataBase/Category.php");
-require_once("DataBase/Tax.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tax.php");
+require_once("../DataBase/Assistant.php");
 require_once("DataBase/Bill.php");
 require_once("DataBase/Bill_Product.php");
 
@@ -25,7 +25,7 @@ $bill = new Bill();
 if(var_post("print", "") == "print")
 {
 	$search = "";
-	
+
 	if(!var_post("group_all", ""))
 	{
 		if($search)
@@ -41,7 +41,7 @@ if(var_post("print", "") == "print")
 		else
 			$search .= "category_id='".var_post("category", "")."' ";
 	}
-		
+
 	if(var_post("available", "") && !var_post("not_available", ""))
 	{
 		if($search)
@@ -49,7 +49,7 @@ if(var_post("print", "") == "print")
 		else
 			$search .= "available='1' ";
 	}
-			
+
 	if(!var_post("available", "") && var_post("not_available", ""))
 	{
 		if($search)
@@ -57,7 +57,7 @@ if(var_post("print", "") == "print")
 		else
 			$search .= "available='0' ";
 	}
-			
+
 	if(var_post("product_id_from", ""))
 	{
 		if($search)
@@ -65,7 +65,7 @@ if(var_post("print", "") == "print")
 		else
 			$search .= "(product_id >=".var_post("product_id_from", "").") ";
 	}
-			
+
 	if(var_post("product_id_to", ""))
 	{
 		if($search)
@@ -73,58 +73,58 @@ if(var_post("print", "") == "print")
 		else
 			$search .= "(product_id <=".var_post("product_id_to", "").") ";
 	}
-	
+
 	$product_data = $product->get('', array(), $search);
-	
+
 	$assistant_data = $assistant->get(var_post("assistant", ""));
-	
+
 	$priceset = new Priceset();
 	$tmp = $priceset->get(var_post("priceset", ""));
 	$priceset_data = $tmp[0];
-			
+
 	include("Druckvorlagen/zeilen.php");
 	include("Druckvorlagen/list.php");
 }
 else
 {
 	$toolbar_box = new NTKVBox("toolbar_box", 0, 0, False);
-	
+
 	$main_box = new NTKTable("main_box", 14, 4, False);
 	$main_box->setStyle("background-color: #dfe7f3;");
-	
+
 	$main_box->add(new NTKLabel("", "Produktnummer von:"), 1, 0);
 	$main_box->add(new NTKEntry("product_id_from", ""), 1, 1);
 	$main_box->add(new NTKLabel("", "bis: "), 1, 2);
 	$main_box->add(new NTKEntry("product_id_to", ""), 1, 3);
-	
+
 	$main_box->add(new NTKLabel("", "alle Gruppen"), 3, 0);
 	$main_box->add(new NTKCheckbox("group_all", 1, True), 3, 1);
 	$main_box->add(new NTKLabel("", "aus Gruppe"), 3, 2);
 	$main_box->add(new NTKComboBox("group", $group->get("")), 3, 3);
-	
+
 	$main_box->add(new NTKLabel("", "verf&uuml;gbare"), 5, 0);
 	$main_box->add(new NTKCheckbox("available", 1, True), 5, 1);
 	$main_box->add(new NTKLabel("", "nicht verf&uuml;gbare"), 5, 2);
 	$main_box->add(new NTKCheckbox("not_available", 1, False), 5, 3);
-	
+
 	$main_box->add(new NTKLabel("", "aus Preisliste"), 7, 0);
 	$main_box->add(new NTKComboBox("priceset", $priceset->get("")), 7, 1);
-	
+
 	$main_box->add(new NTKLabel("", "alle Kategorien"), 9, 0);
 	$main_box->add(new NTKCheckbox("category_all", 1, True), 9, 1);
 	$main_box->add(new NTKLabel("", "aus Kategorie"), 9, 2);
 	$main_box->add(new NTKComboBox("category", $category->get("")), 9, 3);
-	
+
 	$main_box->add(new NTKLabel("", "Mitarbeiter"), 11, 0);
 	$main_box->add(new NTKComboBox("assitant", $assistant->get("")), 11, 1);
-	
+
 	$main_box->add(new NTKButton("submit", "Druckvorschau", "document.forms['print'].submit();"), 13, 3);
-	
+
 	$form = new NTKForm("print", "stat_product_list.php", $main_box);
 	$form->addAttribute("print", "print");
 
 	$toolbar_box->add($form, 0, 0);
-	
+
 	echo getHead();
 	echo $toolbar_box->getHtml();
 

+ 2 - 2
website/app/tour.php

@@ -3,8 +3,8 @@
 require_once("util.php");
 require_once("NTK/NTK.php");
 
-require_once("DataBase/Tour.php");
-require_once("DataBase/Assistant.php");
+require_once("../DataBase/Tour.php");
+require_once("../DataBase/Assistant.php");
 
 ?>