Răsfoiți Sursa

Move app inside website

Johannes Zellner 5 ani în urmă
părinte
comite
fdde0966d2
100 a modificat fișierele cu 21 adăugiri și 29 ștergeri
  1. 2 10
      Dockerfile
  2. 0 0
      website/app/DataBase/Assistant.php
  3. 19 19
      website/app/DataBase/Bill.php
  4. 0 0
      website/app/DataBase/Bill_Product.php
  5. 0 0
      website/app/DataBase/Category.php
  6. 0 0
      website/app/DataBase/Customer.php
  7. 0 0
      website/app/DataBase/Group.php
  8. 0 0
      website/app/DataBase/Price.php
  9. 0 0
      website/app/DataBase/Priceset.php
  10. 0 0
      website/app/DataBase/Product.php
  11. 0 0
      website/app/DataBase/Tax.php
  12. 0 0
      website/app/DataBase/Tour.php
  13. 0 0
      website/app/DataBase/database.php
  14. 0 0
      website/app/Druckvorlagen/customer_list.php
  15. 0 0
      website/app/Druckvorlagen/list.php
  16. 0 0
      website/app/Druckvorlagen/rechnung.php
  17. 0 0
      website/app/Druckvorlagen/tour.php
  18. 0 0
      website/app/Druckvorlagen/zeilen.php
  19. 0 0
      website/app/Icons/Thumbs.db
  20. 0 0
      website/app/Icons/assistant.png
  21. 0 0
      website/app/Icons/back.png
  22. 0 0
      website/app/Icons/backup.png
  23. 0 0
      website/app/Icons/bill.png
  24. 0 0
      website/app/Icons/category.png
  25. 0 0
      website/app/Icons/configuration.png
  26. 0 0
      website/app/Icons/customer.png
  27. 0 0
      website/app/Icons/date_product.png
  28. 0 0
      website/app/Icons/down.png
  29. 0 0
      website/app/Icons/help.png
  30. 0 0
      website/app/Icons/loading.gif
  31. 0 0
      website/app/Icons/logo.gif
  32. 0 0
      website/app/Icons/print.png
  33. 0 0
      website/app/Icons/product.png
  34. 0 0
      website/app/Icons/product_list.png
  35. 0 0
      website/app/Icons/stat.png
  36. 0 0
      website/app/Icons/sync.png
  37. 0 0
      website/app/Icons/tour.png
  38. 0 0
      website/app/Icons/up.png
  39. 0 0
      website/app/Modules/Assistant/db_action.php
  40. 0 0
      website/app/Modules/Assistant/edit_form.php
  41. 0 0
      website/app/Modules/Assistant/new_form.php
  42. 0 0
      website/app/Modules/Assistant/toolbar.php
  43. 0 0
      website/app/Modules/Bill/db_action.php
  44. 0 0
      website/app/Modules/Bill/edit_form.php
  45. 0 0
      website/app/Modules/Bill/new_form.php
  46. 0 0
      website/app/Modules/Bill/toolbar.php
  47. 0 0
      website/app/Modules/Category/anleitung.txt
  48. 0 0
      website/app/Modules/Category/db_action.php
  49. 0 0
      website/app/Modules/Category/edit_form.php
  50. 0 0
      website/app/Modules/Category/new_form.php
  51. 0 0
      website/app/Modules/Category/toolbar.php
  52. 0 0
      website/app/Modules/Configuration/db_action.php
  53. 0 0
      website/app/Modules/Configuration/group.php
  54. 0 0
      website/app/Modules/Configuration/priceset.php
  55. 0 0
      website/app/Modules/Configuration/tax.php
  56. 0 0
      website/app/Modules/Configuration/toolbar.php
  57. 0 0
      website/app/Modules/Customer/db_action.php
  58. 0 0
      website/app/Modules/Customer/edit_form.php
  59. 0 0
      website/app/Modules/Customer/new_form.php
  60. 0 0
      website/app/Modules/Customer/toolbar.php
  61. 0 0
      website/app/Modules/Product/db_action.php
  62. 0 0
      website/app/Modules/Product/edit_form.php
  63. 0 0
      website/app/Modules/Product/new_form.php
  64. 0 0
      website/app/Modules/Product/toolbar.php
  65. 0 0
      website/app/Modules/Tour/db_action.php
  66. 0 0
      website/app/Modules/Tour/edit_form.php
  67. 0 0
      website/app/Modules/Tour/new_form.php
  68. 0 0
      website/app/Modules/Tour/toolbar.php
  69. 0 0
      website/app/Modules/toolbar.php
  70. 0 0
      website/app/NTK/Icons/1downarrow.png
  71. 0 0
      website/app/NTK/Icons/1uparrow.png
  72. 0 0
      website/app/NTK/Icons/ascii.png
  73. 0 0
      website/app/NTK/Icons/ascii_small.png
  74. 0 0
      website/app/NTK/Icons/button_cancel.png
  75. 0 0
      website/app/NTK/Icons/button_cancel_small.png
  76. 0 0
      website/app/NTK/Icons/button_ok.png
  77. 0 0
      website/app/NTK/Icons/filenew.png
  78. 0 0
      website/app/NTK/Icons/fileopen.png
  79. 0 0
      website/app/NTK/Icons/fileprint.png
  80. 0 0
      website/app/NTK/Icons/filesave.png
  81. 0 0
      website/app/NTK/Icons/filesaveas.png
  82. 0 0
      website/app/NTK/Icons/folder.png
  83. 0 0
      website/app/NTK/Icons/folder2.png
  84. 0 0
      website/app/NTK/Icons/folder2_yellow.png
  85. 0 0
      website/app/NTK/Icons/folder_home.png
  86. 0 0
      website/app/NTK/Icons/goto.png
  87. 0 0
      website/app/NTK/Icons/undo.png
  88. 0 0
      website/app/NTK/JavaScript/Splash.js
  89. 0 0
      website/app/NTK/JavaScript/Tooltip.js
  90. 0 0
      website/app/NTK/NTK.php
  91. 0 0
      website/app/NTK/NTKActionList.php
  92. 0 0
      website/app/NTK/NTKButton.php
  93. 0 0
      website/app/NTK/NTKCheckbox.php
  94. 0 0
      website/app/NTK/NTKComboBox.php
  95. 0 0
      website/app/NTK/NTKEntry.php
  96. 0 0
      website/app/NTK/NTKForm.php
  97. 0 0
      website/app/NTK/NTKHBox.php
  98. 0 0
      website/app/NTK/NTKIFrame.php
  99. 0 0
      website/app/NTK/NTKImage.php
  100. 0 0
      website/app/NTK/NTKImageButton.php

