Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #177

Merged
merged 3 commits into from
Nov 10, 2021
Merged

Main #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d6a95a
Merge pull request #174 from it-beard/develop
itbeard Nov 10, 2021
3b66fef
Merge pull request #175 from it-beard/develop
itbeard Nov 10, 2021
f30a81f
Upgrade all projects to .net 6 (#176)
itbeard Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions Pds/Pds.Api.Contracts/Bill/BillContentDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
using System;
using Pds.Core.Enums;
using Pds.Core.Enums;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class BillContentDto
{
public class BillContentDto
{
public Guid Id { get; set; }
public Guid Id { get; set; }

public string Title { get; set; }
public string Title { get; set; }

public SocialMediaType SocialMediaType { get; set; }
}
public SocialMediaType SocialMediaType { get; set; }
}
32 changes: 15 additions & 17 deletions Pds/Pds.Api.Contracts/Bill/BillDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
using System;
using Pds.Core.Enums;
using Pds.Core.Enums;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class BillDto
{
public class BillDto
{
public Guid Id { get; set; }
public Guid Id { get; set; }

public decimal Value { get; set; }
public decimal Value { get; set; }

public DateTime PaidAt { get; set; }
public DateTime PaidAt { get; set; }

public BillType Type { get; set; }
public BillType Type { get; set; }

public PaymentStatus PaymentStatus { get; set; }
public PaymentStatus PaymentStatus { get; set; }

public BillStatus Status { get; set; }
public BillStatus Status { get; set; }

public PaymentType PaymentType { get; set; }
public PaymentType PaymentType { get; set; }

public string Comment { get; set; }
public string Comment { get; set; }

public BillContentDto Content { get; set; }
public BillContentDto Content { get; set; }

public BrandDto Brand { get; set; }
public BrandDto Brand { get; set; }

public bool IsVisible { get; set; }
}
public bool IsVisible { get; set; }
}
11 changes: 4 additions & 7 deletions Pds/Pds.Api.Contracts/Bill/ClientForLookupDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
using System;
namespace Pds.Api.Contracts.Bill;

namespace Pds.Api.Contracts.Bill
public class ClientForLookupDto
{
public class ClientForLookupDto
{
public Guid? Id { get; set; }
public Guid? Id { get; set; }

public string Name { get; set; }
}
public string Name { get; set; }
}
46 changes: 22 additions & 24 deletions Pds/Pds.Api.Contracts/Bill/CreateBillRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,38 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using Pds.Core.Enums;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class CreateBillRequest
{
public class CreateBillRequest
{
[Required]
public Guid BrandId { get; set; }
[Required]
public Guid BrandId { get; set; }

[Range(10, Double.MaxValue, ErrorMessage = "Значение поля {0} должно быть больше чем {1}.")]
public decimal Value { get; set; }
[Range(10, Double.MaxValue, ErrorMessage = "Значение поля {0} должно быть больше чем {1}.")]
public decimal Value { get; set; }

[Required, EnumDataType(typeof(BillType))]
public BillType Type { get; set; }
[Required, EnumDataType(typeof(BillType))]
public BillType Type { get; set; }

[Required]
public PaymentType PaymentType { get; set; }
[Required]
public PaymentType PaymentType { get; set; }

[Required]
public DateTime PaidAt { get; set; }
[Required]
public DateTime PaidAt { get; set; }

public string Comment { get; set; }
public string Comment { get; set; }

public string ContractNumber { get; set; }
public string ContractNumber { get; set; }

public DateTime? ContractDate { get; set; }
public DateTime? ContractDate { get; set; }

public bool IsNeedPayNds { get; set; }
public bool IsNeedPayNds { get; set; }

public Guid? ClientId { get; set; }
public Guid? ClientId { get; set; }

public string Contact { get; set; }
public string Contact { get; set; }

public string ContactName { get; set; }
public string ContactName { get; set; }

public ContactType ContactType { get; set; }
}
public ContactType ContactType { get; set; }
}
9 changes: 3 additions & 6 deletions Pds/Pds.Api.Contracts/Bill/CreateBillResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
namespace Pds.Api.Contracts.Bill;

namespace Pds.Api.Contracts.Bill
public class CreateBillResponse
{
public class CreateBillResponse
{
public Guid Id { get; set; }
}
public Guid Id { get; set; }
}
46 changes: 22 additions & 24 deletions Pds/Pds.Api.Contracts/Bill/EditBillRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,36 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using Pds.Core.Enums;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class EditBillRequest
{
public class EditBillRequest
{
[Required]
public Guid Id { get; set; }
[Required]
public Guid Id { get; set; }

[Required]
[Range(10.00, Double.MaxValue, ErrorMessage = "Значение поля {0} должно быть больше чем {1}.")]
public decimal Value { get; set; }
[Required]
[Range(10.00, Double.MaxValue, ErrorMessage = "Значение поля {0} должно быть больше чем {1}.")]
public decimal Value { get; set; }

public string Comment { get; set; }
public string Comment { get; set; }

public string ContractNumber { get; set; }
public string ContractNumber { get; set; }

public DateTime? ContractDate { get; set; }
public DateTime? ContractDate { get; set; }

public bool IsNeedPayNds { get; set; }
public bool IsNeedPayNds { get; set; }

[Required]
public DateTime PaidAt { get; set; }
[Required]
public DateTime PaidAt { get; set; }

[Required, EnumDataType(typeof(BillType))]
public BillType Type { get; set; }
[Required, EnumDataType(typeof(BillType))]
public BillType Type { get; set; }

[Required, EnumDataType(typeof(PaymentType))]
public PaymentType PaymentType { get; set; }
[Required, EnumDataType(typeof(PaymentType))]
public PaymentType PaymentType { get; set; }

[Required]
public Guid BrandId { get; set; }
[Required]
public Guid BrandId { get; set; }

public BillContentDto Content { get; set; }
}
public BillContentDto Content { get; set; }
}
9 changes: 3 additions & 6 deletions Pds/Pds.Api.Contracts/Bill/EditBillResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
using System;
namespace Pds.Api.Contracts.Bill;

namespace Pds.Api.Contracts.Bill
public class EditBillResponse
{
public class EditBillResponse
{
public Guid Id { get; set; }
}
public Guid Id { get; set; }
}
34 changes: 16 additions & 18 deletions Pds/Pds.Api.Contracts/Bill/GetBillResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
using System;
using Pds.Core.Enums;
using Pds.Core.Enums;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class GetBillResponse
{
public class GetBillResponse
{
public Guid Id { get; set; }
public Guid Id { get; set; }

public decimal Value { get; set; }
public decimal Value { get; set; }

public string Comment { get; set; }
public string Comment { get; set; }

public string ContractNumber { get; set; }
public string ContractNumber { get; set; }

public DateTime? ContractDate { get; set; }
public DateTime? ContractDate { get; set; }

public bool IsNeedPayNds { get; set; }
public bool IsNeedPayNds { get; set; }

public DateTime PaidAt { get; set; }
public DateTime PaidAt { get; set; }

public BillType Type { get; set; }
public BillType Type { get; set; }

public PaymentType PaymentType { get; set; }
public PaymentType PaymentType { get; set; }

public Guid BrandId { get; set; }
public Guid BrandId { get; set; }

public Guid? ClientId { get; set; }
public Guid? ClientId { get; set; }

public BillContentDto Content { get; set; }
}
public BillContentDto Content { get; set; }
}
7 changes: 3 additions & 4 deletions Pds/Pds.Api.Contracts/Bill/GetBillsRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Pds.Api.Contracts.Paging;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class GetBillsRequest : PageSettings
{
public class GetBillsRequest : PageSettings
{

}
}
7 changes: 3 additions & 4 deletions Pds/Pds.Api.Contracts/Bill/GetBillsResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Pds.Api.Contracts.Paging;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class GetBillsResponse : PageResult<BillDto>
{
public class GetBillsResponse : PageResult<BillDto>
{
}
}
30 changes: 14 additions & 16 deletions Pds/Pds.Api.Contracts/Bill/PayContentPayload.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using Pds.Core.Enums;

namespace Pds.Api.Contracts.Bill
namespace Pds.Api.Contracts.Bill;

public class PayBillPayload
{
public class PayBillPayload
{
[Required]
public PaymentType PaymentType { get; set; }
[Required]
public PaymentType PaymentType { get; set; }

[Required]
[Range(10.00, Double.MaxValue, ErrorMessage = "Значение поля {0} должно быть больше чем {1}.")]
public decimal Value { get; set; }
[Required]
[Range(10.00, Double.MaxValue, ErrorMessage = "Значение поля {0} должно быть больше чем {1}.")]
public decimal Value { get; set; }

public string Comment { get; set; }
public string Comment { get; set; }

public DateTime PaidAt { get; set; }
public DateTime PaidAt { get; set; }

public string ContractNumber { get; set; }
public string ContractNumber { get; set; }

public DateTime? ContractDate { get; set; }
public DateTime? ContractDate { get; set; }

public bool IsNeedPayNds { get; set; }
}
public bool IsNeedPayNds { get; set; }
}
11 changes: 4 additions & 7 deletions Pds/Pds.Api.Contracts/BrandDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
using System;
namespace Pds.Api.Contracts;

namespace Pds.Api.Contracts
public class BrandDto
{
public class BrandDto
{
public Guid Id { get; set; }
public string Name { get; set; }
}
public Guid Id { get; set; }
public string Name { get; set; }
}
Loading