dmolinari/SIG-CM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor product pricing: catalog owns base price, pricing manager owns rules

Browse Source
This commit is contained in:
dmolinari
2026-02-21 19:52:25 -03:00
parent 841cc961b5
commit 6d1eb908a0
17 changed files with 90 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -38,7 +38,7 @@ yarn-error.log*
# Configuración de desarrollo que puede contener secretos.
# Es mejor usar "User Secrets" en desarrollo para las claves.
appsettings.Development.json
#appsettings.Development.json
# Archivos de publicación de Visual Studio
[Pp]roperties/[Pp]ublish[Pp]rofiles/

15
frontend/admin-panel/src/components/Products/ProductModal.tsx
View File

@@ -1,6 +1,7 @@
import { useState, useEffect } from 'react';
import type { Product, ProductBundleComponent } from '../../types/Product';
import type { Company } from '../../types/Company';
import type { Category } from '../../types/Category';
import { productService } from '../../services/productService';
import { X, Save, Layers, Plus, Trash2, AlertCircle, Package } from 'lucide-react';
import { motion, AnimatePresence } from 'framer-motion';
@@ -8,6 +9,7 @@ import { motion, AnimatePresence } from 'framer-motion';
interface Props {
product: Product | null;
companies: Company[];
categories: Category[];
allProducts: Product[];
onClose: (refresh?: boolean) => void;
}
@@ -21,11 +23,12 @@ const PRODUCT_TYPES = [
{ id: 6, code: 'BUNDLE', name: 'Paquete Promocional (Combo)' },
];
export default function ProductModal({ product, companies, allProducts, onClose }: Props) {
export default function ProductModal({ product, companies, categories, allProducts, onClose }: Props) {
const [formData, setFormData] = useState<Partial<Product>>({
name: '',
description: '',
companyId: 0,
categoryId: undefined,
productTypeId: 4, // Default Physical
basePrice: 0,
taxRate: 21,
@@ -169,6 +172,16 @@ export default function ProductModal({ product, companies, allProducts, onClose
</select>
</div>
<div className="space-y-1.5">
<label className="text-[10px] font-black text-slate-400 uppercase tracking-widest ml-1">Rubro Asociado</label>
<select className="w-full p-3 bg-slate-50 border-2 border-slate-100 rounded-xl outline-none focus:border-blue-500 font-bold text-sm appearance-none"
value={formData.categoryId || 0} onChange={e => setFormData({ ...formData, categoryId: Number(e.target.value) || undefined })}
>
<option value="0">Ninguno (Producto General)</option>
{categories.map(c => <option key={c.id} value={c.id}>{c.name}</option>)}
</select>
</div>
<div className="space-y-1.5">
<label className="text-[10px] font-black text-slate-400 uppercase tracking-widest ml-1">Precio Base ($)</label>
<input required type="number" step="0.01" className="w-full p-3 bg-slate-50 border-2 border-slate-100 rounded-xl outline-none focus:border-blue-500 font-black text-sm"

15
frontend/admin-panel/src/pages/Pricing/PricingManager.tsx
View File

@@ -4,7 +4,6 @@ import { Save, DollarSign, FileText, Type, AlertCircle } from 'lucide-react';
import { processCategories, type FlatCategory } from '../../utils/categoryTreeUtils';
interface PricingConfig {
basePrice: number;
baseWordCount: number;
extraWordPrice: number;
specialChars: string;
@@ -15,7 +14,7 @@ interface PricingConfig {
// Configuración por defecto
const defaultConfig: PricingConfig = {
basePrice: 0, baseWordCount: 15, extraWordPrice: 0,
baseWordCount: 15, extraWordPrice: 0,
specialChars: '!', specialCharPrice: 0, boldSurcharge: 0, frameSurcharge: 0
};
@@ -113,15 +112,9 @@ export default function PricingManager() {
</h3>
<div className="space-y-4">
<div>
<label className="block text-sm font-medium text-gray-600 mb-1">Precio Mínimo ($)</label>
<div className="relative">
<span className="absolute left-3 top-2 text-gray-500">$</span>
<input type="number" className="pl-6 border p-2 rounded w-full focus:ring-2 focus:ring-blue-500 outline-none"
value={config.basePrice} onChange={e => setConfig({ ...config, basePrice: parseFloat(e.target.value) })} />
</div>
<p className="text-xs text-gray-400 mt-1">Costo por el aviso básico por día.</p>
</div>
<p className="text-xs text-blue-600 mb-2 bg-blue-50/50 p-2 rounded-lg border border-blue-100">
El Precio Base (Precio Mínimo) ahora se define directamente en los Productos del Catálogo.
</p>
<div className="grid grid-cols-2 gap-4">
<div>

10
frontend/admin-panel/src/pages/Products/ProductManager.tsx
View File

@@ -2,14 +2,17 @@ import { useState, useEffect } from 'react';
import { Plus, Search, Edit, Box, Layers } from 'lucide-react';
import { productService } from '../../../../counter-panel/src/services/productService';
import { companyService } from '../../../../counter-panel/src/services/companyService';
import { categoryService } from '../../services/categoryService';
import type { Product } from '../../../../counter-panel/src/types/Product';
import type { Company } from '../../../../counter-panel/src/types/Company';
import type { Category } from '../../types/Category';
import ProductModal from '../../components/Products/ProductModal';
import clsx from 'clsx';
export default function ProductManager() {
const [products, setProducts] = useState<Product[]>([]);
const [companies, setCompanies] = useState<Company[]>([]);
const [categories, setCategories] = useState<Category[]>([]);
const [loading, setLoading] = useState(true);
const [searchTerm, setSearchTerm] = useState('');
@@ -24,12 +27,14 @@ export default function ProductManager() {
const loadData = async () => {
setLoading(true);
try {
const [prodRes, compRes] = await Promise.all([
const [prodRes, compRes, catRes] = await Promise.all([
productService.getAll(),
companyService.getAll()
companyService.getAll(),
categoryService.getAll()
]);
setProducts(prodRes);
setCompanies(compRes);
setCategories(catRes);
} catch (error) {
console.error("Error cargando catálogo", error);
} finally {
@@ -150,6 +155,7 @@ export default function ProductManager() {
<ProductModal
product={editingProduct}
companies={companies}
categories={categories}
allProducts={products} // Pasamos todos los productos para poder armar combos
onClose={handleModalClose}
/>

1
frontend/admin-panel/src/types/Product.ts
View File

@@ -2,6 +2,7 @@ export interface Product {
id: number;
companyId: number;
productTypeId: number; // 1:Classified, 2:Graphic, 3:Radio, 4:Physical, 5:Service, 6:Bundle
categoryId?: number; // Para relacionarlo a un rubro
name: string;
description?: string;
sku?: string;

4
frontend/counter-panel/src/components/POS/AdEditorModal.tsx
View File

@@ -10,6 +10,7 @@ interface AdEditorModalProps {
onClose: () => void;
onConfirm: (listingId: number, price: number, description: string) => void;
clientId: number | null; // El aviso se vinculará a este cliente
productId: number; // Necesario para el precio base
}
interface PricingResult {
@@ -18,7 +19,7 @@ interface PricingResult {
details: string;
}
export default function AdEditorModal({ isOpen, onClose, onConfirm, clientId }: AdEditorModalProps) {
export default function AdEditorModal({ isOpen, onClose, onConfirm, clientId, productId }: AdEditorModalProps) {
const [flatCategories, setFlatCategories] = useState<FlatCategory[]>([]);
const [operations, setOperations] = useState<any[]>([]);
const [loading, setLoading] = useState(false);
@@ -72,6 +73,7 @@ export default function AdEditorModal({ isOpen, onClose, onConfirm, clientId }:
try {
const res = await api.post('/pricing/calculate', {
categoryId: parseInt(categoryId),
productId: productId,
text: debouncedText,
days: days,
isBold: styles.isBold,

1
frontend/counter-panel/src/pages/FastEntryPage.tsx
View File

@@ -240,6 +240,7 @@ export default function FastEntryPage() {
try {
const res = await api.post('/pricing/calculate', {
categoryId: parseInt(formData.categoryId),
productId: 0, // En FastEntry no hay producto aún
text: debouncedText || "",
days: formData.days,
isBold: options.isBold,

1
frontend/counter-panel/src/pages/UniversalPosPage.tsx
View File

@@ -310,6 +310,7 @@ export default function UniversalPosPage() {
onClose={() => setShowAdEditor(false)}
onConfirm={handleAdConfirmed}
clientId={clientId || 1005}
productId={selectedAdProduct?.id || 0}
/>
)}

1
frontend/counter-panel/src/types/Product.ts
View File

@@ -2,6 +2,7 @@ export interface Product {
id: number;
companyId: number;
productTypeId: number; // 1:Classified, 2:Graphic, 3:Radio, 4:Physical, 5:Service, 6:Bundle
categoryId?: number; // Para relacionarlo a un rubro
name: string;
description?: string;
sku?: string;

8
src/SIGCM.API/appsettings.Development.json Normal file
View File

@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

1
src/SIGCM.Application/DTOs/PricingDtos.cs
View File

@@ -3,6 +3,7 @@ namespace SIGCM.Application.DTOs;
public class CalculatePriceRequest
{
public int CategoryId { get; set; }
public int ProductId { get; set; } // Añadido para obtener el Precio Base
public required string Text { get; set; }
public int Days { get; set; }
public bool IsBold { get; set; }

1
src/SIGCM.Domain/Entities/CategoryPricing.cs
View File

@@ -4,7 +4,6 @@ public class CategoryPricing
{
public int Id { get; set; }
public int CategoryId { get; set; }
public decimal BasePrice { get; set; }
public int BaseWordCount { get; set; }
public decimal ExtraWordPrice { get; set; }
public string SpecialChars { get; set; } = "!";

1
src/SIGCM.Domain/Entities/Product.cs
View File

@@ -5,6 +5,7 @@ public class Product
public int Id { get; set; }
public int CompanyId { get; set; }
public int ProductTypeId { get; set; }
public int? CategoryId { get; set; } // Propiedad agregada: Vínculo con Rubro
public required string Name { get; set; }
public string? Description { get; set; }
public string? SKU { get; set; }

24
src/SIGCM.Infrastructure/Data/DbInitializer.cs
View File

@@ -121,6 +121,30 @@ END
// --- MIGRACIONES (Schema Update) ---
var migrationSql = @"
-- Products Columns
IF NOT EXISTS(SELECT * FROM sys.columns WHERE Name = N'CategoryId' AND Object_ID = Object_ID(N'Products'))
BEGIN
ALTER TABLE Products ADD CategoryId INT NULL;
-- Agregar clave foránea opcionalmente
ALTER TABLE Products ADD CONSTRAINT FK_Products_Categories FOREIGN KEY (CategoryId) REFERENCES Categories(Id);
END
-- CategoryPricing Columns
IF EXISTS(SELECT * FROM sys.columns WHERE Name = N'BasePrice' AND Object_ID = Object_ID(N'CategoryPricing'))
BEGIN
-- Drop the default constraint before dropping the column.
-- By finding the constraint dynamically:
DECLARE @ConstraintName nvarchar(200)
SELECT @ConstraintName = Name FROM sys.default_constraints
WHERE parent_object_id = object_id('CategoryPricing')
AND parent_column_id = columnproperty(object_id('CategoryPricing'), 'BasePrice', 'ColumnId')
IF @ConstraintName IS NOT NULL
EXEC('ALTER TABLE CategoryPricing DROP CONSTRAINT ' + @ConstraintName)
ALTER TABLE CategoryPricing DROP COLUMN BasePrice;
END
-- Listings Columns
IF NOT EXISTS(SELECT * FROM sys.columns WHERE Name = N'PublicationStartDate' AND Object_ID = Object_ID(N'Listings'))
ALTER TABLE Listings ADD PublicationStartDate DATETIME2 NULL;

6
src/SIGCM.Infrastructure/Repositories/PricingRepository.cs
View File

@@ -31,7 +31,7 @@ public class PricingRepository
{
var updateSql = @"
UPDATE CategoryPricing
SET BasePrice = @BasePrice, BaseWordCount = @BaseWordCount,
SET BaseWordCount = @BaseWordCount,
ExtraWordPrice = @ExtraWordPrice, SpecialChars = @SpecialChars,
SpecialCharPrice = @SpecialCharPrice, BoldSurcharge = @BoldSurcharge,
FrameSurcharge = @FrameSurcharge
@@ -42,9 +42,9 @@ public class PricingRepository
{
var insertSql = @"
INSERT INTO CategoryPricing
(CategoryId, BasePrice, BaseWordCount, ExtraWordPrice, SpecialChars, SpecialCharPrice, BoldSurcharge, FrameSurcharge)
(CategoryId, BaseWordCount, ExtraWordPrice, SpecialChars, SpecialCharPrice, BoldSurcharge, FrameSurcharge)
VALUES
(@CategoryId, @BasePrice, @BaseWordCount, @ExtraWordPrice, @SpecialChars, @SpecialCharPrice, @BoldSurcharge, @FrameSurcharge)";
(@CategoryId, @BaseWordCount, @ExtraWordPrice, @SpecialChars, @SpecialCharPrice, @BoldSurcharge, @FrameSurcharge)";
await conn.ExecuteAsync(insertSql, pricing);
}
}

6
src/SIGCM.Infrastructure/Repositories/ProductRepository.cs
View File

@@ -47,8 +47,8 @@ public class ProductRepository : IProductRepository
{
using var conn = _db.CreateConnection();
var sql = @"
INSERT INTO Products (CompanyId, ProductTypeId, Name, Description, SKU, BasePrice, TaxRate, IsActive)
VALUES (@CompanyId, @ProductTypeId, @Name, @Description, @SKU, @BasePrice, @TaxRate, @IsActive);
INSERT INTO Products (CompanyId, ProductTypeId, CategoryId, Name, Description, SKU, BasePrice, TaxRate, IsActive)
VALUES (@CompanyId, @ProductTypeId, @CategoryId, @Name, @Description, @SKU, @BasePrice, @TaxRate, @IsActive);
SELECT CAST(SCOPE_IDENTITY() as int);";
return await conn.QuerySingleAsync<int>(sql, product);
}
@@ -58,7 +58,7 @@ public class ProductRepository : IProductRepository
using var conn = _db.CreateConnection();
var sql = @"
UPDATE Products
SET Name = @Name, Description = @Description, BasePrice = @BasePrice, TaxRate = @TaxRate, IsActive = @IsActive
SET CategoryId = @CategoryId, Name = @Name, Description = @Description, BasePrice = @BasePrice, TaxRate = @TaxRate, IsActive = @IsActive
WHERE Id = @Id";
await conn.ExecuteAsync(sql, product);
}

19
src/SIGCM.Infrastructure/Services/PricingService.cs
View File

@@ -10,15 +10,25 @@ public class PricingService
{
private readonly PricingRepository _repo;
private readonly ICouponRepository _couponRepo;
private readonly IProductRepository _productRepo;
public PricingService(PricingRepository repo, ICouponRepository couponRepo)
public PricingService(PricingRepository repo, ICouponRepository couponRepo, IProductRepository productRepo)
{
_repo = repo;
_couponRepo = couponRepo;
_productRepo = productRepo;
}
public async Task<CalculatePriceResponse> CalculateAsync(CalculatePriceRequest request)
{
// 0. Obtener el Producto para saber el Precio Base
var product = await _productRepo.GetByIdAsync(request.ProductId);
if (product == null) return new CalculatePriceResponse
{
TotalPrice = 0,
Details = "Producto no encontrado."
};
// 1. Obtener Reglas
var pricing = await _repo.GetByCategoryIdAsync(request.CategoryId);
@@ -44,7 +54,10 @@ public class PricingService
int realWordCount = words.Length;
// 3. Costo Base y Excedente
decimal currentCost = pricing.BasePrice; // Precio base incluye N palabras
// Obtenemos el precio actual del producto vigenciado, fallback a BasePrice (usando el repo)
decimal productBasePrice = await _productRepo.GetCurrentPriceAsync(request.ProductId, request.StartDate == default ? DateTime.UtcNow : request.StartDate);
decimal currentCost = productBasePrice; // Precio base incluye N palabras
// ¿Cuántas palabras extra cobramos?
// Nota: Los caracteres especiales se cobran aparte según tu requerimiento,
@@ -132,7 +145,7 @@ public class PricingService
return new CalculatePriceResponse
{
TotalPrice = Math.Max(0, totalBeforeDiscount - totalDiscount),
BaseCost = pricing.BasePrice * request.Days,
BaseCost = productBasePrice * request.Days,
ExtraCost = (extraWordCost + specialCharCost) * request.Days,
Surcharges = ((request.IsBold ? pricing.BoldSurcharge : 0) + (request.IsFrame ? pricing.FrameSurcharge : 0) + (request.IsFeatured ? featuredSurcharge : 0)) * request.Days,
Discount = totalDiscount,