+ 2 - 10
Dockerfile

@@ -26,19 +26,11 @@ RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \
 ADD supervisor/ /etc/supervisor/conf.d/
 ADD supervisor/ /etc/supervisor/conf.d/
 RUN sed -e 's,^logfile=.*$,logfile=/run/supervisord.log,' -i /etc/supervisor/supervisord.conf
 RUN sed -e 's,^logfile=.*$,logfile=/run/supervisord.log,' -i /etc/supervisor/supervisord.conf
 
 
+ADD start.sh /app/pkg/
+
 # copy website code mind the trailing slash to copy its content to /app/code/ not the folder itself
 # copy website code mind the trailing slash to copy its content to /app/code/ not the folder itself
 ADD website/ /app/code/
 ADD website/ /app/code/
 
 
-# copy app code
-ADD app /app/code/app
-
 RUN chown -R www-data.www-data /app/code
 RUN chown -R www-data.www-data /app/code
 
 
-ADD start.sh /app/pkg/
-
-# RUN sed -i "s/\$host = \".*\";/\$host = \$_ENV[\"MYSQL_HOST\"];/" /app/code/DataBase/database.php
-# RUN sed -i "s/\$user = \".*\";/\$user = \$_ENV[\"MYSQL_USERNAME\"];/" /app/code/DataBase/database.php
-# RUN sed -i "s/\$password = \".*\";/\$password = \$_ENV[\"MYSQL_PASSWORD\"];/" /app/code/DataBase/database.php
-# RUN sed -i "s/\$db = \".*\";/\$db = \$_ENV[\"MYSQL_DATABASE\"];/" /app/code/DataBase/database.php
-
 CMD [ "/app/pkg/start.sh" ]
 CMD [ "/app/pkg/start.sh" ]

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


