From a29e2865afdeabb48280ce6a1e70979a302d9823 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:11:27 +0100 Subject: [PATCH] OrderSprinter 1.5.0 --- gastsystem/index.php | 6 +- gastsystem/install.php | 4 +- printserver/OrderSprinterPrintserver.exe | Bin 266240 -> 266240 bytes spider/install/installer.php | 2 +- webapp/OrderSprinterPrintserver.exe | Bin 266240 -> 266240 bytes webapp/bar.html | 6 +- webapp/bill.html | 2 +- webapp/css/bestformat.css | 2 +- webapp/customer/prodimages.txt | 56 +-- webapp/customer/speisekarte.txt | 14 +- webapp/feedback.html | 2 +- webapp/index.html | 6 +- webapp/install.html | 2 +- webapp/install/installer.php | 2 +- webapp/kitchen.html | 6 +- webapp/manager.html | 78 +++- webapp/paydesk.html | 2 +- webapp/php/admin.php | 107 +++-- webapp/php/bill.php | 3 + webapp/php/closing.php | 29 +- webapp/php/contenthandler.php | 3 + webapp/php/dbutils.php | 3 + webapp/php/debug.php | 2 +- webapp/php/products.php | 128 +++++- webapp/php/timetracking.php | 330 ++++++++++++++++ webapp/php/translations.php | 1 + webapp/php/utilities/basedb.php | 20 +- webapp/php/utilities/roles.php | 36 +- webapp/php/utilities/version.php | 34 +- webapp/preferences.html | 2 +- webapp/products.html | 143 ++++++- webapp/rating.html | 2 +- webapp/reports.html | 2 +- webapp/reservation.html | 2 +- webapp/supplydesk.html | 2 +- webapp/timetracking.html | 471 +++++++++++++++++++++++ webapp/waiter.html | 4 +- 37 files changed, 1361 insertions(+), 153 deletions(-) create mode 100644 webapp/php/timetracking.php create mode 100644 webapp/timetracking.html diff --git a/gastsystem/index.php b/gastsystem/index.php index e91fef4..5aa8b42 100644 --- a/gastsystem/index.php +++ b/gastsystem/index.php @@ -9,8 +9,8 @@ - - + + @@ -105,7 +105,7 @@
  OrderSprinter
-
1.4.18  
+
1.5.0  
diff --git a/gastsystem/install.php b/gastsystem/install.php index 17d453c..2282756 100644 --- a/gastsystem/install.php +++ b/gastsystem/install.php @@ -90,10 +90,10 @@ if (isset($_POST['code'])) { } else { echo ""; echo "Installation Gastsystem"; - echo ''; + echo ''; echo ""; echo "
"; - echo "Installation OrderSprinter-Gastsystem 1.4.18

"; + echo "Installation OrderSprinter-Gastsystem 1.5.0

"; echo "
"; echo "
"; echo "
"; diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index 54527773add5f7592bc30813ebbea3deec3002a6..1409d065b9cc25197ee5a9392e01fd837438e01a 100644 GIT binary patch delta 1447 zcmYk5e^8V~7{~W{-}lbrJ&-#P1Ob!a1UZg74meOJ<%c@yq!}~jG$M&<8K~eJjAJ(! zX!7IKN_c=*FyZD>RP<20v2#Klrl_!COd4lonx+9Kosmk5sSKydo&`$xkKNCH_t|Hk zXP?~~kD1aid`i4SsQ{0dM zdfeAgs2$=)25yAEHs~nU2{L$yFSrwkE8Ht#x&KplEWmF6tpjla4SyW^LZbM38-IjG z^fX``FfQg>k&r zo(6y8U+t?vz=ETjB3dX}rIEVwLW)7rF5pxDrK6Ne9~wJe#1D^ELZ9E*v7ZaAopY!A zV7%GMqj=Q0n4%l?m~ew<6|Hr77Qujj)PoRgAYZP3D2pJa4{N-op-V{c8a1;8>Y|i7 zobY}C$I<=K@8sc~<0a&6t&RGwz%X|9EQkAer)NJEr1YEz z{zU!xQP_jOoR0;cU%r46T*Z!y2}{N-bYr?G!MTpyA6mp1cy-ar_@p{VaK8LRjZq#= zs_8` zPBu;>r#TV7`1TCbRy0eR}$AH+Fo)B|yzCX1ypTVUw}(Ikg4 zwm7)AdTsrM=g)TD*q$0G=LRY##Lq*6=)q{x)3VZRYF?0JR?C8<(U2OE{?>G>QD2cI zYp90NKc_Z5s;VrNz=%2_O9^mUjnhl##8jqLztKza)8|g;B`1hB5_gA4CjDeE)-fE&XqP+ER94ftcCoh%wR92r}T=wQRmAqqZm$<}nT zDbOmJ;?X`VPMV7N6Tx(@X6}b!Y*DgkoMtm-F<^AVj7|T*M9d;P7xBmY z=<#z;spblIGH@rn=h0HGW8^S~%e-mCb>1cLYUmqpGQh{7-?yg-G~I9cNuvDDw%!87 z!0wBnVlDa#+GnvkS)=%7v%2)zjLF1(&+)&{@vQV`J{6()djMtxNvbWTWmbbm>3#B3 zr~}3{%J*2lHwA+D$=*Te!K%l(L|h*J8nAy^$-L_*LQF-@Q$LGj>N za3^%3_uwc+__VWv4mt$hrI`{}1yYiq3&vcc8 z591GK!wFn`xD3u?`{61W*?lA%WXw4-ptoD7H5;iWL9tuVkQU6>N)-yFp`ENo^ z7F=(W8q}sJ5{{p?LNr>xzP4qGjny@jlR=ruX%#0sr`4QZ;q(rtH#t>ss^V11sh-oj zoVIa#kJBDbRh&9Gt>N?)r}sJabNYbORZeT6i0~H254kwXshX3JO|*`aiBk=ympHBG zl*efUr$t-)!_EC+2=|ADy33K5Vr>lBweVc8cq&4am??bs3o)FPW-l&uIC6>$tafLf z(`wIOxX8LNr*NUQu)t|woa=Bpa-87{XGMEHIMwAh#OZ3nUGc?8JF~G|RuG+j0xkqA1Ct)j`Vh)Q`FX^PzsL72P3*XmCE)eZx*rb=tu}=*Y YY95PH59+0iCuype_0p^`#7N`tKTA@?;Q#;t diff --git a/spider/install/installer.php b/spider/install/installer.php index 57e2661..af5b087 100644 --- a/spider/install/installer.php +++ b/spider/install/installer.php @@ -85,7 +85,7 @@ class Installer { } Database::dropTables($pdo); Database::createEmptyTables($pdo, $prefix); - Database::setVersion($pdo,$prefix,"1.4.18"); + Database::setVersion($pdo,$prefix,"1.5.0"); Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour return array("status" => "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index 54527773add5f7592bc30813ebbea3deec3002a6..1409d065b9cc25197ee5a9392e01fd837438e01a 100644 GIT binary patch delta 1447 zcmYk5e^8V~7{~W{-}lbrJ&-#P1Ob!a1UZg74meOJ<%c@yq!}~jG$M&<8K~eJjAJ(! zX!7IKN_c=*FyZD>RP<20v2#Klrl_!COd4lonx+9Kosmk5sSKydo&`$xkKNCH_t|Hk zXP?~~kD1aid`i4SsQ{0dM zdfeAgs2$=)25yAEHs~nU2{L$yFSrwkE8Ht#x&KplEWmF6tpjla4SyW^LZbM38-IjG z^fX``FfQg>k&r zo(6y8U+t?vz=ETjB3dX}rIEVwLW)7rF5pxDrK6Ne9~wJe#1D^ELZ9E*v7ZaAopY!A zV7%GMqj=Q0n4%l?m~ew<6|Hr77Qujj)PoRgAYZP3D2pJa4{N-op-V{c8a1;8>Y|i7 zobY}C$I<=K@8sc~<0a&6t&RGwz%X|9EQkAer)NJEr1YEz z{zU!xQP_jOoR0;cU%r46T*Z!y2}{N-bYr?G!MTpyA6mp1cy-ar_@p{VaK8LRjZq#= zs_8` zPBu;>r#TV7`1TCbRy0eR}$AH+Fo)B|yzCX1ypTVUw}(Ikg4 zwm7)AdTsrM=g)TD*q$0G=LRY##Lq*6=)q{x)3VZRYF?0JR?C8<(U2OE{?>G>QD2cI zYp90NKc_Z5s;VrNz=%2_O9^mUjnhl##8jqLztKza)8|g;B`1hB5_gA4CjDeE)-fE&XqP+ER94ftcCoh%wR92r}T=wQRmAqqZm$<}nT zDbOmJ;?X`VPMV7N6Tx(@X6}b!Y*DgkoMtm-F<^AVj7|T*M9d;P7xBmY z=<#z;spblIGH@rn=h0HGW8^S~%e-mCb>1cLYUmqpGQh{7-?yg-G~I9cNuvDDw%!87 z!0wBnVlDa#+GnvkS)=%7v%2)zjLF1(&+)&{@vQV`J{6()djMtxNvbWTWmbbm>3#B3 zr~}3{%J*2lHwA+D$=*Te!K%l(L|h*J8nAy^$-L_*LQF-@Q$LGj>N za3^%3_uwc+__VWv4mt$hrI`{}1yYiq3&vcc8 z591GK!wFn`xD3u?`{61W*?lA%WXw4-ptoD7H5;iWL9tuVkQU6>N)-yFp`ENo^ z7F=(W8q}sJ5{{p?LNr>xzP4qGjny@jlR=ruX%#0sr`4QZ;q(rtH#t>ss^V11sh-oj zoVIa#kJBDbRh&9Gt>N?)r}sJabNYbORZeT6i0~H254kwXshX3JO|*`aiBk=ympHBG zl*efUr$t-)!_EC+2=|ADy33K5Vr>lBweVc8cq&4am??bs3o)FPW-l&uIC6>$tafLf z(`wIOxX8LNr*NUQu)t|woa=Bpa-87{XGMEHIMwAh#OZ3nUGc?8JF~G|RuG+j0xkqA1Ct)j`Vh)Q`FX^PzsL72P3*XmCE)eZx*rb=tu}=*Y YY95PH59+0iCuype_0p^`#7N`tKTA@?;Q#;t diff --git a/webapp/bar.html b/webapp/bar.html index 22faa0a..76fea26 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + @@ -13,8 +13,8 @@ - - + +