From 4e70d7756ded3e5cf5f965894bcb114f86907d24 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:03:10 +0100 Subject: [PATCH] OrderSprinter 1.3.13 --- javaprinter/javaprinter.jar | Bin 60592 -> 60664 bytes printserver/OrderSprinterPrintserver.exe | Bin 260096 -> 260096 bytes spider/install/installer.php | 2 +- webapp/OrderSprinterPrintserver.exe | Bin 260096 -> 260096 bytes webapp/bar.html | 2 +- webapp/bill.html | 2 +- webapp/elements/product.js | 3 +- webapp/feedback.html | 2 +- webapp/index.html | 6 +-- webapp/install.html | 2 +- webapp/install/installer.php | 30 ++++++++++-- webapp/kitchen.html | 2 +- webapp/manager.html | 8 ++-- webapp/paydesk.html | 2 +- webapp/php/admin.php | 34 +++++++------- webapp/php/products.php | 20 +++++++- webapp/php/remoteaccess.php | 2 +- webapp/php/updater.php | 2 +- .../TypeAndProducts/ProductEntry.php | 5 +- webapp/preferences.html | 2 +- webapp/products.html | 44 ++++++++++++++---- webapp/rating.html | 2 +- webapp/reports.html | 2 +- webapp/reservation.html | 2 +- webapp/supplydesk.html | 2 +- webapp/waiter.html | 4 +- 26 files changed, 123 insertions(+), 59 deletions(-) diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 69e134e7886c4190ec156e216a4837f5eb4ad4ff..d83db7de52fc00dd60e335d69cb8b498ef0d717c 100644 GIT binary patch delta 2273 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 delta 2194 zcmV;D2yOTH*#ofI0}W710|XQR2nYxOot&4k4RO1ZJf;wnj=Lv+jaO@U6jvF3&+aBW z2@^`Ep)rL*QgUT-v4B+)KntPm)`SES(h@8(yF1xTvOBZP&H};SyjAgT>kU*|wOTKz zsm3I21+CUw>%A)8+Is)v;~)RZ!{d8qm)+3pYT#kcIp6nwm-F4u^6aH2&jZ+ke}oYb zxPH<&YNTDu_Dr{bdottL-L4rkt+dy@(@G}82nno`knW^mC%OltlV;2dqf(%LiC|=3 zPEz2iC}o|arfVdVmObtWwDgy?Gg!p+3aFlI*qNl^S&p3%Xe}={vIs~)CG9%#Y|Nw3 zhJ)p$hH@whRCva5ljz3(fgX_%Vk@^*2)4D43WRolIdQWZL0qHaDy-s#`z_nt zlTAfUcf^P$O#!Xni5baJ!?ol&PYihz7A>wXZ%_uE_EsiLuitUfyKT?4q?283{lzQ{ zlV~S;+e*rv>B8IvWN1!{&pBQ`Z)r1LS7SNFGr?ue6c zq(fuvO9iD5T`Iy*s_;r|3gbqBrsdR_ip^;EvriieUL_zpWvpJU;x#fVRfVX8(IZgz za?3ljRx)n7(*8CTRj97Q4r%|jjLEWURT{fl#ZK&h5(pnPl38m~ z40zvS4LM$~%x6qR94y|-amP&=yxrCkw>!A33@c!$MVHiSshGqRgXWs)q!FY3zQt;H zO&IR5c_eGvF|)TEy@Ul8zh8DV)5iqI%~;xhVb(YhTo#Mzj!NdunagRvy~I_PLn(PT zW(EpqOBk|mkE%E(yD?zJ6>vg`Xf^xlO)7MBD7c4&n1tP@;(iHJn0D7TQtaEekQbM{ zx2br$zQ;@!R$Nu4$gSHXL!r9txEui^s*-h`8X zCGSDJj3OP zg70&2CF+MNe&mbWCU2(TIWma;374$A`p;DS+>dc0Yi2w-Srz<}%oCFND;2-?LzXtC z*|5xac-%6R@d#&;63e4N^_;u*_YmGlSZgVo;kl}j%Lpvrl{ZYjWzOxg5WL4uO z{5gz230z&Qtq2EB!gN*qMUHQUvpZu(q)8FsOc-V^W9BWEd|ImH>)ItH(a1~%`L6;Y ze))>yhc%~vp=_K*j5%)XR&<&ubW3-#~f~*!|PYoFJN${Be!V#i;i8#-~cx;d`(o}Oov*37@#)v(4cg# zA!n@M+;-f7JLwAFUHJ^tHR)y*0vEA4jJ1^{uzB*n?x*q)*E;QB=p2Fvf~^aReVB}TXHUgqaDBxr z-b$!8&W}7iu=sFN9^R8byiXoJm_IyJRKHo*KH{tIzQT)~8z1YK$Hy;g=`09|OS<;S zlCHBV9xlQz=-Q{t!L}D+EbB+h!9G`noz%52l!JY#2#f04SIWVEW{R+0UHf`D*f)x> zT3wqj2YaFb!@qRxn?9^%DeSxq;L}Cy)4KNEaw^XkVW)NNd*xt1D8e$j_H2n#3oR}+ z?9sI!mn*fO7GbTr_6r}jZYk{f%dq-Tv9-^jmEW7#fdia_d)U;2{7>T$PkY&;`{3~h z-TfHB1MJi1G0Mq*e1}kQr>MmN(Ty?Di-Tg6Kdz#K~@n@gh+5UKuy9<8Xhk_OOEq5V$Jb-DApbCF%_^g3;5juxYQ_FvFXiH1( zkKWSK)Utu9euv-Z$I;>Z+^)?9?GFohaod{EBd7?S4W2E8P4h?AG@p1e34pHv+E9lL6=xli$V#lI%MI_0N+%>^%V_ UlY8t>0e_Rr>?a22+yDRo0C8wO-~a#s diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index e1d6868b87f95329a1b0f0a3f094fb975196f8be..7e4d0868caf49439b062749f1bc8e2bb6f7dc554 100644 GIT binary patch delta 1870 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 IU?^ApFKA( "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index e1d6868b87f95329a1b0f0a3f094fb975196f8be..7e4d0868caf49439b062749f1bc8e2bb6f7dc554 100644 GIT binary patch delta 1870 zcmY+F4Qx|Y6vxkf_qDGbd)-R0YgyZMbZi}6$*{N&P=T$&CddXj0Y}0Thzy+BRz3z4 zXcr6+2gC}YT%3V818+ely2^M3zx&b{y6 z|Lf}u_oamUQnqdqr(My^ZQX1mU$%D5Hq@nvPyu*2MYus*Gfga$%qM4AGYREHvBr-w z{0g7}sHITX2|!Wr1JJrJ0(7?vtnpax;Yy)zmu5Fs%GvGRW>(!cOsJ=2G|-z34c2-OKvLdXA!s2W4$+##jHE5&0fK8hf$Lz1^)x!WC>hIf(8Vu z6nqp<4IfCQOTowSlr5mwD_wRe_#~ck1n3YYm7$k{KxAb$cO_mqsi=+l+Q$fW0(+y~ zB}@@m3!X*@>`=RlJYtvIvq(34i19FUM6-l<3G+u?!eYV}N8Q2%!dTQ58cz6b`dx#& zNz)2JD{dz!V{qpvm${2R(ST1HY%*zuH23%1xp>26r6DzEuz}CQO$q9r&T>#`x`QsL z#?2IhA>Nd%HEC^e<0PYGHflSJQkqURP8u*yvg%ahqygikbe(FP6gR|EK?B2{t|BwO z2wAIF%v6ljqldV$Y`!s%liBu+U=#PuBo@Z@^f-3mSX0u~T%!)7%P8gHdg}34lk|&8 zANcn0wvGpsTw^W!c9QEXyVI4Hnu~WvXAy#aoOAOyy!9PAYrw*4I-eQpRBARMI2mgl zI(xv)Hg6kGoN75u=d_Yj1*c7%Dmm@oG=tNAPBS?j zgH6%=?16QI6dGrn-n1GMj_7ONeidBoZOsV=TyY0no}94d7S33lCBr| zGqXO_wK3F1Vxca<9mZh1rv7wq+-=IrK;SI=StMJ*s*eYB0Y5d1SX)DOrsW< zPxL3b+F)5hN1`$&C|g`Xx9t+0PbwAF3@5ag=mJuE3WurV7LkSowK7446V#?qg4~** zb|k21g4#c*p3p_)Xk5X^c8yp|o^L(23;fiyH*hE&S>YAc< ztLiUj71j=^>aMd|Tt!UympO1NR+H2VT(w%Rj+`N`Cg}+^d?+BcY!Nl5$~WbopwsQw z^LQ%~X`=Q*$xsY@3&p@U*#j%+UYZLnh3STe!uCQJ#+^!xV(fu^g*k?saImm6@<$VW zuJpKJG^~eSj4jZQk-@(hJy3(u2kS77S7Ir=jXYJ!&w>bYwUU1m*2NaAq@UB2^YYj7 z-!d^I8@z@x!|aH64gHW*M7~->ZxcE8#ae3iWEB;ZjxEmj7kEnwN`2n3lZqyJizb)k zd;KLo|D@v5m&O!7>yO>vPk$Xve6b&{(4|@}T?G(sj4{&z2W|}F! z(;~n3(WZ!@pN91^zRL*K3P53IrrYv zcVFInZA0VQhQ{rELHzvP(VEa6D;h%G)rQjs5h{Qkb`h?V(Bz49GOj@r-G#x-Ay(tZ zV)hdt0cz?A)O7(6=Ene3Z5ILh!vY=u;q+5w!q968BLct@I{bPvtvzfK`UKi^I9)g{ z&{qySg6*tEe1p@V(bC`qNX%{!0%im;Nu^6qe0eSa>b1$5h&DwX7zGd`TC?wBA~Z&{ z7IoksIWb8|q^bk=6y)$$QGb>P07Nb`{-o=DfK1HjgfXtT;#tHeT;Kt17H;S$o8 zutPYB^dLLEi1g#I1J~25;S4OM>W&OdrP&=B!U)jv4u|j!P=803&;|5JhokOUcG1Ll z)A8W{n^Z!;!kPs1EM#T!KF&Jgo2`B@!l)8bvc6**rBpq{XUu$1<@5Ol1T^w|diF>b z+ah}HNIBbncjO96)Y56iFHaS8-XSGU8Ke=1iWnKo;hsmA{vX& zBxffHfzto8sXnWmwF-enEF00-d>PbvJO{Js%H#dPJXUO5$_hR&r)8WfIX%j09jE1- zS~xw%={Zhioc3{A!RaWca!&7Ys^HYisglzrPF0+)aeAE7El$-~z)+mQu!bj1oK|wm z;IxWU9;aGPUQVkyRno!k`O@CS%z9W832x|3Yd2Qz{qZv_E>Vo6IhmC! zrc2w6&A3Xjl(eIy8P_T{h1FVcqhi^t)`Bf#ChzYS+};bkKfel(xCPDUdBY3Pmv#{R zctN)P@PmDY=*Mpri^+CJvES`gtfsrb=k15v_F8c(Hn3OFf45>AZjx&u^UqUPh}+N~ zS7T2JM6DZ0vQd9k|08r|d9^%Vmlm`V8-nyiD@jQ=8U7abxveZ7l4A#pSKyf2ZukXG zy5~u>mE>&@8>Hweks&q+#Nh z>?7nI$#9djX?5%yfNY>HD&1s{2kZRTpX4pRR_ATvPH@3Y$fXaVLnDHY4Kpr?jvpa^ IU?^ApFKA( - + diff --git a/webapp/bill.html b/webapp/bill.html index cfd14b0..36247fc 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/elements/product.js b/webapp/elements/product.js index adbd79e..5634632 100644 --- a/webapp/elements/product.js +++ b/webapp/elements/product.js @@ -403,7 +403,8 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) { var newTypeBtn = '