+ 19 - 19
app/DataBase/Bill.php → website/app/DataBase/Bill.php

@@ -8,21 +8,21 @@ class Bill
 	{
 	{
 		$this->db = new Database();
 		$this->db = new Database();
 	}
 	}
-	
+
 	function create($bill_id, $value)
 	function create($bill_id, $value)
 	{
 	{
 		$query = "INSERT INTO ".$this->db->bill_table." VALUES('".$bill_id."'";
 		$query = "INSERT INTO ".$this->db->bill_table." VALUES('".$bill_id."'";
 		for($i = 0; $i < count($value); $i++)
 		for($i = 0; $i < count($value); $i++)
 			$query .= ", '".$value[$i]."'";
 			$query .= ", '".$value[$i]."'";
 		$query .= ")";
 		$query .= ")";
-		
+
 		$this->db->query($query);
 		$this->db->query($query);
-		
+
 		$query = "SELECT bill_id from ".$this->db->bill_table." ORDER BY bill_id DESC";
 		$query = "SELECT bill_id from ".$this->db->bill_table." ORDER BY bill_id DESC";
 		$tmp = $this->db->fetchRows($this->db->query($query));
 		$tmp = $this->db->fetchRows($this->db->query($query));
 		return $tmp[0][0];
 		return $tmp[0][0];
 	}
 	}
-	
+
 	function update($bill_id, $value)
 	function update($bill_id, $value)
 	{
 	{
 		$query = "UPDATE ".$this->db->bill_table." SET ";
 		$query = "UPDATE ".$this->db->bill_table." SET ";
@@ -31,30 +31,30 @@ class Bill
 		$query .= "date='".$value[2]."', ";
 		$query .= "date='".$value[2]."', ";
 		$query .= "assistant_id='".$value[3]."', ";
 		$query .= "assistant_id='".$value[3]."', ";
 		$query .= "bill_number='".$value[4]."' ";
 		$query .= "bill_number='".$value[4]."' ";
-		
+
 		$query .= "WHERE bill_id='".$bill_id."'";
 		$query .= "WHERE bill_id='".$bill_id."'";
 		$this->db->query($query);
 		$this->db->query($query);
 	}
 	}
-	
+
 	function setNumber($bill_id)
 	function setNumber($bill_id)
 	{
 	{
 		$data = $this->get($bill_id);
 		$data = $this->get($bill_id);
-		
+
 		$query = "UPDATE ".$this->db->bill_table." SET ";
 		$query = "UPDATE ".$this->db->bill_table." SET ";
 		$query .= "bill_number='".$this->getNextFreeNumberByAssistant($data[0][4])."' ";
 		$query .= "bill_number='".$this->getNextFreeNumberByAssistant($data[0][4])."' ";
-		
+
 		$query .= "WHERE bill_id='".$bill_id."'";
 		$query .= "WHERE bill_id='".$bill_id."'";
-		
+
 		$this->db->query($query);
 		$this->db->query($query);
 	}
 	}
-	
+
 	function delete($bill_id)
 	function delete($bill_id)
 	{
 	{
 		$query = "DELETE FROM ".$this->db->bill_table." WHERE bill_id='$bill_id'";
 		$query = "DELETE FROM ".$this->db->bill_table." WHERE bill_id='$bill_id'";
-		
+
 		$this->db->query($query);
 		$this->db->query($query);
 	}
 	}
-	
+
 	function get($bill_id = "", $row_names = array(), $search = "")
 	function get($bill_id = "", $row_names = array(), $search = "")
 	{
 	{
 		if($bill_id == "")
 		if($bill_id == "")
@@ -68,35 +68,35 @@ class Bill
 					$query .= ", ".$row_names[$i];
 					$query .= ", ".$row_names[$i];
 				$query .= " FROM ".$this->db->bill_table.", ".$this->db->customer_table;
 				$query .= " FROM ".$this->db->bill_table.", ".$this->db->customer_table;
 			}
 			}
