diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 6c5ad421..55c44623 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -1061,7 +1061,7 @@ Public Class cRKSV End Function 'cboPrinter.SelectedItem.ToString - Public Shared Function printKundenBeleg(BELEG As EABeleg, KASSE As cRKSV_Kasse, PERSONAL As cPersonal, printername As String, showDok As Boolean) As Boolean + Public Shared Function printKundenBeleg(BELEG As EABeleg, KASSE As cRKSV_Kasse, PERSONAL As cPersonal, printername As String, showDok As Boolean, Optional POSPayment As Boolean = False) As Boolean 'Dim print As New frmPrintLayout @@ -1238,6 +1238,10 @@ Public Class cRKSV rpt.lblGesamtbetrag.Text = CDbl(sum + (sum * s)).ToString("C") If sum < 0 Then rpt.Label2.Text = "Rechnungskorrektur Nr." End Sub + If POSPayment Then + Dim Pos = New POS(rpt, sum) + Pos.ShowDialog() + End If 'PaperKind = System.Drawing.Printing.PaperKind.Custom ' Me.PageSettings.PaperKind = System.Drawing.Printing.PaperKind.Custom diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index c52b47ce..771d08f6 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 3fd8eee6..148e5a0f 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -566,6 +566,12 @@ Form + + POS.vb + + + Form + frmKundenBesonderheiten_Add.vb @@ -2811,6 +2817,9 @@ frmEssensbestellungen.vb + + POS.vb + frmKundenBesonderheiten_Add.vb diff --git a/SDL/kassenbuch/POS.Designer.vb b/SDL/kassenbuch/POS.Designer.vb new file mode 100644 index 00000000..61ba0b87 --- /dev/null +++ b/SDL/kassenbuch/POS.Designer.vb @@ -0,0 +1,570 @@ + _ +Partial Class POS + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.CheckBoxDummy = New System.Windows.Forms.CheckBox() + Me.CheckBoxAutodruck = New System.Windows.Forms.CheckBox() + Me.Label15 = New System.Windows.Forms.Label() + Me.comboInstalledPrinters = New System.Windows.Forms.ComboBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.TextBox_BelegNr = New System.Windows.Forms.TextBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.StornoBelegNr = New System.Windows.Forms.TextBox() + Me.TextBox_Aktiv = New System.Windows.Forms.TextBox() + Me.Label13 = New System.Windows.Forms.Label() + Me.ComboBox_Typ = New System.Windows.Forms.ComboBox() + Me.Button_Haendlerbeleg_drucken = New System.Windows.Forms.Button() + Me.TextBox_Kassenbon = New System.Windows.Forms.TextBox() + Me.Button_Kundenbeleg_drucken = New System.Windows.Forms.Button() + Me.Button_Gutschrift = New System.Windows.Forms.Button() + Me.Button_Storno = New System.Windows.Forms.Button() + Me.Button_Tagesabschluss = New System.Windows.Forms.Button() + Me.Button_Diagnose = New System.Windows.Forms.Button() + Me.Button_Exit = New System.Windows.Forms.Button() + Me.CheckBox_Kassedruck = New System.Windows.Forms.CheckBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.TextBox_Drucktext2 = New System.Windows.Forms.TextBox() + Me.Label10 = New System.Windows.Forms.Label() + Me.TextBox_Drucktext = New System.Windows.Forms.TextBox() + Me.TextBox_ErgebnisText = New System.Windows.Forms.TextBox() + Me.TextBox_Ergebnis = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.Button_Autorisierung = New System.Windows.Forms.Button() + Me.TextBox_Betrag = New System.Windows.Forms.TextBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.TextBox_Lizenz = New System.Windows.Forms.TextBox() + Me.Label7 = New System.Windows.Forms.Label() + Me.ComboBox_ComStop = New System.Windows.Forms.ComboBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.ComboBox_ComSpeed = New System.Windows.Forms.ComboBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.TextBox_Port = New System.Windows.Forms.TextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.TextBox_IP = New System.Windows.Forms.TextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.ComboBox_COM = New System.Windows.Forms.ComboBox() + Me.TextBox_KasseNr = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'CheckBoxDummy + ' + Me.CheckBoxDummy.AutoSize = True + Me.CheckBoxDummy.Location = New System.Drawing.Point(678, 15) + Me.CheckBoxDummy.Name = "CheckBoxDummy" + Me.CheckBoxDummy.Size = New System.Drawing.Size(128, 17) + Me.CheckBoxDummy.TabIndex = 90 + Me.CheckBoxDummy.Text = "Dummy-Kopf drucken" + Me.CheckBoxDummy.UseVisualStyleBackColor = True + ' + 'CheckBoxAutodruck + ' + Me.CheckBoxAutodruck.AutoSize = True + Me.CheckBoxAutodruck.Location = New System.Drawing.Point(591, 16) + Me.CheckBoxAutodruck.Name = "CheckBoxAutodruck" + Me.CheckBoxAutodruck.Size = New System.Drawing.Size(75, 17) + Me.CheckBoxAutodruck.TabIndex = 89 + Me.CheckBoxAutodruck.Text = "Autodruck" + Me.CheckBoxAutodruck.UseVisualStyleBackColor = True + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Location = New System.Drawing.Point(255, 16) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(45, 13) + Me.Label15.TabIndex = 88 + Me.Label15.Text = "Drucker" + ' + 'comboInstalledPrinters + ' + Me.comboInstalledPrinters.FormattingEnabled = True + Me.comboInstalledPrinters.Location = New System.Drawing.Point(321, 13) + Me.comboInstalledPrinters.Name = "comboInstalledPrinters" + Me.comboInstalledPrinters.Size = New System.Drawing.Size(229, 21) + Me.comboInstalledPrinters.TabIndex = 87 + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(20, 215) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(45, 13) + Me.Label12.TabIndex = 86 + Me.Label12.Text = "BelegNr" + ' + 'TextBox_BelegNr + ' + Me.TextBox_BelegNr.Location = New System.Drawing.Point(117, 212) + Me.TextBox_BelegNr.Name = "TextBox_BelegNr" + Me.TextBox_BelegNr.ReadOnly = True + Me.TextBox_BelegNr.Size = New System.Drawing.Size(44, 20) + Me.TextBox_BelegNr.TabIndex = 85 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(596, 240) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(76, 13) + Me.Label14.TabIndex = 84 + Me.Label14.Text = "StornoBelegNr" + ' + 'StornoBelegNr + ' + Me.StornoBelegNr.Location = New System.Drawing.Point(678, 237) + Me.StornoBelegNr.Name = "StornoBelegNr" + Me.StornoBelegNr.Size = New System.Drawing.Size(78, 20) + Me.StornoBelegNr.TabIndex = 83 + ' + 'TextBox_Aktiv + ' + Me.TextBox_Aktiv.BackColor = System.Drawing.Color.Gray + Me.TextBox_Aktiv.Location = New System.Drawing.Point(23, 506) + Me.TextBox_Aktiv.Name = "TextBox_Aktiv" + Me.TextBox_Aktiv.Size = New System.Drawing.Size(123, 20) + Me.TextBox_Aktiv.TabIndex = 82 + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(329, 110) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(25, 13) + Me.Label13.TabIndex = 81 + Me.Label13.Text = "Typ" + ' + 'ComboBox_Typ + ' + Me.ComboBox_Typ.FormattingEnabled = True + Me.ComboBox_Typ.Items.AddRange(New Object() {"0: ZVT Standard", "1: ICP mit Shutter", "2: ICT 220 alt", "3: ICP Zelos", "4: Clover", "5: CCV Base seriell", "10: SIX", "11: OPI", "12: myPOS", "13: TIM-Server"}) + Me.ComboBox_Typ.Location = New System.Drawing.Point(395, 106) + Me.ComboBox_Typ.MaxDropDownItems = 12 + Me.ComboBox_Typ.Name = "ComboBox_Typ" + Me.ComboBox_Typ.Size = New System.Drawing.Size(154, 21) + Me.ComboBox_Typ.TabIndex = 80 + Me.ComboBox_Typ.Text = "0: ZVT Standard" + ' + 'Button_Haendlerbeleg_drucken + ' + Me.Button_Haendlerbeleg_drucken.Location = New System.Drawing.Point(323, 477) + Me.Button_Haendlerbeleg_drucken.Name = "Button_Haendlerbeleg_drucken" + Me.Button_Haendlerbeleg_drucken.Size = New System.Drawing.Size(122, 23) + Me.Button_Haendlerbeleg_drucken.TabIndex = 79 + Me.Button_Haendlerbeleg_drucken.Text = "Drucken" + Me.Button_Haendlerbeleg_drucken.UseVisualStyleBackColor = True + ' + 'TextBox_Kassenbon + ' + Me.TextBox_Kassenbon.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBox_Kassenbon.Location = New System.Drawing.Point(590, 46) + Me.TextBox_Kassenbon.Multiline = True + Me.TextBox_Kassenbon.Name = "TextBox_Kassenbon" + Me.TextBox_Kassenbon.ReadOnly = True + Me.TextBox_Kassenbon.Size = New System.Drawing.Size(221, 76) + Me.TextBox_Kassenbon.TabIndex = 78 + Me.TextBox_Kassenbon.Text = "Kassenbon" + ' + 'Button_Kundenbeleg_drucken + ' + Me.Button_Kundenbeleg_drucken.Location = New System.Drawing.Point(24, 477) + Me.Button_Kundenbeleg_drucken.Name = "Button_Kundenbeleg_drucken" + Me.Button_Kundenbeleg_drucken.Size = New System.Drawing.Size(122, 23) + Me.Button_Kundenbeleg_drucken.TabIndex = 77 + Me.Button_Kundenbeleg_drucken.Text = "Drucken" + Me.Button_Kundenbeleg_drucken.UseVisualStyleBackColor = True + ' + 'Button_Gutschrift + ' + Me.Button_Gutschrift.Location = New System.Drawing.Point(595, 316) + Me.Button_Gutschrift.Name = "Button_Gutschrift" + Me.Button_Gutschrift.Size = New System.Drawing.Size(163, 29) + Me.Button_Gutschrift.TabIndex = 76 + Me.Button_Gutschrift.Text = "4 = Gutschrift" + Me.Button_Gutschrift.UseVisualStyleBackColor = True + ' + 'Button_Storno + ' + Me.Button_Storno.Location = New System.Drawing.Point(595, 263) + Me.Button_Storno.Name = "Button_Storno" + Me.Button_Storno.Size = New System.Drawing.Size(163, 34) + Me.Button_Storno.TabIndex = 75 + Me.Button_Storno.Text = "3 = Storno" + Me.Button_Storno.UseVisualStyleBackColor = True + ' + 'Button_Tagesabschluss + ' + Me.Button_Tagesabschluss.Location = New System.Drawing.Point(594, 189) + Me.Button_Tagesabschluss.Name = "Button_Tagesabschluss" + Me.Button_Tagesabschluss.Size = New System.Drawing.Size(163, 34) + Me.Button_Tagesabschluss.TabIndex = 74 + Me.Button_Tagesabschluss.Text = "2 = Tagesabschluss" + Me.Button_Tagesabschluss.UseVisualStyleBackColor = True + ' + 'Button_Diagnose + ' + Me.Button_Diagnose.Location = New System.Drawing.Point(594, 139) + Me.Button_Diagnose.Name = "Button_Diagnose" + Me.Button_Diagnose.Size = New System.Drawing.Size(164, 33) + Me.Button_Diagnose.TabIndex = 73 + Me.Button_Diagnose.Text = "1 = Diagnose" + Me.Button_Diagnose.UseVisualStyleBackColor = True + ' + 'Button_Exit + ' + Me.Button_Exit.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Button_Exit.Location = New System.Drawing.Point(594, 477) + Me.Button_Exit.Name = "Button_Exit" + Me.Button_Exit.Size = New System.Drawing.Size(162, 23) + Me.Button_Exit.TabIndex = 72 + Me.Button_Exit.Text = "Programmende" + Me.Button_Exit.UseVisualStyleBackColor = True + ' + 'CheckBox_Kassedruck + ' + Me.CheckBox_Kassedruck.AutoSize = True + Me.CheckBox_Kassedruck.Location = New System.Drawing.Point(395, 77) + Me.CheckBox_Kassedruck.Name = "CheckBox_Kassedruck" + Me.CheckBox_Kassedruck.Size = New System.Drawing.Size(82, 17) + Me.CheckBox_Kassedruck.TabIndex = 71 + Me.CheckBox_Kassedruck.Text = "Kassedruck" + Me.CheckBox_Kassedruck.UseVisualStyleBackColor = True + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(320, 237) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(131, 13) + Me.Label11.TabIndex = 70 + Me.Label11.Text = "Drucktext2 (Händlerbeleg)" + ' + 'TextBox_Drucktext2 + ' + Me.TextBox_Drucktext2.Location = New System.Drawing.Point(323, 263) + Me.TextBox_Drucktext2.Multiline = True + Me.TextBox_Drucktext2.Name = "TextBox_Drucktext2" + Me.TextBox_Drucktext2.ReadOnly = True + Me.TextBox_Drucktext2.ScrollBars = System.Windows.Forms.ScrollBars.Vertical + Me.TextBox_Drucktext2.Size = New System.Drawing.Size(226, 208) + Me.TextBox_Drucktext2.TabIndex = 69 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(21, 237) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(125, 13) + Me.Label10.TabIndex = 68 + Me.Label10.Text = "Drucktext (Kundenbeleg)" + ' + 'TextBox_Drucktext + ' + Me.TextBox_Drucktext.Location = New System.Drawing.Point(23, 262) + Me.TextBox_Drucktext.Multiline = True + Me.TextBox_Drucktext.Name = "TextBox_Drucktext" + Me.TextBox_Drucktext.ReadOnly = True + Me.TextBox_Drucktext.ScrollBars = System.Windows.Forms.ScrollBars.Vertical + Me.TextBox_Drucktext.Size = New System.Drawing.Size(223, 209) + Me.TextBox_Drucktext.TabIndex = 67 + ' + 'TextBox_ErgebnisText + ' + Me.TextBox_ErgebnisText.Location = New System.Drawing.Point(175, 189) + Me.TextBox_ErgebnisText.Multiline = True + Me.TextBox_ErgebnisText.Name = "TextBox_ErgebnisText" + Me.TextBox_ErgebnisText.ReadOnly = True + Me.TextBox_ErgebnisText.Size = New System.Drawing.Size(375, 43) + Me.TextBox_ErgebnisText.TabIndex = 66 + ' + 'TextBox_Ergebnis + ' + Me.TextBox_Ergebnis.Location = New System.Drawing.Point(117, 189) + Me.TextBox_Ergebnis.Name = "TextBox_Ergebnis" + Me.TextBox_Ergebnis.ReadOnly = True + Me.TextBox_Ergebnis.Size = New System.Drawing.Size(44, 20) + Me.TextBox_Ergebnis.TabIndex = 65 + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(21, 192) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(48, 13) + Me.Label9.TabIndex = 64 + Me.Label9.Text = "Ergebnis" + ' + 'Button_Autorisierung + ' + Me.Button_Autorisierung.Location = New System.Drawing.Point(175, 153) + Me.Button_Autorisierung.Name = "Button_Autorisierung" + Me.Button_Autorisierung.Size = New System.Drawing.Size(199, 24) + Me.Button_Autorisierung.TabIndex = 49 + Me.Button_Autorisierung.Text = "Autorisierung starten" + Me.Button_Autorisierung.UseVisualStyleBackColor = True + ' + 'TextBox_Betrag + ' + Me.TextBox_Betrag.Location = New System.Drawing.Point(115, 156) + Me.TextBox_Betrag.MaxLength = 8 + Me.TextBox_Betrag.Name = "TextBox_Betrag" + Me.TextBox_Betrag.Size = New System.Drawing.Size(46, 20) + Me.TextBox_Betrag.TabIndex = 48 + Me.TextBox_Betrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Location = New System.Drawing.Point(21, 159) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(38, 13) + Me.Label8.TabIndex = 63 + Me.Label8.Text = "Betrag" + ' + 'TextBox_Lizenz + ' + Me.TextBox_Lizenz.Location = New System.Drawing.Point(115, 103) + Me.TextBox_Lizenz.Name = "TextBox_Lizenz" + Me.TextBox_Lizenz.Size = New System.Drawing.Size(190, 20) + Me.TextBox_Lizenz.TabIndex = 62 + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(21, 106) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(37, 13) + Me.Label7.TabIndex = 61 + Me.Label7.Text = "Lizenz" + ' + 'ComboBox_ComStop + ' + Me.ComboBox_ComStop.FormattingEnabled = True + Me.ComboBox_ComStop.Items.AddRange(New Object() {"1", "2"}) + Me.ComboBox_ComStop.Location = New System.Drawing.Point(323, 74) + Me.ComboBox_ComStop.Name = "ComboBox_ComStop" + Me.ComboBox_ComStop.Size = New System.Drawing.Size(38, 21) + Me.ComboBox_ComStop.TabIndex = 60 + Me.ComboBox_ComStop.Text = "1" + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(255, 77) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(50, 13) + Me.Label6.TabIndex = 59 + Me.Label6.Text = "ComStop" + ' + 'ComboBox_ComSpeed + ' + Me.ComboBox_ComSpeed.FormattingEnabled = True + Me.ComboBox_ComSpeed.Items.AddRange(New Object() {"9600", "115000"}) + Me.ComboBox_ComSpeed.Location = New System.Drawing.Point(115, 73) + Me.ComboBox_ComSpeed.Name = "ComboBox_ComSpeed" + Me.ComboBox_ComSpeed.Size = New System.Drawing.Size(121, 21) + Me.ComboBox_ComSpeed.TabIndex = 58 + Me.ComboBox_ComSpeed.Text = "9600" + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(21, 77) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(59, 13) + Me.Label5.TabIndex = 57 + Me.Label5.Text = "ComSpeed" + ' + 'TextBox_Port + ' + Me.TextBox_Port.Location = New System.Drawing.Point(492, 47) + Me.TextBox_Port.MaxLength = 5 + Me.TextBox_Port.Name = "TextBox_Port" + Me.TextBox_Port.Size = New System.Drawing.Size(58, 20) + Me.TextBox_Port.TabIndex = 56 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(460, 50) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(26, 13) + Me.Label4.TabIndex = 55 + Me.Label4.Text = "Port" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(255, 50) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(17, 13) + Me.Label3.TabIndex = 54 + Me.Label3.Text = "IP" + ' + 'TextBox_IP + ' + Me.TextBox_IP.Location = New System.Drawing.Point(323, 47) + Me.TextBox_IP.MaxLength = 30 + Me.TextBox_IP.Name = "TextBox_IP" + Me.TextBox_IP.Size = New System.Drawing.Size(114, 20) + Me.TextBox_IP.TabIndex = 53 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(21, 49) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(31, 13) + Me.Label2.TabIndex = 52 + Me.Label2.Text = "COM" + ' + 'ComboBox_COM + ' + Me.ComboBox_COM.FormattingEnabled = True + Me.ComboBox_COM.Items.AddRange(New Object() {"LAN", "COM", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9"}) + Me.ComboBox_COM.Location = New System.Drawing.Point(115, 46) + Me.ComboBox_COM.Name = "ComboBox_COM" + Me.ComboBox_COM.Size = New System.Drawing.Size(121, 21) + Me.ComboBox_COM.TabIndex = 51 + Me.ComboBox_COM.Text = "LAN" + ' + 'TextBox_KasseNr + ' + Me.TextBox_KasseNr.Location = New System.Drawing.Point(115, 20) + Me.TextBox_KasseNr.MaxLength = 4 + Me.TextBox_KasseNr.Name = "TextBox_KasseNr" + Me.TextBox_KasseNr.Size = New System.Drawing.Size(46, 20) + Me.TextBox_KasseNr.TabIndex = 50 + Me.TextBox_KasseNr.Text = "1" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(21, 23) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(47, 13) + Me.Label1.TabIndex = 47 + Me.Label1.Text = "KasseNr" + ' + 'POS + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(841, 543) + Me.Controls.Add(Me.CheckBoxDummy) + Me.Controls.Add(Me.CheckBoxAutodruck) + Me.Controls.Add(Me.Label15) + Me.Controls.Add(Me.comboInstalledPrinters) + Me.Controls.Add(Me.Label12) + Me.Controls.Add(Me.TextBox_BelegNr) + Me.Controls.Add(Me.Label14) + Me.Controls.Add(Me.StornoBelegNr) + Me.Controls.Add(Me.TextBox_Aktiv) + Me.Controls.Add(Me.Label13) + Me.Controls.Add(Me.ComboBox_Typ) + Me.Controls.Add(Me.Button_Haendlerbeleg_drucken) + Me.Controls.Add(Me.TextBox_Kassenbon) + Me.Controls.Add(Me.Button_Kundenbeleg_drucken) + Me.Controls.Add(Me.Button_Gutschrift) + Me.Controls.Add(Me.Button_Storno) + Me.Controls.Add(Me.Button_Tagesabschluss) + Me.Controls.Add(Me.Button_Diagnose) + Me.Controls.Add(Me.Button_Exit) + Me.Controls.Add(Me.CheckBox_Kassedruck) + Me.Controls.Add(Me.Label11) + Me.Controls.Add(Me.TextBox_Drucktext2) + Me.Controls.Add(Me.Label10) + Me.Controls.Add(Me.TextBox_Drucktext) + Me.Controls.Add(Me.TextBox_ErgebnisText) + Me.Controls.Add(Me.TextBox_Ergebnis) + Me.Controls.Add(Me.Label9) + Me.Controls.Add(Me.Button_Autorisierung) + Me.Controls.Add(Me.TextBox_Betrag) + Me.Controls.Add(Me.Label8) + Me.Controls.Add(Me.TextBox_Lizenz) + Me.Controls.Add(Me.Label7) + Me.Controls.Add(Me.ComboBox_ComStop) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.ComboBox_ComSpeed) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.TextBox_Port) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.TextBox_IP) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.ComboBox_COM) + Me.Controls.Add(Me.TextBox_KasseNr) + Me.Controls.Add(Me.Label1) + Me.Name = "POS" + Me.Text = "POS" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents CheckBoxDummy As CheckBox + Friend WithEvents CheckBoxAutodruck As CheckBox + Friend WithEvents Label15 As Label + Friend WithEvents comboInstalledPrinters As ComboBox + Friend WithEvents Label12 As Label + Friend WithEvents TextBox_BelegNr As TextBox + Friend WithEvents Label14 As Label + Friend WithEvents StornoBelegNr As TextBox + Friend WithEvents TextBox_Aktiv As TextBox + Friend WithEvents Label13 As Label + Friend WithEvents ComboBox_Typ As ComboBox + Friend WithEvents Button_Haendlerbeleg_drucken As Button + Friend WithEvents TextBox_Kassenbon As TextBox + Friend WithEvents Button_Kundenbeleg_drucken As Button + Friend WithEvents Button_Gutschrift As Button + Friend WithEvents Button_Storno As Button + Friend WithEvents Button_Tagesabschluss As Button + Friend WithEvents Button_Diagnose As Button + Friend WithEvents Button_Exit As Button + Friend WithEvents CheckBox_Kassedruck As CheckBox + Friend WithEvents Label11 As Label + Friend WithEvents TextBox_Drucktext2 As TextBox + Friend WithEvents Label10 As Label + Friend WithEvents TextBox_Drucktext As TextBox + Friend WithEvents TextBox_ErgebnisText As TextBox + Friend WithEvents TextBox_Ergebnis As TextBox + Friend WithEvents Label9 As Label + Friend WithEvents Button_Autorisierung As Button + Friend WithEvents TextBox_Betrag As TextBox + Friend WithEvents Label8 As Label + Friend WithEvents TextBox_Lizenz As TextBox + Friend WithEvents Label7 As Label + Friend WithEvents ComboBox_ComStop As ComboBox + Friend WithEvents Label6 As Label + Friend WithEvents ComboBox_ComSpeed As ComboBox + Friend WithEvents Label5 As Label + Friend WithEvents TextBox_Port As TextBox + Friend WithEvents Label4 As Label + Friend WithEvents Label3 As Label + Friend WithEvents TextBox_IP As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents ComboBox_COM As ComboBox + Friend WithEvents TextBox_KasseNr As TextBox + Friend WithEvents Label1 As Label +End Class diff --git a/SDL/kassenbuch/POS.resx b/SDL/kassenbuch/POS.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/kassenbuch/POS.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/kassenbuch/POS.vb b/SDL/kassenbuch/POS.vb new file mode 100644 index 00000000..8bec755c --- /dev/null +++ b/SDL/kassenbuch/POS.vb @@ -0,0 +1,299 @@ +Imports System.Drawing.Printing +Imports Microsoft.Win32 + +Public Class POS + + Public Sub New(ByVal _rptKundenBeleg, betrag) + rptKundenBeleg = _rptKundenBeleg + betrag = CInt(betrag) + + End Sub + + + + ' Erstellt durch Jan Groetzner, Groetzner Unternehmensberatung, Seevetal + ' Version: 02.03.2020 + ' Kontakt: easyzvt@groetzner.de + + ' Dieser Quellcode dient als Beispielimplementierung zur Einbindung von EasyZVT in die eigene Kassenanwendung. + ' Der Code und auch Teile davon dürfen frei kopiert und in der Kassenanwendung verwendet werden + + Private EasyZVT_Worker As System.ComponentModel.BackgroundWorker = New System.ComponentModel.BackgroundWorker() + Private Funktion As Integer + Private rptKundenBeleg As rptKundenBeleg + Private Betrag As Integer + + Private WithEvents PDoc As Printing.PrintDocument + + Private Sub POS_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load + ' Anwendungsstart + ' Worker-Thread wird initialisiert + ' Vorherige Werte werden aus der Registry gelesen und in die Oberfläche eingetragen + ' Die Werte in der Oberfläche sollten in der echten Anwendung in der Stammdatentabelle der Kasse gespeichert werden und nicht in der Registry. Geht aber natürlich auch hier. + + Try + AddHandler EasyZVT_Worker.DoWork, New System.ComponentModel.DoWorkEventHandler(AddressOf EasyZVT_Async) + AddHandler EasyZVT_Worker.RunWorkerCompleted, New System.ComponentModel.RunWorkerCompletedEventHandler(AddressOf EasyZVT_OnCompleted) + + Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True) + TextBox_KasseNr.Text = ZVTKey.GetValue("KasseNr", "1") + ComboBox_COM.Text = ZVTKey.GetValue("COM", "LAN") + TextBox_IP.Text = ZVTKey.GetValue("IP", "192.168.86.122") + TextBox_Port.Text = ZVTKey.GetValue("Port", "20007") + ComboBox_ComSpeed.Text = ZVTKey.GetValue("ComSpeed", "9600") + ComboBox_ComStop.Text = ZVTKey.GetValue("ComStop", "1") + TextBox_Lizenz.Text = ZVTKey.GetValue("Lizenz", "") + If ZVTKey.GetValue("Kassedruck", 0) = 1 Then + CheckBox_Kassedruck.Checked = True + Else + CheckBox_Kassedruck.Checked = False + End If + ComboBox_Typ.SelectedIndex = ComboBox_Typ.FindString(ZVTKey.GetValue("Typ", 0).ToString) + PopulateInstalledPrintersCombo() + comboInstalledPrinters.SelectedIndex = comboInstalledPrinters.FindString(ZVTKey.GetValue("DemoDruckername", "")) + If ZVTKey.GetValue("DemoAutodruck", 0) = 0 Then + CheckBoxAutodruck.Checked = False + Else + CheckBoxAutodruck.Checked = True + End If + If ZVTKey.GetValue("DemoDummydruck", 1) = 0 Then + CheckBoxDummy.Checked = False + Else + CheckBoxDummy.Checked = True + End If + ZVTKey.Close() + + Catch ex As Exception + MessageBox.Show("Fehler beim Einlesen der Standardwerte: " & ex.Message) + End Try + End Sub + + + Private Sub SetRegistryParameter() + 'Funktion holt Werte direkt aus der Oberfläche (TextBox_...) und schreibt diese in die Registry als Eingabeparameter für EasyZVT. + 'Im wahren Leben stehen diese Werte in Datenbankeinträgen der Stammdatenverwaltung in der Hauptanwendung + + Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True) + Dim TypSelected As String + Dim Typ As Long + + Try + ZVTKey.SetValue("Funktion", Funktion, RegistryValueKind.DWord) + TypSelected = Strings.Left(ComboBox_Typ.Text, 2).Replace(":", "") + Typ = TypSelected + ZVTKey.SetValue("Typ", Typ, RegistryValueKind.DWord) + ZVTKey.SetValue("KasseNr", TextBox_KasseNr.Text, RegistryValueKind.String) + ZVTKey.SetValue("COM", ComboBox_COM.Text, RegistryValueKind.String) + ZVTKey.SetValue("IP", TextBox_IP.Text, RegistryValueKind.String) + ZVTKey.SetValue("Port", CInt(TextBox_Port.Text), RegistryValueKind.DWord) + ZVTKey.SetValue("ComSpeed", CInt(ComboBox_ComSpeed.Text), RegistryValueKind.DWord) + ZVTKey.SetValue("ComStop", CInt(ComboBox_ComStop.Text), RegistryValueKind.DWord) + ZVTKey.SetValue("Lizenz", TextBox_Lizenz.Text, RegistryValueKind.String) + If Funktion = 0 Or Funktion = 4 Then + Betrag = CInt("0" & TextBox_Betrag.Text) + ZVTKey.SetValue("Betrag", Betrag, RegistryValueKind.DWord) + End If + If Funktion = 3 Then + ZVTKey.SetValue("StornoBetrag", CInt("0" & TextBox_Betrag.Text), RegistryValueKind.DWord) + ZVTKey.SetValue("StornoBelegNr", CInt("0" & StornoBelegNr.Text), RegistryValueKind.DWord) + End If + If CheckBox_Kassedruck.Checked Then + ZVTKey.SetValue("Kassedruck", 1, RegistryValueKind.DWord) + Else + ZVTKey.SetValue("Kassedruck", 0, RegistryValueKind.DWord) + End If + ZVTKey.SetValue("Ergebnis", 1000, RegistryValueKind.DWord) ' Zur Sicherheit, falls EasyZVT gar nicht installiert ist oder nicht gestartet werden kann + ZVTKey.SetValue("ErgebnisText", "EasyZVT konnte nicht gestartet werden", RegistryValueKind.String) + ZVTKey.SetValue("DemoDruckername", comboInstalledPrinters.Text, RegistryValueKind.String) + If CheckBoxAutodruck.Checked Then + ZVTKey.SetValue("DemoAutodruck", 1, RegistryValueKind.DWord) + Else + ZVTKey.SetValue("DemoAutodruck", 0, RegistryValueKind.DWord) + End If + If CheckBoxDummy.Checked Then + ZVTKey.SetValue("DemoDummydruck", 1, RegistryValueKind.DWord) + Else + ZVTKey.SetValue("DemoDummydruck", 0, RegistryValueKind.DWord) + End If + Button_Autorisierung.Enabled = False + Button_Diagnose.Enabled = False + Button_Tagesabschluss.Enabled = False + Button_Storno.Enabled = False + Button_Gutschrift.Enabled = False + Button_Exit.Enabled = False + + TextBox_ErgebnisText.Text = "EasyZVT-Zahlung aktiv" + TextBox_Aktiv.Text = "warte auf Aktiv=0" + + + Catch ex As Exception + MessageBox.Show("Das Schreiben der Parameter ist fehlgeschlagen: " & ex.Message) + Exit Sub + End Try + ZVTKey.Close() + + End Sub + Private Sub Autorisierung() + + Funktion = 0 + SetRegistryParameter() + EasyZVT_Worker.RunWorkerAsync() + + End Sub + Private Sub Button_Autorisierung_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Autorisierung.Click + 'Zahlung per Klick auslösen + Autorisierung() + End Sub + Private Sub TextBox_Betrag_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles TextBox_Betrag.KeyPress + + End Sub + + Private Sub EasyZVT_Async(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs) + ' Programmstart von ZVTStart.exe und warten auf Programmende + + Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True) + Try + Dim ZVTStart As String = ZVTKey.GetValue("Start") + Dim Proc As System.Diagnostics.Process + + If (Len(ZVTStart) > 1) Then + ZVTKey.SetValue("Ergebnis", 1000, RegistryValueKind.DWord) ' Wenn das Ergebnis 1000 bleibt konnte EasyZVT nicht gestartet werden + Proc = System.Diagnostics.Process.Start(ZVTStart) + System.Threading.Thread.Sleep(3000) ' Warte drei Sekunden bis Prozess ZVTStart geladen ist, dann erst anfangen Flag Aktiv abzufragen + While ZVTKey.GetValue("Aktiv") = 1 + System.Threading.Thread.Sleep(500) ' Warten... + If TextBox_Aktiv.BackColor = Color.Gray Then ' kleine Spielerei :-) + TextBox_Aktiv.BackColor = Color.Red + Else + TextBox_Aktiv.BackColor = Color.Gray + End If + End While + TextBox_Aktiv.BackColor = Color.Gray + Else + MsgBox("EasyZVT ist nicht installiert. Bitte im Internet Explorer über www.easyzvt.de/publish installieren") + End If + Catch ex As Exception + MessageBox.Show("Der Programmstart ist fehlgeschlagen: " & ex.Message) + Exit Sub + End Try + ZVTKey.Close() + End Sub + Private Sub EasyZVT_OnCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) + ' Diese Funktion wird automatisch aufgerufen wenn der Worker-Thread seine Arbeit beendet + ' und EasyZVT seine Ausgabewerte in die Registry zurückgeschrieben hat + + + Dim ZVTKey As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\GUB\ZVT", True) + TextBox_Aktiv.Text = "" + TextBox_Ergebnis.Text = ZVTKey.GetValue("Ergebnis") + TextBox_ErgebnisText.Text = ZVTKey.GetValue("ErgebnisText") + TextBox_Drucktext.Text = Replace(ZVTKey.GetValue("Drucktext"), vbLf, vbCrLf) + TextBox_Drucktext2.Text = Replace(ZVTKey.GetValue("Drucktext2"), vbLf, vbCrLf) + + TextBox_BelegNr.Text = ZVTKey.GetValue("BelegNr").ToString + TextBox_Betrag.Text = "" + + If CheckBoxAutodruck.Checked Then + If Len(TextBox_Drucktext.Text) > 1 Then + Button_Kundenbeleg_drucken.PerformClick() + End If + If Len(TextBox_Drucktext2.Text) > 1 Then + Button_Haendlerbeleg_drucken.PerformClick() + End If + + End If + + TextBox_Betrag.Focus() + Button_Autorisierung.Enabled = True + Button_Diagnose.Enabled = True + Button_Tagesabschluss.Enabled = True + Button_Storno.Enabled = True + Button_Gutschrift.Enabled = True + Button_Exit.Enabled = True + ZVTKey.Close() + End Sub + + + Private Sub Button_Diagnose_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Diagnose.Click + Funktion = 1 + SetRegistryParameter() + EasyZVT_Worker.RunWorkerAsync() + + End Sub + + Private Sub Button_Exit_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Exit.Click + Application.Exit() + End Sub + + Private Sub Button_Tagesabschluss_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Tagesabschluss.Click + Funktion = 2 + SetRegistryParameter() + EasyZVT_Worker.RunWorkerAsync() + + End Sub + + Private Sub Button_Storno_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Storno.Click + Funktion = 3 + SetRegistryParameter() + EasyZVT_Worker.RunWorkerAsync() + + End Sub + + Private Sub Button_Gutschrift_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Gutschrift.Click + Funktion = 4 + SetRegistryParameter() + EasyZVT_Worker.RunWorkerAsync() + + End Sub + + + Private Sub PDoc_SeiteDrucken(ByVal sender As System.Object, ByVal e As System.Drawing.Printing.PrintPageEventArgs) Handles PDoc.PrintPage + + Dim Textfont As Font = TextBox_Kassenbon.Font + Dim Hoehe, Breite As Integer + Dim Links, Oben As Integer + With PDoc.DefaultPageSettings + 'Hoehe = .PaperSize.Height - .Margins.Top - .Margins.Bottom + 'Breite = .PaperSize.Width - .Margins.Left - .Margins.Right + Hoehe = 500 ' 5,00 Zoll + Breite = 270 ' = 2,70 zoll + 'Links = PDoc.DefaultPageSettings.Margins.Left + 'Oben = PDoc.DefaultPageSettings.Margins.Top + Links = 10 + Oben = 10 + End With + ' Einen Rahmen zeichnen + Dim Rahmen As New Rectangle(Links, Oben, Breite, Hoehe) + e.Graphics.DrawRectangle(Pens.Blue, Rahmen) + ' In den Rahmen den Kassenbontext zeichnen + Dim StrFormat As StringFormat + StrFormat = New StringFormat(StringFormatFlags.LineLimit) + e.Graphics.DrawString(TextBox_Kassenbon.Text, Textfont, Brushes.Black, Rahmen, StrFormat) + e.HasMorePages = False + + End Sub + Private Sub Button_Kundenbeleg_drucken_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Kundenbeleg_drucken.Click + + End Sub + + Private Sub Button_Haendlerbeleg_drucken_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Haendlerbeleg_drucken.Click + + End Sub + Private Sub PopulateInstalledPrintersCombo() + ' Add list of installed printers found to the combo box. + ' The pkInstalledPrinters string will be used to provide the display string. + Dim i As Integer + Dim pkInstalledPrinters As String + + For i = 0 To PrinterSettings.InstalledPrinters.Count - 1 + pkInstalledPrinters = PrinterSettings.InstalledPrinters.Item(i) + comboInstalledPrinters.Items.Add(pkInstalledPrinters) + Next + End Sub + + Private Sub comboInstalledPrinters_SelectionChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles comboInstalledPrinters.SelectedIndexChanged + + End Sub + + +End Class \ No newline at end of file diff --git a/SDL/kassenbuch/frmBelegNeu.Designer.vb b/SDL/kassenbuch/frmBelegNeu.Designer.vb index 22097e82..fcd17e15 100644 --- a/SDL/kassenbuch/frmBelegNeu.Designer.vb +++ b/SDL/kassenbuch/frmBelegNeu.Designer.vb @@ -135,6 +135,7 @@ Partial Class frmBelegNeu Me.DataGridViewTextBoxColumn8 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn9 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel() + Me.btnPOS = New System.Windows.Forms.Button() CType(Me.dgvBelegPos, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnl.SuspendLayout() Me.pnlData.SuspendLayout() @@ -423,12 +424,12 @@ Partial Class frmBelegNeu ' Me.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnPrint.ForeColor = System.Drawing.Color.Black - Me.btnPrint.Image = Global.SDL.My.Resources.printer2 + Me.btnPrint.Image = Global.SDL.My.Resources.Resources.printer2 Me.btnPrint.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnPrint.Location = New System.Drawing.Point(475, 33) + Me.btnPrint.Location = New System.Drawing.Point(556, 33) Me.btnPrint.Name = "btnPrint" Me.btnPrint.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0) - Me.btnPrint.Size = New System.Drawing.Size(145, 59) + Me.btnPrint.Size = New System.Drawing.Size(64, 59) Me.btnPrint.TabIndex = 13 Me.btnPrint.Text = "Beleg drucken" & Global.Microsoft.VisualBasic.ChrW(10) & "und buchen" Me.btnPrint.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -501,12 +502,15 @@ Partial Class frmBelegNeu Me.txtAbfertigungsNr._DateTimeOnly = False Me.txtAbfertigungsNr._numbersOnly = False Me.txtAbfertigungsNr._numbersOnlyKommastellen = "" + Me.txtAbfertigungsNr._numbersOnlyTrennzeichen = True Me.txtAbfertigungsNr._Prozent = False Me.txtAbfertigungsNr._ShortDateNew = False Me.txtAbfertigungsNr._ShortDateOnly = False Me.txtAbfertigungsNr._TimeOnly = False + Me.txtAbfertigungsNr._TimeOnly_Seconds = False Me.txtAbfertigungsNr._value = Nothing Me.txtAbfertigungsNr._Waehrung = False + Me.txtAbfertigungsNr._WaehrungZeichen = True Me.txtAbfertigungsNr.ForeColor = System.Drawing.Color.Black Me.txtAbfertigungsNr.Location = New System.Drawing.Point(266, 259) Me.txtAbfertigungsNr.MaxLength = 8 @@ -679,12 +683,15 @@ Partial Class frmBelegNeu Me.txtzuKassieren._DateTimeOnly = False Me.txtzuKassieren._numbersOnly = False Me.txtzuKassieren._numbersOnlyKommastellen = "" + Me.txtzuKassieren._numbersOnlyTrennzeichen = True Me.txtzuKassieren._Prozent = False Me.txtzuKassieren._ShortDateNew = False Me.txtzuKassieren._ShortDateOnly = False Me.txtzuKassieren._TimeOnly = False + Me.txtzuKassieren._TimeOnly_Seconds = False Me.txtzuKassieren._value = Nothing Me.txtzuKassieren._Waehrung = True + Me.txtzuKassieren._WaehrungZeichen = True Me.txtzuKassieren.Enabled = False Me.txtzuKassieren.ForeColor = System.Drawing.Color.Black Me.txtzuKassieren.Location = New System.Drawing.Point(441, 133) @@ -757,7 +764,7 @@ Partial Class frmBelegNeu ' Me.btnOfferte.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOfferte.ForeColor = System.Drawing.Color.Black - Me.btnOfferte.Image = Global.SDL.My.Resources.list + Me.btnOfferte.Image = Global.SDL.My.Resources.Resources.list Me.btnOfferte.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnOfferte.Location = New System.Drawing.Point(212, 6) Me.btnOfferte.Name = "btnOfferte" @@ -786,12 +793,15 @@ Partial Class frmBelegNeu Me.lblAtrKdNr._DateTimeOnly = False Me.lblAtrKdNr._numbersOnly = False Me.lblAtrKdNr._numbersOnlyKommastellen = "" + Me.lblAtrKdNr._numbersOnlyTrennzeichen = True Me.lblAtrKdNr._Prozent = False Me.lblAtrKdNr._ShortDateNew = False Me.lblAtrKdNr._ShortDateOnly = False Me.lblAtrKdNr._TimeOnly = False + Me.lblAtrKdNr._TimeOnly_Seconds = False Me.lblAtrKdNr._value = Nothing Me.lblAtrKdNr._Waehrung = False + Me.lblAtrKdNr._WaehrungZeichen = True Me.lblAtrKdNr.BackColor = System.Drawing.Color.FromArgb(CType(CType(244, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(244, Byte), Integer)) Me.lblAtrKdNr.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblAtrKdNr.ForeColor = System.Drawing.Color.Black @@ -810,12 +820,15 @@ Partial Class frmBelegNeu Me.lblkundeKdNr._DateTimeOnly = False Me.lblkundeKdNr._numbersOnly = False Me.lblkundeKdNr._numbersOnlyKommastellen = "" + Me.lblkundeKdNr._numbersOnlyTrennzeichen = True Me.lblkundeKdNr._Prozent = False Me.lblkundeKdNr._ShortDateNew = False Me.lblkundeKdNr._ShortDateOnly = False Me.lblkundeKdNr._TimeOnly = False + Me.lblkundeKdNr._TimeOnly_Seconds = False Me.lblkundeKdNr._value = Nothing Me.lblkundeKdNr._Waehrung = False + Me.lblkundeKdNr._WaehrungZeichen = True Me.lblkundeKdNr.BackColor = System.Drawing.Color.FromArgb(CType(CType(244, Byte), Integer), CType(CType(244, Byte), Integer), CType(CType(244, Byte), Integer)) Me.lblkundeKdNr.BorderStyle = System.Windows.Forms.BorderStyle.None Me.lblkundeKdNr.ForeColor = System.Drawing.Color.Black @@ -858,12 +871,15 @@ Partial Class frmBelegNeu Me.lblKunde_UstId_Land._DateTimeOnly = False Me.lblKunde_UstId_Land._numbersOnly = False Me.lblKunde_UstId_Land._numbersOnlyKommastellen = "" + Me.lblKunde_UstId_Land._numbersOnlyTrennzeichen = True Me.lblKunde_UstId_Land._Prozent = False Me.lblKunde_UstId_Land._ShortDateNew = False Me.lblKunde_UstId_Land._ShortDateOnly = False Me.lblKunde_UstId_Land._TimeOnly = False + Me.lblKunde_UstId_Land._TimeOnly_Seconds = False Me.lblKunde_UstId_Land._value = Nothing Me.lblKunde_UstId_Land._Waehrung = False + Me.lblKunde_UstId_Land._WaehrungZeichen = True Me.lblKunde_UstId_Land.ForeColor = System.Drawing.Color.Black Me.lblKunde_UstId_Land.Location = New System.Drawing.Point(62, 117) Me.lblKunde_UstId_Land.MaxLength = 2 @@ -879,12 +895,15 @@ Partial Class frmBelegNeu Me.lblKunde_UstId_Nr._DateTimeOnly = False Me.lblKunde_UstId_Nr._numbersOnly = False Me.lblKunde_UstId_Nr._numbersOnlyKommastellen = "" + Me.lblKunde_UstId_Nr._numbersOnlyTrennzeichen = True Me.lblKunde_UstId_Nr._Prozent = False Me.lblKunde_UstId_Nr._ShortDateNew = False Me.lblKunde_UstId_Nr._ShortDateOnly = False Me.lblKunde_UstId_Nr._TimeOnly = False + Me.lblKunde_UstId_Nr._TimeOnly_Seconds = False Me.lblKunde_UstId_Nr._value = Nothing Me.lblKunde_UstId_Nr._Waehrung = False + Me.lblKunde_UstId_Nr._WaehrungZeichen = True Me.lblKunde_UstId_Nr.ForeColor = System.Drawing.Color.Black Me.lblKunde_UstId_Nr.Location = New System.Drawing.Point(120, 117) Me.lblKunde_UstId_Nr.MaxLength = 12 @@ -900,12 +919,15 @@ Partial Class frmBelegNeu Me.txtSteuersatz._DateTimeOnly = False Me.txtSteuersatz._numbersOnly = False Me.txtSteuersatz._numbersOnlyKommastellen = "" + Me.txtSteuersatz._numbersOnlyTrennzeichen = True Me.txtSteuersatz._Prozent = True Me.txtSteuersatz._ShortDateNew = False Me.txtSteuersatz._ShortDateOnly = False Me.txtSteuersatz._TimeOnly = False + Me.txtSteuersatz._TimeOnly_Seconds = False Me.txtSteuersatz._value = Nothing Me.txtSteuersatz._Waehrung = False + Me.txtSteuersatz._WaehrungZeichen = True Me.txtSteuersatz.ForeColor = System.Drawing.Color.Black Me.txtSteuersatz.Location = New System.Drawing.Point(441, 77) Me.txtSteuersatz.MaxLineLength = -1 @@ -945,12 +967,15 @@ Partial Class frmBelegNeu Me.lblFrachtf_Pass._DateTimeOnly = False Me.lblFrachtf_Pass._numbersOnly = False Me.lblFrachtf_Pass._numbersOnlyKommastellen = "" + Me.lblFrachtf_Pass._numbersOnlyTrennzeichen = True Me.lblFrachtf_Pass._Prozent = False Me.lblFrachtf_Pass._ShortDateNew = False Me.lblFrachtf_Pass._ShortDateOnly = False Me.lblFrachtf_Pass._TimeOnly = False + Me.lblFrachtf_Pass._TimeOnly_Seconds = False Me.lblFrachtf_Pass._value = Nothing Me.lblFrachtf_Pass._Waehrung = False + Me.lblFrachtf_Pass._WaehrungZeichen = True Me.lblFrachtf_Pass.ForeColor = System.Drawing.Color.Black Me.lblFrachtf_Pass.Location = New System.Drawing.Point(441, 182) Me.lblFrachtf_Pass.MaxLength = 15 @@ -966,12 +991,15 @@ Partial Class frmBelegNeu Me.lblKunde_Land._DateTimeOnly = False Me.lblKunde_Land._numbersOnly = False Me.lblKunde_Land._numbersOnlyKommastellen = "" + Me.lblKunde_Land._numbersOnlyTrennzeichen = True Me.lblKunde_Land._Prozent = False Me.lblKunde_Land._ShortDateNew = False Me.lblKunde_Land._ShortDateOnly = False Me.lblKunde_Land._TimeOnly = False + Me.lblKunde_Land._TimeOnly_Seconds = False Me.lblKunde_Land._value = Nothing Me.lblKunde_Land._Waehrung = False + Me.lblKunde_Land._WaehrungZeichen = True Me.lblKunde_Land.ForeColor = System.Drawing.Color.Black Me.lblKunde_Land.Location = New System.Drawing.Point(8, 98) Me.lblKunde_Land.MaxLength = 3 @@ -987,12 +1015,15 @@ Partial Class frmBelegNeu Me.lblFrachtf_Fahrer._DateTimeOnly = False Me.lblFrachtf_Fahrer._numbersOnly = False Me.lblFrachtf_Fahrer._numbersOnlyKommastellen = "" + Me.lblFrachtf_Fahrer._numbersOnlyTrennzeichen = True Me.lblFrachtf_Fahrer._Prozent = False Me.lblFrachtf_Fahrer._ShortDateNew = False Me.lblFrachtf_Fahrer._ShortDateOnly = False Me.lblFrachtf_Fahrer._TimeOnly = False + Me.lblFrachtf_Fahrer._TimeOnly_Seconds = False Me.lblFrachtf_Fahrer._value = Nothing Me.lblFrachtf_Fahrer._Waehrung = False + Me.lblFrachtf_Fahrer._WaehrungZeichen = True Me.lblFrachtf_Fahrer.ForeColor = System.Drawing.Color.Black Me.lblFrachtf_Fahrer.Location = New System.Drawing.Point(441, 163) Me.lblFrachtf_Fahrer.MaxLength = 40 @@ -1008,12 +1039,15 @@ Partial Class frmBelegNeu Me.lblKunde_Plz._DateTimeOnly = False Me.lblKunde_Plz._numbersOnly = False Me.lblKunde_Plz._numbersOnlyKommastellen = "" + Me.lblKunde_Plz._numbersOnlyTrennzeichen = True Me.lblKunde_Plz._Prozent = False Me.lblKunde_Plz._ShortDateNew = False Me.lblKunde_Plz._ShortDateOnly = False Me.lblKunde_Plz._TimeOnly = False + Me.lblKunde_Plz._TimeOnly_Seconds = False Me.lblKunde_Plz._value = Nothing Me.lblKunde_Plz._Waehrung = False + Me.lblKunde_Plz._WaehrungZeichen = True Me.lblKunde_Plz.ForeColor = System.Drawing.Color.Black Me.lblKunde_Plz.Location = New System.Drawing.Point(34, 98) Me.lblKunde_Plz.MaxLength = 7 @@ -1029,12 +1063,15 @@ Partial Class frmBelegNeu Me.lblKunde_Strasse._DateTimeOnly = False Me.lblKunde_Strasse._numbersOnly = False Me.lblKunde_Strasse._numbersOnlyKommastellen = "" + Me.lblKunde_Strasse._numbersOnlyTrennzeichen = True Me.lblKunde_Strasse._Prozent = False Me.lblKunde_Strasse._ShortDateNew = False Me.lblKunde_Strasse._ShortDateOnly = False Me.lblKunde_Strasse._TimeOnly = False + Me.lblKunde_Strasse._TimeOnly_Seconds = False Me.lblKunde_Strasse._value = Nothing Me.lblKunde_Strasse._Waehrung = False + Me.lblKunde_Strasse._WaehrungZeichen = True Me.lblKunde_Strasse.ForeColor = System.Drawing.Color.Black Me.lblKunde_Strasse.Location = New System.Drawing.Point(8, 79) Me.lblKunde_Strasse.MaxLength = 40 @@ -1050,12 +1087,15 @@ Partial Class frmBelegNeu Me.lblFrachtf_LKWNr._DateTimeOnly = False Me.lblFrachtf_LKWNr._numbersOnly = False Me.lblFrachtf_LKWNr._numbersOnlyKommastellen = "" + Me.lblFrachtf_LKWNr._numbersOnlyTrennzeichen = True Me.lblFrachtf_LKWNr._Prozent = False Me.lblFrachtf_LKWNr._ShortDateNew = False Me.lblFrachtf_LKWNr._ShortDateOnly = False Me.lblFrachtf_LKWNr._TimeOnly = False + Me.lblFrachtf_LKWNr._TimeOnly_Seconds = False Me.lblFrachtf_LKWNr._value = Nothing Me.lblFrachtf_LKWNr._Waehrung = False + Me.lblFrachtf_LKWNr._WaehrungZeichen = True Me.lblFrachtf_LKWNr.ForeColor = System.Drawing.Color.Black Me.lblFrachtf_LKWNr.Location = New System.Drawing.Point(110, 164) Me.lblFrachtf_LKWNr.MaxLength = 25 @@ -1071,12 +1111,15 @@ Partial Class frmBelegNeu Me.lblKunde_Ort._DateTimeOnly = False Me.lblKunde_Ort._numbersOnly = False Me.lblKunde_Ort._numbersOnlyKommastellen = "" + Me.lblKunde_Ort._numbersOnlyTrennzeichen = True Me.lblKunde_Ort._Prozent = False Me.lblKunde_Ort._ShortDateNew = False Me.lblKunde_Ort._ShortDateOnly = False Me.lblKunde_Ort._TimeOnly = False + Me.lblKunde_Ort._TimeOnly_Seconds = False Me.lblKunde_Ort._value = Nothing Me.lblKunde_Ort._Waehrung = False + Me.lblKunde_Ort._WaehrungZeichen = True Me.lblKunde_Ort.ForeColor = System.Drawing.Color.Black Me.lblKunde_Ort.Location = New System.Drawing.Point(92, 98) Me.lblKunde_Ort.MaxLength = 40 @@ -1100,6 +1143,7 @@ Partial Class frmBelegNeu ' 'kdkunde ' + Me.kdkunde._AlleFirmenCLUSTER = False Me.kdkunde._AllowSetValue = True Me.kdkunde._autoSizeGross = False Me.kdkunde._display_Name1 = False @@ -1108,6 +1152,7 @@ Partial Class frmBelegNeu Me.kdkunde._displayWoelflKd = False Me.kdkunde._hideIfListEmpty = True Me.kdkunde._loadKdData = True + Me.kdkunde._UseFIRMA = "" Me.kdkunde._ValueKdAndName = False Me.kdkunde.dgvpos = "LEFT" Me.kdkunde.KdName = Nothing @@ -1121,10 +1166,12 @@ Partial Class frmBelegNeu Me.kdkunde.searchActive = True Me.kdkunde.Size = New System.Drawing.Size(331, 20) Me.kdkunde.TabIndex = 10 + Me.kdkunde.TIMER_SEARCH = True Me.kdkunde.usrcntl = Nothing ' 'pnlOPt ' + Me.pnlOPt.Controls.Add(Me.btnPOS) Me.pnlOPt.Controls.Add(Me.cbxBelegOffnen) Me.pnlOPt.Controls.Add(Me.lblStorno) Me.pnlOPt.Controls.Add(Me.Label17) @@ -1210,7 +1257,7 @@ Partial Class frmBelegNeu ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.ForeColor = System.Drawing.Color.Black - Me.Button3.Image = Global.SDL.My.Resources.save + Me.Button3.Image = Global.SDL.My.Resources.Resources.save Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button3.Location = New System.Drawing.Point(590, 67) Me.Button3.Name = "Button3" @@ -1347,12 +1394,15 @@ Partial Class frmBelegNeu Me.txtEinzelpreis._DateTimeOnly = False Me.txtEinzelpreis._numbersOnly = True Me.txtEinzelpreis._numbersOnlyKommastellen = "2" + Me.txtEinzelpreis._numbersOnlyTrennzeichen = True Me.txtEinzelpreis._Prozent = False Me.txtEinzelpreis._ShortDateNew = False Me.txtEinzelpreis._ShortDateOnly = False Me.txtEinzelpreis._TimeOnly = False + Me.txtEinzelpreis._TimeOnly_Seconds = False Me.txtEinzelpreis._value = "" Me.txtEinzelpreis._Waehrung = False + Me.txtEinzelpreis._WaehrungZeichen = True Me.txtEinzelpreis.Enabled = False Me.txtEinzelpreis.ForeColor = System.Drawing.Color.Red Me.txtEinzelpreis.Location = New System.Drawing.Point(-1, 179) @@ -1369,12 +1419,15 @@ Partial Class frmBelegNeu Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = False Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False Me.MyTextBox1._value = "" Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True Me.MyTextBox1.ForeColor = System.Drawing.Color.Black Me.MyTextBox1.Location = New System.Drawing.Point(0, 0) Me.MyTextBox1.MaxLineLength = -1 @@ -1483,6 +1536,7 @@ Partial Class frmBelegNeu ' 'kdFrachtf ' + Me.kdFrachtf._AlleFirmenCLUSTER = False Me.kdFrachtf._AllowSetValue = True Me.kdFrachtf._autoSizeGross = False Me.kdFrachtf._display_Name1 = False @@ -1491,6 +1545,7 @@ Partial Class frmBelegNeu Me.kdFrachtf._displayWoelflKd = False Me.kdFrachtf._hideIfListEmpty = True Me.kdFrachtf._loadKdData = True + Me.kdFrachtf._UseFIRMA = "" Me.kdFrachtf._ValueKdAndName = False Me.kdFrachtf.dgvpos = "LEFT" Me.kdFrachtf.KdName = Nothing @@ -1504,6 +1559,7 @@ Partial Class frmBelegNeu Me.kdFrachtf.searchActive = True Me.kdFrachtf.Size = New System.Drawing.Size(331, 20) Me.kdFrachtf.TabIndex = 30 + Me.kdFrachtf.TIMER_SEARCH = True Me.kdFrachtf.usrcntl = Nothing Me.kdFrachtf.Visible = False ' @@ -1591,6 +1647,20 @@ Partial Class frmBelegNeu Me.FlowLayoutPanel2.TabIndex = 3 Me.FlowLayoutPanel2.Visible = False ' + 'btnPOS + ' + Me.btnPOS.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPOS.ForeColor = System.Drawing.Color.Black + Me.btnPOS.Image = Global.SDL.My.Resources.Resources.verag_Card1 + Me.btnPOS.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnPOS.Location = New System.Drawing.Point(486, 33) + Me.btnPOS.Name = "btnPOS" + Me.btnPOS.Padding = New System.Windows.Forms.Padding(0, 0, 5, 0) + Me.btnPOS.Size = New System.Drawing.Size(64, 59) + Me.btnPOS.TabIndex = 16 + Me.btnPOS.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnPOS.UseVisualStyleBackColor = True + ' 'frmBelegNeu ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1730,4 +1800,5 @@ Partial Class frmBelegNeu Friend WithEvents Label8 As System.Windows.Forms.Label Friend WithEvents txtzuKassieren As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label22 As System.Windows.Forms.Label + Friend WithEvents btnPOS As Button End Class diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index ab3aafe3..5bf815b1 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -27,7 +27,9 @@ Public Class frmBelegNeu Public printErfolgreich = False Public defaultPrinter = "" - + Private EasyZVT_Worker As System.ComponentModel.BackgroundWorker = New System.ComponentModel.BackgroundWorker() + Private Funktion As Integer + Private Betrag As Integer = 0 Public aktFiliale As Integer = 0 Public aktAbfertigungsNr As Integer = 0 @@ -721,15 +723,20 @@ Public Class frmBelegNeu ' Dim RKSV_Service_Location = "\\192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/" - Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnPrint.Click + Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnPrint.Click, btnPOS.Click + Dim IsPosPayment As Boolean = False + + If sender.Name = "btnPOS" Then + IsPosPayment = True + End If Try printErfolgreich = False If BELEG.gebucht Or BELEG.gebuchtStorno Then ' KASSE.LOAD(cboKassen._value) If BELEG.rksv_id > 0 Then KASSE.LOAD(BELEG.rksv_id) Select Case BELEG.Belegart - Case "1" : If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then Me.Close() + Case "1" : If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked, IsPosPayment) Then Me.Close() Case "2" : If cRKSV.printKundenBelegLG(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, "LG") Then Me.Close() 'Beleg drucken End Select Else @@ -856,7 +863,7 @@ Public Class frmBelegNeu Select Case BELEG.Belegart Case "1" - If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked) Then + If cRKSV.printKundenBeleg(BELEG, KASSE, PERSONAL, cboPrinter.SelectedItem.ToString, cbxBelegOffnen.Checked, IsPosPayment) Then 'WARTEN printErfolgreich = True End If @@ -1462,6 +1469,7 @@ Public Class frmBelegNeu End Sub + End Class Class TestRKSVW diff --git a/SDL/kassenbuch/frmKassenbuch.vb b/SDL/kassenbuch/frmKassenbuch.vb index 8a7dd8f4..c7098ff1 100644 --- a/SDL/kassenbuch/frmKassenbuch.vb +++ b/SDL/kassenbuch/frmKassenbuch.vb @@ -58,7 +58,7 @@ Public Class frmKassenbuch If PERSONAL.ID = 274 Then master_Kasse = True - If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "SIENER" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "SIENER" Or VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "DANIEL" Then Button6.Visible = True End If KennwortTime = Now diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 951e2f78..8f46cccb 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -1192,7 +1192,7 @@ 3.8.0 - 10.0.3 + 13.0.2