From 6af89f9ac787a52a75b7b0c2efa04882e7af512d Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 12 Nov 2024 16:37:54 +0100 Subject: [PATCH] QR App --- Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb | 4 ++-- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/usrcntlAktDetails.vb | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb b/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb index 7a92cdc..6b4badd 100644 --- a/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb +++ b/Aviso/AvisoReports/rptQRSendung_VerwahrungApp.vb @@ -61,8 +61,8 @@ Public Class rptQRSendung_VerwahrungApp 'QR.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://verwahrung.app.verag.ag/lkw-driver?avisoid=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&sendungsid=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SND.tblSnd_SendungID) & "×tamp=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(Now.ToString("ddMMyyyy_HHmm"))) Dim token = VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt("avisoid=" & (AVISO.AvisoID) & "&sendungsid=" & (tblSnd_SendungID) & "×tamp=" & Now.ToString("ddMMyyyy_HHmm") & "&nation=" & If(AVISO.LKW_Nationalitaet, "")) - MsgBox(token) - MsgBox(VERAG_PROG_ALLGEMEIN.cCryptography3.Decrypt(token)) + 'MsgBox(token) + 'MsgBox(VERAG_PROG_ALLGEMEIN.cCryptography3.Decrypt(token)) QR.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://verwahrung.app.verag.ag/lkw-driver?token=" & token) picQRAviso.Image = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getBARCODEAviso(AVISO.AvisoID) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index ef34caf..d763738 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 476f91b..27ec220 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -350,7 +350,6 @@ Public Class usrcntlAktDetails ' btnLkwBeleg.Visible = False btnAktAbschliessen.Visible = False btnAktAbschliessen.BackColor = Color.DarkGreen - lblBarZuKassierenSumme.Visible = False Select Case AVISO.Status @@ -393,9 +392,12 @@ Public Class usrcntlAktDetails pnlAbgeschlossen.Visible = True btnAktAbschliessen.Visible = False ' btnLkwBeleg.Visible = False + btnQRVerwahrung.Visible = False + Else pnlAbgeschlossen.Visible = False ' btnAktAbschliessen.Visible = True + btnQRVerwahrung.Visible = True End If intiAktUebernehmenBtn() @@ -3856,6 +3858,7 @@ Public Class usrcntlAktDetails Dim rpt As New rptQRSendung_VerwahrungApp(AVISO, SND) Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON + If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True) If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)