'; var assignBtn = '

'; - return newTypeName + newTypeBtn + assignBtn; + var sortAlphaBtn = '

'; + return newTypeName + newTypeBtn + assignBtn + sortAlphaBtn; }, insertValuesIntoMenuList:function() { $("#typename_" + this.id).html(PROD_NAME[lang]); diff --git a/webapp/feedback.html b/webapp/feedback.html index 1f1f5b0..c4d5e48 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 5a7c7fe..9c68b60 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,8 +9,8 @@ - - + + @@ -206,7 +206,7 @@ function handleResultOfInstallCheck(is_installed) { if (is_installed == "Yes") { useInstallation(); } else { - setTimeout(function(){document.location.href = "install.html?v=1.3.12"},500); + setTimeout(function(){document.location.href = "install.html?v=1.3.13"},500); } } diff --git a/webapp/install.html b/webapp/install.html index 824b5d1..45f06fa 100644 --- a/webapp/install.html +++ b/webapp/install.html @@ -725,7 +725,7 @@ $(document).ready(function() {   - +   diff --git a/webapp/install/installer.php b/webapp/install/installer.php index bd033bb..81ce562 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -2153,6 +2153,28 @@ return false; } } +function updateUserTable1312_1313($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.3.12") { +$ret = $this->updateUserTable1311_1312($prefix, $version, $dbname); +if (!$ret) { +echo "Version update v1.3.11 to 1.3.12 not successful."; +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$this->updateVersion($pdo, '1.3.13'); + +return true; +} catch (PDOException $e) { +echo "Error in v1.3.12 to 1.3.13: $e"; +return false; +} +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; @@ -2279,7 +2301,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')"); -$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.3.12')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.3.13')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')"); @@ -2692,7 +2714,7 @@ $zones[] = $timezone_identifiers[$i]; } echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.3.12"; +$installerVersion = "1.3.13"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -2722,7 +2744,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27" "1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13","1.1.14","1.1.15","1.1.16","1.1.17", "1.1.18","1.1.19","1.1.20","1.1.21","1.1.22","1.1.23","1.1.24","1.1.25","1.1.26","1.1.27","1.1.28","1.1.29","1.1.30", "1.2.0","1.2.1","1.2.2", "1.2.3", "1.2.4","1.2.5","1.2.6","1.2.7","1.2.8","1.2.9","1.2.10","1.2.11","1.2.12","1.2.13","1.2.14","1.2.15","1.2.16","1.2.17", -"1.2.18","1.2.19","1.2.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3.7","1.3.8","1.3.9","1.3.10","1.3.11" +"1.2.18","1.2.19","1.2.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3.7","1.3.8","1.3.9","1.3.10","1.3.11","1.3.12" ); if (!in_array($version, $supportedVersions)) { @@ -2730,7 +2752,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1311_1312($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1312_1313($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index fccc5c2..f4733f4 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 1215e01..72b8ebd 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + @@ -358,7 +358,7 @@ var MAN_HSCURRENCY = ["HS/3 Währungsangabe","HS/3 Currency","HS/3 Moneda"]; var MAN_DEL_HINT = ["Zum Löschen anklicken","Click to delete","Click para removar"]; var MAN_FONTSIZE_HINT = ["Die Schriftgröße hat nur Einfluss, wenn kein eigenes Layout festgelegt wurde.","The font size only effects receipts if they do not use a specified layout.","El valor sólo funciona si no se usa un layout individual."]; var MAN_INIT_AUSTRIA = ["Erstelle Startbeleg (Österreich)","Create initial receipt (Austria)","Crear tiquet inicial (Austria)"]; -var MAN_GOLIVE_WAIT_HINT = ["Bitte beachten Sie, dass diese Aktion auf langsamen Servern mehrere Minuten dauern kann. Schließen Sie diesen Dialog und warten Sie auf die Meldung, dass det Vorgang abgeschlossen wurde.","Please be aware that this action may take a while on slow servers. Please close this dialog and wait for the message that the process has completed.","Esta acción puede durar unos minutos. Por favor confirme este dialogo y espere por el mensaje que la acción esta completada."] +var MAN_GOLIVE_WAIT_HINT = ["Bitte beachten Sie, dass diese Aktion auf langsamen Servern mehrere Minuten dauern kann. Schließen Sie diesen Dialog und warten Sie auf die Meldung, dass der Vorgang abgeschlossen wurde.","Please be aware that this action may take a while on slow servers. Please close this dialog and wait for the message that the process has completed.","Esta acción puede durar unos minutos. Por favor confirme este dialogo y espere por el mensaje que la acción esta completada."] var MAN_CLOSING_TIME_LIMIT_ERROR = ["Ein Tagesabschluss wurde nicht erzeugt, weil zwischen zwei Tagesabschlüssen etwas Zeit (mind. 2 Min.) vergehen sollte.","No closure was created because between two clsoings there should be some time (at least 2 minutes).","No conclusión esta creado porque el tiempo entre dos conclusiones debe ser un rato (min, 2 minutos)."]; var MAN_DB_PROPERTIES = ["Größe der Datenbanktabellen","Sizes of the data base tables","Tamaño de los tabulas de la base de datos"]; var MAN_DBTABLENAME = ["Tabelle","Table","Tabula"]; @@ -1592,9 +1592,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.3.12&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.3.13&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.3.12&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.3.13&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 35e0afb..3ae6327 100644 --- a/webapp/paydesk.html +++ b/webapp/paydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/php/admin.php b/webapp/php/admin.php index 682e286..a4c9abe 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1088,7 +1088,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.3.12"); + echo json_encode($view . "?v=1.3.13"); } } @@ -1290,25 +1290,25 @@ class Admin { if (!self::isOnlyRatingUser($rights, $right_rating, true)) { if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.3.12"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.3.13"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.12"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.13"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.12"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.12"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.12"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.13"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.13"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.13"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.12"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.13"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.12"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.12"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.12"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.12"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.12"); }; - if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.12"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.12"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.12"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.12"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.13"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.13"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.13"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.13"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.13"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.13"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.13"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.13"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.13"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1316,7 +1316,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.12", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.13", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/php/products.php b/webapp/php/products.php index 6eea7f6..4ef258b 100644 --- a/webapp/php/products.php +++ b/webapp/php/products.php @@ -36,7 +36,7 @@ class Products { function handleCommand($command) { - $cmdArray = array('showDbProducts', 'getMenuLevelUp', 'applySingleProdData', 'createExtra', 'applyExtra', 'upExtra', 'delExtra','sortup','sortdown', 'delproduct', 'reassign', 'applyType', 'delType', 'getSingleProdData', 'getSingleTypeData', 'getPriceLevelInfo','setPriceLevelInfo', 'createProduct','createProdType','addGeneralComment','changeGeneralComment','delGeneralComment','upGeneralComment','downGeneralComment'); + $cmdArray = array('showDbProducts', 'getMenuLevelUp', 'applySingleProdData', 'createExtra', 'applyExtra', 'upExtra', 'delExtra','sortup','sortdown', 'delproduct', 'reassign', 'applyType', 'delType', 'getSingleProdData', 'getSingleTypeData', 'getPriceLevelInfo','setPriceLevelInfo', 'createProduct','createProdType','addGeneralComment','changeGeneralComment','delGeneralComment','upGeneralComment','downGeneralComment','sortProdAlpha'); if (in_array($command, $cmdArray)) { if (!($this->userrights->hasCurrentUserRight('right_products'))) { if ($command == 'createProdType') { @@ -139,6 +139,8 @@ class Products { if ($this->isCmdAllowed(R_WAI | R_PRO)) { $this->getAssignedExtrasOfProd($_GET['prodid']); } + } else if ($command == 'sortProdAlpha') { + $this->sortProdAlpha($_POST['refid']); } else { echo "Command not supported."; } @@ -1062,6 +1064,22 @@ class Products { } } + function sortProdAlpha($typeid) { + $pdo = DbUtils::openDbAndReturnPdoStatic(); + $pdo->beginTransaction(); + $sql = "SELECT id,longname FROM %products% WHERE category=? AND removed is null ORDER BY longname"; + $result = CommonUtils::fetchSqlAll($pdo, $sql, array($typeid)); + $sort = 1; + $sql = "UPDATE %products% SET sorting=? WHERE id=?"; + foreach ($result as $prodentry) { + $prodid = $prodentry["id"]; + CommonUtils::execSql($pdo, $sql, array($sort,$prodid)); + $sort++; + } + $pdo->commit(); + echo json_encode(array("status" => "OK")); + } + function createProdType($id,$prodTypeName) { if (!is_numeric($id)) { echo json_encode(array("status" => "ERROR", "code" => ERROR_GENERAL_ID_TYPE, "msg" => ERROR_GENERAL_ID_TYPE_MSG)); diff --git a/webapp/php/remoteaccess.php b/webapp/php/remoteaccess.php index 8bc277d..f140aad 100644 --- a/webapp/php/remoteaccess.php +++ b/webapp/php/remoteaccess.php @@ -22,7 +22,7 @@ class RemoteAccess { $res = Roomtables::getUnpaidTablesCore($pdo, $room['id']); $noOfOpenTables += count($res); foreach ($res as $table) { - $priceOfOpenTables += $table["sum"]; + $priceOfOpenTables += $table["pricesum"]; } } echo json_encode(array("status" => OK, "opentables" => $noOfOpenTables, "sum" => $priceOfOpenTables)); diff --git a/webapp/php/updater.php b/webapp/php/updater.php index 4c6c0b8..9a0b24f 100644 --- a/webapp/php/updater.php +++ b/webapp/php/updater.php @@ -117,7 +117,7 @@ class Updater { $infoFileLines = $infoFile["msg"]; if (count($infoFileLines) > 1) { - $checkIfNewerVersion = self::isV2Newer('1.3.12',trim($infoFileLines[0])); + $checkIfNewerVersion = self::isV2Newer('1.3.13',trim($infoFileLines[0])); return array("status" => "OK","msg" => $infoFileLines[0],"url" => $url,"neweravailable" => ($checkIfNewerVersion ? 1 : 0)); } else { return array("status" => "ERROR","msg" => "Info file not valid","url" => $url); diff --git a/webapp/php/utilities/TypeAndProducts/ProductEntry.php b/webapp/php/utilities/TypeAndProducts/ProductEntry.php index 523dd9b..9154a85 100644 --- a/webapp/php/utilities/TypeAndProducts/ProductEntry.php +++ b/webapp/php/utilities/TypeAndProducts/ProductEntry.php @@ -185,10 +185,7 @@ class ProductEntry { $this->taxaustria = 0; $this->amount = ""; - if (count($propertyparts) > 1) { - if (trim($propertyparts[1]) == "") { - return; - } + if ((count($propertyparts) > 1) && (trim($propertyparts[1]) != "")) { $exts = explode(";",$propertyparts[1]); foreach($exts as $anExtProp) { $parts = explode(":",$anExtProp); diff --git a/webapp/preferences.html b/webapp/preferences.html index e14df99..cab8dc8 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 255f0a1..e475e7f 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + @@ -52,6 +52,7 @@ var PROD_PASS_SUPPLY = ["Durchlaufe Bereitstellung","Pass supplydesk","Pasar pun var PROD_NO_PASS_SUPPLY = ["Bereitstellung nicht durchlaufen","Do not pass supplydesk","No pasar punto >preparado<"]; var PROD_NEW_CAT = ["Neue Kategorie","New category","Nueva categoría"]; var PROD_ASSIGN = ["Produkt zuweisen","Assign product","Asignar producto"]; +var PROD_SORT_ALPHA = ["Produkte alphabetisch sortieren","Sort products alphabetical","Especie productos alfabéticamente"]; var PROD_TITLE = ["Angebot","Products","Productos"]; var PROD_ENTER_CAT_NAME = ["Name der neuen Produktkategorie eingeben!","Enter name of new category!","Ningún nombre de la categoría nueva insertado!"]; var PROD_WRONG_FORMAT = ["Falsches Zahlenformat oder fehlender Eintrag!","Wrong number format or missing entry!","Formato falso o ningún dato!"]; @@ -69,6 +70,7 @@ var PROD_PRINTER = ["Drucker","Printer","Imrpimadora"]; var PROD_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"]; var PROD_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"]; var PROD_PLACEHOLDER_NEW_PRODTYPE = ["Name der neuen Kategorie", "Name of the new category","Nombre de la categoría nueva"]; +var PROD_APPLIED = ["Aktion wurde durchgeführt.","Action was performed.","Acción completa."]; // this is the maximal price that a product may cost var MAX_PRICE = 999.99; @@ -259,6 +261,8 @@ function setLanguage(language) { gotoprodtype(objid); } else if (cmd == 'goupimg') { goupprodtype(); + } else if (cmd == 'sortalphaprod') { + sortAlpha(objid); } else if (cmd == 'prodextrainput') { doAjax("GET","php/contenthandler.php?module=products&command=getAssignedExtrasOfProd&prodid=" + objid,null,handleAssignedExtras,"Zugewiesene Optionen"); } @@ -332,6 +336,14 @@ function setLanguage(language) { }); } + function sortAlpha(typeid) { + var data = { + refid: typeid + }; + doAjax("POST","php/contenthandler.php?module=products&command=sortProdAlpha",data,reloadPageWithTimeout,"Sortierung ist fehlgeschlagen"); + } + + function goupprodtype() { doAjax("GET","php/contenthandler.php?module=products&command=getMenuLevelUp&ref=" + p_currenttypeid,null,saveMenu,"keine Produkthierarchyinformation bekommen"); } @@ -378,7 +390,7 @@ function setLanguage(language) { var url = "php/contenthandler.php?module=products&command=getSingleProdData&id=" + prodid; $("#assextralist_" + prodid).html(""); $("#assextralist_" + prodid).trigger("create"); - actionOnProd(url,prodid,null); + actionOnProd(url,prodid,null,false); } function parsePricesAndProperties(prodid) { @@ -519,7 +531,7 @@ function setLanguage(language) { assignextrastotype: isAssignAllExtrasChecked }; - actionOnProd("php/contenthandler.php?module=products&command=applySingleProdData",prodid,data); + actionOnProd("php/contenthandler.php?module=products&command=applySingleProdData",prodid,data,true); if (isAssignAllExtrasChecked == 1) { $(".assextralist").html(""); @@ -530,14 +542,28 @@ function setLanguage(language) { } } - function actionOnProd(url,prodid,postdata) { - if (postdata == null) { - doAjax("GET", url, null, refreshProduct, "Fehler Produktdaten"); - } else { - doAjax("POST", url, postdata, refreshProduct, "Fehler Produktdaten"); - } + function actionOnProd(url,prodid,postdata,confirmation) { + if (confirmation) { + if (postdata == null) { + doAjax("GET", url, null, refreshProductAndConfirm, "Fehler Produktdaten"); + } else { + doAjax("POST", url, postdata, refreshProductAndConfirm, "Fehler Produktdaten"); + } + } else { + if (postdata == null) { + doAjax("GET", url, null, refreshProduct, "Fehler Produktdaten"); + } else { + doAjax("POST", url, postdata, refreshProduct, "Fehler Produktdaten"); + } + } + } + function refreshProductAndConfirm(prodData) { + alert(PROD_APPLIED[lang]); + refreshProduct(prodData); + } + function refreshProduct(prodData) { var aProduct = newProduct(prodData.id,prodData.longname,prodData.shortname,prodData.priceA,prodData.priceB,prodData.priceC,prodData.unit,prodData.days,prodData.tax,prodData.taxaustria,prodData.amount,prodData.available,prodData.audio,prodData.favorite); aProduct.insertValuesIntoMenuList(); diff --git a/webapp/rating.html b/webapp/rating.html index 070b76b..017a159 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 21c9ed8..64571ea 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 80e508f..bbbd7bd 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 6f715fa..3112e0c 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 43fd5df..ec97fc5 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +