Compare commits
No commits in common. "master" and "release/1.0.99" have entirely different histories.
master
...
release/1.
@ -40,6 +40,6 @@ namespace gehGassi.Dto.Walks
|
||||
/// <summary>
|
||||
/// Zahlungsart für den Walk
|
||||
/// </summary>
|
||||
public WalkPaymentTypeDto? PaymentType { get; set; }
|
||||
public WalkPaymentTypeDto PaymentType { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -105,6 +105,6 @@ namespace gehGassi.Dto.Walks
|
||||
/// <summary>
|
||||
/// Zahlungsart für den Walk
|
||||
/// </summary>
|
||||
public WalkPaymentTypeDto? PaymentType { get; set; }
|
||||
public WalkPaymentTypeDto PaymentType { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,36 +0,0 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace gehGassi.Persistence.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class Walk_PaymentType_DefaultSet : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<int>(
|
||||
name: "PaymentType",
|
||||
table: "Walks",
|
||||
type: "int",
|
||||
nullable: false,
|
||||
defaultValue: 1,
|
||||
oldClrType: typeof(int),
|
||||
oldType: "int");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AlterColumn<int>(
|
||||
name: "PaymentType",
|
||||
table: "Walks",
|
||||
type: "int",
|
||||
nullable: false,
|
||||
oldClrType: typeof(int),
|
||||
oldType: "int",
|
||||
oldDefaultValue: 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -7819,9 +7819,7 @@ namespace gehGassi.Persistence.Migrations
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("PaymentType")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int")
|
||||
.HasDefaultValue(1);
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<Point>("PickupLocation")
|
||||
.HasColumnType("geography");
|
||||
|
||||
@ -383,7 +383,6 @@ namespace gehGassi.Persistence
|
||||
builder.Entity<Walk>().OwnsOne(p => p.ReturnAddress);
|
||||
builder.Entity<Walk>().Property(c => c.Price).HasColumnType("decimal(18,2)");
|
||||
builder.Entity<Walk>().Property(c => c.VoucherAmmount).HasColumnType("decimal(18,2)");
|
||||
builder.Entity<Walk>().Property(c => c.PaymentType).HasDefaultValue(WalkPaymentType.MangoPay);
|
||||
|
||||
builder.Entity<WalkComplaint>().HasIndex(c => c.Index);
|
||||
builder.Entity<WalkComplaint>().HasOne<Walk>().WithMany().HasForeignKey(c => c.WalkId).OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
@ -776,7 +776,7 @@ namespace gehGassi.Web.Controllers
|
||||
/// </summary>
|
||||
/// <param name="model">Model</param>
|
||||
/// <returns>Json</returns>
|
||||
[Authorize(Policy = Policies.CustomerOnly)]
|
||||
[Authorize(Policy = Policies.PowerUserOnly)]
|
||||
[HasPermission(Permission.AdvertisementsManage, Permission.AdvertisementsEdit)]
|
||||
[CustomerAuthorize("CustomerId")]
|
||||
[ValidateAntiForgeryToken]
|
||||
|
||||
@ -1039,7 +1039,7 @@ namespace gehGassi.Web.Controllers.Api
|
||||
walk.CompletedInfo = string.Empty;
|
||||
walk.Defactation = false;
|
||||
walk.PaymentStatus = PaymentStatus.Pending;
|
||||
walk.PaymentType = model.PaymentType != null ? (WalkPaymentType)model.PaymentType : WalkPaymentType.MangoPay;
|
||||
walk.PaymentType = (WalkPaymentType)model.PaymentType;
|
||||
walk.UpdatedAt = DateTimeOffset.UtcNow;
|
||||
walk.Created = DateTimeOffset.UtcNow;
|
||||
|
||||
@ -3630,7 +3630,7 @@ namespace gehGassi.Web.Controllers.Api
|
||||
walk.CompletedInfo = string.Empty;
|
||||
walk.Defactation = false;
|
||||
walk.PaymentStatus = PaymentStatus.Pending;
|
||||
walk.PaymentType = model.PaymentType != null ? (WalkPaymentType)model.PaymentType : WalkPaymentType.MangoPay;
|
||||
walk.PaymentType = (WalkPaymentType)model.PaymentType;
|
||||
walk.UpdatedAt = DateTimeOffset.UtcNow;
|
||||
walk.Created = DateTimeOffset.UtcNow;
|
||||
|
||||
@ -3810,7 +3810,7 @@ namespace gehGassi.Web.Controllers.Api
|
||||
walk.CompletedInfo = string.Empty;
|
||||
walk.Defactation = false;
|
||||
walk.PaymentStatus = PaymentStatus.None;
|
||||
walk.PaymentType = model.PaymentType != null ? (WalkPaymentType)model.PaymentType : WalkPaymentType.MangoPay;
|
||||
walk.PaymentType = (WalkPaymentType)model.PaymentType;
|
||||
walk.UpdatedAt = DateTimeOffset.UtcNow;
|
||||
walk.Created = DateTimeOffset.UtcNow;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user