diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe index c1383ab..06116c2 100644 Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index c1383ab..06116c2 100644 Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ diff --git a/webapp/bar.html b/webapp/bar.html index 2bdc979..7670e69 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 17d0030..782f54b 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/css/bestformat.css b/webapp/css/bestformat.css index e6903a7..f16af38 100644 --- a/webapp/css/bestformat.css +++ b/webapp/css/bestformat.css @@ -444,6 +444,19 @@ table.prodtable .prodpriceC { background-color: rgb(246, 246, 246, 0.0) !important; } +@media all and (min-width: 0em){ + .typetop img { width:100px; } + .typehigher img { width:100px; } +} +@media all and (min-width: 20em){ + .typetop img { width:120px; } + .typehigher img { width:120px; } +} +@media all and (min-width: 40em){ + .typetop img { width:160px; } + .typehigher img { width:160px; } +} + .prodminus,.srminus { position: absolute; top: 0px; bottom: 0px; right: 130px; diff --git a/webapp/elements/product.js b/webapp/elements/product.js index c79a6ce..7f44c9e 100644 --- a/webapp/elements/product.js +++ b/webapp/elements/product.js @@ -297,7 +297,9 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) { return txt; }, createLowerMenuTypeStructure: function() { - var newTypeName = '

'; + var style = ' style="background-color: white;" '; + var newTypeName = '

'; + var newTypeBtn = '

'; var assignBtn = '

'; return newTypeName + newTypeBtn + assignBtn; diff --git a/webapp/feedback.html b/webapp/feedback.html index 47442e6..75ad487 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 5d0fea5..f08d98c 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -7,8 +7,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index 65b33e9..d2cb909 100644 --- a/webapp/install.html +++ b/webapp/install.html @@ -679,7 +679,7 @@ $(document).ready(function() {   - +   diff --git a/webapp/install/installer.php b/webapp/install/installer.php index 0c66a12..c3b11d4 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -718,6 +718,42 @@ $ret &= $this->setVersion($prefix, '1.1.8'); return $ret; } +function updateUserTable1108_1109($prefix,$version) { +$pdo = $this->pdo; +try { +if ($version != "1.1.8") { +$ret = $this->updateUserTable1107_1108($prefix,$version); +if (!$ret) { +return false; +} +} + +$adminCl = new Admin(); +DbUtils::overrulePrefix($prefix); + +$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)"; +$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); +$stmt->execute(array('groupworkitems','1')); + +$sql = "ALTER TABLE %user% ADD extrasapplybtnpos INT(1) NULL AFTER keeptypelevel"; +$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); +$stmt->execute(); + +$sql = "UPDATE %user% SET extrasapplybtnpos=?"; +$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); +$stmt->execute(array(1)); + +$sql = "ALTER TABLE %user% MODIFY extrasapplybtnpos INT(1) NOT NULL"; +$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); +$stmt->execute(); + +$this->updateVersion($pdo, '1.1.9'); +return true; +} catch (PDOException $e) { +return false; +} +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -789,7 +825,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.1.8')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.9')"); $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')"); @@ -798,6 +834,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'cancelunpaidcode', '')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'bigfontworkreceipt', '0')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'prominentsearch', '0')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'groupworkitems', '1')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtphost', '')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtpauth', '1')"); @@ -1161,7 +1198,7 @@ return; $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27","1.0.28","1.0.29", "1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39", "1.0.40", -"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.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" ); if (!in_array($version, $supportedVersions)) { @@ -1169,7 +1206,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1107_1108($_POST['prefix'], $version); +$ret = $admin->updateUserTable1108_1109($_POST['prefix'], $version); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index 0ce4f15..39689c0 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index dd2bd42..5bed3d9 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + @@ -132,6 +132,7 @@ var MAN_PRINT_CONCEPT = ["Druckkonzept","Print concept","Concepto de impresión" var MAN_PAYMENT_CONFIG = ["Menü Zahlungsweg","Menu Payment Type","Selección tipo de pagar"]; var MAN_WORKFONT_CONFIG = ["Arbeitsbon Schriftgröße","Font size work receipt","Tamaño de letras en tiques de trabajo"]; var MAN_PROMINENT_SEARCH = ["Prominente Produktsuche","Prominent Product search","Buscar de productos ariba"]; +var MAN_GROUP_WORK_ITEMS = ["Artikelzusammenfassung Arbeitsbon","Summary articels on work receipt", "Agrupación articulos tique d. tr." ]; var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text de email para reservación"]; var MAN_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"]; var MAN_CHANGE_CONFIG_CONTENT = ["Sollen folgende Werte geändert werden? ","Do you want to change these values? ","Debe ser cambiado estos datos? "]; @@ -238,7 +239,7 @@ var MAN_SIZE_NORMAL = ["normal","normal","normal"]; var MAN_SIZE_BIG = ["groß","big","grande"]; var lang = 0; -var generalVals = [12,2,0,3,0,1,1,0,0]; +var generalVals = [12,2,0,3,0,1,1,0,0,1]; var numberOfClosings = 0; @@ -257,6 +258,7 @@ var generalValuesSettings = [ ["paymentconfig",MAN_PAYMENT_CONFIG[lang],"s",3], ["bigfontworkreceipt",MAN_WORKFONT_CONFIG[lang],"s",7], ["prominentsearch",MAN_PROMINENT_SEARCH[lang],"s",8], + ["groupworkitems",MAN_GROUP_WORK_ITEMS[lang],"s",9], ["workflowconfig",MAN_WORKFLOW[lang],"s",4], ["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0], ["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2], @@ -436,6 +438,7 @@ function insertGeneralConfigItems(configResult) { $("#partOfWorkflowConfig").html(createWorkflowConfigPart(values.workflowconfig)); $("#partOfBigFontWorkReceipt").html(createBigFontWorkReceiptPart(values.bigfontworkreceipt)); $("#partOfProminentSearch").html(createProminentSearchPart(values.prominentsearch)); + $("#partOfGroupWorkItems").html(createGroupWorkItemsPart(values.groupworkitems)); var language = values.billlanguage; generalVals[2] = language; $("#partOfBillLanguage").html(createBillLanguagePart(language)); @@ -460,6 +463,7 @@ function insertGeneralConfigItems(configResult) { generalVals[6] = values.smtpsecure; generalVals[7] = values.bigfontworkreceipt; generalVals[8] = values.prominentsearch; + generalVals[9] = values.groupworkitems; $("#smtphost").val(values.smtphost); $("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth)); @@ -549,7 +553,22 @@ function createProminentSearchPart(theValue) { return html; } - function createWorkflowConfigPart(workflow) { +function createGroupWorkItemsPart(theValue) { + var html = '
'; + html += ''; + html += '
'; + return html; +} + +function createWorkflowConfigPart(workflow) { var html = '
'; html += ''; html += ''; + + html += ''; + html += ''; + html += ''; + + html += '
'; + return html; +} + function fillButtonSizes(buttonsizes) { $("#roombtnpart").html(createBtnSizePart(buttonsizes.roombtnsize, "roombtnsize", PREF_ROOM_BTN_SIZE[l])); $("#tablebtnpart").html(createBtnSizePart(buttonsizes.tablebtnsize, "tablebtnsize", PREF_TABLE_BTN_SIZE[l])); @@ -270,6 +291,12 @@ function fillKeepTypeLevel(preferKeepTypeLevel) { $("#preferktlpartbox").trigger("create"); } +// REM* position iof apply button for extras +function fillExtrasApplyBtnPosPart(applyPos) { + $("#preferapplypospart").html(createPreferExtrasApplyBtnPosPart(applyPos, "preferapplyposlabel", PREF_APPLY_EXTRA_POS[l])); + $("#preferktlpartbox").trigger("create"); +} + function handleBtnSize(jsonResult) { if (jsonResult != "OK") { alert("Fehler"); @@ -346,11 +373,18 @@ function binding() { $("#preferktllabel").off('change').on('change', function(e) { var newVal = $("#preferktllabel").find(":selected").val(); - $("#preferktlbtnpart").html(createPreferKTLPart(newVal, "preferktllabel", PREF_TM[l])); + $("#preferktlbtnpart").html(createPreferKTLPart(newVal, "preferktllabel", PREF_KTL[l])); $("#preferktlpartbox").trigger("create"); doAjax("POST","php/contenthandler.php?module=admin&command=setKeepTypeLevel",{keeptypelevel:newVal},handleGeneralAnswer,"Keep Type Level"); binding(); }); + $("#preferapplyposlabel").off('change').on('change', function(e) { + var newVal = $("#preferapplyposlabel").find(":selected").val(); + $("#preferapplypospart").html(createPreferExtrasApplyBtnPosPart(newVal, "preferapplyposlabel", PREF_APPLY_EXTRA_POS[l])); + $("#preferktlpartbox").trigger("create"); + doAjax("POST","php/contenthandler.php?module=admin&command=setApplyExtrasBtnPos",{applyextrasbtnpos:newVal},handleGeneralAnswer,"Apply Extras Button Position"); + binding(); + }); } $(document).on("pageinit", "#pref-page", function () { @@ -362,6 +396,7 @@ $(document).on("pageinit", "#pref-page", function () { setButtonSizes(); setPreferTablemap(); setKeepTypeLevel(); + setApplyBtnPos(); binding(); }); @@ -422,9 +457,10 @@ $(document).on("pageinit", "#pref-page", function () {
-

Tischplan

-

Besxhreibung

+

Bestellnavigation

+

Beschreibung

+
diff --git a/webapp/products.html b/webapp/products.html index 01d469c..a35a6e9 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + @@ -63,6 +63,7 @@ var PROD_ASSIGN_EXTRAS_ALL = ["Extras allen Produkten dieser Kategorie zuweisen: 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 decpoint = "."; var lang = 0; diff --git a/webapp/rating.html b/webapp/rating.html index d9f2bfd..6c71f24 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index acf91c4..b87ce7b 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 965311c..2d03b29 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 181d1d8..5ecb5b8 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 1d390f0..e05d5b9 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - + @@ -95,6 +95,8 @@ var supplyright = 0; var keeptypelevel = 1; +var applyExtraBtnPos = 1; + var prominentsearch = 0; var osroombtnsize = 0; @@ -668,6 +670,7 @@ function insertWaiterSettings(settings) { rightchangeprice = settings.rightchangeprice; supplyright = settings.supplyright; keeptypelevel = settings.keeptypelevel; + applyExtraBtnPos = settings.extrasapplybtnpos; prominentsearch = config.prominentsearch; setLanguage(settings.userlanguage); @@ -1119,6 +1122,9 @@ function attachAndDisplayFirstRefTypes(jsonTypesAndProds) { function listOfExtras(prodid) { var size = getProdSizeClass(); var li = "
  • " + W_EXTRAS[lang] +"
    • "; + if (applyExtraBtnPos != 1) { + li += '
  • ' + W_APPLY[lang] + '
    • '; + } for (var i=0;i' + toHtml(extraname) + ''; } - li += '
  • ' + W_APPLY[lang] + '
    • '; + if (applyExtraBtnPos != 2) { + li += '
  • ' + W_APPLY[lang] + '
    • '; + } li += createHigherLine(size); return li; } @@ -1143,7 +1151,7 @@ function bindExtrasSel() { var ids = this.id.split("_"); var extraid = ids[1]; var prodid = ids[2]; - if (extraid == "a") { + if ((extraid == "abottom") || (extraid == "atop")) { var aProd = getProdEntry(prodid); var allAvailExtrasOfProd = aProd.extras; var assignedExtras = []; @@ -1324,6 +1332,7 @@ function bindFavEvent() { function displayTypesProds(ref,extras) { + window.scrollTo(0,0); if (ref==0) { fillFavArea(); bindFavEvent();