Letzter Stand von Flohmarkt 01.03.2020

- project_id dynamisch über Datenbank (zumindest in pos)
- footer und header auch dynamisch
- create.sql für Abgleich der Datenbank-Struktur

api/controllers/RequestController.php

@@ -12,6 +12,8 @@ class RequestController
 {
 	private $mdate;
 	private $dbh;
+    private $project;
+    private $project_id;
 
 	function __construct ($path = "", $path2 = "")
 	{
@@ -19,6 +21,13 @@ class RequestController
 		$this->mdate = date('Y-m-d H:i:s', strtotime("now"));
 		$this->dbh = new PDO("mysql:host=localhost;dbname=kasse", "root", "gc01mysql");
 		$this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+        $q = $this->dbh->query("SELECT * FROM projects			 				  
+                                WHERE active = '1' 
+                                ORDER BY project_id DESC
+                                LIMIT 1");
+		$this->project = $q->fetch(PDO::FETCH_ASSOC);
+        $this->project_id = $this->project['project_id'];
+        
 	}
 
 
@@ -42,6 +51,12 @@ class RequestController
 			case 'pos_infos2':
 				$result = $this->posInfos2($data);
 				break;
+			case 'pos_cancel':
+				$result = $this->posCancel($data);
+				break;
+            case 'projects':
+				$result = $this->projects($data);
+				break;
             case 'sellers':
 				$result = $this->sellers($data);
 				break;
@@ -65,7 +80,7 @@ class RequestController
 		$disabled = array('token' => 0, 'active' => 0, 'disabled' => 1);
 
 		$q = $this->dbh->query("SELECT * FROM pos			 				  
-						  		WHERE project_id = '{$data['project_id']}' AND pos_id = '{$data['pos_id']}' LIMIT 1");
+						  		WHERE pos_id = '{$data['pos_id']}' LIMIT 1");
 		$result = $q->fetch(PDO::FETCH_ASSOC);
 
 		if (!$result || $result['disabled'] != 0) {
@@ -89,7 +104,7 @@ class RequestController
 		}
 
 		$this->dbh->exec("UPDATE pos SET token = '{$result['token']}', active = '{$result['active']}', disabled = '{$result['disabled']}', mdate = '{$this->mdate}' 
-							   WHERE project_id = '{$result['project_id']}' AND pos_id = '{$result['pos_id']}' ");
+							   WHERE pos_id = '{$result['pos_id']}' ");
 
 		return $result;
 	}
@@ -107,7 +122,7 @@ class RequestController
 
 			if ($d['invoice_number'] == 0) {
 				$this->dbh->exec("INSERT INTO invoice_header (project_id, pos_id, invoice_date, cashier, line_count, total, paid, mdate, cdate) 
-							   VALUES ( '{$d['project_id']}','{$d['pos_id']}',  '{$d['invoice_date']}',
+							   VALUES ( '{$this->project_id}','{$d['pos_id']}',  '{$d['invoice_date']}',
 										'{$d['cashier']}','{$d['line_count']}', '{$d['total']}','{$d['paid']}', 
 										'{$this->mdate}','{$this->mdate}' )");
 				$data['invoice_number'] = $this->dbh->lastInsertId();
@@ -130,7 +145,7 @@ class RequestController
 			foreach ($d['details'] as $item) {
                 if ($item['item'] != "") {
 				$this->dbh->exec("INSERT INTO invoice_details (project_id, invoice_number, line_number, item, seller_id, item_id, price) 
-										   VALUES ( '{$d['project_id']}','{$data['invoice_number']}', '{$item['line_number']}',
+										   VALUES ( '{$this->project_id}','{$data['invoice_number']}', '{$item['line_number']}',
 										   			'{$item['item']}','{$item['seller_id']}','{$item['item_id']}', 
 										   	   		'{$item['price']}' )");
                 }
@@ -152,7 +167,7 @@ class RequestController
 	private function posInfos ($data)
 	{
 		$result = array('items' => array(), 'invoices' => array());
-		$q = $this->dbh->query("SELECT item FROM invoice_details WHERE project_id = '{$data['project_id']}' AND item NOT IN ('000-000','123-456') ORDER BY item ");
+		$q = $this->dbh->query("SELECT item FROM invoice_details WHERE project_id = '{$this->project_id}' AND item NOT IN ('000-000','123-456') AND cancelled = 0 ORDER BY item ");
 		if ($q) {
 			$r = $q->fetchAll(PDO::FETCH_ASSOC);
 			$result['items'] = array_column($r, 'item');
@@ -160,11 +175,11 @@ class RequestController
 
 		if ($data['pos_id'] == 0) {
             $q = $this->dbh->query("SELECT * FROM `view_invoice_header` a
-								WHERE a.project_id = '{$data['project_id']}' ORDER BY a.invoice_number ");
+								WHERE a.project_id = '{$this->project_id}' ORDER BY a.invoice_number ");
 		    
         } else {
             $q = $this->dbh->query("SELECT * FROM `view_invoice_header` a
-								WHERE a.project_id = '{$data['project_id']}' AND a.pos_id = '{$data['pos_id']}' ORDER BY a.invoice_number ");
+								WHERE a.project_id = '{$this->project_id}' AND a.pos_id = '{$data['pos_id']}' ORDER BY a.invoice_number ");
         }
 
 		if ($q) {
@@ -180,11 +195,11 @@ class RequestController
 
 		if ($data['pos_id'] == 0) {
             $q = $this->dbh->query("SELECT * FROM `view_invoice_header` a
-								WHERE a.project_id = '{$data['project_id']}' ORDER BY a.invoice_number ");
+								WHERE a.project_id = '{$this->project_id}' ORDER BY a.invoice_number ");
 		    
         } else {
             $q = $this->dbh->query("SELECT * FROM `view_invoice_header` a
-								WHERE a.project_id = '{$data['project_id']}' AND a.pos_id = '{$data['pos_id']}' ORDER BY a.invoice_number ");
+								WHERE a.project_id = '{$this->project_id}' AND a.pos_id = '{$data['pos_id']}' ORDER BY a.invoice_number ");
         }
 
 		if ($q) {
@@ -205,8 +220,9 @@ class RequestController
         $ptr = printer_open("POS-58");
         printer_set_option($ptr, PRINTER_MODE, "raw");
 
-        printer_write($ptr, implode("", file(dirname(__FILE__)."\\..\\..\data\\header.txt")));
-
+        printer_write($ptr, $this->project['print_header']);
+        printer_write($ptr, str_repeat("\r\n", 2));
+        
         printer_write($ptr, "Rechn.-Nr. " . $result['invoice_number'] . "\r\n");
         printer_write($ptr, "Kasse " . $result['pos_id'] . ", " . $result['cashier'] . "\r\n");
         printer_write($ptr, "\r\n");
@@ -220,17 +236,55 @@ class RequestController
         printer_write($ptr, "________________________________\r\n");
         printer_write($ptr, str_pad(str_replace(".",",",$result['total']), 31, " ", STR_PAD_LEFT) . "\r\n");
 
-        printer_write($ptr, implode("", file(dirname(__FILE__)."\\..\\..\data\\footer.txt")));
+        printer_write($ptr, $this->project['print_footer']);
+        printer_write($ptr, str_repeat("\r\n", 7));
         printer_close($ptr);
 
         return $result;
     }
 
+    private function posCancel ($data)
+    {
+        $result = "error";
+        
+        if (isset($data['item']) && $data['item'] != "") {
+			$item = $data['item'];
+            
+            $this->dbh->exec("UPDATE invoice_details SET
+									cancelled = '1'
+							   WHERE item = '{$item}' ");
+            $result = "OK";
+        }
+        return $result;
+    }
+
+    private function projects ($data)
+	{
+		if (isset($data['sellers']) && is_array($data['sellers']) && count($data['sellers']) > 0) {
+            if (in_array($seller['seller_id'], $seller_ids)) {
+                $this->dbh->exec("UPDATE projects 
+                                       SET event_date = '{$data['event_date']}',
+                                           event_location = '{$data['event_location']}', 
+                                           print_header = '{$data['print_header']}',
+                                           print_footer = '{$data['print_footer']}', 
+                                           active = '{$data['active']}', 
+                                           mdate = '{$this->mdate}' 
+                                       WHERE project_id = '{$data['project_id']}' ");
+            } else {
+                $this->dbh->exec("INSERT INTO projects (project_id, event_date, event_location, print_header, print_footer, active, mdate, cdate) 
+                                       VALUES ( '{$data['project_id']}','{$data['event_date']}',  '{$data['event_location']}',  '{$data['print_header']}',
+                                                '{$data['print_footer']}',  '{$data['active']}','{$this->mdate}','{$this->mdate}' )");
+            }
+		}
 
+		$q = $this->dbh->query("SELECT * FROM projects ORDER BY project_id");
+		return $q->fetchAll(PDO::FETCH_ASSOC);
+	}
+    
 	private function sellers ($data)
 	{
 		if (isset($data['sellers']) && is_array($data['sellers']) && count($data['sellers']) > 0) {
-			$q = $this->dbh->query("SELECT seller_id FROM sellers WHERE project_id = '{$data['project_id']}' ORDER BY seller_id");
+			$q = $this->dbh->query("SELECT seller_id FROM sellers WHERE project_id = '{$this->project_id}' ORDER BY seller_id");
 			$r = $q->fetchAll(PDO::FETCH_ASSOC);
 			$seller_ids = array();
 			if ($r) {
@@ -248,25 +302,24 @@ class RequestController
 										   	   mail = '{$seller['mail']}', 
 										   	   phone = '{$seller['phone']}', 
 										   	   mdate = '{$this->mdate}' 
-							   			   WHERE project_id = '{$data['project_id']}' AND seller_id = '{$seller['seller_id']}' ");
+							   			   WHERE project_id = '{$this->project_id}' AND seller_id = '{$seller['seller_id']}' ");
 				} else {
 					$this->dbh->exec("INSERT INTO sellers (project_id, seller_id, name, first_name, address, zip_code, place, mail, phone, mdate, cdate) 
-										   VALUES ( '{$seller['project_id']}','{$seller['seller_id']}',  '{$seller['name']}',  '{$seller['first_name']}',
+										   VALUES ( '{$this->project_id}','{$seller['seller_id']}',  '{$seller['name']}',  '{$seller['first_name']}',
 										   			'{$seller['address']}',  '{$seller['zip_code']}', '{$seller['place']}','{$seller['mail']}', 
 										   	   		'{$seller['phone']}','{$this->mdate}','{$this->mdate}' )");
 				}
 			}
 		}
 
-		$q = $this->dbh->query("SELECT * FROM sellers WHERE project_id = '{$data['project_id']}' ORDER BY seller_id");
+		$q = $this->dbh->query("SELECT * FROM sellers WHERE project_id = '{$this->project_id}' ORDER BY seller_id");
 		return $q->fetchAll(PDO::FETCH_ASSOC);
 	}
 
 	public function CsvExport ($data)
 	{
-		$data['project_id'] = "3";
 		$q = $this->dbh->query("SELECT seller_id, name, first_name, address, zip_code, place, mail, phone, 0.0 as total, 0.0 as provision, 0.0 as cash_out  
-								FROM sellers WHERE project_id = '{$data['project_id']}' ORDER BY seller_id");
+								FROM sellers WHERE project_id = '{$this->project_id}' ORDER BY seller_id");
 		
 		$sellers = array();
 		foreach ($q->fetchAll(PDO::FETCH_ASSOC) as $s) {
@@ -279,7 +332,7 @@ class RequestController
 		}		
 		
 		// Verkäufe nachladen, 
-		$q = $this->dbh->query("SELECT * FROM invoice_details WHERE project_id = '{$data['project_id']}' ");
+		$q = $this->dbh->query("SELECT * FROM invoice_details WHERE project_id = '{$this->project_id}' AND cancelled = 0");
 		
 		while ($row = $q->fetch(PDO::FETCH_ASSOC)) {
             if (isset($sellers[$row['seller_id']])) {
@@ -290,7 +343,7 @@ class RequestController
 		}
 		
 		// Summen berechnen
-		$q = $this->dbh->query("SELECT seller_id, sum(price) as price FROM invoice_details WHERE project_id = '{$data['project_id']}' GROUP BY seller_id ");
+		$q = $this->dbh->query("SELECT seller_id, sum(price) as price FROM invoice_details WHERE project_id = '{$this->project_id}' AND cancelled = 0 GROUP BY seller_id ");
 		while ($row = $q->fetch(PDO::FETCH_ASSOC)) {
             if (isset($sellers[$row['seller_id']])) {
                 $sellers[$row['seller_id']]['total'] = $row['price'];

data/footer.txt

@@ -4,7 +4,7 @@
 
 ********************************
       Naechster Flohmarkt:
-    Sonntag,  14. April 2019
+      Sonntag,  15.09.2019
           10 - 12  Uhr
      Kulturhalle  Steinheim
 ********************************

data/header.txt

@@ -1,7 +1,7 @@
 ********************************
  Vorsortierter  Flohmarkt  fuer
    Kinder-  und  Babykleidung 
-      Sonntag,  07.10.2018
+      Sonntag,  14.04.2019
      Kulturhalle  Steinheim
 ********************************
  Familientagesstaette Steinheim

queries/create.sql

@@ -0,0 +1,219 @@
+-- phpMyAdmin SQL Dump
+-- version 3.4.5
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Erstellungszeit: 22. Jun 2022 um 20:12
+-- Server Version: 5.5.16
+-- PHP-Version: 5.3.8
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- Datenbank: `kasse`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `invoice_details`
+--
+
+DROP TABLE IF EXISTS `invoice_details`;
+CREATE TABLE IF NOT EXISTS `invoice_details` (
+  `project_id` int(11) NOT NULL DEFAULT '1',
+  `invoice_number` int(11) NOT NULL,
+  `line_number` int(11) NOT NULL,
+  `item` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
+  `seller_id` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `item_id` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `price` decimal(6,2) NOT NULL,
+  `cancelled` tinyint(4) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`project_id`,`invoice_number`,`line_number`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `invoice_header`
+--
+
+DROP TABLE IF EXISTS `invoice_header`;
+CREATE TABLE IF NOT EXISTS `invoice_header` (
+  `invoice_number` int(11) NOT NULL AUTO_INCREMENT,
+  `project_id` int(11) NOT NULL,
+  `pos_id` int(11) NOT NULL,
+  `invoice_date` datetime NOT NULL,
+  `cashier` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `line_count` int(11) NOT NULL,
+  `total` decimal(6,2) NOT NULL,
+  `paid` decimal(6,2) NOT NULL,
+  `printed` tinyint(4) NOT NULL DEFAULT '0',
+  `mdate` datetime NOT NULL,
+  `cdate` datetime NOT NULL,
+  PRIMARY KEY (`invoice_number`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2477 ;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `items`
+--
+
+DROP TABLE IF EXISTS `items`;
+CREATE TABLE IF NOT EXISTS `items` (
+  `project_id` int(11) NOT NULL,
+  `seller_id` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `item_id` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `description` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `price` decimal(6,2) NOT NULL,
+  `mdate` datetime NOT NULL,
+  `cdate` datetime NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `pos`
+--
+
+DROP TABLE IF EXISTS `pos`;
+CREATE TABLE IF NOT EXISTS `pos` (
+  `pos_id` int(11) NOT NULL,
+  `token` int(11) NOT NULL,
+  `active` tinyint(4) NOT NULL,
+  `disabled` tinyint(4) NOT NULL,
+  `cashier_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `mdate` datetime NOT NULL,
+  `cdate` datetime NOT NULL,
+  PRIMARY KEY (`pos_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `projects`
+--
+
+DROP TABLE IF EXISTS `projects`;
+CREATE TABLE IF NOT EXISTS `projects` (
+  `project_id` int(11) NOT NULL AUTO_INCREMENT,
+  `event_date` date NOT NULL,
+  `event_location` varchar(255) NOT NULL,
+  `print_header` text NOT NULL,
+  `print_footer` text NOT NULL,
+  `active` tinyint(4) NOT NULL DEFAULT '0',
+  `mdate` datetime NOT NULL,
+  `cdate` datetime NOT NULL,
+  PRIMARY KEY (`project_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=8 ;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `sellers`
+--
+
+DROP TABLE IF EXISTS `sellers`;
+CREATE TABLE IF NOT EXISTS `sellers` (
+  `project_id` int(11) NOT NULL DEFAULT '1',
+  `seller_id` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `first_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `address` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `zip_code` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
+  `place` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `mail` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `phone` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `mdate` datetime NOT NULL,
+  `cdate` datetime NOT NULL,
+  PRIMARY KEY (`project_id`,`seller_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+-- --------------------------------------------------------
+
+--
+-- Stellvertreter-Struktur des Views `view_invoices`
+--
+DROP VIEW IF EXISTS `view_invoices`;
+CREATE TABLE IF NOT EXISTS `view_invoices` (
+`invoice_number` int(11)
+,`project_id` int(11)
+,`pos_id` int(11)
+,`invoice_date` datetime
+,`cashier` varchar(30)
+,`line_count` bigint(21)
+,`total` decimal(28,2)
+,`line_number` int(11)
+,`item` varchar(10)
+,`seller_id` varchar(5)
+,`item_id` varchar(5)
+,`price` decimal(6,2)
+);
+-- --------------------------------------------------------
+
+--
+-- Stellvertreter-Struktur des Views `view_invoice_header`
+--
+DROP VIEW IF EXISTS `view_invoice_header`;
+CREATE TABLE IF NOT EXISTS `view_invoice_header` (
+`invoice_number` int(11)
+,`project_id` int(11)
+,`pos_id` int(11)
+,`invoice_date` datetime
+,`cashier` varchar(30)
+,`paid` decimal(6,2)
+,`printed` tinyint(4)
+,`line_count` bigint(21)
+,`total` decimal(28,2)
+,`mdate` datetime
+,`cdate` datetime
+);
+-- --------------------------------------------------------
+
+--
+-- Stellvertreter-Struktur des Views `view_totals`
+--
+DROP VIEW IF EXISTS `view_totals`;
+CREATE TABLE IF NOT EXISTS `view_totals` (
+`invoice_number` int(11)
+,`line_count` bigint(21)
+,`total` decimal(28,2)
+);
+-- --------------------------------------------------------
+
+--
+-- Struktur des Views `view_invoices`
+--
+DROP TABLE IF EXISTS `view_invoices`;
+
+CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `view_invoices` AS select `a`.`invoice_number` AS `invoice_number`,`a`.`project_id` AS `project_id`,`a`.`pos_id` AS `pos_id`,`a`.`invoice_date` AS `invoice_date`,`a`.`cashier` AS `cashier`,`a`.`line_count` AS `line_count`,`a`.`total` AS `total`,`b`.`line_number` AS `line_number`,`b`.`item` AS `item`,`b`.`seller_id` AS `seller_id`,`b`.`item_id` AS `item_id`,`b`.`price` AS `price` from (`view_invoice_header` `a` left join `invoice_details` `b` on((`a`.`invoice_number` = `b`.`invoice_number`)));
+
+-- --------------------------------------------------------
+
+--
+-- Struktur des Views `view_invoice_header`
+--
+DROP TABLE IF EXISTS `view_invoice_header`;
+
+CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `view_invoice_header` AS select `a`.`invoice_number` AS `invoice_number`,`a`.`project_id` AS `project_id`,`a`.`pos_id` AS `pos_id`,`a`.`invoice_date` AS `invoice_date`,`a`.`cashier` AS `cashier`,`a`.`paid` AS `paid`,`a`.`printed` AS `printed`,`b`.`line_count` AS `line_count`,`b`.`total` AS `total`,`a`.`mdate` AS `mdate`,`a`.`cdate` AS `cdate` from (`invoice_header` `a` left join `view_totals` `b` on((`a`.`invoice_number` = `b`.`invoice_number`)));
+
+-- --------------------------------------------------------
+
+--
+-- Struktur des Views `view_totals`
+--
+DROP TABLE IF EXISTS `view_totals`;
+
+CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `view_totals` AS select `a`.`invoice_number` AS `invoice_number`,count(`a`.`line_number`) AS `line_count`,sum(`a`.`price`) AS `total` from `invoice_details` `a` group by `a`.`invoice_number`;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

scripts/app.js

@@ -81,6 +81,14 @@ angular.module('pos', ['ngRoute'])
             return "?";
         };
     })
+    .filter("datum2", function () {
+        return function (d) {
+            if (d !== null) {
+                return moment(d).format("DD.MM.YYYY");
+            }
+            return "?";
+        };
+    })
     .filter('comma2decimal', [
         function() {
             return function(input) {

scripts/controllers/dashboard.js

@@ -5,7 +5,7 @@ angular.module('pos')
         var webservice = 'api/?a=pos';
 
         $scope.postParams = {
-            'project_id': "3",
+            'project_id': "5",
             'pos_id': 0,
             'cashier': window.localStorage.getItem("cashier"),
             'token': window.localStorage.getItem("token"),

scripts/controllers/main.js

@@ -2,28 +2,15 @@
 
 
 angular.module('pos')
-    .controller('MainCtrl', function ($scope, $timeout) {
-		var webservice = 'api/';		
+    .controller('MainCtrl', function ($scope, $timeout, $http) {
+		var webservice = 'api/?a=projects';		
 		
         $scope.getRandomHex = function (digits) {
             var rand = Math.random();
             return Math.floor(Date.now() / rand).toString(16).substring(2, 2 + digits);
         };
 
-        $scope.projects = [
-            {
-                'ID': "a47e09a1",
-                'Date': new Date('2016-10-10'),
-                'Description': "Famta Flohmarkt",
-                'Count': 3,
-                'PointsOfSale': [
-                    {
-                        'ID': "32af92",
-                        'Client': "192.168.2.3"
-                    }
-                ]
-            }
-        ];
+        $scope.projects = [];
 
         $scope.newProject = {
             'ID': $scope.getRandomHex(8),
@@ -47,6 +34,15 @@ angular.module('pos')
                 JsBarcode(".barcode").init();
             }, 300);
         };
+        
+        $scope.refresh = function () {
+            $http.post(webservice)
+				.then(function (response) {
+					$scope.projects = response.data;
+				});
+		};
+        
+        $scope.refresh();
 
 
     });

scripts/controllers/pos.js

@@ -5,7 +5,7 @@ angular.module('pos')
         var webservice = 'api/?a=pos';
 
         $scope.postParams = {
-            'project_id': "3",
+            'project_id': "5",
             'pos_id': $routeParams.id,
             'cashier': window.localStorage.getItem("cashier"),
             'token': window.localStorage.getItem("token"),
@@ -66,6 +66,7 @@ angular.module('pos')
         $scope.currentLine = 0;
         $scope.currentLineType = '.item';
         $scope.currentInvoice = $scope.invoiceTemplate();
+        $scope.currentItem = "";
 
         $scope.offlineInvoices = JSON.parse(window.localStorage.getItem("offlineInvoices"));
         $scope.invoices = [];
@@ -154,6 +155,8 @@ angular.module('pos')
         $scope.selectItem = function (index, itemType) {
             if (index !== undefined) {
                 $scope.currentLine = index;
+            } else {
+                $scope.currentLine = currentInvoice.details.length()-1;
             }
             if (itemType !== undefined) {
                 $scope.currentLineType = itemType;
@@ -194,6 +197,7 @@ angular.module('pos')
                 if (!currentItem.item.match(/^\d{3}-\d{3}$/gi)) {
                     $scope.showWarning(2);
 				} else if ($scope.currentInvoice.invoice_number == 0 && _.contains($scope.soldItems, currentItem.item)) {
+                    $scope.currentItem = currentItem.item;
                     $scope.showWarning(1);
                 } else if ($scope.currentSoldItems(i) !== i) {
                     errorSound.play();
@@ -368,6 +372,14 @@ angular.module('pos')
                     }
                 });
         };
+        
+        $scope.cancelItem = function (item) {
+            $http.post(webservice + '_cancel', { 'params': $scope.postParams, 'item': item })
+                .then(function (response) {
+                    $scope.currentInvoice = $scope.invoiceTemplate();
+                    $scope.selectItem(0);
+                });
+        };
 
 		$scope.refresh = function () {
             for (var i = 0; i < $scope.offlineInvoices.length; i++) {

scripts/controllers/seller.js

@@ -8,7 +8,7 @@ angular.module('pos')
         $scope.generateSellers = function (count) {
               return _.map(_.range(1, count + 1), function (num) {
                   return {
-                      'project_id': "3",
+                      'project_id': "5",
                       'seller_id': num.toString().padLeft('0', 3),
                       'name': "",
                       'address': "",
@@ -22,13 +22,13 @@ angular.module('pos')
         $scope.sellers = []; // $scope.generateSellers(85);
 
         $scope.save = function () {
-            $http.post(webservice, { 'project_id': "3", 'sellers': $scope.sellers }).then(function (response) {
+            $http.post(webservice, { 'project_id': "5", 'sellers': $scope.sellers }).then(function (response) {
                 $scope.sellers = response.data;
             });
         };
 
         $scope.load = function () {
-            $http.post(webservice, { 'project_id': "3" }).then(function (response) {
+            $http.post(webservice, { 'project_id': "5" }).then(function (response) {
                 $scope.sellers = response.data;
             });
         };

templates/main.html

@@ -1,8 +1,37 @@
 <div class="row marketing">
+    <div class="col-md-7">
+
+        <table class="table table-striped">
+            <tr>
+                <th></th>
+                <th>ID</th>
+                <th>Datum</th>
+                <th>Ort</th>
+                <th>Aktiv</th>
+            </tr>
+            <tr ng-repeat="p in projects ">
+                <td><button type="button" class="btn" data-toggle="modal" data-target="#projectModal" ng-click="loadInvoice(invoice.invoice_number)"><i class="glyphicon glyphicon-pencil"></i></button></td>
+                <td>
+                    {{p.project_id}}
+                </td>
+                <td>
+                    {{p.event_date|datum2}}
+                </td>
+                <td>
+                    {{p.event_location}}
+                </td>
+                <td>
+                    <button type="button" class="btn btn-warning" ng-show="p.active==0"><i class="glyphicon glyphicon-print"></i></button>
+                    <button type="button" class="btn btn-success" ng-show="p.active==1"><i class="glyphicon glyphicon-check"></i></button>
+                </td>
+
+            </tr>
+        </table>
+    </div>
     <form class="form-horizontal">
         <div class="form-group">
             <label for="projects" class="col-sm-2 control-label">Vorhandene Projekte</label>
-            <select id="projects" multiple class="form-control" ng-model="ID">
+            <select id="projects" multiple class="form-control" ng-model="projects" >
             </select>
 
         </div>

templates/pos.html

@@ -37,7 +37,8 @@
             </tr>
             <tr ng-repeat="b in currentInvoice.details ">
                 <td>
-                    {{b.line_number}}
+                <button type="button" class="btn" ng-click="removeItem(b)"><i class="glyphicon glyphicon-trash"></i></button>
+                    {{currentInvoice.details.length-$index}}
                 </td>
                 <td>
                     <input class="form-control item monospace" type="text" required item ng-model="b.item" ng-keypress="keyPressItem($event, $index)"/>
@@ -145,6 +146,9 @@
             </div>
             <div class="modal-body">
                 {{warningInfo[warning]}}!
+                <div ng-show="postParams.pos_id=='8'"><br/><br/>Möchten Sie diesen Eintrag '{{currentItem}}' stornieren?<br/>
+                    <button type="button" class="btn btn-danger" ng-click="cancelItem(currentItem)" data-dismiss="modal">Storno</button>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-danger" data-dismiss="modal">OK</button>