Ambar -> Sendungsdetails -> Emailvorlage für Warenort; Ambar Zollbeschau NEU, GUI-Änderungen Essensbestellungen

This commit is contained in:
2022-12-21 14:05:18 +01:00
parent 374bd9c4b8
commit bc100dc340
7 changed files with 554 additions and 415 deletions

View File

@@ -92,8 +92,8 @@ Public Class frmFrachtkostenBerechnen
'resetInputFields()
setControlEUAnteile()
origin = IIf(cbxLandVon._value <> "", cbxLandVon._value, "") & " " & IIf(txbVonPLZ._value <> "", txbVonPLZ._value, "") & " " & IIf(txbVonOrt._value <> "", txbVonOrt._value, "")
destination = IIf(cbxLandNach._value <> "", cbxLandNach._value, "") & " " & IIf(txbNachPLZ._value <> "", txbNachPLZ._value, "") & " " & IIf(txbNachOrt._value <> "", txbNachOrt._value, "")
origin = IIf(cbxLandVon._value <> "", cbxLandVon.Text.Replace(cbxLandVon._value & " -", "").Trim(), "") & " " & IIf(txbVonPLZ._value <> "", txbVonPLZ._value, "") & " " & IIf(txbVonOrt._value <> "", txbVonOrt._value, "")
destination = IIf(cbxLandNach._value <> "", cbxLandNach.Text.Replace(cbxLandNach._value & " -", "").Trim(), "") & " " & IIf(txbNachPLZ._value <> "", txbNachPLZ._value, "") & " " & IIf(txbNachOrt._value <> "", txbNachOrt._value, "")
Dim getValues = True
Dim twoRouteRequest As Boolean = False
@@ -249,13 +249,13 @@ Public Class frmFrachtkostenBerechnen
'Hinweis INPUT false
End If
If (txbVonOrt._value = "" Or txbVonPLZ._value = "") Then
If (txbVonOrt._value = "" And txbVonPLZ._value = "") Then
lblWarningAbgangort.Visible = True
btnOK.DialogResult = DialogResult.OK
isFilled = False
End If
If (txbNachOrt._value = "" Or txbNachPLZ._value = "") Then
If (txbNachOrt._value = "" And txbNachPLZ._value = "") Then
lblWarningBestimmungsort.Visible = True
btnOK.DialogResult = DialogResult.OK
isFilled = False