gehgassiGmbH/gehgassi_backend
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gehgassiGmbH:fafbc55732e01cf40e8c5a47ab10b372710cb81d
Branches Tags
gehgassiGmbH:master
gehgassiGmbH:release/1.0.101
gehgassiGmbH:features/auto-payout-tool
gehgassiGmbH:develop
gehgassiGmbH:features/paymenttype-cash
gehgassiGmbH:release/1.0.100
gehgassiGmbH:release/1.0.99
..
compare: gehgassiGmbH:b481a3999a35769cd32926d5f9ccb82d8c46728b
Branches Tags
gehgassiGmbH:release/1.0.101
gehgassiGmbH:features/auto-payout-tool
gehgassiGmbH:develop
gehgassiGmbH:features/paymenttype-cash
gehgassiGmbH:master
gehgassiGmbH:release/1.0.100
gehgassiGmbH:release/1.0.99

No commits in common. "fafbc55732e01cf40e8c5a47ab10b372710cb81d" and "b481a3999a35769cd32926d5f9ccb82d8c46728b" have entirely different histories.
fafbc55732 ... b481a3999a

4 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
gehGassi.Dto/Walks/PublicWalkRequestAcceptDto.cs
View File

@ -40,6 +40,6 @@ namespace gehGassi.Dto.Walks
/// <summary> /// <summary>
/// Zahlungsart für den Walk /// Zahlungsart für den Walk
/// </summary> /// </summary>
public WalkPaymentTypeDto? PaymentType { get; set; } public WalkPaymentTypeDto PaymentType { get; set; }
} }
} }

2
gehGassi.Dto/Walks/WalkCreateDto.cs
View File

@ -105,6 +105,6 @@ namespace gehGassi.Dto.Walks
/// <summary> /// <summary>
/// Zahlungsart für den Walk /// Zahlungsart für den Walk
/// </summary> /// </summary>
public WalkPaymentTypeDto? PaymentType { get; set; } public WalkPaymentTypeDto PaymentType { get; set; }
} }
} }

2
gehGassi.Web/Controllers/AdvertisementController.cs
View File

@ -776,7 +776,7 @@ namespace gehGassi.Web.Controllers
/// </summary> /// </summary>
/// <param name="model">Model</param> /// <param name="model">Model</param>
/// <returns>Json</returns> /// <returns>Json</returns>
[Authorize(Policy = Policies.CustomerOnly)] [Authorize(Policy = Policies.PowerUserOnly)]
[HasPermission(Permission.AdvertisementsManage, Permission.AdvertisementsEdit)] [HasPermission(Permission.AdvertisementsManage, Permission.AdvertisementsEdit)]
[CustomerAuthorize("CustomerId")] [CustomerAuthorize("CustomerId")]
[ValidateAntiForgeryToken] [ValidateAntiForgeryToken]

6
gehGassi.Web/Controllers/Api/ApiWalksController.cs
View File

@ -1039,7 +1039,7 @@ namespace gehGassi.Web.Controllers.Api
walk.CompletedInfo = string.Empty; walk.CompletedInfo = string.Empty;
walk.Defactation = false; walk.Defactation = false;
walk.PaymentStatus = PaymentStatus.Pending; walk.PaymentStatus = PaymentStatus.Pending;
walk.PaymentType = model.PaymentType != null ? (WalkPaymentType)model.PaymentType : WalkPaymentType.MangoPay; walk.PaymentType = (WalkPaymentType)model.PaymentType;
walk.UpdatedAt = DateTimeOffset.UtcNow; walk.UpdatedAt = DateTimeOffset.UtcNow;
walk.Created = DateTimeOffset.UtcNow; walk.Created = DateTimeOffset.UtcNow;
@ -3630,7 +3630,7 @@ namespace gehGassi.Web.Controllers.Api
walk.CompletedInfo = string.Empty; walk.CompletedInfo = string.Empty;
walk.Defactation = false; walk.Defactation = false;
walk.PaymentStatus = PaymentStatus.Pending; walk.PaymentStatus = PaymentStatus.Pending;
walk.PaymentType = model.PaymentType != null ? (WalkPaymentType)model.PaymentType : WalkPaymentType.MangoPay; walk.PaymentType = (WalkPaymentType)model.PaymentType;
walk.UpdatedAt = DateTimeOffset.UtcNow; walk.UpdatedAt = DateTimeOffset.UtcNow;
walk.Created = DateTimeOffset.UtcNow; walk.Created = DateTimeOffset.UtcNow;
@ -3810,7 +3810,7 @@ namespace gehGassi.Web.Controllers.Api
walk.CompletedInfo = string.Empty; walk.CompletedInfo = string.Empty;
walk.Defactation = false; walk.Defactation = false;
walk.PaymentStatus = PaymentStatus.None; walk.PaymentStatus = PaymentStatus.None;
walk.PaymentType = model.PaymentType != null ? (WalkPaymentType)model.PaymentType : WalkPaymentType.MangoPay; walk.PaymentType = (WalkPaymentType)model.PaymentType;
walk.UpdatedAt = DateTimeOffset.UtcNow; walk.UpdatedAt = DateTimeOffset.UtcNow;
walk.Created = DateTimeOffset.UtcNow; walk.Created = DateTimeOffset.UtcNow;