-			
+
 			$query .= " WHERE bill.customer_id=customer.customer_id ";
 			$query .= " WHERE bill.customer_id=customer.customer_id ";
 			if($search != "")
 			if($search != "")
 				$query .= " AND ( ".$search." )";
 				$query .= " AND ( ".$search." )";
-			
+
 			$query .= " ORDER BY bill_number ASC";
 			$query .= " ORDER BY bill_number ASC";
-			
+
 			return $this->db->fetchRows($this->db->query($query));
 			return $this->db->fetchRows($this->db->query($query));
 		}
 		}
 		else
 		else
 		{
 		{
 			$query = "SELECT * FROM ".$this->db->bill_table." WHERE bill_id='".$bill_id."'";
 			$query = "SELECT * FROM ".$this->db->bill_table." WHERE bill_id='".$bill_id."'";
 			$query .= " ORDER BY bill_number ASC";
 			$query .= " ORDER BY bill_number ASC";
-			
+
 			return $this->db->fetchRows($this->db->query($query));
 			return $this->db->fetchRows($this->db->query($query));
 		}
 		}
 	}
 	}
-	
+
 	function getNextFreeNumberByAssistant($assistant_id)
 	function getNextFreeNumberByAssistant($assistant_id)
 	{
 	{
 		$query = "SELECT bill_number FROM ".$this->db->bill_table." WHERE assistant_id='".$assistant_id."' ORDER BY bill_number DESC";
 		$query = "SELECT bill_number FROM ".$this->db->bill_table." WHERE assistant_id='".$assistant_id."' ORDER BY bill_number DESC";
 		$result = $this->db->fetchRows($this->db->query($query));
 		$result = $this->db->fetchRows($this->db->query($query));
 		return $result[0][0]+1;
 		return $result[0][0]+1;
 	}
 	}
