diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe
index 81b27c6..2e38020 100644
Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ
diff --git a/spider/install/installer.php b/spider/install/installer.php
index 2e590b8..42f1b78 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.3.2");
+ Database::setVersion($pdo,$prefix,"1.3.3");
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 81b27c6..2e38020 100644
Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ
diff --git a/webapp/bar.html b/webapp/bar.html
index 8e70ac5..7e4a4b6 100644
--- a/webapp/bar.html
+++ b/webapp/bar.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/bill.html b/webapp/bill.html
index 07700b7..f148e12 100644
--- a/webapp/bill.html
+++ b/webapp/bill.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/customers.html b/webapp/customers.html
index 1ab4f8e..ce9e32f 100644
--- a/webapp/customers.html
+++ b/webapp/customers.html
@@ -38,6 +38,8 @@ var CUS_REMARK_LABEL = ["Bemerkung:","Remark:","Comentario:"];
var CUS_PHONE_LABEL = ["Telefon","Phone","Telefono"];
var CUS_MOBIL_LABEL = ['Mobil','Mobile','Móvil'];
var CUS_WWW_LABEL = ['Webseite','Home page', ' Página web'];
+var CUS_HELLO_LABEL = ["Anrede (für Emails)","Saludation (for emails)","Encabezamiento (email)"];
+var CUS_REGARDS_LABEL = ["Gruß (Email-Abschluss)","Greeting (end of email)","Abrazo (Email)"];
var CUS_ROOM_LABEL = ['Zimmer','Room','Habitación'];
var CUS_NEW_CUS_BTN = ["Gast anlegen","Create guest","Crear cliente"];
var CUS_EMPTY_NAME = ["Gästenamen nicht angegeben","Name of the guest not specified","Ningún nombre del cliente"];
@@ -76,10 +78,13 @@ var CUS_PRINT_ALL = ["Alle Bons drucken","Print all receipts","Imprimir todos lo
var CUS_FILTER_OPEN_BILLS = ["Filter Gäste mit offenen Rechnungen","Filter on customers with ooen bills","Filtrar clientes con tiquets non-pagados"];
var CUS_LOGBTN = ["Rechnungslog (csv)","Log of payments (csv)","Protocolo de los pagos (csv)"];
var CUS_SEND_EMAIL = ["Email an alle Gruppenmitglieder senden","Send email to all group members","Enviar email a todos los miembros"];
-var CUS_EMAIL_WARNING = ["Emails lassen sich nur versenden, wenn die Email-Konfiguration vorgenommen wurde","Emails can only be sent if the email configuration was done","Sólo puede enviar emails si la configuración es completada"];
+var CUS_EMAIL_WARNING = ["Emails lassen sich nur versenden, wenn die Email-Konfiguration vorgenommen wurde.","Emails can only be sent if the email configuration was done.","Sólo puede enviar emails si la configuración es completada."];
var CUS_STORNO_QUEST_TITLE = ["Storno?","Cancel?","Contrapartida?"];
var CUS_STORNO_QUEST_TEXT = ["Bon als vom Gast unbezahlt deklarieren?","Cancel the payment of the guest?","Contrapartida del tique por el cliente?"];
var CUS_YES = ["Ja","Yes","Si"];
+var CUS_PLACEHOLDER_HINT = ["Im Text können die Platzhalter {NAME}, {ANREDE}, {GRUSS} verwendet werden.",
+ "You can use {NAME}, {ANREDE}, {GRUSS} as placeholder for the name, the salutation or the greeting in the text.",
+ "En el texto se puede usar {NAME}, {ANREDE}, {GRUSS} para sustituir nombre, encabezamiento o abrazo."];
var l = 0;
@@ -93,6 +98,8 @@ function setLanguage(language) {
$("#newcusphonelabel").html(CUS_PHONE_LABEL[l]);
$("#newcusmobillabel").html(CUS_MOBIL_LABEL[l]);
$("#newcuswwwlabel").html(CUS_WWW_LABEL[l]);
+ $("#newcushellolabel").html(CUS_HELLO_LABEL[l] + ":");
+ $("#newcusregardslabel").html(CUS_REGARDS_LABEL[l] + ":");
$("#newcusroomlabel").html(CUS_ROOM_LABEL[l]);
$("#newcustomerbtn").html(CUS_NEW_CUS_BTN[l]);
$("#customersearchlabel").html(CUS_SEARCH_LABEL[l]);
@@ -125,7 +132,7 @@ $(document).on("pageinit", "#info-page", function () {
-
+
+ Anrede
+
+
+
+
+ Gruß
+
+
+
Check-In :
diff --git a/webapp/elements/customers.js b/webapp/elements/customers.js
index ffa9872..fd94423 100644
--- a/webapp/elements/customers.js
+++ b/webapp/elements/customers.js
@@ -1 +1 @@
-var allgroups=[];var customers=[];var decpoint=".";var currency="";var payments=[];function getGeneralConfigItemsCus(){$("#customersearch").val("");$("#groupsearch").val("");clearNewCustomerFields();clearNewGroupFields();doAjax("GET","php/contenthandler.php?module=admin&command=getGeneralConfigItems",null,insertConfigDoRest,"Fehler Konfigurationsdaten");doAjax("GET","php/contenthandler.php?module=customers&command=getPaymentsForGuest",null,insertPayments,"Fehler Zahlungswege",true);customizeDatePicker("#newcustomercheckin",null);customizeDatePicker("#newcustomercheckout",null);customizeDatePicker("#customerdate","")}function insertConfigDoRest(b){if(b.status==="OK"){var a=b.msg;$("#customersearch").val("");setLanguage(a.userlanguage);decpoint=a.decpoint;currency=a.currency;bindGroupsOrCustomerBtns();showCustomersArea();startSearch()}else{setTimeout(function(){document.location.href="index.html"},250)}}function insertPayments(d){if(d.status=="OK"){var c=d.msg;payments=[];for(var b=0;b
";return a}function showCustomersArea(){$("#customersarea").show();$("#groupsarea").hide();$("#customersbtn").buttonMarkup({theme:"f"});$("#customersbtn").buttonMarkup({icon:"arrow-d"});$("#groupsbtn").buttonMarkup({theme:"c"});$("#groupsbtn").buttonMarkup({icon:"arrow-r"})}function showGroupsArea(){$("#customersarea").hide();$("#groupsarea").show();$("#customersbtn").buttonMarkup({theme:"c"});$("#customersbtn").buttonMarkup({icon:"arrow-r"});$("#groupsbtn").buttonMarkup({theme:"f"});$("#groupsbtn").buttonMarkup({icon:"arrow-d"})}function bindGroupsOrCustomerBtns(){$("#customersbtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();showCustomersArea()});$("#groupsbtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();showGroupsArea()});$("#newcustomerbtn").off("click").on("click",function(h){h.stopImmediatePropagation();h.preventDefault();var b=$("#newcustomername").val().trim();var k=$("#newcustomeremail").val().trim();var m=$("#newcustomeraddress").val().trim();var g=$("#newcustomerremark").val().trim();var i=$("#newcustomerphone").val().trim();var j=$("#newcustomermobil").val().trim();var c=$("#newcustomerwww").val().trim();var a=$("#newcustomerroom").val().trim();if(b===""){alert(CUS_EMPTY_NAME[l])}else{var f=getCheckinouts("#newcustomercheckin","#newcustomercheckout");if(!f.valid){alert(CUS_CHECKIN_AFTER_OUT[l]);return}var d={name:b,email:k,addr:m,remark:g,phone:i,mobil:j,www:c,checkin:f.checkin,checkout:f.checkout,room:a};if(!cusCheckTextLengths(d)){return}doAjax("POST","php/contenthandler.php?module=customers&command=createNewCustomer",d,handleCreateCustomerResult,"Gast anlegen unmöglich",true)}});$("#customersearch").off("keyup").on("keyup",function(a){startSearch()});$("#groupsearch").off("keyup").on("keyup",function(a){startSearch()});$("#newgroupbtn").off("click").on("click",function(c){c.stopImmediatePropagation();c.preventDefault();var a=$("#newgroupname").val().trim();var d=$("#newgroupremark").val().trim();if(a===""){alert(GROUP_EMPTY_NAME[l])}else{var b={name:a,remark:d};doAjax("POST","php/contenthandler.php?module=customers&command=createNewGroup",b,handleCreateGroupResult,"Gruppe anlegen unmöglich",true)}});$("#customerlog").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();window.open("php/contenthandler.php?module=customers&command=exportLog","_blank")})}function bindOnDynamicCustomersBtn(){$(".applycustomer").off("click").on("click",function(g){g.stopImmediatePropagation();g.preventDefault();var j=this.id.split("_")[1];var a=[];for(var b=0;b200){cusAlertTextLength("Bemerkung");return false}var c=$("#cusfield_cusfield_newroom_"+a).val();if(c.length>50){cusAlertTextLength("Zimmer");return false}var b={id:a,checkin:g.checkin,checkout:g.checkout,room:c,remark:f};doAjax("POST","php/contenthandler.php?module=customers&command=newVacation",b,handleChangeVacationResult,"Aufenthalt anlegen unmöglich",true)});$(".delvacation").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();var b=this.id.split("_")[1];doAjax("POST","php/contenthandler.php?module=customers&command=delVacation",{id:b},handleChangeVacationResult,"Aufenthalt löschen unmöglich",true)});$(".unpaybill").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=this.id.split("_")[1];$("#stornocode").val("");$("#stornoreason").val("");areYouSureCancel(CUS_STORNO_QUEST_TITLE[l],CUS_STORNO_QUEST_TEXT[l],CUS_YES[l],function(){var c={id:a,code:$("#stornocode").val(),remark:$("#stornoreason").val()};doAjax("POST","php/contenthandler.php?module=customers&command=unpay",c,handleChangeBillResult,"Deklaration als unbezahlt unmöglich",true)})});$(".paymentpay").off("click").on("click",function(d){d.stopImmediatePropagation();d.preventDefault();var g=this.id;var c=g.split("_");var a=c[2];var f=c[3];var b=c[4];if(b!="all"){doAjax("POST","php/contenthandler.php?module=customers&command=pay",{id:b,paymentid:f},handleChangeBillResult,"Deklaration als bezahlt unmöglich",true)}else{doAjax("POST","php/contenthandler.php?module=customers&command=payallbills",{id:a,paymentid:f},handleChangeBillResult,"Deklaration alle unmöglich",true)}});$(".printbill").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=this.id.split("_")[1];doAjax("POST","php/contenthandler.php?module=customers&command=printbill",{id:a},null,"Drucken unmöglich",true)});$(".printallbills").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=this.id.split("_")[1];doAjax("POST","php/contenthandler.php?module=customers&command=printallbills",{id:a},null,"Drucken alle unmöglich",true)})}function updateVacationsOfCustomer(a){doAjax("GET","php/contenthandler.php?module=customers&command=getVacations",{cusid:a},handleVacationsResult,null,true)}function updateBillsOfCustomer(a){doAjax("GET","php/contenthandler.php?module=customers&command=getBills",{cusid:a},handleBillsResult,null,true)}function handleVacationsResult(e){if(e.status==="OK"){var f=e.msg.vacations;var b=e.msg.cusid;var a="";for(var d=0;d0){if(d){a+=""+CUS_DECLARE_ALL_PAY[l]+" : ";for(var c=0;cCheck-in: "+d;a+="Check-out: "+c;a+="
"+CUS_ROOM_LABEL[l]+": "+f;a+="
"+CUS_REMARK_LABEL[l]+g;a+=createDeleteButton(h+"_delvacation",CUS_DEL[l],"d","delvacation");a+="
";return a}function renderABill(h,b,c,f,g,i){var a=f.replace(".",decpoint)+" "+currency;var e="c";if(i==1){e="f"}var d=createCollapsibleStartGeneral("billentry_"+h,c+" - "+a,e,"billentry",true);d+="
"+CUS_BILLID[l]+": "+b;d+="
"+CUS_BILLDATE[l]+": "+c;d+="
"+CUS_BILLBRUTTO[l]+": "+c;if(i==0){d+=createPaymentsArea(h,b,CUS_DECLAREPAY[l])}else{d+=createApplyButton(b+"_unpaybill",CUS_DECLAREUNPAY[l],"d","unpaybill")}d+=createApplyButton(b+"_printbill",CUS_PRINTBILL[l],"f","printbill");d+="
";return d}function handleEmailResult(a){if(a.status==="OK"){alert("Aktion abgeschlossen")}else{alert("Error: "+a.msg)}}function handleChangeVacationResult(b){if(b.status==="OK"){var a=b.cusid;$("#cusfield_newcheckin_"+a).val("");$("#cusfield_newcheckout_"+a).val("");$("#cusfield_cusfield_newroom_"+a).val("");$("#cusfield_vacremark_"+a).val("");updateVacationsOfCustomer(a)}else{alert("Error: "+b.msg)}}function handleChangeBillResult(b){if(b.status==="OK"){var a=b.cusid;updateBillsOfCustomer(a)}else{alert("Error: "+b.msg)}}function deleteCustomerCore(b){var a={id:b};doAjax("POST","php/contenthandler.php?module=customers&command=deleteCustomer",a,handleDeleteCustomerResult,"Gast löschen unmöglich",true)}function deleteGroupCore(b){var a={id:b};doAjax("POST","php/contenthandler.php?module=customers&command=deleteGroup",a,handleDeleteGroupResult,"Gruppe löschen unmöglich",true)}function areYouSureCus(c,b,a,d){$("#sure .sure-1").text(c);$("#sure .sure-2").text(b);$("#sure .sure-do").text(a).off("click.sure").on("click.sure",function(){d()});$(this).off("click.sure");$.mobile.changePage("#sure")}function startSearch(){var a={search:$("#groupsearch").val().trim()};doAjax("POST","php/contenthandler.php?module=customers&command=getGroups",a,handleGetGroupsResult,"Gästeabfrage unmöglich",true)}function startCustomerSearch(){var c=$("#customersearch").val().trim();var a=getDate("#customerdate");var d="";if((a!=null)&&(a!="")){d=a.year+"-"+a.month+"-"+a.day}var b=0;if($("#customeropenbills").is(":checked")){b=1}var e={search:c,date:d,onlyopenbills:b};doAjax("POST","php/contenthandler.php?module=customers&command=getCustomers",e,handleGetCustomerResult,"Gästeabfrage unmöglich",true)}function clearNewCustomerFields(){$("#newcustomername").val("");$("#newcustomeremail").val("");$("#newcustomeraddress").val("");$("#newcustomerremark").val("");$("#newcustomerphone").val("");$("#newcustomermobil").val("");$("#newcustomerwww").val("");$("#newcustomercheckin").val("");$("#newcustomercheckout").val("");$("#newcustomerroom").val("")}function handleCreateCustomerResult(a){if(a.status==="OK"){clearNewCustomerFields();if(a.code==1){var b=CUS_ALREADY_CUS_NAME[l];b=b.replace("%number%",a.value);alert(b)}startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function clearNewGroupFields(){$("#newgroupname").val("");$("#newgroupremark").val("")}function handleCreateGroupResult(a){if(a.status==="OK"){clearNewGroupFields();startSearch()}else{if(a.code==1){alert(CUS_GROUP_EXISTS[l])}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}}function handleChangeCustomerResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function handleDeleteCustomerResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function handleDeleteGroupResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function handleChangeGroupResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function createInputTextField(f,d,e,b,c){var a='';a+=' '+b+": ";a+=' ';a+="
";return a}function createTextAreaField(f,d,e,b,c){var a='';a+=' '+b+" ";a+=' ";a+="
";return a}function createDateTimePicker(d,b,c){var a='';a+=' '+b+" : ";a+=' ';a+="
";return a}function createCollapsibleStartNew(d,b,c){var a='';a+="
"+toHtml(b)+" ";return a}function createCollapsibleStartGeneral(g,c,e,f,b){var d=" ";if(b===false){d=' style="display:none;" '}var a='
";a+="
"+toHtml(c)+" ";return a}function createApplyButton(e,b,d,c){var a='
'+b+" ";return a}function createDeleteButton(e,b,d,c){var a='
'+b+" ";return a}function createApplyDeleteButtons(d,c,b){var a='
';a+='
'+createApplyButton(d,CUS_APPLY[l],"f",c)+"
";a+='
'+createDeleteButton(d,CUS_DEL[l],"d",b)+"
";a+="
";return a}function renderACustomer(d){var b=d.id;var c="";if((d.openbillsum!=null)&&(d.openbillsum!="")){c=" ("+d.openbillsum;c=c.replace(".",decpoint)+" "+currency+")"}var a=createCollapsibleStartNew(b,d.name+c,"c");a+="
";a+=createCollapsibleStartGeneral("allbills_"+b,CUS_BILLS[l],"e","billscollapsible",true);a+='
';a+="
";a+=createCollapsibleStartGeneral("allvacations_"+b,CUS_VACATIONS[l],"e","vacationcollapsible",true);a+='
';a+=createCollapsibleStartGeneral("newvacations_"+b,CUS_NEWVACATIONS[l],"c","newvacationscollapsible",true);a+=createDateTimePicker("cusfield_newcheckin_"+b,"Check-in","a");a+=createDateTimePicker("cusfield_newcheckout_"+b,"Check-out","a");a+=createInputTextField(b,"cus","cusfield_newroom",CUS_ROOM_LABEL[l],"");a+=createInputTextField(b,"cus","vacremark",CUS_REMARK_LABEL[l],"");a+=createApplyButton(b+"_newvacation",CUS_APPLY[l],"f","newvacation");a+="
";a+="";return a}function renderCustomers(b){var a="";for(var c=0;c";a+="";return a}function renderGroups(b){var a="";for(var c=0;c';e+=''+CUS_GRP_ASS_LIST[l]+" ";for(var d=0;d'+toHtml(c.name)+" "}e+="";return e}function cusAlertTextLength(a){alert(CUS_ALERT_TEXT_LEN[l]+a)}function cusCheckTextLengths(a){if(a.name.length>50){cusAlertTextLength("Name");return false}if(a.addr.length>200){cusAlertTextLength(CUS_ADR_LABEL[l]);return false}if(a.phone.length>30){cusAlertTextLength(CUS_PHONE_LABEL[l]);return false}if(a.mobil.length>30){cusAlertTextLength(CUS_MOBIL_LABEL[l]);return false}if(a.email.length>50){cusAlertTextLength("Email");return false}if(a.www.length>50){cusAlertTextLength(CUS_WWW_LABEL[l]);return false}if(a.remark.length>500){cusAlertTextLength(CUS_REMARK_LABEL[l]);return false}return true}function customizeDatePicker(e,b){var d="de";if(l==1){d="en"}else{if(l==2){d="es"}}var a=new Date().getFullYear();var c=(a-10)+":"+(a+3);$(e).datepicker($.datepicker.regional[d]).datepicker("option",{changeMonth:true,changeYear:true,yearRange:c});if((b!=null)&&(b!="")){$(e).datepicker("setDate",new Date(b))}else{$(e).val("")}}function getDate(d){var c=$(d).val();if((c==undefined)||(c.trim()=="")){return null}var a=$(d).datepicker("getDate");var b={day:("0"+a.getDate()).slice(-2),month:("0"+(a.getMonth()+1)).slice(-2),year:a.getFullYear(),date:a};return b}function getCheckinouts(b,h){var d=getDate(b);var c=getDate(h);var a="";if((d!=null)&&(d!="")){a=d.year+"-"+d.month+"-"+d.day}var f="";if((c!=null)&&(c!="")){f=c.year+"-"+c.month+"-"+c.day}var e=true;if((d!=null)&&(d!="")&&(c!=null)&&(c!="")){if(d.date>c.date){e=false}}var g={checkin:a,checkout:f,valid:e};return g}function areYouSureCancel(c,b,a,d){$("#cancelsure .sure-1").text(c);$("#cancelsure .sure-2").text(b);$("#cancelsure .sure-do").text(a).off("click.cancelsure").on("click.cancelsure",function(f){f.stopImmediatePropagation();f.preventDefault();$("#nocancelbtn").off("click");$("#cancelsure").dialog("close");$.mobile.changePage("#info-page");d();$(this).off("click.cancelsure")});$("#nocancelbtn").off("click").on("click",function(f){f.stopImmediatePropagation();f.preventDefault();$("#cancelsure .sure-do").text(a).off("click.cancelsure");$("#cancelsure").dialog("close");$.mobile.changePage("#info-page")});$.mobile.changePage("#cancelsure");setTimeout(function(){$("#stornocode").val("");$("#stornoreason").val("")},1000)};
\ No newline at end of file
+var allgroups=[];var customers=[];var decpoint=".";var currency="";var payments=[];function getGeneralConfigItemsCus(){$("#customersearch").val("");$("#groupsearch").val("");clearNewCustomerFields();clearNewGroupFields();doAjax("GET","php/contenthandler.php?module=admin&command=getGeneralConfigItems",null,insertConfigDoRest,"Fehler Konfigurationsdaten");doAjax("GET","php/contenthandler.php?module=customers&command=getPaymentsForGuest",null,insertPayments,"Fehler Zahlungswege",true);customizeDatePicker("#newcustomercheckin",null);customizeDatePicker("#newcustomercheckout",null);customizeDatePicker("#customerdate","")}function insertConfigDoRest(b){if(b.status==="OK"){var a=b.msg;$("#customersearch").val("");setLanguage(a.userlanguage);decpoint=a.decpoint;currency=a.currency;bindGroupsOrCustomerBtns();showCustomersArea();startSearch()}else{setTimeout(function(){document.location.href="index.html"},250)}}function insertPayments(d){if(d.status=="OK"){var c=d.msg;payments=[];for(var b=0;b";return a}function showCustomersArea(){$("#customersarea").show();$("#groupsarea").hide();$("#customersbtn").buttonMarkup({theme:"f"});$("#customersbtn").buttonMarkup({icon:"arrow-d"});$("#groupsbtn").buttonMarkup({theme:"c"});$("#groupsbtn").buttonMarkup({icon:"arrow-r"})}function showGroupsArea(){$("#customersarea").hide();$("#groupsarea").show();$("#customersbtn").buttonMarkup({theme:"c"});$("#customersbtn").buttonMarkup({icon:"arrow-r"});$("#groupsbtn").buttonMarkup({theme:"f"});$("#groupsbtn").buttonMarkup({icon:"arrow-d"})}function bindGroupsOrCustomerBtns(){$("#customersbtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();showCustomersArea()});$("#groupsbtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();showGroupsArea()});$("#newcustomerbtn").off("click").on("click",function(i){i.stopImmediatePropagation();i.preventDefault();var b=$("#newcustomername").val().trim();var m=$("#newcustomeremail").val().trim();var o=$("#newcustomeraddress").val().trim();var g=$("#newcustomerremark").val().trim();var j=$("#newcustomerphone").val().trim();var k=$("#newcustomermobil").val().trim();var c=$("#newcustomerwww").val().trim();var n=$("#newcustomerhello").val().trim();var h=$("#newcustomerregards").val().trim();var a=$("#newcustomerroom").val().trim();if(b===""){alert(CUS_EMPTY_NAME[l])}else{var f=getCheckinouts("#newcustomercheckin","#newcustomercheckout");if(!f.valid){alert(CUS_CHECKIN_AFTER_OUT[l]);return}var d={name:b,email:m,addr:o,remark:g,phone:j,mobil:k,www:c,hello:n,regards:h,checkin:f.checkin,checkout:f.checkout,room:a};if(!cusCheckTextLengths(d)){return}doAjax("POST","php/contenthandler.php?module=customers&command=createNewCustomer",d,handleCreateCustomerResult,"Gast anlegen unmöglich",true)}});$("#customersearch").off("keyup").on("keyup",function(a){startSearch()});$("#groupsearch").off("keyup").on("keyup",function(a){startSearch()});$("#newgroupbtn").off("click").on("click",function(c){c.stopImmediatePropagation();c.preventDefault();var a=$("#newgroupname").val().trim();var d=$("#newgroupremark").val().trim();if(a===""){alert(GROUP_EMPTY_NAME[l])}else{var b={name:a,remark:d};doAjax("POST","php/contenthandler.php?module=customers&command=createNewGroup",b,handleCreateGroupResult,"Gruppe anlegen unmöglich",true)}});$("#customerlog").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();window.open("php/contenthandler.php?module=customers&command=exportLog","_blank")})}function bindOnDynamicCustomersBtn(){$(".applycustomer").off("click").on("click",function(g){g.stopImmediatePropagation();g.preventDefault();var j=this.id.split("_")[1];var a=[];for(var b=0;b200){cusAlertTextLength("Bemerkung");return false}var c=$("#cusfield_cusfield_newroom_"+a).val();if(c.length>50){cusAlertTextLength("Zimmer");return false}var b={id:a,checkin:g.checkin,checkout:g.checkout,room:c,remark:f};doAjax("POST","php/contenthandler.php?module=customers&command=newVacation",b,handleChangeVacationResult,"Aufenthalt anlegen unmöglich",true)});$(".delvacation").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();var b=this.id.split("_")[1];doAjax("POST","php/contenthandler.php?module=customers&command=delVacation",{id:b},handleChangeVacationResult,"Aufenthalt löschen unmöglich",true)});$(".unpaybill").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=this.id.split("_")[1];$("#stornocode").val("");$("#stornoreason").val("");areYouSureCancel(CUS_STORNO_QUEST_TITLE[l],CUS_STORNO_QUEST_TEXT[l],CUS_YES[l],function(){var c={id:a,code:$("#stornocode").val(),remark:$("#stornoreason").val()};doAjax("POST","php/contenthandler.php?module=customers&command=unpay",c,handleChangeBillResult,"Deklaration als unbezahlt unmöglich",true)})});$(".paymentpay").off("click").on("click",function(d){d.stopImmediatePropagation();d.preventDefault();var g=this.id;var c=g.split("_");var a=c[2];var f=c[3];var b=c[4];if(b!="all"){doAjax("POST","php/contenthandler.php?module=customers&command=pay",{id:b,paymentid:f},handleChangeBillResult,"Deklaration als bezahlt unmöglich",true)}else{doAjax("POST","php/contenthandler.php?module=customers&command=payallbills",{id:a,paymentid:f},handleChangeBillResult,"Deklaration alle unmöglich",true)}});$(".printbill").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=this.id.split("_")[1];doAjax("POST","php/contenthandler.php?module=customers&command=printbill",{id:a},null,"Drucken unmöglich",true)});$(".printallbills").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=this.id.split("_")[1];doAjax("POST","php/contenthandler.php?module=customers&command=printallbills",{id:a},null,"Drucken alle unmöglich",true)})}function updateVacationsOfCustomer(a){doAjax("GET","php/contenthandler.php?module=customers&command=getVacations",{cusid:a},handleVacationsResult,null,true)}function updateBillsOfCustomer(a){doAjax("GET","php/contenthandler.php?module=customers&command=getBills",{cusid:a},handleBillsResult,null,true)}function handleVacationsResult(e){if(e.status==="OK"){var f=e.msg.vacations;var b=e.msg.cusid;var a="";for(var d=0;d0){if(d){a+=""+CUS_DECLARE_ALL_PAY[l]+" : ";for(var c=0;cCheck-in: "+d;a+="Check-out: "+c;a+="
"+CUS_ROOM_LABEL[l]+": "+f;a+="
"+CUS_REMARK_LABEL[l]+g;a+=createDeleteButton(h+"_delvacation",CUS_DEL[l],"d","delvacation");a+="";return a}function renderABill(h,b,c,f,g,i){var a=f.replace(".",decpoint)+" "+currency;var e="c";if(i==1){e="f"}var d=createCollapsibleStartGeneral("billentry_"+h,c+" - "+a,e,"billentry",true);d+="
"+CUS_BILLID[l]+": "+b;d+="
"+CUS_BILLDATE[l]+": "+c;d+="
"+CUS_BILLBRUTTO[l]+": "+c;if(i==0){d+=createPaymentsArea(h,b,CUS_DECLAREPAY[l])}else{d+=createApplyButton(b+"_unpaybill",CUS_DECLAREUNPAY[l],"d","unpaybill")}d+=createApplyButton(b+"_printbill",CUS_PRINTBILL[l],"f","printbill");d+="";return d}function handleEmailResult(a){if(a.status==="OK"){alert("Aktion abgeschlossen")}else{alert("Error: "+a.msg)}}function handleChangeVacationResult(b){if(b.status==="OK"){var a=b.cusid;$("#cusfield_newcheckin_"+a).val("");$("#cusfield_newcheckout_"+a).val("");$("#cusfield_cusfield_newroom_"+a).val("");$("#cusfield_vacremark_"+a).val("");updateVacationsOfCustomer(a)}else{alert("Error: "+b.msg)}}function handleChangeBillResult(b){if(b.status==="OK"){var a=b.cusid;updateBillsOfCustomer(a)}else{alert("Error: "+b.msg)}}function deleteCustomerCore(b){var a={id:b};doAjax("POST","php/contenthandler.php?module=customers&command=deleteCustomer",a,handleDeleteCustomerResult,"Gast löschen unmöglich",true)}function deleteGroupCore(b){var a={id:b};doAjax("POST","php/contenthandler.php?module=customers&command=deleteGroup",a,handleDeleteGroupResult,"Gruppe löschen unmöglich",true)}function areYouSureCus(c,b,a,d){$("#sure .sure-1").text(c);$("#sure .sure-2").text(b);$("#sure .sure-do").text(a).off("click.sure").on("click.sure",function(){d()});$(this).off("click.sure");$.mobile.changePage("#sure")}function startSearch(){var a={search:$("#groupsearch").val().trim()};doAjax("POST","php/contenthandler.php?module=customers&command=getGroups",a,handleGetGroupsResult,"Gästeabfrage unmöglich",true)}function startCustomerSearch(){var c=$("#customersearch").val().trim();var a=getDate("#customerdate");var d="";if((a!=null)&&(a!="")){d=a.year+"-"+a.month+"-"+a.day}var b=0;if($("#customeropenbills").is(":checked")){b=1}var e={search:c,date:d,onlyopenbills:b};doAjax("POST","php/contenthandler.php?module=customers&command=getCustomers",e,handleGetCustomerResult,"Gästeabfrage unmöglich",true)}function clearNewCustomerFields(){$("#newcustomername").val("");$("#newcustomeremail").val("");$("#newcustomeraddress").val("");$("#newcustomerremark").val("");$("#newcustomerphone").val("");$("#newcustomermobil").val("");$("#newcustomerwww").val("");$("#newcustomerhello").val("");$("#newcustomerregards").val("");$("#newcustomercheckin").val("");$("#newcustomercheckout").val("");$("#newcustomerroom").val("")}function handleCreateCustomerResult(a){if(a.status==="OK"){clearNewCustomerFields();if(a.code==1){var b=CUS_ALREADY_CUS_NAME[l];b=b.replace("%number%",a.value);alert(b)}startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function clearNewGroupFields(){$("#newgroupname").val("");$("#newgroupremark").val("")}function handleCreateGroupResult(a){if(a.status==="OK"){clearNewGroupFields();startSearch()}else{if(a.code==1){alert(CUS_GROUP_EXISTS[l])}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}}function handleChangeCustomerResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function handleDeleteCustomerResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function handleDeleteGroupResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function handleChangeGroupResult(a){if(a.status==="OK"){startSearch()}else{alert(CUS_ACTION_FAILED[l]+": "+a.msg)}}function createInputTextField(f,d,e,b,c){var a='
';a+=' '+b+": ";a+=' ';a+="
";return a}function createTextAreaField(f,d,e,b,c){var a='';a+=' '+b+" ";a+=' ";a+="
";return a}function createDateTimePicker(d,b,c){var a='';a+=' '+b+" : ";a+=' ';a+="
";return a}function createCollapsibleStartNew(d,b,c){var a='';a+="
"+toHtml(b)+" ";return a}function createCollapsibleStartGeneral(g,c,e,f,b){var d=" ";if(b===false){d=' style="display:none;" '}var a='
";a+="
"+toHtml(c)+" ";return a}function createApplyButton(e,b,d,c){var a='
'+b+" ";return a}function createDeleteButton(e,b,d,c){var a='
'+b+" ";return a}function createApplyDeleteButtons(d,c,b){var a='
';a+='
'+createApplyButton(d,CUS_APPLY[l],"f",c)+"
";a+='
'+createDeleteButton(d,CUS_DEL[l],"d",b)+"
";a+="
";return a}function renderACustomer(d){var b=d.id;var c="";if((d.openbillsum!=null)&&(d.openbillsum!="")){c=" ("+d.openbillsum;c=c.replace(".",decpoint)+" "+currency+")"}var a=createCollapsibleStartNew(b,d.name+c,"c");a+="
";a+=createCollapsibleStartGeneral("allbills_"+b,CUS_BILLS[l],"e","billscollapsible",true);a+='
';a+="
";a+=createCollapsibleStartGeneral("allvacations_"+b,CUS_VACATIONS[l],"e","vacationcollapsible",true);a+='
';a+=createCollapsibleStartGeneral("newvacations_"+b,CUS_NEWVACATIONS[l],"c","newvacationscollapsible",true);a+=createDateTimePicker("cusfield_newcheckin_"+b,"Check-in","a");a+=createDateTimePicker("cusfield_newcheckout_"+b,"Check-out","a");a+=createInputTextField(b,"cus","cusfield_newroom",CUS_ROOM_LABEL[l],"");a+=createInputTextField(b,"cus","vacremark",CUS_REMARK_LABEL[l],"");a+=createApplyButton(b+"_newvacation",CUS_APPLY[l],"f","newvacation");a+="
";a+="";return a}function renderCustomers(b){var a="";for(var c=0;c";a+="";return a}function renderGroups(b){var a="";for(var c=0;c';e+=''+CUS_GRP_ASS_LIST[l]+" ";for(var d=0;d'+toHtml(c.name)+" "}e+="";return e}function cusAlertTextLength(a){alert(CUS_ALERT_TEXT_LEN[l]+a)}function cusCheckTextLengths(a){if(a.name.length>50){cusAlertTextLength("Name");return false}if(a.addr.length>200){cusAlertTextLength(CUS_ADR_LABEL[l]);return false}if(a.phone.length>30){cusAlertTextLength(CUS_PHONE_LABEL[l]);return false}if(a.mobil.length>30){cusAlertTextLength(CUS_MOBIL_LABEL[l]);return false}if(a.email.length>50){cusAlertTextLength("Email");return false}if(a.www.length>50){cusAlertTextLength(CUS_WWW_LABEL[l]);return false}if(a.remark.length>500){cusAlertTextLength(CUS_REMARK_LABEL[l]);return false}return true}function customizeDatePicker(e,b){var d="de";if(l==1){d="en"}else{if(l==2){d="es"}}var a=new Date().getFullYear();var c=(a-10)+":"+(a+3);$(e).datepicker($.datepicker.regional[d]).datepicker("option",{changeMonth:true,changeYear:true,yearRange:c});if((b!=null)&&(b!="")){$(e).datepicker("setDate",new Date(b))}else{$(e).val("")}}function getDate(d){var c=$(d).val();if((c==undefined)||(c.trim()=="")){return null}var a=$(d).datepicker("getDate");var b={day:("0"+a.getDate()).slice(-2),month:("0"+(a.getMonth()+1)).slice(-2),year:a.getFullYear(),date:a};return b}function getCheckinouts(b,h){var d=getDate(b);var c=getDate(h);var a="";if((d!=null)&&(d!="")){a=d.year+"-"+d.month+"-"+d.day}var f="";if((c!=null)&&(c!="")){f=c.year+"-"+c.month+"-"+c.day}var e=true;if((d!=null)&&(d!="")&&(c!=null)&&(c!="")){if(d.date>c.date){e=false}}var g={checkin:a,checkout:f,valid:e};return g}function areYouSureCancel(c,b,a,d){$("#cancelsure .sure-1").text(c);$("#cancelsure .sure-2").text(b);$("#cancelsure .sure-do").text(a).off("click.cancelsure").on("click.cancelsure",function(f){f.stopImmediatePropagation();f.preventDefault();$("#nocancelbtn").off("click");$("#cancelsure").dialog("close");$.mobile.changePage("#info-page");d();$(this).off("click.cancelsure")});$("#nocancelbtn").off("click").on("click",function(f){f.stopImmediatePropagation();f.preventDefault();$("#cancelsure .sure-do").text(a).off("click.cancelsure");$("#cancelsure").dialog("close");$.mobile.changePage("#info-page")});$.mobile.changePage("#cancelsure");setTimeout(function(){$("#stornocode").val("");$("#stornoreason").val("")},1000)};
\ No newline at end of file
diff --git a/webapp/feedback.html b/webapp/feedback.html
index e3346bf..7e27a70 100644
--- a/webapp/feedback.html
+++ b/webapp/feedback.html
@@ -4,7 +4,7 @@
-
+
diff --git a/webapp/index.html b/webapp/index.html
index 154fdb4..d7903dc 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -9,8 +9,8 @@
-
-
+
+
@@ -203,7 +203,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") {
useInstallation();
} else {
- setTimeout(function(){document.location.href = "install.html?v=1.3.2"},500);
+ setTimeout(function(){document.location.href = "install.html?v=1.3.3"},500);
}
}
diff --git a/webapp/install.html b/webapp/install.html
index cbbe255..b2e40cb 100644
--- a/webapp/install.html
+++ b/webapp/install.html
@@ -679,7 +679,7 @@ $(document).ready(function() {
- Update -> 1.3.2
+ Update -> 1.3.3
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index 3afc783..aecb969 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -64,7 +64,7 @@ return $pdo;
}
function checkPhpStatus() {
-$extensions = array("gd","mysqli","openssl","pdo_mysql","PDO","session","zlib");
+$extensions = array("gd","mysqli","openssl","pdo_mysql","PDO","session","zlib","curl");
$missing = array();
$extensions_status = 1;
@@ -1832,6 +1832,39 @@ return false;
}
}
+function updateUserTable1302_1303($prefix, $version, $dbname) {
+$pdo = $this->pdo;
+try {
+if ($version != "1.3.2") {
+$ret = $this->updateUserTable1301_1302($prefix, $version, $dbname);
+if (!$ret) {
+echo "Version update v1.3.1 to 1.3.2 not successful.";
+return false;
+}
+}
+
+DbUtils::overrulePrefix($prefix);
+
+$sql = "ALTER TABLE %customers% ADD hello VARCHAR(100) NULL AFTER www";
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute();
+$sql = "ALTER TABLE %customers% ADD regards VARCHAR(100) NULL AFTER hello";
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute();
+$this->execSql($pdo, "OPTIMIZE TABLE %customers%");
+
+$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
+$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
+$stmt->execute(array('rksvserver',''));
+
+$this->updateVersion($pdo, '1.3.3');
+return true;
+} catch (PDOException $e) {
+echo "Error in v1.3.2 to 1.3.3: $e";
+return false;
+}
+}
+
function setVersion($prefix,$theVersion) {
$pdo = $this->pdo;
@@ -1958,7 +1991,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.2')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.3.3')");
$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')");
@@ -1985,6 +2018,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paydeskid', 'OrderSprinter-1')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'aeskey', '0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'certificatesn', '1234567')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'rksvserver', '')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'digigopaysetready', '1')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'waitergopayprint', '0')");
@@ -2340,7 +2374,7 @@ $zones[] = $timezone_identifiers[$i];
}
echo json_encode($zones);
} else if ($command == 'update') {
-$installerVersion = "1.3.2";
+$installerVersion = "1.3.3";
$admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
@@ -2371,7 +2405,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.2.18","1.2.19","1.2.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2"
);
if (!in_array($version, $supportedVersions)) {
@@ -2379,7 +2413,7 @@ echo json_encode("Quellversion nicht unterstützt");
return;
}
-$ret = $admin->updateUserTable1301_1302($_POST['prefix'], $version, $_POST['db']);
+$ret = $admin->updateUserTable1302_1303($_POST['prefix'], $version, $_POST['db']);
if(session_id() == '') {
session_start();
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 4c6ddd1..f9ddbc4 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
-
+
diff --git a/webapp/manager.html b/webapp/manager.html
index 35c0807..1c8d60b 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
-
+
@@ -193,6 +193,7 @@ var MAN_REST_INFO = ["Der Import dauert eine Weile...","The import takes a while
var MAN_UPLOAD_FILE = ["Diese Datei hochladen (importieren ): ", "Upload this file: ","Importar este file: "];
var MAN_BAK_REST_HEAD = ["Sicherung und Import","Backup and Restore","Exportar y Importar"];
var MAN_BAK_BTN = ["Sicherung (Konfiguration)","Backup (Configuration)","Exportar (configuración)"];
+var MAN_BAK_GUEST_BTN = ["Sicherung (Konfiguration + Gäste)","Backup (Configuration + guests)","Exportar (configuración y clientes)"];
var MAN_BAK_BTN_ALL = ["Sicherung (Alles ohne Logs)","Backup (all without logs)","Exportar (todo sin protocolo)"];
var MAN_BAK_BTN_ALL_LOGS = ["Sicherung (Alles mit Logs)","Backup (all with logs)","Exportar (todo y protocolo)"];
var MAN_RESTORE_BTN = ["Importieren","Restore","Importar"];
@@ -308,6 +309,7 @@ var MAN_AESKEY = ["AES256 Schlüssel","AES256 Key","AES256 LLave"];
var MAN_AESKEY_WRONG_LENGTH = ["Ein AES256-Schlüssel muss in Hex-Darstellung 64 Zeichen haben.","An AES256 key requires to have 64 characters in a hex string.", "Una llave de AES256 tiene que contener 64 characteres en forma hex."];
var MAN_AESKEY_NO_HEX = ["Der AES-Schlüssel muss als Hex-Zahl angegeben werden.","The AES key must be specified as hex number","La llava AES tiene que especificado en formato hex."];
var MAN_CERTIFICATE_SN = ["Zertifikatsseriennummer", "Certificate Serial No","Certificado ID"];
+var MAN_RKSVSERVER = ["RKSV-Server-URL","RKSV server URL","RKSV-Server URL"];
var MAN_TAX = ["Steuersatz (%)","Tax (%)","Impuesto (%)"];
var MAN_CONFIRM_GO_LIVE = ["Die Umsatz- und Logdaten wurden gelöscht und nur die Konfiguration übernommen. Deswegen ist nun ein erneutes Einloggen erforderlich.",
"The sales and log data is deleted and configuration is recreated. Therefore a log-in is required now.",
@@ -330,6 +332,8 @@ var MAN_HSOUTFILE = ["HS/3 Datei HS3CASH.OUT","HS/3 file HS3CASH.OUT","HS/3 file
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 lang = 0;
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1];
@@ -393,6 +397,7 @@ var generalValuesSettings = [
["paydeskid",MAN_PAYDESKID[lang],"i",0,""],
["aeskey",MAN_AESKEY[lang],"i",0,""],
["certificatesn",MAN_CERTIFICATE_SN[lang],"i",0,""],
+ ["rksvserver",MAN_RKSVSERVER[lang],"i",0,""],
["hotelinterface",MAN_HOTELINTERFACE[lang],"s",22],
["hsinfile",MAN_HSINFILE[lang],"i",0],
["hsoutfile",MAN_HSOUTFILE[lang],"i",0],
@@ -462,6 +467,7 @@ function setLanguage(l) {
$("#addrecprinterhint").html("" + MAN_ADD_RECPRINTER_DESCR[l] + "
");
$("#aeskeytxt").html(MAN_AESKEY[l]);
$("#certificatesntxt").html(MAN_CERTIFICATE_SN[l]);
+ $("#rksvservertxt").html(MAN_RKSVSERVER[l]);
$("#emailbadratingtxt").html(MAN_EMAIL_BAD_RATING[l]);
$("#emailratingcontacttxt").html(MAN_EMAIL_RATING_CONTACT[l]);
@@ -471,6 +477,7 @@ function setLanguage(l) {
$("#uplfiletxt").html(MAN_UPLOAD_FILE[l]);
$("#bakrestxt").html(MAN_BAK_REST_HEAD[l]);
$("#backupbtntxt").html(MAN_BAK_BTN[l]);
+ $("#backupguestsbtntxt").html(MAN_BAK_GUEST_BTN[l]);
$("#backupbtntxtall").html(MAN_BAK_BTN_ALL[l]);
$("#backupbtntxtalllogs").html(MAN_BAK_BTN_ALL_LOGS[l])
$("#restorebtntxt").html(MAN_RESTORE_BTN[l]);
@@ -479,6 +486,7 @@ function setLanguage(l) {
$("#shutdownbtntxt").html(MAN_SHUTDOWN[l]);
$("#shutdownhinttxt").html(MAN_SHUTDOWN_HINT[l]);
$("#optimizebtntxt").html(MAN_OPTIMIZE[l]);
+ // $("#initreceiptbtntxt").html(MAN_INIT_AUSTRIA[l]);
$("#optimizehinttxt").html(MAN_OPTIMIZE_HINT[l]);
$("#upllogotxt").html(MAN_UPLOAD_LOGO[l]);
$("#dellogobtn").html(MAN_NO_LOGO_BTN[l]);
@@ -691,6 +699,7 @@ function insertGeneralConfigItems(configResult) {
$("#paydeskid").val(values.paydeskid);
$("#aeskey").val(values.aeskey);
$("#certificatesn").val(values.certificatesn);
+ $("#rksvserver").val(values.rksvserver);
$("#partOfHotelInterface").html(createHotelInterfacePart(values.hotelinterface));
@@ -1311,6 +1320,12 @@ function binding() {
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs";
});
+ $("#backupguests_btn").off("click").on("click", function (e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests";
+ });
+
$("#restorebtntxt").off("click").on("click", function (e) {
$("#restinfoafterclick").html(MAN_REST_INFO[lang]);
});
@@ -1334,6 +1349,11 @@ function binding() {
e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=optimize",null,handleAnswerOptimize,"Skriptproblem");
});
+// $("#initreceiptbutton").off("click").on("click", function (e) {
+// e.stopImmediatePropagation();
+// e.preventDefault();
+// doAjax("GET","php/contenthandler.php?module=bill&command=initaustriareceipt",null,handleAnswerInitReceipt,"Skriptproblem");
+// });
$("#dellogobtn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
@@ -1513,6 +1533,13 @@ function handleAnswerOptimize(result) {
alert("Fehler " + result.code + ": " + result.msg);
}
}
+function handleAnswerInitReceipt(answer) {
+ if (answer.status == "OK") {
+ alert("Startbeleg wurde erzeugt.");
+ } else {
+ alert("Fehler: " + answer.msg);
+ }
+}
function hasChangedData(idOfElem) {
var fieldChangedAttr = $("" + idOfElem).data("changed");
if (typeof fieldChangedAttr != 'undefined') {
@@ -2246,8 +2273,8 @@ function initroomfield(roomfield_json) {
}
function golive() {
- doAjax("POST","php/contenthandler.php?module=admin&command=golive",null,handleGoLive,"Produktivbetriebsstart");
-
+ alert(MAN_GOLIVE_WAIT_HINT[lang]);
+ doAjax("POST","php/contenthandler.php?module=admin&command=golive",null,handleGoLive,"Produktivbetriebsstart");
}
function handleGoLive(answer) {
@@ -2724,6 +2751,10 @@ $(document).on("pageinit", "#admin-page", function () {
AES-Schlüssel:
+
+ RKSV-Modul:
+
+
Zert.Seriennummer:
@@ -3006,16 +3037,20 @@ $(document).on("pageinit", "#admin-page", function () {
-
Sicherung und Import
+
Sicherung und Import
Die Datensicherung und -wiederherstellung erfordert...
-
+
-
+
+
+
Die Datensicherung und -wiederherstellung erfordert...
-