Commit bd6d300a authored by Michal Bilanin's avatar Michal Bilanin 🙄
Browse files

Merge remote-tracking branch 'origin/master' into fix/transactions 

# Conflicts:
#	BusinessLayer/Facades/ProductFacade.cs
#	PresentationLayer.Mvc/Areas/Admin/Controllers/ProductController.cs
parents ce9e5c2f 529a29ab

BusinessLayer/BusinessConstants.cs

0 → 100644
+6 −0
Original line number Diff line number Diff line 
namespace BusinessLayer;



public static class BusinessConstants

{

    public static string WebRootPath { get; set; }

}

BusinessLayer/DTOs/GiftCardCreateDto.cs

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
public class GiftCardCreateDto

{

    public int Discount { get; set; }

    public string Name { get; set; }

    public string Name { get; set; } = "";

    public int CouponsCount { get; set; }

    public DateTime? StartDateTime { get; set; }

    public DateTime? ExpiryDateTime { get; set; }

BusinessLayer/DTOs/GiftCardDetailDto.cs

+0 −1
Original line number Diff line number Diff line
@@ -2,6 +2,5 @@ 


public class GiftCardDetailDto : GiftCardViewDto

{

    public int Id { get; set; }

    public List<CouponCodeDto> CouponCodes { get; set; } = [];

}
 
 No newline at end of file

BusinessLayer/DTOs/GiftCardEditDto.cs

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
public class GiftCardEditDto

{

    public int Id { get; set; }

    public string Name { get; set; }

    public string Name { get; set; } = "";

    public int Discount { get; set; }

    public int CouponsCount { get; set; }

    public DateTime? StartDateTime { get; set; }

BusinessLayer/DTOs/GiftCardViewDto.cs

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
public class GiftCardViewDto

{

    public int Id { get; set; }

    public string Name { get; set; }

    public string Name { get; set; } = "";

    public int Discount { get; set; }

    public int CouponsCount { get; set; }

    public DateTime? StartDateTime { get; set; }