Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,5 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
FodyWeavers.xsd
/src/backend/DeLong.WebAPI/appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AutoMapper;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.CashWarehouse;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;
using DeLong.Service.DTOs.CashWarehouse;

namespace DeLong.Service.Services;

Expand Down
10 changes: 5 additions & 5 deletions src/backend/DeLong.Application/Services/CategoryService.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using AutoMapper;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Domain.Configurations;
using DeLong.Application.DTOs.Categories;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using DeLong.Application.DTOs.Categories;

namespace DeLong.Service.Services;

Expand Down Expand Up @@ -73,7 +73,7 @@
return _mapper.Map<CategoryResultDto>(existCategory);
}

public async ValueTask<IEnumerable<CategoryResultDto>> RetrieveAllAsync(PaginationParams @params, Filter filter, string search = null)

Check warning on line 76 in src/backend/DeLong.Application/Services/CategoryService.cs

View workflow job for this annotation

GitHub Actions / Build App

Cannot convert null literal to non-nullable reference type.
{
var categoriesQuery = _categoryRepository.GetAll(u => !u.IsDeleted)
.ToPaginate(@params)
Expand Down
10 changes: 5 additions & 5 deletions src/backend/DeLong.Application/Services/CustomerService.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using AutoMapper;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Domain.Configurations;
using DeLong.Application.DTOs.Customers;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using DeLong.Application.DTOs.Customers;

namespace DeLong.Service.Services;

Expand Down
6 changes: 3 additions & 3 deletions src/backend/DeLong.Application/Services/DiscountService.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AutoMapper;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using DeLong_Desktop.ApiService.DTOs.Discounts;
using Microsoft.AspNetCore.Http;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;
using DeLong_Desktop.ApiService.DTOs.Discounts;

namespace DeLong.Service.Services;

Expand Down
6 changes: 3 additions & 3 deletions src/backend/DeLong.Application/Services/EmployeeService.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using AutoMapper;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.Employee;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Service.DTOs.Employee;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;

namespace DeLong.Service.Services;
Expand Down
6 changes: 3 additions & 3 deletions src/backend/DeLong.Application/Services/KursDollarService.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AutoMapper;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.KursDollar;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;
using DeLong.Service.DTOs.KursDollar;

namespace DeLong.Service.Services;

Expand Down
4 changes: 2 additions & 2 deletions src/backend/DeLong.Application/Services/PaymentService.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using AutoMapper;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.Payments;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Service.DTOs.Payments;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;

namespace DeLong.Service.Services;
Expand Down
10 changes: 5 additions & 5 deletions src/backend/DeLong.Application/Services/PriceService.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using AutoMapper;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Service.DTOs.Prices;
using DeLong.Domain.Configurations;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.Prices;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;

namespace DeLong.Service.Services;
Expand Down
10 changes: 5 additions & 5 deletions src/backend/DeLong.Application/Services/ProductService.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using AutoMapper;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Domain.Configurations;
using DeLong.Application.DTOs.Products;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using DeLong.Application.DTOs.Products;

namespace DeLong.Service.Services;

Expand Down
6 changes: 3 additions & 3 deletions src/backend/DeLong.Application/Services/SaleItemService.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using AutoMapper;
using DeLong.Domain.Entities;
using DeLong.Domain.Configurations;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.SaleItems;
using Microsoft.EntityFrameworkCore;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;

namespace DeLong.Service.Services;

Expand Down
8 changes: 4 additions & 4 deletions src/backend/DeLong.Application/Services/TokenService.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.Text;
using System.Security.Claims;
using DeLong.Service.Interfaces;
using DeLong.Service.Interfaces;
using Microsoft.Extensions.Configuration;
using Microsoft.IdentityModel.Tokens;
using System.IdentityModel.Tokens.Jwt;
using Microsoft.Extensions.Configuration;
using System.Security.Claims;
using System.Text;

namespace DeLong.Service.Services;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AutoMapper;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.DTOs.TransactionItems;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;
using DeLong.Service.DTOs.TransactionItems;

namespace DeLong.Service.Services;

Expand Down
6 changes: 3 additions & 3 deletions src/backend/DeLong.Application/Services/TransactionService.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AutoMapper;
using DeLong.Application.DTOs.Transactions;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using DeLong.Application.Exceptions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;
using DeLong.Application.DTOs.Transactions;

namespace DeLong.Service.Services;

Expand Down
8 changes: 4 additions & 4 deletions src/backend/DeLong.Application/Services/UserService.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using AutoMapper;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Application.DTOs.Users;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using Microsoft.EntityFrameworkCore;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;

namespace DeLong.Service.Services;

Expand Down
10 changes: 5 additions & 5 deletions src/backend/DeLong.Application/Services/WarehouseService.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using AutoMapper;
using DeLong.Domain.Entities;
using Microsoft.AspNetCore.Http;
using DeLong.Service.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Application.DTOs.Warehouses;
using DeLong.Application.Exceptions;
using DeLong.Application.Extensions;
using DeLong.Application.Interfaces;
using DeLong.Domain.Configurations;
using DeLong.Domain.Entities;
using DeLong.Service.Interfaces;
using Microsoft.AspNetCore.Http;
using Microsoft.EntityFrameworkCore;
using DeLong.Application.DTOs.Warehouses;

namespace DeLong.Service.Services;

Expand Down
4 changes: 2 additions & 2 deletions src/backend/DeLong.Domain/Entities/ReturnProduct.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
 using DeLong.Domain.Common;
using DeLong.Domain.Common;

namespace DeLong.Domain.Entities;

Expand All @@ -14,7 +14,7 @@ public class ReturnProduct : Auditable
public long ProductId { get; set; }
public string ProductName { get; set; } = string.Empty;
public decimal Quantity { get; set; }
public string UnitOfMeasure { get; set; } =string.Empty;
public string UnitOfMeasure { get; set; } = string.Empty;
public decimal ReturnSumma { get; set; }
public string Reason { get; set; } = string.Empty; // Qaytish sababi
}
Loading
Loading