X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fkasse.c;h=977f8017b092a326a722c94c004f0ff6a608febc;hb=e4291c495d24828979078c21635893068af5e12a;hp=03a082ae63fbbd1f3c247ce6e699b3e304d33351;hpb=a0de6ca449bb1b0d3f9c3960e82f36a7fd4ca54e;p=c128-kasse

diff --git a/src/kasse.c b/src/kasse.c
index 03a082a..977f801 100644
--- a/src/kasse.c
+++ b/src/kasse.c
@@ -1,6 +1,6 @@
 /* 
  * RGB2R-C128-Kassenprogramm
- * (c) 2007-2008 phil_fry, sECuRE, sur5r
+ * © 2007-2009 phil_fry, sECuRE, sur5r
  * See LICENSE for license information
  *
  */
@@ -16,15 +16,10 @@
 #include "kasse.h"
 #include "credit_manager.h"
 #include "c128time.h"
+#include "print.h"
 // drucker 4 oder 5
 // graphic 4,0,10
 
-/* NOTE: undocumented function which scratches files
-   We need to use this function because linking unistd.h
-   makes our program break at runtime.
- */
-unsigned char __fastcall__ _sysremove(const char *name);
-
 static void sane_exit() {
 	save_items();
 	save_credits();
@@ -41,79 +36,49 @@ static void print_screen() {
 		cprintf("Einnahme %ld konnte nicht umgerechnet werden\r\n", money);
 		exit(1);
 	}
-	cprintf("C128-Kassenprogramm (phil_fry, sECuRE, sur5r)\r\
-\r\nUhrzeit: %s (wird nicht aktualisiert)\r\
-Eingenommen: %s, Verkauft: %ld Flaschen, Drucken: %s\r\n\r\n", 
+	cprintf("C128-Kassenprogramm (phil_fry, sECuRE, sur5r) " GV "\r\
+\r\nUhrzeit:     %s (wird nicht aktualisiert)\r\
+Eingenommen: %s, Verkauft: %ld Dinge, Drucken: %s\r\n",
 	time, profit, items_sold, (printing == 1 ? "ein" : "aus"));
-	for (; i < status.num_items; ++i)
-		cprintf("Eintrag %x: %s (%d Cents, %d mal verkauft)\r\n",
-			i, status.status[i].item_name, status.status[i].price, status.status[i].times_sold);
-	cprintf("\r\nBefehle: s) Daten sichern d) Drucken umschalten\r\
-g) Guthabenverwaltung     z) Zeit setzen\r\
-f) Freitext verkaufen     q) Beenden\r\n");
-}
-
-static void log_file(const char *s) {
-	/* A log-entry has usually 50 bytes, so we take 64 bytes.
-	   Because files are wrapped (log.0, log.1, ...) every 100
-	   lines, we don't need more than 100 * 64 bytes. */
-	char *buffer = malloc(sizeof(char) * 64 * 100);
-	char filename[8];
-	int read = 0;
-	unsigned int c;
-	if (buffer == NULL) {
-		cprintf("No memory available\n");
-		}
-	buffer[0] = '\0';
-	if (((++log_lines_written) % 100) == 0)
-		log_num++;
-	sprintf(filename, "log-%d", log_num);
-	/* Don't read log if there were no lines written before */
-	if (log_lines_written != 1) {
-		if ((c = cbm_open((BYTE)8, (BYTE)8, (BYTE)0, filename)) != 0) {
-			c128_perror(c, "cbm_open(log)");
-			sane_exit();
+	cprintf("\xB0\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xB2\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xB2\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xB2\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xAE\r\n");
+	for (; i < min(status.num_items, 15); ++i) {
+		if (format_euro(profit, sizeof(profit), status.status[i].price) == NULL) {
+			cprintf("Preis %ld konnte nicht umgerechnet werden\r\n", status.status[i].price);
+			exit(1);
 		}
-		read = cbm_read((BYTE)8, buffer, sizeof(char) * 64 * 100);
-		cbm_close((BYTE)8);
-		_sysremove(filename);
-	}
-	if ((c = cbm_open((BYTE)8, (BYTE)8, (BYTE)1, filename)) != 0) {
-		c128_perror(c, "cbm_open(log)");
-		sane_exit();
-	}
-	if (read < 0) {
-		cprintf("Could not read existing logfile (read returned %d)\n", read);
-		sane_exit();
-	}
-	strcpy(buffer+read, s);
-	c = cbm_write((BYTE)8, buffer, read+strlen(s));
-	if (c != (read+strlen(s))) {
-		cprintf("Could not save logfile (wrote %d bytes, wanted %d bytes), please make sure the floppy is not full!\n", c, (read+strlen(s)));
-		sane_exit();
-	}
-	cbm_close((BYTE)8);
-	free(buffer);
-}
 
-static char retry_or_quit() {
-	char *c;
-	do {
-		cprintf("\r\nr)etry or q)uit?\r\n");
-		c = get_input();
-	} while ((*c != 'r') && (*c != 'q'));
-	return *c;
+		cprintf("\x7D%2d: %-" xstr(MAX_ITEM_NAME_LENGTH) "s \x7D%s, %3dx \x7D",
+			i, status.status[i].item_name, profit, status.status[i].times_sold);
+		if ((i+16) < status.num_items) {
+
+			if (format_euro(profit, sizeof(profit), status.status[i+16].price) == NULL) {
+				cprintf("Preis %ld konnte nicht umgerechnet werden\r\n", status.status[i+16].price);
+				exit(1);
+			}
+			cprintf("%2d: %-" xstr(MAX_ITEM_NAME_LENGTH) "s \x7D%s, %3dx \x7D",
+				i+16, status.status[i+16].item_name, profit, status.status[i+16].times_sold);
+		} else cprintf("              \x7D                \x7D");
+		cprintf("\r\n");
+	}
+	cprintf("\xAD\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xB1\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xB1\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xB1\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\x60\xBD\r\n");
+	cprintf(
+"   s) Daten sichern                 d) Drucken umschalten\r\
+   g) Guthabenverwaltung            z) Zeit setzen\r\
+   f) Freitext verkaufen            q) Beenden\r\n");
 }
 
-/* Prints a line and logs it to file */
+/*
+ * Prints a line and logs it to file. Every line can be at max 80 characters.
+ *
+ */
 static void print_log(char *name, int item_price, int einheiten, char *nickname, char *rest) {
 	char *time = get_time();
 	char price[10];
 	/* Format: 
-	   Transaction-ID (Anzahl verkaufter Einträge, inklusive des zu druckenden!) -- 6-stellig
+	   Transaction-ID (Anzahl verkaufter Einträge, inklusive des zu druckenden!) -- 6-stellig
 	   Uhrzeit -- 8-stellig
-	   Eintragname (= Getränk) -- 9-stellig
-	   Preis (in Cents) -- 7-stellig
+	   Eintragname (= Getränk) -- 9-stellig
+	   Preis (in Cents) -- 9-stellig
 	   Anzahl -- 2-stellig
 	   Nickname (falls es vom Guthaben abgezogen wird) -- 10-stellig
 	   restguthaben (9-stellig)
@@ -126,37 +91,13 @@ static void print_log(char *name, int item_price, int einheiten, char *nickname,
 		exit(1);
 	}
 
-	sprintf(print_buffer, "%c[%lu] %s - %-9s - %s - r %s - %d - an %s\r",  17,
-			items_sold, time, name, price, rest,
+	sprintf(print_buffer, "%c[%3u] %s - %-" xstr(MAX_ITEM_NAME_LENGTH) "s - %s - %s - %d - an %s\r",  17,
+			status.transaction_id, time, name, price, rest,
 			einheiten, (*nickname != '\0' ? nickname : "Unbekannt"));
+	status.transaction_id++;
 	print_the_buffer();
 }
 
-void print_the_buffer() {
-	BYTE c;
-RETRY:
-	c = cbm_open((BYTE)4, (BYTE)4, (BYTE)0, NULL);
-	if (c != 0) {
-		c128_perror(c, "cbm_open(printer)");
-		if (retry_or_quit() == 'q')
-			sane_exit();
-
-		goto RETRY;
-	}
-	c = cbm_write((BYTE)4, print_buffer, strlen(print_buffer));
-	if (c != strlen(print_buffer)) {
-		c128_perror(c, "write(printer)");
-		if (retry_or_quit() == 'q') {
-			save_items();
-			save_credits();
-			exit(1);
-		}
-		goto RETRY;
-	}
-	cbm_close((BYTE)4);
-	log_file(print_buffer);
-}
-
 /* dialog which is called for each bought item */
 static signed int buy(char *name, unsigned int price) {
 	int negative = 1;
@@ -166,18 +107,20 @@ static signed int buy(char *name, unsigned int price) {
 	int einheiten;
 	char *input;
 	char nickname[11];
-	char rest[9];
+	char rest[11];
 	struct credits_t *credit;
 
 	memset(rest, ' ', sizeof(rest));
 	rest[8] = '\0';
 
+	clrscr();
 	cprintf("Wieviel Einheiten \"%s\"? [1] \r\n", name);
 	while (1) {
-		c = getchar();
+		c = cgetc();
 		if (c == 13)
 			break;
-		else if (c == 27) {
+		cputc(c);
+		if (c == 27) {
 			cprintf("Kauf abgebrochen, druecke RETURN...\r\n");
 			get_input();
 			return 1;
@@ -189,7 +132,8 @@ static signed int buy(char *name, unsigned int price) {
 	einheiten = atoi(entered) * negative;
 	
 	toggle_videomode();
-	cprintf("%dx %s fuer ", einheiten, name);
+	cprintf("\r\n             *** VERKAUF ***\r\n\r\n");
+	cprintf("%dx %s", einheiten, name);
 	toggle_videomode();
 	
 	cprintf("\r\nAuf ein Guthaben kaufen? Wenn ja, Nickname eingeben:\r\n");
@@ -197,20 +141,28 @@ static signed int buy(char *name, unsigned int price) {
 	strncpy(nickname, input, 11);
 	if (*nickname != '\0') {
 		toggle_videomode();
-		cprintf("%s\r\n", nickname);
+		cprintf(" fuer %s\r\n", nickname);
 		toggle_videomode();
 	}
 
-	if (nickname != NULL && *nickname != '\0' && *nickname != 32) {
+	if (*nickname != '\0' && *nickname != 32) {
 		nickname_len = strlen(nickname);
 		/* go through credits and remove the amount of money or set nickname
 		 * to NULL if no such credit could be found */
 		credit = find_credit(nickname);
 		if (credit != NULL) {
-			if ((signed int)credit->credit < ((signed int)price * einheiten)) {
-				cprintf("Sorry, %s hat nicht genug Geld :-(\r\n", nickname);
-				get_input();
-				return 0;
+			while ((signed int)credit->credit < ((signed int)price * einheiten)) {
+				if (format_euro(rest, 10, credit->credit) == NULL) {
+					cprintf("Preis %d konnte nicht umgerechnet werden\r\n", credit->credit);
+					exit(1);
+				}
+				cprintf("\r\n%s hat nicht genug Geld (%s). e) einzahlen a) abbruch \r\n", nickname, rest);
+				c = cgetc();
+				if (c == 'e') {
+					deposit_credit(nickname);
+				} else {
+					return 0;
+				}
 			}
 			/* substract money */
 			credit->credit -= (price * einheiten);
@@ -223,7 +175,7 @@ static signed int buy(char *name, unsigned int price) {
 			cprintf("\r\nVerbleibendes Guthaben fuer %s: %s. Druecke RETURN...\r\n",
 				nickname, rest);
 			toggle_videomode();
-			cprintf("\r\nDein verbleibendes Guthaben betraegt %s.\r\n", rest);
+			cprintf("\r\nDein Guthaben betraegt noch %s.\r\n", rest);
 			toggle_videomode();
 			get_input();
 			matches++;
@@ -272,10 +224,11 @@ void buy_custom() {
 
 	cprintf("\r\nWie teuer ist \"%s\" (in cents)?\r\n", name);
 	while (1) {
-		c = getchar();
+		c = cgetc();
 		if (c == 13)
 			break;
-		else if (c == 27) {
+		cputc(c);
+		if (c == 27) {
 			cprintf("Kauf abgebrochen, druecke RETURN...\r\n");
 			get_input();
 			return;
@@ -314,6 +267,7 @@ void set_time_interactive() {
 
 int main() {
 	char *c;
+	char *time;
 
 	if (VIDEOMODE == 40)
 		toggle_videomode();
@@ -325,18 +279,31 @@ int main() {
 
 	/* Load configuration */
 	load_config();
-	cprintf("got %d logfiles\r\n", log_num);
 
 	/* Load items (= drinks) */
 	load_items();
 	/* Load credits */
 	load_credits();
+
+	time = get_time();
+	sprintf(print_buffer, "%c--------------------------------------------------------------------------------\r", 17);
+	print_the_buffer();
+	sprintf(print_buffer, "%cC128-Kasse Version " GV "\r", 17);
+	print_the_buffer();
+
+	sprintf(print_buffer, "%cKasse gestartet um %s. Nutze logfile log-%u, zeile %d.\r", 17, time, log_num, log_lines_written);
+	print_the_buffer();
+
+	print_header();
+
 	while (1) {
 		print_screen();
 		c = get_input();
 		/* ...display dialogs eventually */
 		if (*c > 47 && *c < 58) {
-			buy_stock((*c) - 48);
+			/* if the input starts with a digit, we will interpret it as a number
+			 * for the item to be sold */
+			buy_stock(atoi(c));
 			toggle_videomode();
 			clrscr();
 			toggle_videomode();
@@ -363,7 +330,8 @@ int main() {
 		} else if (*c == 'q')
 			break;
 	}
-	cprintf("BYEBYE\r\n");
+	clrscr();
+	cprintf("\r\nBYEBYE\r\n");
 
 	return 0;
 }