OrderSprinter 1.5.19
This commit is contained in:
parent
a8d14ae349
commit
66fd05062b
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.18" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.18" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.19" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.19" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<div data-role="footer" data-theme="b" id="thefooter1">
|
||||
<div class="ui-grid-a">
|
||||
<div class="ui-block-a"> OrderSprinter</div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.18 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.19 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
|
|||
} else {
|
||||
echo "<html>";
|
||||
echo "<head><title>Installation Gastsystem</title>";
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.18">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.19">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.18</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.19</span><br><br>";
|
||||
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
|
||||
echo "<br><input type=submit value='Installation starten' class=installbtn />";
|
||||
echo "</form></div></html>";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"1.5.18");
|
||||
Database::setVersion($pdo,$prefix,"1.5.19");
|
||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||
return array("status" => "OK","msg" => "Installation successful");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.5.18"></script>
|
||||
<script src="kitchenbar.js?v=1.5.18"></script>
|
||||
<script src="utilities.js?v=1.5.19"></script>
|
||||
<script src="kitchenbar.js?v=1.5.19"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.18"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.19"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -909,7 +909,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
|
|||
<tr id=updateline>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn">Update -> 1.5.18</button>
|
||||
<button id="updatebtn">Update -> 1.5.19</button>
|
||||
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ $zones[] = $timezone_identifiers[$i];
|
|||
echo json_encode($zones);
|
||||
} else if ($command == 'update') {
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.18";
|
||||
$installerVersion = "1.5.19";
|
||||
|
||||
$admin = new InstallAdmin();
|
||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.5.18"></script>
|
||||
<script src="kitchenbar.js?v=1.5.18"></script>
|
||||
<script src="utilities.js?v=1.5.19"></script>
|
||||
<script src="kitchenbar.js?v=1.5.19"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=1.5.18"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.18"></script>
|
||||
<script src="elements/roommap.js?v=1.5.18"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.18"></script>
|
||||
<script src="utilities.js?v=1.5.19"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.19"></script>
|
||||
<script src="elements/roommap.js?v=1.5.19"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.19"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -302,6 +302,9 @@ var MAN_GEN_PRINT_SECTION_TXT = ["Allgemeine Druckeinstellungen:","General print
|
|||
var MAN_WORKRECEIPS_SECTION_TXT = ["Arbeitsbons:","Work receipts:","Tiquets de trabajo:"];
|
||||
var MAN_DISCOUNT_SECTION_TXT = ["Rabatteinstellungen in Bestellansicht:","Discount settings in order view:","Descuentas en vista de camareros:"];
|
||||
var MAN_TIMETRACKING = ["Zeiterfassung:","Time tracking:","Tiempos de los empleados:"];
|
||||
var MAN_SUMUPFORCARD = ["SumUp für Kartenzahlung","SumUp for card payment","SumUp para pago con tarjeta"];
|
||||
var MAN_SUMUP = ["SumUp-Anbindung","Connection to SumUp","SumUp"];
|
||||
var MAN_SUMUPFAILURETEXT = ["Stornotext bei fehlgeschlagener Kartenzahlung","Text in report for failured card payment","Texto en el informe para el pago con tarjeta de crédito fallido"];
|
||||
var MAN_MEMORYLIMIT = ["PHP Memory Limit (MB)","PHP Memory Limit (MB)","PHP Memory Limit (MB)"];
|
||||
var MAN_POLL_SECTION_TXT = ["Abfrageintervalle des Druckservers:","Poll intervall of the printserver:","Intervalo de consulta del print server:"];
|
||||
var MAN_SERVER_SECTION_TXT = ["Server:","Server:","Servidor:"];
|
||||
|
|
@ -388,8 +391,8 @@ var MAN_CLOSSHOWPAYTAXES = ["Individuelle Steuerbeträge pro Zahlungsweg auf Tag
|
|||
var MAN_CLOSSHOWPRODS = ["Produktstatistik auf Tagesabschlussbon","Product statistics on closung","Statistica de productos en el cerramiento"];
|
||||
var MAN_SHOWPAYMENTS = ["Zahldialog und Wechselgeldrechner (Mobil)","Payment way and calculator (mobil)","Modo de pagar y calculadora (movil)"];
|
||||
var MAN_SHOWPAYMENTS_HINT = ["Wird der Zahldialog deaktiviert, wird stets eine Barzahlung angenommen!","If the payment dialog is deactivated all payments are declared as cash payments!","Si el dialogo de modo de pagar esta deactivado cada pagamiento es de moneda"];
|
||||
var MAN_SHOWPAYMENT2 = ["EC-Karte","EC card","EC"];
|
||||
var MAN_SHOWPAYMENT3 = ["Kreditkarten","credit card","tarjeta de credito"];
|
||||
var MAN_SHOWPAYMENT2 = ["Kartenzahlung","Card Payment","Pago con Tarjeta"];
|
||||
var MAN_SHOWPAYMENT3 = ["Kartenzahlung","Card Payment","Pago con Tarjeta"];
|
||||
var MAN_SHOWPAYMENT4 = ["Rechnung","Bill","Factura"];
|
||||
var MAN_SHOWPAYMENT5 = ["Überweisung","Transfer","transferencia"];
|
||||
var MAN_SHOWPAYMENT6 = ["Lastschrift","debitsCard","Débito"];
|
||||
|
|
@ -473,7 +476,7 @@ var MAN_NO_NEW_UPD_VERSION = ["Update nicht möglich (Version auf dem Server ist
|
|||
var MAN_UPDATE_BTN_CLICK = ["Das Update startet und kann einige Minuten dauern. Bitte bestätigen diese Meldung und warten Sie, bis dass ein Hinweistext über den Abschluss des Updates informiert.","The update will start and may take a few minutes. Please confirm this message and wait until a message informs you that the update is complete.","La actualización se iniciará y puede tardar unos minutos. Confirme este mensaje y espere a que un mensaje le informe de que la actualización ha finalizado."];
|
||||
|
||||
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, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,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, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0];
|
||||
|
||||
var numberOfClosings = 0;
|
||||
|
||||
|
|
@ -619,6 +622,10 @@ var generalValuesSettings = [
|
|||
["cbirdfolder",MAN_CBIRD_FOLDER[lang],"i",0,""],
|
||||
["billprintjobs",MAN_BILLPRINTJOBS[lang],"s",61],
|
||||
["usebarcode",MAN_USE_BARCODE[lang],"s",62],
|
||||
["sumupforcard",MAN_SUMUPFORCARD[lang],"s",63],
|
||||
["affiliatekey","Affiliate Key","i",0],
|
||||
["appid","App-Id","i",0],
|
||||
["sumupfailuretext",MAN_SUMUPFAILURETEXT[lang],"i",0,""]
|
||||
];
|
||||
|
||||
var predef = "";
|
||||
|
|
@ -763,6 +770,8 @@ function setLanguage(l) {
|
|||
$("#pickupsectiontxt").html(MAN_PICKUP_CONFIGSECTION_TXT[l]);
|
||||
$("#templatesectiontxt").html(MAN_TEMPLATESECTION_TXT[l]);
|
||||
$("#timetrackingtxt").html(MAN_TIMETRACKING[l]);
|
||||
$("#sumuptxt").html(MAN_SUMUP[l]);
|
||||
$("#sumupfailuretexttxt").html(MAN_SUMUPFAILURETEXT[l]);
|
||||
$("#tasktxt").html(MAN_TASKS[l]);
|
||||
$("#desktopviewsectiontxt").html(MAN_DESKTOP_SECTION_TXT[l]);
|
||||
$("#specialsettingssectiontxt").html(MAN_SPECIAL_SETTINGS_TXT[l]);
|
||||
|
|
@ -988,6 +997,8 @@ function insertGeneralConfigItems(configResult) {
|
|||
$("#partOfOneclickcooked").html(createYesNo("oneclickcooked",MAN_ONECLICKCOOKED, values.oneclickcooked));
|
||||
$("#partOfShowpickupdelbtn").html(createYesNo("showpickupdelbtn",MAN_SHOWPICKDELBTN, values.showpickupdelbtn));
|
||||
$("#partOfShowpickhelp").html(createYesNo("showpickhelp",MAN_SHOWPICKHELP, values.showpickhelp));
|
||||
|
||||
$("#partOfSumupforcard").html(createYesNo("sumupforcard",MAN_SUMUPFORCARD, values.sumupforcard));
|
||||
|
||||
var language = values.billlanguage;
|
||||
generalVals[2] = language;
|
||||
|
|
@ -1083,6 +1094,7 @@ function insertGeneralConfigItems(configResult) {
|
|||
generalVals[60] = values.showpayments;
|
||||
generalVals[61] = values.billprintjobs;
|
||||
generalVals[62] = values.usebarcode;
|
||||
generalVals[63] = values.sumupforcard;
|
||||
|
||||
defaulttmp = values.defaulttmp;
|
||||
|
||||
|
|
@ -1123,6 +1135,10 @@ function insertGeneralConfigItems(configResult) {
|
|||
|
||||
$("#partOfHotelInterface").html(createHotelInterfacePart(values.hotelinterface));
|
||||
|
||||
$("#affiliatekey").val(values.affiliatekey);
|
||||
$("#appid").val(values.appid);
|
||||
$("#sumupfailuretext").val(values.sumupfailuretext);
|
||||
|
||||
$("#configpart").trigger("create");
|
||||
bindConfig();
|
||||
continueInitialization();
|
||||
|
|
@ -1540,7 +1556,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.18";
|
||||
document.location.href = "index.html?v=1.5.19";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2108,7 +2124,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=1.5.18&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.19&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
@ -3855,7 +3871,22 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div data-role="fieldcontain">
|
||||
<label for="reservationnote">Reservierungstemplate Email:</label>
|
||||
<textarea cols="40" rows="8" name="reservationnote" id="reservationnote" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br><b><u><span id="sumuptxt">SumUp-Anbindung</span></u></b><br><br>
|
||||
<div id="partOfSumupforcard"></div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="affiliatekey">Affiliate Key:</label>
|
||||
<input type="text" value="" data-mini="true" placeholder="" id="affiliatekey" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="appid">App-Id:</label>
|
||||
<input type="text" value="" data-mini="true" placeholder="" id="appid" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="sumupfailuretext"><span id="sumupfailuretexttxt">Stornotext:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="" id="sumupfailuretext" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
||||
<br><b><u><span id="timetrackingtxt">Zeitmanagement</span></u></b><br><br>
|
||||
<div data-role="fieldcontain">
|
||||
|
|
@ -3901,7 +3932,7 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div id="partOfshowpayments"></div>
|
||||
<i id=showpaymentshint style="padding-left: 50px;padding-right: 50px;">Hinweis: alles Bar</i><br>
|
||||
<div id="partOfshowpayment2"></div>
|
||||
<div id="partOfshowpayment3"></div>
|
||||
<div id="partOfshowpayment3" style="display:none;"></div>
|
||||
<div id="partOfshowpayment4"></div>
|
||||
<div id="partOfshowpayment5"></div>
|
||||
<div id="partOfshowpayment6"></div>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1205,7 +1205,12 @@ class Admin {
|
|||
array("showhostprint",1,false),
|
||||
array("oneclickcooked",0,false),
|
||||
array("showpickupdelbtn",1,false),
|
||||
array("showpickhelp",1,false)
|
||||
array("showpickhelp",1,false),
|
||||
|
||||
array("sumupforcard",0,false),
|
||||
array("affiliatekey",'',true),
|
||||
array("appid",'',true),
|
||||
array("sumupfailuretext","",false)
|
||||
);
|
||||
|
||||
if (is_null($pdo)) {
|
||||
|
|
@ -1400,7 +1405,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.18");
|
||||
echo json_encode($view . "?v=1.5.19");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1616,31 +1621,31 @@ 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.5.18"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.19"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.18"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.19"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.19"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.19"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.18"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.18"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.18");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.18"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.19"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.19"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.19"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.19");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.19"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.18");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.18");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.19");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.19");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2237,6 +2242,11 @@ class Admin {
|
|||
"rksvserver" => array("dbcol" => "rksvserver","checksum" => 0),
|
||||
"showprepinwaiter" => array("dbcol" => "showprepinwaiter","checksum" => 0),
|
||||
"cbirdfolder" => array("dbcol" => "cbirdfolder","checknum" => 0),
|
||||
|
||||
"sumupforcard" => array("dbcol" => "sumupforcard","checknum" => 0),
|
||||
"affiliatekey" => array("dbcol" => "affiliatekey","checknum" => 0),
|
||||
"appid" => array("dbcol" => "appid","checknum" => 0),
|
||||
"sumupfailuretext" => array("dbcol" => "sumupfailuretext","checknum" => 0)
|
||||
);
|
||||
$problem = false;
|
||||
foreach ($changedValues as $aChangeSet) {
|
||||
|
|
@ -2331,7 +2341,7 @@ class Admin {
|
|||
}
|
||||
}
|
||||
|
||||
if (($name == "updateurl") || ($name == "tmpdir") || ($name == "ftphost") || ($name == "ftpuser")) {
|
||||
if (($name == "updateurl") || ($name == "tmpdir") || ($name == "ftphost") || ($name == "ftpuser") || ($name == "sumupfailuretext")) {
|
||||
$aVal = trim($aVal);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -121,11 +121,33 @@ class Bill {
|
|||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$status = $this->initaustriareceipt($pdo);
|
||||
echo json_encode($status);
|
||||
return;
|
||||
} else {
|
||||
echo json_encode(array("status" => "ERROR", "code" => ERROR_MANAGER_NOT_AUTHOTRIZED, "msg" => ERROR_MANAGER_NOT_AUTHOTRIZED_MSG));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if ($command == 'initCardPayment') {
|
||||
if ($this->hasCurrentUserPaydeskRights()) {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$retVal = $this->initCardPayment($pdo,$_POST['billid']);
|
||||
echo json_encode($retVal);
|
||||
return;
|
||||
} else {
|
||||
echo json_encode(array("status" => "ERROR", "code" => ERROR_PAYDESK_NOT_AUTHOTRIZED, "msg" => ERROR_PAYDESK_NOT_AUTHOTRIZED_MSG));
|
||||
return false;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if ($command == 'cancelCardPayment') {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$retVal = $this->cancelCardPayment($pdo,$_POST['billid'],$_POST['randvalue']);
|
||||
echo json_encode($retVal);
|
||||
return;
|
||||
}
|
||||
|
||||
if ($this->hasCurrentUserBillRights()) {
|
||||
if ($command == 'getLastBillsWithContent') {
|
||||
$this->getLastBillsWithContent($_GET['day'],$_GET['month'],$_GET['year']);
|
||||
|
|
@ -165,6 +187,35 @@ class Bill {
|
|||
}
|
||||
}
|
||||
|
||||
public function initCardPayment($pdo,$billid) {
|
||||
$randval = md5(rand(0, getrandmax()));
|
||||
$sql = "INSERT INTO %work% (item,value,signature) VALUES(?,?,?)";
|
||||
CommonUtils::execSql($pdo, $sql, array("sumuphash",$billid,$randval));
|
||||
return array("status" => "OK","msg" => $randval);
|
||||
}
|
||||
|
||||
public function cancelCardPayment($pdo,$billid,$randVal) {
|
||||
$sql = "SELECT count(id) as countid FROM %work% WHERE item=? AND value=? AND signature=?";
|
||||
$result = CommonUtils::fetchSqlAll($pdo, $sql, array("sumuphash",$billid,$randVal));
|
||||
$countid = $result[0]["countid"];
|
||||
if ($countid != 1) {
|
||||
return array("status" => "ERROR","msg" => "Keine Authorisierung zum Stornieren der Rechnung");
|
||||
} else {
|
||||
|
||||
$failuretext = CommonUtils::getConfigValue($pdo, "sumupfailuretext", "");
|
||||
$ok = $this->cancelBill($pdo, $billid, '', $failuretext, true, false, false, 0);
|
||||
|
||||
if ($ok) {
|
||||
$sql = "DELETE FROM %work% WHERE item=? AND value=? AND signature=?";
|
||||
CommonUtils::execSql($pdo, $sql, array("sumuphash",$billid,$randVal));
|
||||
return array("status" => "OK");
|
||||
} else {
|
||||
return array("status" => "ERROR","msg" => "Stornierung fehlgeschlagen");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function billIsCancelled($pdo,$billid) {
|
||||
$sql = "SELECT status FROM %bill% WHERE id=?";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
|
|
@ -808,7 +859,7 @@ class Bill {
|
|||
|
||||
$stornocodeInDb = CommonUtils::getConfigValue($pdo, 'stornocode', null);
|
||||
|
||||
if (is_null($stornocodeInDb)) {
|
||||
if (is_null($stornocodeInDb) && $checkStornoCode) {
|
||||
if ($doEcho) {
|
||||
echo json_encode(array("status" => "ERROR", "code" => ERROR_BILL_NOT_STORNO_CODE, "msg" => ERROR_BILL_NOT_STORNO_CODE_MSG));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -245,6 +245,9 @@ $sql = "DELETE FROM %printjobs%";
|
|||
CommonUtils::execSql($pdo, $sql, null);
|
||||
CommonUtils::execSql($pdo, "OPTIMIZE TABLE %printjobs%", null);
|
||||
|
||||
$sql = "DELETE FROM %work% WHERE item=?";
|
||||
CommonUtils::execSql($pdo, $sql, array("sumuphash"));
|
||||
|
||||
$sql = "UPDATE %queue% SET isclosed=?";
|
||||
CommonUtils::execSql($pdo, $sql, array(1));
|
||||
|
||||
|
|
|
|||
|
|
@ -853,7 +853,7 @@ class Customers {
|
|||
$txt = "<head>";
|
||||
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.18">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.19">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.18";
|
||||
$version = "1.5.19";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -2007,6 +2007,7 @@ class QueueContent {
|
|||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Test if all queue items with the given ids are not paid
|
||||
* -> if there are paid items --> report error by return negative value
|
||||
|
|
@ -2048,27 +2049,30 @@ class QueueContent {
|
|||
$pdo->beginTransaction();
|
||||
}
|
||||
|
||||
|
||||
$idList = explode(",", $ids);
|
||||
$allNumeric = true;
|
||||
foreach($idList as $anId) {
|
||||
if (!is_numeric($anId)) {
|
||||
$allNumeric = false;
|
||||
}
|
||||
}
|
||||
|
||||
$allNotPaid = true;
|
||||
for ($i=0;$i<count($ids_array);$i++) {
|
||||
$anId = $ids_array[$i];
|
||||
if (is_numeric($anId)) {
|
||||
$sql = "SELECT count(id) as countid FROM %queue% WHERE paidtime is not null AND id=?";
|
||||
$row = CommonUtils::getRowSqlObject($pdo, $sql, array($anId));
|
||||
if ($row != null) {
|
||||
$aCount = $row->countid;
|
||||
if (($aCount != null) && ($aCount == 1)) {
|
||||
$allNotPaid = false;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ($allNumeric) {
|
||||
$sql = "SELECT count(id) as countid FROM %queue% WHERE paidtime is not null AND id in ($ids)";
|
||||
$counts = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
if ($counts[0]["countid"] > 0) {
|
||||
$allNotPaid = false;
|
||||
}
|
||||
} else {
|
||||
$allNotPaid = false;
|
||||
}
|
||||
|
||||
$billid = (-1);
|
||||
if ($allNotPaid == true) {
|
||||
$billid = -1;
|
||||
|
||||
|
||||
$sql = "SELECT MAX(id) as maxid FROM %bill%";
|
||||
$maxIdRes = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
$maxId = $maxIdRes[0]["maxid"];
|
||||
|
|
@ -2144,7 +2148,7 @@ class QueueContent {
|
|||
$pdo->commit();
|
||||
}
|
||||
|
||||
$billInfo = array("billid" => $billid, "date" => $currentTime);
|
||||
$billInfo = array("billid" => $billid, "date" => $currentTime, "brutto" => $brutto);
|
||||
|
||||
// Rksv::signBill($pdo, $billid);
|
||||
|
||||
|
|
@ -2192,8 +2196,7 @@ class QueueContent {
|
|||
return $billid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private function getUserId() {
|
||||
if(session_id() == '') {
|
||||
session_start();
|
||||
|
|
|
|||
|
|
@ -1122,6 +1122,25 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_1518_1519($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::insertOrUpdateConfigItem($pdo, 'sumupforcard', '0');
|
||||
self::insertOrUpdateConfigItem($pdo, 'affiliatekey', '');
|
||||
self::insertOrUpdateConfigItem($pdo, 'appid', '');
|
||||
self::insertOrUpdateConfigItem($pdo, 'sumupfailuretext', 'Fehlgeschlagene Kartenzahlung');
|
||||
|
||||
$sql = "UPDATE `%payment%` SET name=?, name_en=?, name_esp=? WHERE id=?";
|
||||
self::execSqlWithParam($pdo, $sql, array("Kartenzahlung","Card Payment","Pago con tarjeta",2));
|
||||
|
||||
$sql = "UPDATE `%bill%` SET paymentid=? WHERE paymentid=?";
|
||||
self::execSqlWithParam($pdo, $sql, array(2,3));
|
||||
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||
"1.3.1" => array("upd_1301_1302","1.3.2"),
|
||||
|
|
@ -1187,10 +1206,10 @@ class Version {
|
|||
"1.5.14" => array("upd_1514_1515","1.5.15"),
|
||||
"1.5.15" => array("upd_1515_1516","1.5.16"),
|
||||
"1.5.16" => array("upd_1516_1517","1.5.17"),
|
||||
"1.5.17" => array("upd_1517_1518","1.5.18")
|
||||
"1.5.17" => array("upd_1517_1518","1.5.18"),
|
||||
"1.5.18" => array("upd_1518_1519","1.5.19")
|
||||
);
|
||||
|
||||
// RE;* also for install process no check is required
|
||||
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {
|
||||
$curversion = CommonUtils::getConfigValue($pdo, "version", "0");
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.5.18"></script>
|
||||
<script src="utilities.js?v=1.5.19"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js"></script>
|
||||
<script src="elements/product.js?v=1.5.18"></script>
|
||||
<script src="elements/extra.js?v=1.5.18"></script>
|
||||
<script src="elements/product.js?v=1.5.19"></script>
|
||||
<script src="elements/extra.js?v=1.5.19"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,206 @@
|
|||
<html>
|
||||
|
||||
<head>
|
||||
<head>
|
||||
<title>Zahlungsinformation</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<script>
|
||||
|
||||
var SUM_HEADLINE = ["SumUp-Zahlungsinformation","SumUp Payment Information","SumUP información sobre pagamiento"];
|
||||
var SUM_TO_ORDER = ["Weiter zur Bestellseite","Continue to ordering view","Continuar a página de orden"];
|
||||
var SUM_TO_PAYMENT = ["Zurück zur Kassenansicht","Back to paydesk view","Volver a la vista de pagamiento"];
|
||||
var SUM_BILL_ID = ["Rechnungsnummer","Bill id","ID de factura"];
|
||||
var SUM_STATUS_FAILED = ["Fehlgeschlagen","Failed","Abortado"];
|
||||
var SUM_STATUS_OK = ["OK","OK","OK"];
|
||||
var SUM_REASON = ["Grund","Reason","Razón"];
|
||||
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
|
||||
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
|
||||
|
||||
var nextpage = "paydesk.html?version=1.5.19";
|
||||
|
||||
var lang;
|
||||
|
||||
function setLanguage(language) {
|
||||
lang = language;
|
||||
|
||||
$("#headline").html(SUM_HEADLINE[lang]);
|
||||
|
||||
urlsuffix = location.search;
|
||||
if (urlsuffix.indexOf('billinformation=') < 0) {
|
||||
alert("Fehler beim Aufruf der Seite - GET-Parameter fehlen!");
|
||||
return;
|
||||
} else {
|
||||
var billinformation = '';
|
||||
var smpStatus = '';
|
||||
var smpFailureCause = '';
|
||||
var urlParts = urlsuffix.split(/&|\?/);
|
||||
for (var i=0;i<urlParts.length;i++) {
|
||||
var aPart = urlParts[i];
|
||||
if (aPart.indexOf('billinformation=') == 0) {
|
||||
var parts = aPart.split("=");
|
||||
billinformation = parts[1];
|
||||
} else if (aPart.indexOf('smp-status=') == 0) {
|
||||
var parts = aPart.split("=");
|
||||
smpStatus = parts[1];
|
||||
} else if (aPart.indexOf('smp-failure-cause=') == 0) {
|
||||
var parts = aPart.split("=");
|
||||
smpFailureCause = parts[1];
|
||||
}
|
||||
}
|
||||
if (billinformation == "") {
|
||||
alert("Fehler beim Aufruf der Seite - Rechnungsinformation wurde nicht übermittelt!");
|
||||
return;
|
||||
}
|
||||
|
||||
var billinfoparts = billinformation.split("-");
|
||||
|
||||
if (billinfoparts.length < 4) {
|
||||
alert("Fehler beim Aufruf der Seite - Rechnungsinformation wurde nicht komplett übermittelt!");
|
||||
return;
|
||||
}
|
||||
|
||||
var billid = billinfoparts[0];
|
||||
var nextPage = billinfoparts[1];
|
||||
var tableid = billinfoparts[2];
|
||||
var randvalue = billinfoparts[3];
|
||||
|
||||
if (smpStatus == "failed") {
|
||||
nextPage = "p";
|
||||
}
|
||||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.5.19";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=1.5.19";
|
||||
}
|
||||
|
||||
var txt = "<table class='viewtable'>";
|
||||
txt += "<tr><td>" + SUM_BILL_ID[lang] + "<td>" + billinfoparts[0] + "</tr>";
|
||||
if (smpStatus == "failed") {
|
||||
txt += "<tr><td>Status<td><span style='color:red;'>" + SUM_STATUS_FAILED[lang] + "</span></tr>";
|
||||
txt += "<tr><td>" + SUM_REASON[lang] + "<td>" + smpFailureCause + "</tr>";
|
||||
txt += "<tr><td>" + SUM_CANCEL_ITEM[lang] + '<td id="cancelmsg"><img id="progressimg" src="php/3rdparty/images/ajax-loader.gif" /></tr>';
|
||||
} else {
|
||||
txt += "<tr><td>Status<td><span style='color:green;'>" + SUM_STATUS_OK[lang] + "</span></tr>";
|
||||
}
|
||||
txt += "</table>";
|
||||
$("#billstatus").html(txt);
|
||||
|
||||
if (smpStatus == "failed") {
|
||||
cancelPayment(billid, randvalue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function cancelPayment(billid, randvalue) {
|
||||
var data = {
|
||||
billid: billid,
|
||||
randvalue: randvalue
|
||||
};
|
||||
doAjax("POST", "php/contenthandler.php?module=bill&command=cancelCardPayment", data, handleCancelAnswer, null, true);
|
||||
}
|
||||
|
||||
function handleCancelAnswer(answer) {
|
||||
if (answer.status != "OK") {
|
||||
alert("Error: " + answer.msg);
|
||||
return;
|
||||
}
|
||||
|
||||
setTimeout(function(){
|
||||
$("#cancelmsg").html(SUM_CANCELLATION_OK[lang]);},250
|
||||
);
|
||||
}
|
||||
|
||||
function binding() {
|
||||
$("#nextpagebtn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
setTimeout(function(){document.location.href = nextpage;},250);
|
||||
});
|
||||
}
|
||||
|
||||
function getGeneralConfigItems() {
|
||||
doAjax("GET", "php/contenthandler.php?module=admin&command=getGeneralConfigItems", null, insertGenConfigStartRest, "Fehler Konfigurationsdaten");
|
||||
}
|
||||
|
||||
function insertGenConfigStartRest(configResult) {
|
||||
|
||||
if (configResult.status == "OK") {
|
||||
var values = configResult.msg;
|
||||
|
||||
setLanguage(values.userlanguage);
|
||||
|
||||
binding();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "index.html"},250); // not logged in
|
||||
}
|
||||
}
|
||||
|
||||
$(document).on("pageinit", "#index-page", function () {
|
||||
|
||||
initializeMainMenu("#modulemenu");
|
||||
hideMenu();
|
||||
$.ajaxSetup({ cache: false });
|
||||
|
||||
getGeneralConfigItems();
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<div data-role="page" id="index-page" data-theme="c">
|
||||
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
|
||||
<ul data-role="listview" id="modulemenu" data-divider-theme="a" data-inset="true">
|
||||
<li data-role="list-divider" data-theme="b" data-role="heading">Hauptmenü</li>
|
||||
</ul>
|
||||
</div><!-- /panel -->
|
||||
<div data-role="header" data-theme="b" data-position="fixed" id="theheader" style="background-color:black;">
|
||||
<h1>Rechungsinformation</h1>
|
||||
<div data-type="horizontal" style="top:0px;position:absolute;float:right;z-index:10;display:inline;" align="right" class="ui-btn-right">
|
||||
<a href="#" data-role="button" data-icon="arrow-d" data-ajax="false" id="menuswitch">Hauptmenü</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div data-role="content">
|
||||
|
||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
|
||||
<H2><span id="headline">Sumup-Zahlungsinformation</span></H2>
|
||||
|
||||
<div id="billstatus"></div>
|
||||
<form>
|
||||
<button type="submit" data-theme="f" data-icon="check" id="nextpagebtn"><span id="nextpagebtntxt">Weiter</span></button>
|
||||
</form>
|
||||
</div> <!-- Login-Maske -->
|
||||
|
||||
</div>
|
||||
|
||||
<div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
|
||||
<div class="ui-grid-a">
|
||||
<div class="ui-block-a userinfo" id="loggedinuser"></div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo"></div>
|
||||
</div><!-- /grid-a -->
|
||||
</div> <!-- footer -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.5.18"></script>
|
||||
<script src="utilities.js?v=1.5.19"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.18">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.19">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.19">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue