[WIP] certs

Elwig/Services/DeliveryService.cs

@@ -60,7 +60,7 @@ namespace Elwig.Services {
             vm.Weight = p.Weight;
             vm.ActualTare = p.WeighingInfo.Tare ?? 0;
             vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection;
-            vm.Tare = vm.TargetTare ?? (vm.ActualTare != 0 ? vm.ActualTare : null);
+            vm.Tare = vm.ActualTare != 0 ? vm.TargetTare ?? vm.ActualTare : null;
             vm.IsManualWeighing = p.IsManualWeighing;
             vm.IsNetWeight = p.IsNetWeight;
 

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -614,7 +614,7 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(p);
-            CorrectTareButton.Visibility = !ViewModel.IsReceipt && (ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox) ? Visibility.Visible : Visibility.Hidden;
+            CorrectTareButton.Visibility = !ViewModel.IsReceipt && p.WeighingInfo.Tare != null && p.WeighingInfo.Tare != 0 ? Visibility.Visible : Visibility.Hidden;
             FinishInputFilling();
         }
 
@@ -1409,8 +1409,6 @@ namespace Elwig.Windows {
 
         private void UnloadingInput_Checked(object sender, RoutedEventArgs evt) {
             if (!IsEditing && !IsCreating) return;
-            if (!ViewModel.IsReceipt)
-                CorrectTareButton.Visibility = ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox ? Visibility.Visible : Visibility.Hidden;
             var mod = ViewModel.Modifiers.ToList();
             var source = ViewModel.ModifiersSource.ToList();
             if (App.Client.IsMatzen) {