diff --git a/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml b/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml index c5ef271..3462582 100644 --- a/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml +++ b/gehGassiApp/gehGassiApp/Controls/Register/Step2ExternalControl.xaml @@ -150,7 +150,7 @@ - + diff --git a/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml b/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml index c709204..937af60 100644 --- a/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml +++ b/gehGassiApp/gehGassiApp/Controls/Register/Step3Control.xaml @@ -117,7 +117,7 @@ - + diff --git a/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs b/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs index c98e476..25046a5 100644 --- a/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs +++ b/gehGassiApp/gehGassiApp/ViewModels/Account/RegisterViewModel.cs @@ -203,9 +203,7 @@ namespace gehGassiApp.ViewModels.Account if (AppUserType == AppUserType.DogOwner) return true; - // if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null) - // return true; - if (SelectedNationality != null && SelectedMainResidence != null) + if (AcceptedTermsMangopay && SelectedNationality != null && SelectedMainResidence != null) return true; return false; diff --git a/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs b/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs index 7ee040e..702329a 100644 --- a/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs +++ b/gehGassiApp/gehGassiApp/ViewModels/More/AddPaymentUserViewModel.cs @@ -81,7 +81,7 @@ namespace gehGassiApp.ViewModels.More /// Hat der Benutzer die MangoPay-AGB akzeptiert? /// [ObservableProperty] - private bool _acceptedTermsMangopay = true; + private bool _acceptedTermsMangopay; #region Commands @@ -177,7 +177,7 @@ namespace gehGassiApp.ViewModels.More { SelectedNationality = null; SelectedMainResidence = null; - AcceptedTermsMangopay = true; + AcceptedTermsMangopay = false; IsBusy = true; await Task.Delay(Core.Common.Constants.AnimationDelayDetails); diff --git a/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs b/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs index cb7d7fc..5cd4335 100644 --- a/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs +++ b/gehGassiApp/gehGassiApp/ViewModels/More/BecomeWalkerViewmodel.cs @@ -91,7 +91,7 @@ namespace gehGassiApp.ViewModels.More /// Hat der Benutzer die MangoPay-AGB akzeptiert? /// [ObservableProperty] - private bool _acceptedTermsMangopay = true; + private bool _acceptedTermsMangopay; #region Commands @@ -193,7 +193,7 @@ namespace gehGassiApp.ViewModels.More { SelectedNationality = null; SelectedMainResidence = null; - AcceptedTermsMangopay = true; + AcceptedTermsMangopay = false; IsBusy = true; await Task.Delay(Core.Common.Constants.AnimationDelayDetails); diff --git a/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml b/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml index 15c22c2..1ce238d 100644 --- a/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml +++ b/gehGassiApp/gehGassiApp/Views/More/AddPaymentUserView.xaml @@ -63,8 +63,8 @@ ItemDisplayBinding="{Binding Name}" ItemsSource="{Binding MainResidences}" SelectedItem="{Binding SelectedMainResidence}" /> - - + - + - + diff --git a/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml b/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml index 816195a..51cee7f 100644 --- a/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml +++ b/gehGassiApp/gehGassiApp/Views/More/MoreWalkerView.xaml @@ -510,7 +510,7 @@ - + - + - + diff --git a/gehGassiApp/gehGassiApp/Views/ProfileView.xaml b/gehGassiApp/gehGassiApp/Views/ProfileView.xaml index 17b899e..e1d7437 100644 --- a/gehGassiApp/gehGassiApp/Views/ProfileView.xaml +++ b/gehGassiApp/gehGassiApp/Views/ProfileView.xaml @@ -453,7 +453,7 @@ SelectedItem="{Binding SelectedMainResidence}" /> - + Text="{x:Static res:Text.Profile_AutoPayout_Desc}" /> - +