-	
+
 	function hasTimestamp($timestamp)
 	function hasTimestamp($timestamp)
 	{
 	{
 		$query = "SELECT * FROM ".$this->db->bill_table." WHERE timestamp='".$timestamp."'";
 		$query = "SELECT * FROM ".$this->db->bill_table." WHERE timestamp='".$timestamp."'";
-		
+
 		if(count($this->db->fetchRows($this->db->query($query))) > 0)
 		if(count($this->db->fetchRows($this->db->query($query))) > 0)
 			return True;
 			return True;
 		else
 		else

+ 0 - 0
app/DataBase/Bill_Product.php → website/app/DataBase/Bill_Product.php


+ 0 - 0
app/DataBase/Category.php → website/app/DataBase/Category.php


+ 0 - 0
app/DataBase/Customer.php → website/app/DataBase/Customer.php


+ 0 - 0
app/DataBase/Group.php → website/app/DataBase/Group.php


+ 0 - 0
app/DataBase/Price.php → website/app/DataBase/Price.php


+ 0 - 0
app/DataBase/Priceset.php → website/app/DataBase/Priceset.php


+ 0 - 0
app/DataBase/Product.php → website/app/DataBase/Product.php


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


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


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


+ 0 - 0
app/Druckvorlagen/customer_list.php → website/app/Druckvorlagen/customer_list.php


+ 0 - 0
app/Druckvorlagen/list.php → website/app/Druckvorlagen/list.php


+ 0 - 0
app/Druckvorlagen/rechnung.php → website/app/Druckvorlagen/rechnung.php


+ 0 - 0
app/Druckvorlagen/tour.php → website/app/Druckvorlagen/tour.php


+ 0 - 0
app/Druckvorlagen/zeilen.php → website/app/Druckvorlagen/zeilen.php


+ 0 - 0
app/Icons/Thumbs.db → website/app/Icons/Thumbs.db


+ 0 - 0
app/Icons/assistant.png → website/app/Icons/assistant.png


+ 0 - 0
app/Icons/back.png → website/app/Icons/back.png


+ 0 - 0
app/Icons/backup.png → website/app/Icons/backup.png


+ 0 - 0
app/Icons/bill.png → website/app/Icons/bill.png


+ 0 - 0
app/Icons/category.png → website/app/Icons/category.png


+ 0 - 0
app/Icons/configuration.png → website/app/Icons/configuration.png


+ 0 - 0
app/Icons/customer.png → website/app/Icons/customer.png


+ 0 - 0
app/Icons/date_product.png → website/app/Icons/date_product.png


+ 0 - 0
app/Icons/down.png → website/app/Icons/down.png


+ 0 - 0
app/Icons/help.png → website/app/Icons/help.png


+ 0 - 0
app/Icons/loading.gif → website/app/Icons/loading.gif


+ 0 - 0
app/Icons/logo.gif → website/app/Icons/logo.gif


+ 0 - 0
app/Icons/print.png → website/app/Icons/print.png


+ 0 - 0
app/Icons/product.png → website/app/Icons/product.png


+ 0 - 0
app/Icons/product_list.png → website/app/Icons/product_list.png


+ 0 - 0
app/Icons/stat.png → website/app/Icons/stat.png


+ 0 - 0
app/Icons/sync.png → website/app/Icons/sync.png


+ 0 - 0
app/Icons/tour.png → website/app/Icons/tour.png


+ 0 - 0
app/Icons/up.png → website/app/Icons/up.png


+ 0 - 0
app/Modules/Assistant/db_action.php → website/app/Modules/Assistant/db_action.php


+ 0 - 0
app/Modules/Assistant/edit_form.php → website/app/Modules/Assistant/edit_form.php


+ 0 - 0
app/Modules/Assistant/new_form.php → website/app/Modules/Assistant/new_form.php


+ 0 - 0
app/Modules/Assistant/toolbar.php → website/app/Modules/Assistant/toolbar.php


+ 0 - 0
app/Modules/Bill/db_action.php → website/app/Modules/Bill/db_action.php


+ 0 - 0
app/Modules/Bill/edit_form.php → website/app/Modules/Bill/edit_form.php


+ 0 - 0
app/Modules/Bill/new_form.php → website/app/Modules/Bill/new_form.php


+ 0 - 0
app/Modules/Bill/toolbar.php → website/app/Modules/Bill/toolbar.php


+ 0 - 0
app/Modules/Category/anleitung.txt → website/app/Modules/Category/anleitung.txt


+ 0 - 0
app/Modules/Category/db_action.php → website/app/Modules/Category/db_action.php


+ 0 - 0
app/Modules/Category/edit_form.php → website/app/Modules/Category/edit_form.php


+ 0 - 0
app/Modules/Category/new_form.php → website/app/Modules/Category/new_form.php


+ 0 - 0
app/Modules/Category/toolbar.php → website/app/Modules/Category/toolbar.php


+ 0 - 0
app/Modules/Configuration/db_action.php → website/app/Modules/Configuration/db_action.php


+ 0 - 0
app/Modules/Configuration/group.php → website/app/Modules/Configuration/group.php


+ 0 - 0
app/Modules/Configuration/priceset.php → website/app/Modules/Configuration/priceset.php


+ 0 - 0
app/Modules/Configuration/tax.php → website/app/Modules/Configuration/tax.php


+ 0 - 0
app/Modules/Configuration/toolbar.php → website/app/Modules/Configuration/toolbar.php


+ 0 - 0
app/Modules/Customer/db_action.php → website/app/Modules/Customer/db_action.php


+ 0 - 0
app/Modules/Customer/edit_form.php → website/app/Modules/Customer/edit_form.php


+ 0 - 0
app/Modules/Customer/new_form.php → website/app/Modules/Customer/new_form.php


+ 0 - 0
app/Modules/Customer/toolbar.php → website/app/Modules/Customer/toolbar.php


+ 0 - 0
app/Modules/Product/db_action.php → website/app/Modules/Product/db_action.php


+ 0 - 0
app/Modules/Product/edit_form.php → website/app/Modules/Product/edit_form.php


+ 0 - 0
app/Modules/Product/new_form.php → website/app/Modules/Product/new_form.php


+ 0 - 0
app/Modules/Product/toolbar.php → website/app/Modules/Product/toolbar.php


+ 0 - 0
app/Modules/Tour/db_action.php → website/app/Modules/Tour/db_action.php


+ 0 - 0
app/Modules/Tour/edit_form.php → website/app/Modules/Tour/edit_form.php


+ 0 - 0
app/Modules/Tour/new_form.php → website/app/Modules/Tour/new_form.php


+ 0 - 0
app/Modules/Tour/toolbar.php → website/app/Modules/Tour/toolbar.php


+ 0 - 0
app/Modules/toolbar.php → website/app/Modules/toolbar.php


+ 0 - 0
app/NTK/Icons/1downarrow.png → website/app/NTK/Icons/1downarrow.png


+ 0 - 0
app/NTK/Icons/1uparrow.png → website/app/NTK/Icons/1uparrow.png


+ 0 - 0
app/NTK/Icons/ascii.png → website/app/NTK/Icons/ascii.png


+ 0 - 0
app/NTK/Icons/ascii_small.png → website/app/NTK/Icons/ascii_small.png


+ 0 - 0
app/NTK/Icons/button_cancel.png → website/app/NTK/Icons/button_cancel.png


+ 0 - 0
app/NTK/Icons/button_cancel_small.png → website/app/NTK/Icons/button_cancel_small.png


+ 0 - 0
app/NTK/Icons/button_ok.png → website/app/NTK/Icons/button_ok.png


+ 0 - 0
app/NTK/Icons/filenew.png → website/app/NTK/Icons/filenew.png


+ 0 - 0
app/NTK/Icons/fileopen.png → website/app/NTK/Icons/fileopen.png


+ 0 - 0
app/NTK/Icons/fileprint.png → website/app/NTK/Icons/fileprint.png


+ 0 - 0
app/NTK/Icons/filesave.png → website/app/NTK/Icons/filesave.png


+ 0 - 0
app/NTK/Icons/filesaveas.png → website/app/NTK/Icons/filesaveas.png


+ 0 - 0
app/NTK/Icons/folder.png → website/app/NTK/Icons/folder.png


+ 0 - 0
app/NTK/Icons/folder2.png → website/app/NTK/Icons/folder2.png


+ 0 - 0
app/NTK/Icons/folder2_yellow.png → website/app/NTK/Icons/folder2_yellow.png


+ 0 - 0
app/NTK/Icons/folder_home.png → website/app/NTK/Icons/folder_home.png


+ 0 - 0
app/NTK/Icons/goto.png → website/app/NTK/Icons/goto.png


+ 0 - 0
app/NTK/Icons/undo.png → website/app/NTK/Icons/undo.png


+ 0 - 0
app/NTK/JavaScript/Splash.js → website/app/NTK/JavaScript/Splash.js


+ 0 - 0
app/NTK/JavaScript/Tooltip.js → website/app/NTK/JavaScript/Tooltip.js


+ 0 - 0
app/NTK/NTK.php → website/app/NTK/NTK.php


+ 0 - 0
app/NTK/NTKActionList.php → website/app/NTK/NTKActionList.php


+ 0 - 0
app/NTK/NTKButton.php → website/app/NTK/NTKButton.php


+ 0 - 0
app/NTK/NTKCheckbox.php → website/app/NTK/NTKCheckbox.php


+ 0 - 0
app/NTK/NTKComboBox.php → website/app/NTK/NTKComboBox.php


+ 0 - 0
app/NTK/NTKEntry.php → website/app/NTK/NTKEntry.php


+ 0 - 0
app/NTK/NTKForm.php → website/app/NTK/NTKForm.php


+ 0 - 0
app/NTK/NTKHBox.php → website/app/NTK/NTKHBox.php


+ 0 - 0
app/NTK/NTKIFrame.php → website/app/NTK/NTKIFrame.php


+ 0 - 0
app/NTK/NTKImage.php → website/app/NTK/NTKImage.php


+ 0 - 0
app/NTK/NTKImageButton.php → website/app/NTK/NTKImageButton.php


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff