36 Commits

Author SHA1 Message Date
b64c627702 feat(checkout): update payment intent payload to use 'transfer_payer_dni' and remove placeholder from DNI input 2026-07-16 11:38:10 -03:00
fc425543ee feat(checkout): add DNI input handling for transfer payments and update related components 2026-07-16 11:28:33 -03:00
36045656e7 feat(checkout): enhance transfer payment flow with DNI input handling and completion action 2026-07-16 11:18:26 -03:00
ada832cbba feat(checkout): update button width and background color for payment components 2026-07-16 11:02:30 -03:00
524eea38f4 feat(checkout): enhance transfer payment flow with DNI input and validation 2026-07-16 10:55:28 -03:00
f163e8a353 feat(checkout): refactor payment step components for QR, transfer, and TelePagos methods 2026-07-16 10:21:59 -03:00
8b785fd631 feat(cart): refactor cart item structure and update related components for consistency 2026-07-16 10:02:24 -03:00
e4195a8567 feat(product-detail): enhance product variant handling with inventory policies and update UI components 2026-07-15 14:33:39 -03:00
25085f6f85 feat(hero-banner): update event icons and add gradient overlay to hero banner 2026-07-14 14:30:01 -03:00
257e4fbeb8 feat(hero-banner): add HeroBanner component with dynamic hero and event configurations 2026-07-14 14:03:51 -03:00
cc87169c1c feat(menu-guard): implement hasMenuGuard for route access control based on tenant menu permissions 2026-07-14 12:22:26 -03:00
e383a8f159 feat(tenant): add HeroConfig, EventConfig, and Menu interfaces to enhance tenant structure 2026-07-14 12:17:40 -03:00
993aa5823a feat(product-detail): implement resolver for product details and update component logic for improved error handling
feat(product-carousel): enhance image loading with optimized attributes and improve layout consistency
style: refactor HTML structure for better readability and maintainability
test(product-detail): add unit tests for product detail resolver and component behavior
2026-07-08 16:12:35 -03:00
6c00a3e2bb feat(store-home): implement resolver for product data and enhance component logic for improved error handling and loading states 2026-07-08 16:04:11 -03:00
efa0d48a40 feat(purchase-item): enhance attributes display for quantity-only items 2026-07-08 15:42:09 -03:00
9fcbf34573 feat(purchase): enhance purchase detail and summary interfaces, update purchase item component for improved data handling 2026-07-08 15:31:37 -03:00
451dc58cd7 style: update cart item layout and typography for improved consistency and readability 2026-07-08 14:27:01 -03:00
26466f57db style: update page title color to #A0A0A0 for consistency across components 2026-07-08 14:16:06 -03:00
a9dc55c274 feat(purchase-detail): implement purchase item component with dynamic attributes and styling 2026-07-08 14:09:51 -03:00
5e9a5917fd feat(purchase-detail): restructure cart item layout for improved readability and alignment 2026-07-08 13:47:23 -03:00
e06edaaa42 feat(purchase-detail): add purchase detail page with routing and mock data 2026-07-08 13:40:29 -03:00
1f2ca09b81 style: update font sizes for labels and page titles across multiple components 2026-07-08 13:16:50 -03:00
56355569f2 fix: correct spelling of "contraseña" in various components and templates 2026-07-08 12:26:46 -03:00
036b2a950f feat(profile): enhance profile form with validation messages and submission logic 2026-07-08 12:12:22 -03:00
7507580c2c feat(profile): add updateProfile method and enhance password validation in register form 2026-07-08 12:06:36 -03:00
b016569b10 feat(purchase-list): implement loading skeleton and enhance purchase list fetching logic 2026-07-08 11:31:52 -03:00
23f48ccec0 style(account-sidebar): update active nav link color to use CSS variable for consistency 2026-07-08 11:20:17 -03:00
6a5683f6b7 feat(purchase-list): refactor purchase list item structure and styles for improved layout 2026-07-08 10:12:20 -03:00
b7ed16966c feat(profile): update profile form layout and functionality, enhance styles for better responsiveness 2026-07-08 09:34:24 -03:00
baf5e2d4e7 feat(layout): enhance layout structure by adding padding and container classes 2026-07-08 09:14:33 -03:00
64ade4d595 feat(profile-form): refactor form-group styles and update error handling in checkout form 2026-07-08 09:05:15 -03:00
b9b8a70ca1 style(profile-form): adjust label styles and remove gap in form group 2026-07-08 08:52:04 -03:00
28ffe3c788 feat(user-dropdown): convert buttons to links for account and purchases navigation 2026-07-08 08:44:07 -03:00
4969026fe9 feat(purchase-list-item): create purchase list item component with styles and template 2026-07-08 08:39:57 -03:00
09d88e6324 feat(account-page): implement account layout with sidebar, profile form, and purchase list components 2026-07-08 08:39:52 -03:00
1a2d303b4e feat(account-page): implement account layout, profile, and purchases pages with corresponding components 2026-07-08 08:36:17 -03:00
92 changed files with 3281 additions and 1049 deletions

View File

@@ -1,20 +1,36 @@
import { provideHttpClient, withFetch, withInterceptors } from '@angular/common/http'; import { HttpRequest, provideHttpClient, withFetch, withInterceptors } from '@angular/common/http';
import { ApplicationConfig, provideAppInitializer, provideBrowserGlobalErrorListeners } from '@angular/core'; import {
ApplicationConfig,
provideAppInitializer,
provideBrowserGlobalErrorListeners,
} from '@angular/core';
import { provideRouter } from '@angular/router'; import { provideRouter } from '@angular/router';
import { provideClientHydration } from '@angular/platform-browser'; import { provideClientHydration, withHttpTransferCacheOptions } from '@angular/platform-browser';
import { routes } from './app.routes'; import { routes } from './app.routes';
import { authBootstrap } from './core/services/auth/auth-bootstrap'; import { authBootstrap } from './core/services/auth/auth-bootstrap';
import { authInterceptor } from './core/services/auth/auth.interceptor'; import { authInterceptor } from './core/services/auth/auth.interceptor';
import { tenantBootstrap } from './core/services/tenant-bootstrap'; import { tenantBootstrap } from './core/services/tenant-bootstrap';
function isStoreCatalogRequest(request: HttpRequest<unknown>): boolean {
return (
request.method === 'GET' &&
/\/api\/tenants\/[^/]+\/productos(?:\/\d+)?(?:\?|$)/.test(request.urlWithParams)
);
}
export const appConfig: ApplicationConfig = { export const appConfig: ApplicationConfig = {
providers: [ providers: [
provideBrowserGlobalErrorListeners(), provideBrowserGlobalErrorListeners(),
provideRouter(routes), provideRouter(routes),
provideClientHydration(), provideClientHydration(
withHttpTransferCacheOptions({
includeRequestsWithAuthHeaders: true,
filter: isStoreCatalogRequest,
}),
),
provideHttpClient(withFetch(), withInterceptors([authInterceptor])), provideHttpClient(withFetch(), withInterceptors([authInterceptor])),
provideAppInitializer(authBootstrap), provideAppInitializer(authBootstrap),
provideAppInitializer(tenantBootstrap) provideAppInitializer(tenantBootstrap),
] ],
}; };

View File

@@ -160,8 +160,8 @@ describe('app routes', () => {
expect(placeholders).toEqual([ expect(placeholders).toEqual([
'Nombre y Apellido', 'Nombre y Apellido',
'Email', 'Email',
'Contrasena', 'Contraseña',
'Repetir Contrasena' 'Repetir Contraseña'
]); ]);
}); });

View File

@@ -0,0 +1,24 @@
import { inject } from '@angular/core';
import { CanActivateFn, Router } from '@angular/router';
import { TenantService } from '../services/tenant.service';
export const hasMenuGuard = (menuCode: string): CanActivateFn => {
return () => {
const tenantService = inject(TenantService);
const router = inject(Router);
const tenant = tenantService.tenant();
if (!tenant) {
return router.createUrlTree(['/']);
}
const hasMenu = tenant.menues?.some(menu => menu.code === menuCode) ?? false;
if (hasMenu) {
return true;
}
return router.createUrlTree(['/']);
};
};

View File

@@ -5,12 +5,12 @@
<div class="user-dropdown__divider"></div> <div class="user-dropdown__divider"></div>
<button type="button" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-account"> <a routerLink="/mi-cuenta/datos-personales" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-account">
Mi cuenta Mi cuenta
</button> </a>
<button type="button" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-purchases"> <a routerLink="/mi-cuenta/compras" class="user-dropdown__item" role="menuitem" data-testid="user-dropdown-purchases">
Mis compras Mis compras
</button> </a>
<button <button
type="button" type="button"
class="user-dropdown__item" class="user-dropdown__item"

View File

@@ -35,6 +35,7 @@
} }
.user-dropdown__item { .user-dropdown__item {
display: block;
width: 100%; width: 100%;
border: 0; border: 0;
border-radius: 6px; border-radius: 6px;
@@ -46,6 +47,7 @@
background: transparent; background: transparent;
cursor: pointer; cursor: pointer;
transition: color 0.15s ease; transition: color 0.15s ease;
text-decoration: none;
} }
.user-dropdown__item:active, .user-dropdown__item:active,

View File

@@ -1,8 +1,11 @@
import { Component, computed, input, output } from '@angular/core'; import { Component, computed, input, output } from '@angular/core';
import { RouterLink } from '@angular/router';
import { AuthUser } from '../../../../services/auth/auth.interfaces'; import { AuthUser } from '../../../../services/auth/auth.interfaces';
@Component({ @Component({
selector: 'app-user-dropdown', selector: 'app-user-dropdown',
standalone: true,
imports: [RouterLink],
templateUrl: './user-dropdown.component.html', templateUrl: './user-dropdown.component.html',
styleUrl: './user-dropdown.component.scss' styleUrl: './user-dropdown.component.scss'
}) })

View File

@@ -28,7 +28,11 @@
} }
<main class="flex-grow-1 d-block"> <main class="flex-grow-1 d-block">
<router-outlet /> <section class="py-5">
<div class="container-xl px-3 px-md-4">
<router-outlet />
</div>
</section>
</main> </main>
<app-store-footer <app-store-footer

View File

@@ -2,7 +2,11 @@ import { Component, computed, inject, OnInit, signal } from '@angular/core';
import { Router, RouterOutlet } from '@angular/router'; import { Router, RouterOutlet } from '@angular/router';
import { TenantService } from '../../services/tenant.service'; import { TenantService } from '../../services/tenant.service';
import { CartService } from '../../services/cart/cart.service'; import { CartService } from '../../services/cart/cart.service';
import { StoreFooterComponent, StoreFooterSection, StoreSocialLink } from './store-footer/store-footer.component'; import {
StoreFooterComponent,
StoreFooterSection,
StoreSocialLink,
} from './store-footer/store-footer.component';
import { StoreHeaderComponent } from './store-header/store-header.component'; import { StoreHeaderComponent } from './store-header/store-header.component';
import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component'; import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
import { ButtonComponent } from '../../../shared/components/button/button.component'; import { ButtonComponent } from '../../../shared/components/button/button.component';
@@ -11,9 +15,15 @@ import { AuthService } from '../../services/auth/auth.service';
@Component({ @Component({
selector: 'app-store-layout', selector: 'app-store-layout',
imports: [RouterOutlet, StoreHeaderComponent, StoreFooterComponent, CartComponent, ButtonComponent], imports: [
RouterOutlet,
StoreHeaderComponent,
StoreFooterComponent,
CartComponent,
ButtonComponent,
],
templateUrl: './store-layout.component.html', templateUrl: './store-layout.component.html',
styleUrl: './store-layout.component.scss' styleUrl: './store-layout.component.scss',
}) })
export class StoreLayoutComponent implements OnInit { export class StoreLayoutComponent implements OnInit {
private readonly tenantService = inject(TenantService); private readonly tenantService = inject(TenantService);
@@ -57,14 +67,14 @@ export class StoreLayoutComponent implements OnInit {
} }
return { return {
productVariantId: item.product_variant_id, cartItemId: item.id,
imageUrl: item.product?.imagen ?? null, imageUrl: item.product?.imagen ?? null,
product, product,
originalPrice: null, originalPrice: null,
discountedPrice: parseFloat(item.precio_unitario), discountedPrice: parseFloat(item.precio_unitario),
discountPercentage: null, discountPercentage: null,
attributes, attributes,
quantity: item.cantidad quantity: item.cantidad,
}; };
} }
@@ -81,7 +91,7 @@ export class StoreLayoutComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.cartService.loadCart().subscribe({ this.cartService.loadCart().subscribe({
error: (err) => console.error('Error loading cart', err) error: (err) => console.error('Error loading cart', err),
}); });
} }
@@ -92,7 +102,7 @@ export class StoreLayoutComponent implements OnInit {
protected onLogoutClick(): void { protected onLogoutClick(): void {
this.authService.logout().subscribe({ this.authService.logout().subscribe({
next: () => void this.router.navigate(['/login']), next: () => void this.router.navigate(['/login']),
error: (err) => console.error('Error logging out', err) error: (err) => console.error('Error logging out', err),
}); });
} }
@@ -101,34 +111,33 @@ export class StoreLayoutComponent implements OnInit {
void this.router.navigate(['/checkout']); void this.router.navigate(['/checkout']);
} }
protected readonly footerSections: StoreFooterSection[] = [ protected readonly footerSections: StoreFooterSection[] = [
{ {
heading: 'Cuenta', heading: 'Cuenta',
links: ['Mi cuenta', 'Mis compras', 'Cerrar sesion'] links: ['Mi cuenta', 'Mis compras', 'Cerrar sesion'],
}, },
{ {
heading: 'Ayuda', heading: 'Ayuda',
links: ['Contacto', 'Ayuda', 'Preguntas frecuentes'] links: ['Contacto', 'Ayuda', 'Preguntas frecuentes'],
} },
]; ];
protected readonly socialLinks: StoreSocialLink[] = [ protected readonly socialLinks: StoreSocialLink[] = [
{ {
label: 'Instagram', label: 'Instagram',
iconClass: 'fa-brands fa-instagram' iconClass: 'fa-brands fa-instagram',
}, },
{ {
label: 'WhatsApp', label: 'WhatsApp',
iconClass: 'fa-brands fa-whatsapp' iconClass: 'fa-brands fa-whatsapp',
}, },
{ {
label: 'Facebook', label: 'Facebook',
iconClass: 'fa-brands fa-facebook' iconClass: 'fa-brands fa-facebook',
}, },
{ {
label: 'LinkedIn', label: 'LinkedIn',
iconClass: 'fa-brands fa-linkedin-in' iconClass: 'fa-brands fa-linkedin-in',
} },
]; ];
} }

View File

@@ -18,6 +18,14 @@ export interface RegisterPayload {
password_confirmation: string; password_confirmation: string;
} }
export interface UpdateProfilePayload {
nombre_apellido: string;
email: string;
dni?: string;
telefono?: string;
password?: string;
}
export interface LoginResponse { export interface LoginResponse {
message: string; message: string;
token: string; token: string;

View File

@@ -9,7 +9,8 @@ import {
LoginPayload, LoginPayload,
LoginResponse, LoginResponse,
RegisterPayload, RegisterPayload,
RegisterResponse RegisterResponse,
UpdateProfilePayload
} from './auth.interfaces'; } from './auth.interfaces';
import { CookieService } from '../cookie/cookie.service'; import { CookieService } from '../cookie/cookie.service';
@@ -43,6 +44,12 @@ export class AuthService {
return this.http.post<RegisterResponse>(`${environment.url}register`, payload); return this.http.post<RegisterResponse>(`${environment.url}register`, payload);
} }
updateProfile(payload: UpdateProfilePayload): Observable<AuthUser> {
return this.http.put<AuthUser>(`${environment.url}me`, payload).pipe(
tap((user) => this.userState.set(user))
);
}
logout(): Observable<void> { logout(): Observable<void> {
if (!this.tokenState()) { if (!this.tokenState()) {
this.clearSession(); this.clearSession();

View File

@@ -3,12 +3,14 @@ export interface CartItemProduct {
imagen: string | null; imagen: string | null;
} }
export type BuyableType = 'variant' | 'bundle';
export interface CartItem { export interface CartItem {
id: number; id: number;
cantidad: number; cantidad: number;
precio_unitario: string; precio_unitario: string;
product_id: number; buyable_type: BuyableType;
product_variant_id: number; buyable_id: number;
product: CartItemProduct | null; product: CartItemProduct | null;
} }

View File

@@ -21,21 +21,21 @@ describe('CartService', () => {
id: 1, id: 1,
cantidad: 2, cantidad: 2,
precio_unitario: '10.00', precio_unitario: '10.00',
product_id: 5, buyable_type: 'variant',
product_variant_id: 10, buyable_id: 10,
product: { product: {
nombre: 'Test Product (Size: M)', nombre: 'Test Product (Size: M)',
imagen: null imagen: null,
} },
} },
], ],
subtotal: '20.00' subtotal: '20.00',
}; };
beforeEach(() => { beforeEach(() => {
tenantServiceMock = { tenantServiceMock = {
getTenantApiUrl: vi.fn().mockReturnValue('http://api.test/tenants/acme'), getTenantApiUrl: vi.fn().mockReturnValue('http://api.test/tenants/acme'),
tenant: vi.fn().mockReturnValue({ codigo: 'acme' }) tenant: vi.fn().mockReturnValue({ codigo: 'acme' }),
}; };
TestBed.configureTestingModule({ TestBed.configureTestingModule({
@@ -43,8 +43,8 @@ describe('CartService', () => {
CartService, CartService,
provideHttpClient(), provideHttpClient(),
provideHttpClientTesting(), provideHttpClientTesting(),
{ provide: TenantService, useValue: tenantServiceMock } { provide: TenantService, useValue: tenantServiceMock },
] ],
}); });
service = TestBed.inject(CartService); service = TestBed.inject(CartService);
@@ -83,19 +83,23 @@ describe('CartService', () => {
tenant_codigo: 'acme', tenant_codigo: 'acme',
status: 'active', status: 'active',
items: [], items: [],
subtotal: '0.00' subtotal: '0.00',
}); });
}); });
it('should add item and update signal', () => { it('should add item and update signal', () => {
service.addItem(10, 2).subscribe((res) => { service.addItem('variant', 10, 2).subscribe((res) => {
expect(res.data).toEqual(mockCart); expect(res.data).toEqual(mockCart);
expect(service.cart()).toEqual(mockCart); expect(service.cart()).toEqual(mockCart);
}); });
const req = httpMock.expectOne('http://api.test/tenants/acme/cart/items'); const req = httpMock.expectOne('http://api.test/tenants/acme/cart/items');
expect(req.request.method).toBe('POST'); expect(req.request.method).toBe('POST');
expect(req.request.body).toEqual({ product_variant_id: 10, cantidad: 2 }); expect(req.request.body).toEqual({
buyable_type: 'variant',
buyable_id: 10,
cantidad: 2,
});
expect(req.request.withCredentials).toBe(true); expect(req.request.withCredentials).toBe(true);
req.flush({ data: mockCart }); req.flush({ data: mockCart });
}); });
@@ -122,7 +126,7 @@ describe('CartService', () => {
tenant_codigo: 'acme', tenant_codigo: 'acme',
status: 'active', status: 'active',
items: [], items: [],
subtotal: '0.00' subtotal: '0.00',
}; };
service.removeItem(10).subscribe((res) => { service.removeItem(10).subscribe((res) => {

View File

@@ -4,10 +4,10 @@ import { catchError, map, Observable, tap } from 'rxjs';
import { ApiResponse } from '../api-response.interface'; import { ApiResponse } from '../api-response.interface';
import { TenantService } from '../tenant.service'; import { TenantService } from '../tenant.service';
import { Cart } from './cart.interface'; import { BuyableType, Cart } from './cart.interface';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root',
}) })
export class CartService { export class CartService {
private readonly http = inject(HttpClient); private readonly http = inject(HttpClient);
@@ -29,29 +29,31 @@ export class CartService {
tenant_codigo: this.tenantService.tenant()?.codigo ?? '', tenant_codigo: this.tenantService.tenant()?.codigo ?? '',
status: 'active', status: 'active',
items: [], items: [],
subtotal: '0.00' subtotal: '0.00',
}); });
} }
loadCart(): Observable<Cart> { loadCart(): Observable<Cart> {
return this.http return this.http
.get<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart`, { .get<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart`, {
withCredentials: true withCredentials: true,
}) })
.pipe( .pipe(
map((response) => response.data), map((response) => response.data),
tap((cart) => this.cartState.set(cart)) tap((cart) => this.cartState.set(cart)),
); );
} }
addItem(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> { addItem(
buyableType: BuyableType,
buyableId: number,
cantidad: number,
): Observable<ApiResponse<Cart>> {
this.isUpdatingState.set(true); this.isUpdatingState.set(true);
return this.http return this.http
.post<ApiResponse<Cart>>( .post<
`${this.tenantApiUrl}/cart/items`, ApiResponse<Cart>
{ product_variant_id: productVariantId, cantidad }, >(`${this.tenantApiUrl}/cart/items`, { buyable_type: buyableType, buyable_id: buyableId, cantidad }, { withCredentials: true })
{ withCredentials: true }
)
.pipe( .pipe(
tap((response) => { tap((response) => {
this.cartState.set(response.data); this.cartState.set(response.data);
@@ -60,18 +62,16 @@ export class CartService {
catchError((error) => { catchError((error) => {
this.isUpdatingState.set(false); this.isUpdatingState.set(false);
throw error; throw error;
}) }),
); );
} }
updateItemQuantity(productVariantId: number, cantidad: number): Observable<ApiResponse<Cart>> { updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
this.isUpdatingState.set(true); this.isUpdatingState.set(true);
return this.http return this.http
.patch<ApiResponse<Cart>>( .patch<
`${this.tenantApiUrl}/cart/items/${productVariantId}`, ApiResponse<Cart>
{ cantidad }, >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { cantidad }, { withCredentials: true })
{ withCredentials: true }
)
.pipe( .pipe(
tap((response) => { tap((response) => {
this.cartState.set(response.data); this.cartState.set(response.data);
@@ -80,17 +80,16 @@ export class CartService {
catchError((error) => { catchError((error) => {
this.isUpdatingState.set(false); this.isUpdatingState.set(false);
throw error; throw error;
}) }),
); );
} }
removeItem(productVariantId: number): Observable<ApiResponse<Cart>> { removeItem(cartItemId: number): Observable<ApiResponse<Cart>> {
this.isUpdatingState.set(true); this.isUpdatingState.set(true);
return this.http return this.http
.delete<ApiResponse<Cart>>( .delete<
`${this.tenantApiUrl}/cart/items/${productVariantId}`, ApiResponse<Cart>
{ withCredentials: true } >(`${this.tenantApiUrl}/cart/items/${cartItemId}`, { withCredentials: true })
)
.pipe( .pipe(
tap((response) => { tap((response) => {
this.cartState.set(response.data); this.cartState.set(response.data);
@@ -99,7 +98,7 @@ export class CartService {
catchError((error) => { catchError((error) => {
this.isUpdatingState.set(false); this.isUpdatingState.set(false);
throw error; throw error;
}) }),
); );
} }
} }

View File

@@ -29,16 +29,22 @@ export interface ProductAttribute {
options: ProductAttributeOption[]; options: ProductAttributeOption[];
} }
export type InventoryPolicy = 'tracked' | 'unlimited';
export interface ProductVariant { export interface ProductVariant {
id: number; id: number;
cantidad_maxima: number; inventory_policy: InventoryPolicy;
cantidad_maxima: number | null;
cantidad_vendida: number;
definitions: Record<string, string>; definitions: Record<string, string>;
images: string[]; images: string[];
} }
export interface ProductVariantMap { export interface ProductVariantMap {
variant_id: number; variant_id: number;
cantidad_maxima: number; inventory_policy: InventoryPolicy;
cantidad_maxima: number | null;
cantidad_vendida: number;
attributes: Record<string, string>; attributes: Record<string, string>;
} }
@@ -47,4 +53,3 @@ export interface ProductDetail extends Product {
variants_map: ProductVariantMap[]; variants_map: ProductVariantMap[];
variant: ProductVariant | null; variant: ProductVariant | null;
} }

View File

@@ -16,6 +16,51 @@ export interface PurchaseStatusResponse {
status: string | null; status: string | null;
} }
export interface PurchaseSummaryResponse extends PurchaseStatusResponse {
id: number;
created_at: string | null;
total: string;
}
export interface PurchaseDetailAttributeResponse {
name: string;
value: string | null;
}
export interface PurchaseDetailItemResponse {
id: number;
quantity: number;
unit_price: string;
line_total: string;
product: {
id: number;
nombre: string;
slug: string;
imagen: string | null;
} | null;
variant: {
id: number;
attributes: PurchaseDetailAttributeResponse[];
} | null;
}
export interface PurchaseDetailResponse extends PurchaseStatusResponse {
id: number;
cart_id: number | null;
tenant_codigo: string;
user_id: number;
created_at: string | null;
payment_method: string | null;
dni: string | null;
telefono: string | null;
nombre_apellido: string | null;
email: string | null;
items_source: 'purchase' | 'cart' | null;
items: PurchaseDetailItemResponse[];
subtotal: string;
total: string;
}
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
@@ -36,9 +81,13 @@ export class CheckoutService {
return purchase; return purchase;
} }
async generatePaymentIntent(tenantCode: string, purchaseId: number, method: 'qr' | 'transfer' | 'telepagos'): Promise<any> { async generatePaymentIntent(tenantCode: string, purchaseId: number, method: 'qr' | 'transfer' | 'telepagos', payerDni?: string): Promise<any> {
const payload: any = { method };
if (payerDni) {
payload.transfer_payer_dni = payerDni;
}
const response = await firstValueFrom( const response = await firstValueFrom(
this.http.post<any>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`, { method }) this.http.post<any>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}/payment-intent`, payload)
); );
if (!response) { if (!response) {
throw new Error('Error al generar la intención de pago.'); throw new Error('Error al generar la intención de pago.');
@@ -62,20 +111,32 @@ export class CheckoutService {
}; };
} }
async getPurchase(tenantCode: string, purchaseId: string | number): Promise<PurchaseStatusResponse> { async getPurchases(tenantCode: string, status?: string): Promise<{ data: PurchaseSummaryResponse[] }> {
let url = `${environment.url}tenants/${tenantCode}/compras`;
if (status) {
url += `?status=${status}`;
}
const response = await firstValueFrom( const response = await firstValueFrom(
this.http.get<{ data?: PurchaseStatusResponse } | PurchaseStatusResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`) this.http.get<{ data: PurchaseSummaryResponse[] }>(url)
);
if (!response) {
throw new Error('Error al obtener las compras.');
}
return response;
}
async getPurchase(tenantCode: string, purchaseId: string | number): Promise<PurchaseDetailResponse> {
const response = await firstValueFrom(
this.http.get<{ data?: PurchaseDetailResponse } | PurchaseDetailResponse>(`${environment.url}tenants/${tenantCode}/compras/${purchaseId}`)
); );
const purchase = this.extractResponseData<PurchaseStatusResponse>(response); const purchase = this.extractResponseData<PurchaseDetailResponse>(response);
if (!purchase) { if (!purchase) {
throw new Error('Error al obtener la compra.'); throw new Error('Error al obtener la compra.');
} }
return { return purchase;
status: purchase.status ?? null
};
} }
private extractResponseData<T>(response: T | { data?: T } | null | undefined): T | null { private extractResponseData<T>(response: T | { data?: T } | null | undefined): T | null {

View File

@@ -9,6 +9,26 @@ export interface BankAccount {
cvu: string; cvu: string;
} }
export interface HeroConfig {
background_image?: string | null;
title_html?: string | null;
description_html?: string | null;
button_text?: string | null;
button_href?: string | null;
}
export interface EventConfig {
title?: string | null;
location?: string | null;
dates?: string[] | null;
}
export interface Menu {
id: number;
code: string;
route: string;
}
export interface Tenant { export interface Tenant {
id: number; id: number;
codigo: string; codigo: string;
@@ -24,6 +44,9 @@ export interface Tenant {
footer_logo: string; footer_logo: string;
selected_bank_account_id?: number | null; selected_bank_account_id?: number | null;
selected_bank_account?: BankAccount | null; selected_bank_account?: BankAccount | null;
hero_config?: HeroConfig | null;
event_config?: EventConfig | null;
menues?: Menu[];
} }
export type TenantBootstrapResponse = ApiResponse<Tenant>; export type TenantBootstrapResponse = ApiResponse<Tenant>;

View File

@@ -0,0 +1,75 @@
import { TestBed } from '@angular/core/testing';
import { beforeEach, describe, expect, it } from 'vitest';
import { ProductAttribute } from '../../../../core/services/catalog/catalog.interface';
import { ProductAttributeSelectorComponent } from './product-attribute-selector.component';
describe('ProductAttributeSelectorComponent', () => {
const sizeAttribute: ProductAttribute = {
id: 1,
codigo: 'size',
nombre: 'Size',
is_required: true,
metadata_schema: null,
type: 'select',
options: [
{ id: 10, value: 'S', label: 'S', sort_order: 0, metadata: null },
{ id: 20, value: 'M', label: 'M', sort_order: 1, metadata: null },
],
};
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [ProductAttributeSelectorComponent],
}).compileComponents();
});
it('keeps an unlimited option available when maximum quantity is null', () => {
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
fixture.componentRef.setInput('attributes', [sizeAttribute]);
fixture.componentRef.setInput('variantsMap', [
{
variant_id: 1,
inventory_policy: 'unlimited',
cantidad_maxima: null,
cantidad_vendida: 0,
attributes: { size: 'S' },
},
]);
fixture.detectChanges();
const buttons = Array.from(
fixture.nativeElement.querySelectorAll('.attribute-selector__text-option'),
) as HTMLButtonElement[];
expect(buttons[0].disabled).toBe(false);
expect(buttons[1].disabled).toBe(true);
});
it('disables tracked options without available stock', () => {
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
fixture.componentRef.setInput('attributes', [sizeAttribute]);
fixture.componentRef.setInput('variantsMap', [
{
variant_id: 1,
inventory_policy: 'tracked',
cantidad_maxima: 0,
cantidad_vendida: 0,
attributes: { size: 'S' },
},
{
variant_id: 2,
inventory_policy: 'tracked',
cantidad_maxima: 2,
cantidad_vendida: 0,
attributes: { size: 'M' },
},
]);
fixture.detectChanges();
const buttons = Array.from(
fixture.nativeElement.querySelectorAll('.attribute-selector__text-option'),
) as HTMLButtonElement[];
expect(buttons[0].disabled).toBe(true);
expect(buttons[1].disabled).toBe(false);
});
});

View File

@@ -6,14 +6,14 @@ import {
input, input,
output, output,
signal, signal,
untracked untracked,
} from '@angular/core'; } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { import {
ProductAttribute, ProductAttribute,
ProductAttributeOption, ProductAttributeOption,
ProductVariant, ProductVariant,
ProductVariantMap ProductVariantMap,
} from '../../../../core/services/catalog/catalog.interface'; } from '../../../../core/services/catalog/catalog.interface';
@Component({ @Component({
@@ -22,7 +22,7 @@ import {
imports: [CommonModule], imports: [CommonModule],
templateUrl: './product-attribute-selector.component.html', templateUrl: './product-attribute-selector.component.html',
styleUrl: './product-attribute-selector.component.scss', styleUrl: './product-attribute-selector.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class ProductAttributeSelectorComponent { export class ProductAttributeSelectorComponent {
public attributes = input<ProductAttribute[]>([]); public attributes = input<ProductAttribute[]>([]);
@@ -44,28 +44,36 @@ export class ProductAttributeSelectorComponent {
availability[attribute.id] = {}; availability[attribute.id] = {};
for (const option of attribute.options) { for (const option of attribute.options) {
const optionNormalized = this.normalizeText(option.value || option.label); const optionNormalized = this.normalizeText(option.value || option.label);
const isAvailable = variants.some(variant => {
if (variant.cantidad_maxima <= 0) return false;
const variantAttrValue = this.getDefaultVariantAttributeValue(attribute, variant.attributes); const isAvailable = variants.some((variant) => {
if (!this.isVariantAvailable(variant)) return false;
const variantAttrValue = this.getDefaultVariantAttributeValue(
attribute,
variant.attributes,
);
if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) { if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
return false; return false;
} }
for (const otherAttr of attributes) { for (const otherAttr of attributes) {
if (otherAttr.id === attribute.id) continue; if (otherAttr.id === attribute.id) continue;
const selectedOptionId = selections[otherAttr.id]; const selectedOptionId = selections[otherAttr.id];
if (selectedOptionId !== undefined) { if (selectedOptionId !== undefined) {
const selectedOption = otherAttr.options.find(o => o.id === selectedOptionId); const selectedOption = otherAttr.options.find((o) => o.id === selectedOptionId);
if (selectedOption) { if (selectedOption) {
const selectedNormalized = this.normalizeText(selectedOption.value || selectedOption.label); const selectedNormalized = this.normalizeText(
const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.attributes); selectedOption.value || selectedOption.label,
if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) { );
return false; const vAttrValue = this.getDefaultVariantAttributeValue(
} otherAttr,
variant.attributes,
);
if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
return false;
} }
} }
}
} }
return true; return true;
}); });
@@ -85,7 +93,7 @@ export class ProductAttributeSelectorComponent {
effect(() => { effect(() => {
const attributes = this.attributes(); const attributes = this.attributes();
const defaultVariant = this.defaultVariant(); const defaultVariant = this.defaultVariant();
untracked(() => { untracked(() => {
this.initializeSelections(attributes, defaultVariant); this.initializeSelections(attributes, defaultVariant);
}); });
@@ -95,24 +103,27 @@ export class ProductAttributeSelectorComponent {
const selections = this.selectedAttributeOptions(); const selections = this.selectedAttributeOptions();
const variantsMap = this.variantsMap(); const variantsMap = this.variantsMap();
const attributes = this.attributes(); const attributes = this.attributes();
untracked(() => { untracked(() => {
this.emitMatchingVariant(selections, variantsMap, attributes); this.emitMatchingVariant(selections, variantsMap, attributes);
}); });
}); });
} }
protected hasSelectedOption(attribute: ProductAttribute, option: ProductAttributeOption): boolean { protected hasSelectedOption(
attribute: ProductAttribute,
option: ProductAttributeOption,
): boolean {
return this.selectedAttributeOptions()[attribute.id] === option.id; return this.selectedAttributeOptions()[attribute.id] === option.id;
} }
protected selectAttributeOption( protected selectAttributeOption(
attribute: ProductAttribute, attribute: ProductAttribute,
option: ProductAttributeOption option: ProductAttributeOption,
): void { ): void {
this.selectedAttributeOptions.update((current) => ({ this.selectedAttributeOptions.update((current) => ({
...current, ...current,
[attribute.id]: option.id [attribute.id]: option.id,
})); }));
} }
@@ -124,7 +135,10 @@ export class ProductAttributeSelectorComponent {
return this.findFirstHexValue(option.metadata) ?? '#D9D9D9'; return this.findFirstHexValue(option.metadata) ?? '#D9D9D9';
} }
private initializeSelections(attributes: ProductAttribute[], defaultVariant: ProductVariant | null): void { private initializeSelections(
attributes: ProductAttribute[],
defaultVariant: ProductVariant | null,
): void {
const selections: Record<number, number> = {}; const selections: Record<number, number> = {};
for (const attribute of attributes) { for (const attribute of attributes) {
@@ -139,7 +153,7 @@ export class ProductAttributeSelectorComponent {
private findDefaultOptionId( private findDefaultOptionId(
attribute: ProductAttribute, attribute: ProductAttribute,
variant: ProductVariant | null variant: ProductVariant | null,
): number | null { ): number | null {
if (!variant) { if (!variant) {
return null; return null;
@@ -152,7 +166,7 @@ export class ProductAttributeSelectorComponent {
const normalizedValue = this.normalizeText(defaultValue); const normalizedValue = this.normalizeText(defaultValue);
const matchByValue = attribute.options.find( const matchByValue = attribute.options.find(
(option) => this.normalizeText(option.value) === normalizedValue (option) => this.normalizeText(option.value) === normalizedValue,
); );
if (matchByValue) { if (matchByValue) {
@@ -160,7 +174,7 @@ export class ProductAttributeSelectorComponent {
} }
const matchByLabel = attribute.options.find( const matchByLabel = attribute.options.find(
(option) => this.normalizeText(option.label) === normalizedValue (option) => this.normalizeText(option.label) === normalizedValue,
); );
return matchByLabel?.id ?? null; return matchByLabel?.id ?? null;
@@ -168,7 +182,7 @@ export class ProductAttributeSelectorComponent {
private getDefaultVariantAttributeValue( private getDefaultVariantAttributeValue(
attribute: ProductAttribute, attribute: ProductAttribute,
variantAttributes: Record<string, string> variantAttributes: Record<string, string>,
): string | null { ): string | null {
const normalizedCodigo = this.normalizeText(attribute.codigo); const normalizedCodigo = this.normalizeText(attribute.codigo);
const normalizedNombre = this.normalizeText(attribute.nombre); const normalizedNombre = this.normalizeText(attribute.nombre);
@@ -192,6 +206,10 @@ export class ProductAttributeSelectorComponent {
.toLowerCase(); .toLowerCase();
} }
private isVariantAvailable(variant: ProductVariantMap): boolean {
return variant.inventory_policy === 'unlimited' || (variant.cantidad_maxima ?? 0) > 0;
}
private findFirstHexValue(value: unknown): string | null { private findFirstHexValue(value: unknown): string | null {
if (typeof value === 'string') { if (typeof value === 'string') {
const match = value.match(/#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b/); const match = value.match(/#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b/);
@@ -223,7 +241,7 @@ export class ProductAttributeSelectorComponent {
private emitMatchingVariant( private emitMatchingVariant(
selections: Record<number, number>, selections: Record<number, number>,
variantsMap: ProductVariantMap[], variantsMap: ProductVariantMap[],
attributes: ProductAttribute[] attributes: ProductAttribute[],
): void { ): void {
if (attributes.length === 0 || variantsMap.length === 0) { if (attributes.length === 0 || variantsMap.length === 0) {
this.variantChange.emit(null); this.variantChange.emit(null);
@@ -235,12 +253,12 @@ export class ProductAttributeSelectorComponent {
for (const attr of attributes) { for (const attr of attributes) {
const selectedOptionId = selections[attr.id]; const selectedOptionId = selections[attr.id];
if (selectedOptionId === undefined) { if (selectedOptionId === undefined) {
allSelected = false; allSelected = false;
break; break;
} }
const option = attr.options.find(o => o.id === selectedOptionId); const option = attr.options.find((o) => o.id === selectedOptionId);
if (option) { if (option) {
selectedValuesById[attr.id] = this.normalizeText(option.value || option.label); selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
} }
} }
@@ -249,12 +267,12 @@ export class ProductAttributeSelectorComponent {
return; return;
} }
const matchingVariant = variantsMap.find(vMap => { const matchingVariant = variantsMap.find((vMap) => {
return attributes.every(attr => { return attributes.every((attr) => {
const selectedValue = selectedValuesById[attr.id]; const selectedValue = selectedValuesById[attr.id];
const vMapValue = this.getDefaultVariantAttributeValue(attr, vMap.attributes); const vMapValue = this.getDefaultVariantAttributeValue(attr, vMap.attributes);
if (!vMapValue) return false; if (!vMapValue) return false;
return this.normalizeText(vMapValue) === selectedValue; return this.normalizeText(vMapValue) === selectedValue;
}); });
}); });

View File

@@ -1,51 +1,70 @@
<div class="product-carousel d-flex flex-column gap-4"> <div class="product-carousel d-flex flex-column gap-4">
<!-- Active/Main Image Area --> <!-- Active/Main Image Area -->
<div class="product-carousel__main position-relative bg-light overflow-hidden"> <div class="product-carousel__main position-relative bg-light overflow-hidden">
<!-- Main Image --> <!-- Main Image -->
@if (images().length > 0) { @if (images().length > 0) {
<img [src]="images()[activeIndex()]" alt="Product active image" <img
class="product-carousel__main-image w-100 h-100 object-fit-cover" /> [ngSrc]="images()[activeIndex()]"
alt="Product active image"
fill
priority
sizes="(min-width: 992px) 42vw, 100vw"
class="product-carousel__main-image w-100 h-100 object-fit-cover"
/>
} @else { } @else {
<!-- Placeholder --> <!-- Placeholder -->
<div class="product-carousel__placeholder w-100 h-100 d-flex align-items-center justify-content-center text-muted"> <div
<i class="fa-solid fa-image fa-3x"></i> class="product-carousel__placeholder w-100 h-100 d-flex align-items-center justify-content-center text-muted"
</div> >
<i class="fa-solid fa-image fa-3x"></i>
</div>
} }
<!-- Discount Badge --> <!-- Discount Badge -->
@if (discount() && discount()! > 0) { @if (discount() && discount()! > 0) {
<span <span
class="product-carousel__discount-badge position-absolute top-0 end-0 bg-primary text-white px-3 py-2 fw-semibold"> class="product-carousel__discount-badge position-absolute top-0 end-0 bg-primary text-white px-3 py-2 fw-semibold"
-{{ discount() }}% >
</span> -{{ discount() }}%
</span>
} }
<!-- Navigation Arrows --> <!-- Navigation Arrows -->
@if (images().length > 1) { @if (images().length > 1) {
<button type="button" <button
class="product-carousel__nav-btn product-carousel__nav-btn--prev position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center" type="button"
(click)="prevImage()" aria-label="Previous image"> class="product-carousel__nav-btn product-carousel__nav-btn--prev position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center"
<i class="fa-solid fa-chevron-left"></i> (click)="prevImage()"
</button> aria-label="Previous image"
>
<i class="fa-solid fa-chevron-left"></i>
</button>
<button type="button" <button
class="product-carousel__nav-btn product-carousel__nav-btn--next position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center" type="button"
(click)="nextImage()" aria-label="Next image"> class="product-carousel__nav-btn product-carousel__nav-btn--next position-absolute top-50 translate-middle-y border-0 p-0 d-flex align-items-center justify-content-center"
<i class="fa-solid fa-chevron-right"></i> (click)="nextImage()"
</button> aria-label="Next image"
>
<i class="fa-solid fa-chevron-right"></i>
</button>
} }
</div> </div>
<!-- Thumbnails Row --> <!-- Thumbnails Row -->
@if (images().length > 1) { @if (images().length > 1) {
<div class="product-carousel__thumbnails"> <div class="product-carousel__thumbnails">
@for (image of images(); track image; let idx = $index) { @for (image of images(); track image; let idx = $index) {
<button type="button" class="product-carousel__thumbnail border-0 p-0 overflow-hidden bg-light" <button
[class.product-carousel__thumbnail--active]="idx === activeIndex()" (click)="selectImage(idx)" type="button"
[attr.aria-label]="'Select image ' + (idx + 1)"> class="product-carousel__thumbnail border-0 p-0 overflow-hidden bg-light"
<img [src]="image" alt="Product thumbnail" class="w-100 h-100 object-fit-cover" /> [class.product-carousel__thumbnail--active]="idx === activeIndex()"
</button> (click)="selectImage(idx)"
} [attr.aria-label]="'Select image ' + (idx + 1)"
</div> >
<img [src]="image" alt="Product thumbnail" class="w-100 h-100 object-fit-cover" />
</button>
}
</div>
} }
</div> </div>

View File

@@ -1,13 +1,13 @@
import { ChangeDetectionStrategy, Component, input, signal } from '@angular/core'; import { ChangeDetectionStrategy, Component, input, signal } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule, NgOptimizedImage } from '@angular/common';
@Component({ @Component({
selector: 'app-product-carousel', selector: 'app-product-carousel',
standalone: true, standalone: true,
imports: [CommonModule], imports: [CommonModule, NgOptimizedImage],
templateUrl: './product-carousel.component.html', templateUrl: './product-carousel.component.html',
styleUrl: './product-carousel.component.scss', styleUrl: './product-carousel.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class ProductCarouselComponent { export class ProductCarouselComponent {
readonly images = input<string[]>([]); readonly images = input<string[]>([]);

View File

@@ -0,0 +1,6 @@
<div class="account-layout">
<app-account-sidebar class="account-sidebar"></app-account-sidebar>
<div class="account-content">
<router-outlet></router-outlet>
</div>
</div>

View File

@@ -0,0 +1,17 @@
.account-layout {
display: flex;
margin: 0 auto;
gap: 100px;
min-height: calc(100vh - 100px);
}
.account-sidebar {
width: 250px;
flex-shrink: 0;
}
.account-content {
flex: 1;
}
label {
font-size: 13px !important;
}

View File

@@ -0,0 +1,12 @@
import { Component } from '@angular/core';
import { RouterOutlet } from '@angular/router';
import { AccountSidebar } from '../components/account-sidebar/account-sidebar';
@Component({
selector: 'app-account-layout',
standalone: true,
imports: [RouterOutlet, AccountSidebar],
templateUrl: './account-layout.html',
styleUrl: './account-layout.scss',
})
export class AccountLayout {}

View File

@@ -0,0 +1,8 @@
<div class="sidebar-container">
<h2 class="sidebar-title">MI CUENTA</h2>
<div class="divider"></div>
<nav class="sidebar-nav">
<a routerLink="/mi-cuenta/datos-personales" routerLinkActive="active" class="nav-link">Datos Personales</a>
<a routerLink="/mi-cuenta/compras" routerLinkActive="active" class="nav-link">Mis compras</a>
</nav>
</div>

View File

@@ -0,0 +1,34 @@
.sidebar-container {
display: flex;
flex-direction: column;
}
.sidebar-title {
font-size: 16px;
font-weight: bold;
color: #1a1a1a;
margin-bottom: 12px;
}
.divider {
height: 1px;
background-color: #e0e0e0;
margin-bottom: 20px;
}
.sidebar-nav {
display: flex;
flex-direction: column;
gap: 16px;
}
.nav-link {
text-decoration: none;
color: #888;
font-size: 14px;
font-weight: 500;
transition: color 0.2s;
}
.nav-link:hover {
color: #5a5a5a;
}
.nav-link.active {
color: var(--color-primary); /* Blue color matching the image */
font-weight: 600;
}

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
import { RouterLink, RouterLinkActive } from '@angular/router';
@Component({
selector: 'app-account-sidebar',
standalone: true,
imports: [RouterLink, RouterLinkActive],
templateUrl: './account-sidebar.html',
styleUrl: './account-sidebar.scss',
})
export class AccountSidebar {}

View File

@@ -0,0 +1,66 @@
<form [formGroup]="profileForm" class="profile-form" (ngSubmit)="onSubmit()">
<div class="form-group">
<label>Nombre y Apellido:</label>
<app-input
type="text"
[value]="profileForm.controls['fullName'].value"
(valueChange)="profileForm.controls['fullName'].setValue($event)"
></app-input>
@if (getControlError('fullName'); as errorMessage) {
<small class="text-danger">{{ errorMessage }}</small>
}
</div>
<div class="form-group">
<label>Email:</label>
<app-input
type="email"
[value]="profileForm.controls['email'].value"
(valueChange)="profileForm.controls['email'].setValue($event)"
></app-input>
@if (getControlError('email'); as errorMessage) {
<small class="text-danger">{{ errorMessage }}</small>
}
</div>
<div class="form-group">
<label>DNI:</label>
<app-input
type="text"
[value]="profileForm.controls['dni'].value"
(valueChange)="profileForm.controls['dni'].setValue($event)"
></app-input>
@if (getControlError('dni'); as errorMessage) {
<small class="text-danger">{{ errorMessage }}</small>
}
</div>
<div class="form-group">
<label>Teléfono:</label>
<app-input
type="text"
[value]="profileForm.controls['phone'].value"
(valueChange)="profileForm.controls['phone'].setValue($event)"
></app-input>
@if (getControlError('phone'); as errorMessage) {
<small class="text-danger">{{ errorMessage }}</small>
}
</div>
<div class="form-group">
<label>Contraseña (dejar en blanco para no modificar):</label>
<app-input
type="password"
[value]="profileForm.controls['password'].value"
(valueChange)="profileForm.controls['password'].setValue($event)"
></app-input>
@if (getControlError('password'); as errorMessage) {
<small class="text-danger">{{ errorMessage }}</small>
}
</div>
<div class="form-actions mt-3">
<app-button type="button" variant="cancel" hostClass="action-btn" buttonClass="w-100" (click)="onCancel()">Cancelar</app-button>
<app-button type="submit" variant="primary" hostClass="action-btn" buttonClass="w-100" [disabled]="isSubmitting()">Guardar</app-button>
</div>
</form>

View File

@@ -0,0 +1,15 @@
.profile-form {
display: flex;
flex-direction: column;
gap: 16px;
width: 100%;
}
.form-actions {
display: flex;
gap: 12px;
margin-top: 16px;
}
.action-btn {
flex: 1;
display: block;
}

View File

@@ -0,0 +1,105 @@
import { Component, inject, effect, signal, OnInit } from '@angular/core';
import { ReactiveFormsModule, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { InputComponent } from '../../../../../../shared/components/input/input.component';
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
import { AuthService } from '../../../../../../core/services/auth/auth.service';
import { ToastService } from '../../../../../../core/services/toast.service';
@Component({
selector: 'app-profile-form',
standalone: true,
imports: [ReactiveFormsModule, InputComponent, ButtonComponent],
templateUrl: './profile-form.html',
styleUrl: './profile-form.scss',
})
export class ProfileForm implements OnInit {
profileForm: FormGroup;
private authService = inject(AuthService);
private toastService = inject(ToastService);
isSubmitting = signal(false);
constructor(private fb: FormBuilder) {
this.profileForm = this.fb.group({
fullName: ['', [Validators.required, Validators.maxLength(255)]],
email: ['', [Validators.required, Validators.email, Validators.maxLength(255)]],
dni: ['', [Validators.pattern(/^[0-9]{7,8}$/)]],
phone: ['', [Validators.pattern(/^\+?[0-9\s\-]{10,20}$/)]],
password: ['', [Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[\W_]).{8,}$/)]]
});
effect(() => {
const user = this.authService.user();
if (user) {
this.profileForm.patchValue({
fullName: user.nombre_apellido,
email: user.email,
dni: user.dni || '',
phone: user.telefono || ''
});
}
});
}
ngOnInit() {
// Refresh user data directly from the API to ensure consistency
this.authService.loadCurrentUser().subscribe();
}
getControlError(controlName: string): string | null {
const control = this.profileForm.get(controlName);
if (!control || !control.errors || (!control.touched && !this.isSubmitting())) return null;
if (control.errors['required']) return 'Este campo es obligatorio.';
if (control.errors['email']) return 'Ingresa un email válido.';
if (control.errors['maxlength']) return 'Excede el largo máximo.';
if (controlName === 'dni' && control.errors['pattern']) return 'DNI inválido (7-8 números).';
if (controlName === 'phone' && control.errors['pattern']) return 'Teléfono inválido.';
if (controlName === 'password' && control.errors['pattern']) return 'Debe contener mayúscula, minúscula, carácter especial y mínimo 8 caracteres.';
return 'Valor inválido.';
}
onSubmit() {
if (this.profileForm.invalid) {
this.profileForm.markAllAsTouched();
return;
}
this.isSubmitting.set(true);
const formValue = this.profileForm.value;
const payload: any = {
nombre_apellido: formValue.fullName,
email: formValue.email,
};
if (formValue.dni) payload.dni = formValue.dni;
if (formValue.phone) payload.telefono = formValue.phone;
if (formValue.password) payload.password = formValue.password;
this.authService.updateProfile(payload).subscribe({
next: () => {
this.isSubmitting.set(false);
this.toastService.success('Perfil actualizado correctamente.');
},
error: (error: any) => {
this.isSubmitting.set(false);
const errorMessage = error.error?.message || 'Error al actualizar el perfil.';
this.toastService.danger(errorMessage);
}
});
}
onCancel() {
const user = this.authService.user();
if (user) {
this.profileForm.reset({
fullName: user.nombre_apellido,
email: user.email,
dni: user.dni || '',
phone: user.telefono || '',
password: ''
});
} else {
this.profileForm.reset();
}
}
}

View File

@@ -0,0 +1,50 @@
<article class="w-100 py-3 rounded-0 cart-item">
<div class="position-relative overflow-hidden cart-item-media">
@if (item.discountPercentage) {
<span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge">-{{ item.discountPercentage }}%</span>
}
@if (item.imageUrl) {
<img class="w-100 h-100 object-fit-cover d-block" [src]="item.imageUrl" [alt]="item.title" />
} @else {
<div class="w-100 h-100 cart-item-placeholder" aria-hidden="true"></div>
}
</div>
<div class="d-flex flex-column justify-content-between w-100 h-100 py-1 cart-item-content">
<div class="d-grid cart-item-top-row align-items-start">
<h3 class="m-0 text-uppercase fw-bold cart-item-product">{{ item.title }}</h3>
<div class="cart-item-prices">
@if (item.originalPrice) {
<span class="text-decoration-line-through cart-item-original-price">$ {{ item.originalPrice }}</span>
}
<span class="fw-bold cart-item-discounted-price">$ {{ item.price }}</span>
</div>
</div>
<div
class="d-grid cart-item-attributes"
[class.cart-item-attributes--quantity-only]="item.attributes.length === 0"
>
<div class="cart-item-attribute">
<span class="cart-item-attribute-label">Cantidad: </span>
<span class="fw-bold">{{ item.quantity }} unidad{{ item.quantity === 1 ? '' : 'es' }}</span>
</div>
@for (attribute of item.attributes; track attribute.label + attribute.value) {
<div class="cart-item-attribute">
<span class="cart-item-attribute-label">{{ attribute.label }}: </span>
<span class="fw-bold">{{ attribute.value }}</span>
</div>
}
</div>
@if (item.transferPrice) {
<div class="cart-item-transfer-price">
<span class="cart-item-price-label">Precio por transferencia</span>
<span class="fw-bold">${{ item.transferPrice }}</span>
</div>
}
</div>
</article>

View File

@@ -0,0 +1,118 @@
:host {
display: block;
border-bottom: 1px solid #dddddd;
}
:host(:last-child) {
border-bottom: none;
}
.cart-item {
display: grid;
grid-template-columns: 120px minmax(0, 1fr);
gap: 0.75rem;
background-color: transparent;
position: relative;
}
.cart-item-media {
width: 120px;
aspect-ratio: 4 / 3;
border-radius: 5px 0 0 5px;
background-color: #ffffff;
border: 1px solid #eaeaea;
overflow: hidden;
img {
width: 100%;
height: 100%;
object-fit: cover;
}
}
.cart-item-discount-badge {
width: 44px;
height: 22px;
display: flex;
align-items: center;
justify-content: center;
border-bottom-right-radius: 4px;
background-color: var(--bs-primary, #5b75ff);
color: #ffffff;
font-size: 10px;
font-weight: 500;
line-height: 1;
}
.cart-item-placeholder {
width: 100%;
height: 100%;
background: linear-gradient(135deg, #e0e0e0, #f5f5f5);
}
.cart-item-content {
gap: 0.5rem;
}
.cart-item-top-row {
grid-template-columns: minmax(0, 1fr) auto;
gap: 0.75rem;
}
.cart-item-product {
color: #666666;
font-size: 10px;
line-height: 1.25;
font-weight: 325;
}
.cart-item-prices {
display: grid;
justify-items: end;
line-height: 1.1;
}
.cart-item-original-price {
color: #a0a0a0;
font-size: 9px;
font-weight: 325;
}
.cart-item-discounted-price {
color: var(--bs-primary, #5b75ff);
font-size: 15px;
font-weight: bold;
}
.cart-item-price-label {
color: #a0a0a0;
font-size: 9px;
font-weight: 325;
}
.cart-item-attributes {
gap: 0.125rem;
&--quantity-only {
flex: 1;
align-content: center;
}
}
.cart-item-attribute {
color: #666666;
font-size: 9px;
line-height: 1.2;
}
.cart-item-attribute-label {
font-weight: 325;
}
.cart-item-transfer-price {
color: #666666;
font-size: 9px;
line-height: 1.2;
display: grid;
justify-items: end;
}

View File

@@ -0,0 +1,27 @@
import { Component, Input } from '@angular/core';
export type PurchaseItemViewModel = {
id: number;
title: string;
imageUrl: string | null;
quantity: number;
attributes: Array<{
label: string;
value: string | null;
}>;
price: string;
originalPrice?: string | null;
transferPrice?: string | null;
discountPercentage?: string | number | null;
};
@Component({
selector: 'app-purchase-item',
standalone: true,
imports: [],
templateUrl: './purchase-item.html',
styleUrl: './purchase-item.scss',
})
export class PurchaseItem {
@Input() item!: PurchaseItemViewModel;
}

View File

@@ -0,0 +1,11 @@
<div class="purchase-item" [routerLink]="[purchase.id]" style="cursor: pointer;">
<div class="purchase-info">
<span class="purchase-id">Compra {{ purchase.id }}.</span>
<span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
</div>
<div class="purchase-action">
<svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="arrow-icon">
<path d="M1 1L7 7L1 13" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
</div>
</div>

View File

@@ -0,0 +1,37 @@
.purchase-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 16px;
padding-left:0;
transition: box-shadow 0.2s, border-radius 0.2s;
cursor: pointer;
}
.purchase-item:hover {
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.07);
border-radius: 8px;
}
.purchase-item:hover .arrow-icon {
color: #5b75ff; /* Blue on hover */
}
.purchase-info {
display: flex;
flex-direction: column;
gap: 4px;
}
.purchase-id {
font-weight: bold;
color: #666666;
font-size: 13px;
}
.purchase-date {
font-weight: 325;
color: #666666;
font-size: 10px;
}
.arrow-icon {
width: 8px;
height: 14px;
color: #888;
transition: color 0.2s;
}

View File

@@ -0,0 +1,14 @@
import { Component, Input } from '@angular/core';
import { RouterLink } from '@angular/router';
@Component({
selector: 'app-purchase-list-item',
standalone: true,
imports: [RouterLink],
templateUrl: './purchase-list-item.html',
styleUrl: './purchase-list-item.scss',
})
export class PurchaseListItem {
@Input() purchase!: { id: number; date: string };
}

View File

@@ -0,0 +1,29 @@
<div class="purchase-list-container">
<ng-container *ngIf="isLoading(); else contentTpl">
<!-- Skeleton -->
<div class="skeleton-item" *ngFor="let i of [1, 2, 3, 4]">
<div class="skeleton-info">
<div class="skeleton-id"></div>
<div class="skeleton-date"></div>
</div>
<div class="skeleton-action"></div>
</div>
</ng-container>
<ng-template #contentTpl>
<ng-container *ngIf="purchases().length > 0; else emptyTpl">
<ng-container *ngFor="let purchase of purchases(); let last = last">
<app-purchase-list-item
[purchase]="purchase">
</app-purchase-list-item>
<div class="purchase-divider" *ngIf="!last"></div>
</ng-container>
</ng-container>
</ng-template>
<ng-template #emptyTpl>
<div class="empty-state">
Aún no hay compras realizadas
</div>
</ng-template>
</div>

View File

@@ -0,0 +1,73 @@
.purchase-list-container {
display: flex;
flex-direction: column;
width: 100%;
}
.purchase-divider {
height: 1px;
background-color: #DDDDDD;
width: 100%;
}
.empty-state {
padding: 2rem 0;
text-align: center;
color: #666;
font-size: 1rem;
}
/* Skeleton */
.skeleton-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 1rem 0;
border-bottom: 1px solid #DDDDDD;
}
.skeleton-item:last-child {
border-bottom: none;
}
.skeleton-info {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.skeleton-id {
width: 100px;
height: 1rem;
background-color: #EEEEEE;
border-radius: 4px;
animation: pulse 1.5s infinite ease-in-out;
}
.skeleton-date {
width: 150px;
height: 0.8rem;
background-color: #EEEEEE;
border-radius: 4px;
animation: pulse 1.5s infinite ease-in-out;
}
.skeleton-action {
width: 24px;
height: 24px;
background-color: #EEEEEE;
border-radius: 50%;
animation: pulse 1.5s infinite ease-in-out;
}
@keyframes pulse {
0% {
background-color: #EEEEEE;
}
50% {
background-color: #E0E0E0;
}
100% {
background-color: #EEEEEE;
}
}

View File

@@ -0,0 +1,62 @@
import { Component, OnInit, inject, signal } from '@angular/core';
import { CommonModule } from '@angular/common';
import { PurchaseListItem } from '../purchase-list-item/purchase-list-item';
import { CheckoutService, PurchaseSummaryResponse } from '../../../../../../core/services/checkout.service';
import { ToastService } from '../../../../../../core/services/toast.service';
import { TenantService } from '../../../../../../core/services/tenant.service';
type PurchaseListViewModel = {
id: number;
date: string;
};
@Component({
selector: 'app-purchase-list',
standalone: true,
imports: [CommonModule, PurchaseListItem],
templateUrl: './purchase-list.html',
styleUrl: './purchase-list.scss',
})
export class PurchaseList implements OnInit {
private readonly checkoutService = inject(CheckoutService);
private readonly toastService = inject(ToastService);
private readonly tenantService = inject(TenantService);
purchases = signal<PurchaseListViewModel[]>([]);
isLoading = signal<boolean>(true);
async ngOnInit(): Promise<void> {
try {
const tenantCode = this.tenantService.tenant()?.codigo || '';
const response = await this.checkoutService.getPurchases(tenantCode, 'paid');
const mappedPurchases = response.data.map((purchase: PurchaseSummaryResponse) => ({
id: purchase.id,
date: this.formatDate(purchase.created_at),
}));
this.purchases.set(mappedPurchases);
} catch (error) {
this.toastService.danger('Hubo un error al cargar las compras');
} finally {
this.isLoading.set(false);
}
}
private formatDate(value: string | null): string {
if (!value) {
return '-';
}
const date = new Date(value);
if (Number.isNaN(date.getTime())) {
return '-';
}
return new Intl.DateTimeFormat('es-AR', {
day: '2-digit',
month: '2-digit',
year: 'numeric',
}).format(date);
}
}

View File

@@ -0,0 +1,4 @@
<div class="page-container">
<h2 class="page-title">DATOS PERSONALES</h2>
<app-profile-form></app-profile-form>
</div>

View File

@@ -0,0 +1,13 @@
.page-container {
display: flex;
flex-direction: column;
width: 100%;
max-width: 600px;
}
.page-title {
font-size: 15px;
font-weight: bold;
color: #A0A0A0;
margin-bottom: 24px;
}

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
import { ProfileForm } from '../../components/profile-form/profile-form';
@Component({
selector: 'app-profile-page',
standalone: true,
imports: [ProfileForm],
templateUrl: './profile-page.html',
styleUrl: './profile-page.scss',
})
export class ProfilePage {}

View File

@@ -0,0 +1,33 @@
<div class="page-container">
<div class="d-flex align-items-center mb-4">
<a routerLink="../" class="text-decoration-none " >
<i class="bi bi-arrow-left fs-5"></i>
</a>
<h2 class="page-title m-0">MIS COMPRAS</h2>
</div>
@if (isLoading()) {
<p class="purchase-loading">Cargando detalle de compra...</p>
} @else if (purchase(); as purchase) {
<div class="d-flex justify-content-between align-items-center mb-4 pb-3" style="border-bottom: 1px solid #dddddd;">
<div class="purchase-info">
<span class="purchase-id">Compra {{ purchase.id }}.</span>
<span class="purchase-date">Fecha de compra: {{ purchase.date }}</span>
</div>
<div class="purchase-total ">
<span class="purchase-total-label">Total:</span>
<span class="purchase-total-value">${{ purchase.total }}</span>
</div>
</div>
<p style="font-size: 12px; color: #666666; margin:0;">Productos:</p>
<div class="d-flex flex-column">
@for (item of purchase.items; track item.id) {
<app-purchase-item [item]="item"></app-purchase-item>
} @empty {
<p class="purchase-empty">No hay productos para mostrar en esta compra.</p>
}
</div>
}
</div>

View File

@@ -0,0 +1,51 @@
.page-container {
display: flex;
flex-direction: column;
width: 100%;
max-width: 600px;
}
.page-title {
font-size: 15px;
font-weight: bold;
color: #A0A0A0;
}
.purchase-info {
display: flex;
flex-direction: column;
gap: 4px;
}
.purchase-id {
font-weight: bold;
color: #666666;
font-size: 13px;
}
.purchase-date {
font-weight: 325;
color: #666666;
font-size: 10px;
}
.purchase-total {
display: flex;
align-items: center;
gap: 0.5rem;
}
.purchase-total-label {
font-size: 17px;
color: #666666;
font-weight: 325;
}
.purchase-total-value {
color: var(--bs-primary, #5b75ff);
font-weight: bold;
font-size: 17px;
}
.purchase-loading,
.purchase-empty {
color: #666666;
font-size: 12px;
margin: 0;
}

View File

@@ -0,0 +1,95 @@
import { CommonModule } from '@angular/common';
import { Component, OnInit, inject, signal } from '@angular/core';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { CheckoutService, PurchaseDetailResponse } from '../../../../../../core/services/checkout.service';
import { TenantService } from '../../../../../../core/services/tenant.service';
import { ToastService } from '../../../../../../core/services/toast.service';
import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
type PurchaseDetailViewModel = {
id: number;
date: string;
total: string;
items: PurchaseItemViewModel[];
};
@Component({
selector: 'app-purchase-detail-page',
standalone: true,
imports: [CommonModule, RouterLink, PurchaseItem],
templateUrl: './purchase-detail-page.html',
styleUrl: './purchase-detail-page.scss',
})
export class PurchaseDetailPage implements OnInit {
private readonly route = inject(ActivatedRoute);
private readonly router = inject(Router);
private readonly checkoutService = inject(CheckoutService);
private readonly tenantService = inject(TenantService);
private readonly toastService = inject(ToastService);
readonly isLoading = signal(true);
readonly purchase = signal<PurchaseDetailViewModel | null>(null);
async ngOnInit(): Promise<void> {
const purchaseId = this.route.snapshot.paramMap.get('id');
const tenant = this.tenantService.tenant();
if (!purchaseId || !tenant) {
void this.router.navigate(['/mi-cuenta/compras']);
return;
}
try {
const response = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
this.purchase.set({
id: response.id,
date: this.formatDate(response.created_at),
total: response.total,
items: this.mapItems(response),
});
} catch (error) {
console.error('Failed to fetch purchase detail:', error);
this.toastService.danger('Hubo un error al cargar el detalle de la compra');
void this.router.navigate(['/mi-cuenta/compras']);
} finally {
this.isLoading.set(false);
}
}
private formatDate(value: string | null): string {
if (!value) {
return '-';
}
const date = new Date(value);
if (Number.isNaN(date.getTime())) {
return '-';
}
return new Intl.DateTimeFormat('es-AR', {
day: '2-digit',
month: '2-digit',
year: 'numeric',
}).format(date);
}
private mapItems(purchase: PurchaseDetailResponse): PurchaseItemViewModel[] {
return purchase.items.map((item) => ({
id: item.id,
title: item.product?.nombre ?? 'Producto sin nombre',
imageUrl: item.product?.imagen ?? null,
quantity: item.quantity,
attributes: (item.variant?.attributes ?? []).map((attribute) => ({
label: attribute.name,
value: attribute.value,
})),
price: item.line_total,
originalPrice: null,
transferPrice: null,
discountPercentage: null,
}));
}
}

View File

@@ -0,0 +1,4 @@
<div class="page-container">
<h2 class="page-title">MIS COMPRAS</h2>
<app-purchase-list></app-purchase-list>
</div>

View File

@@ -0,0 +1,12 @@
.page-container {
display: flex;
flex-direction: column;
width: 100%;
max-width: 600px;
}
.page-title {
font-size: 15px;
font-weight: bold;
color: #A0A0A0;
}

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
import { PurchaseList } from '../../components/purchase-list/purchase-list';
@Component({
selector: 'app-purchases-page',
standalone: true,
imports: [PurchaseList],
templateUrl: './purchases-page.html',
styleUrl: './purchases-page.scss',
})
export class PurchasesPage {}

View File

@@ -5,75 +5,71 @@
(ngSubmit)="submit()" (ngSubmit)="submit()"
> >
<div class="checkout-form__fields"> <div class="checkout-form__fields">
<div class="form-field"> <div class="form-group">
<label class="form-field__label" for="checkout-nombre"> <label for="checkout-nombre">
Nombre y Apellido <span class="form-field__required" aria-hidden="true">*</span> Nombre y Apellido <span class="required" aria-hidden="true">*</span>
</label> </label>
<app-input <app-input
id="checkout-nombre" id="checkout-nombre"
type="text" type="text"
placeholder="Descripcion"
[value]="form().controls.nombre.value" [value]="form().controls.nombre.value"
[invalid]="showControlError('nombre')" [invalid]="showControlError('nombre')"
[disabled]="form().controls.nombre.disabled" [disabled]="form().controls.nombre.disabled"
(valueChange)="updateField('nombre', $event)" (valueChange)="updateField('nombre', $event)"
/> />
@if (getControlError('nombre'); as errorMessage) { @if (getControlError('nombre'); as errorMessage) {
<small class="form-field__error">{{ errorMessage }}</small> <small class="error">{{ errorMessage }}</small>
} }
</div> </div>
<div class="form-field"> <div class="form-group">
<label class="form-field__label" for="checkout-email"> <label for="checkout-email">
Email <span class="form-field__required" aria-hidden="true">*</span> Email <span class="required" aria-hidden="true">*</span>
</label> </label>
<app-input <app-input
id="checkout-email" id="checkout-email"
type="email" type="email"
placeholder="Descripcion"
[value]="form().controls.email.value" [value]="form().controls.email.value"
[invalid]="showControlError('email')" [invalid]="showControlError('email')"
[disabled]="form().controls.email.disabled" [disabled]="form().controls.email.disabled"
(valueChange)="updateField('email', $event)" (valueChange)="updateField('email', $event)"
/> />
@if (getControlError('email'); as errorMessage) { @if (getControlError('email'); as errorMessage) {
<small class="form-field__error">{{ errorMessage }}</small> <small class="error">{{ errorMessage }}</small>
} }
</div> </div>
<div class="form-field"> <div class="form-group">
<label class="form-field__label" for="checkout-dni"> <label for="checkout-dni">
DNI <span class="form-field__required" aria-hidden="true">*</span> DNI <span class="required" aria-hidden="true">*</span>
</label> </label>
<app-input <app-input
id="checkout-dni" id="checkout-dni"
type="text" type="text"
placeholder="Descripcion"
[value]="form().controls.dni.value" [value]="form().controls.dni.value"
[invalid]="showControlError('dni')" [invalid]="showControlError('dni')"
[disabled]="form().controls.dni.disabled" [disabled]="form().controls.dni.disabled"
(valueChange)="updateField('dni', $event)" (valueChange)="updateField('dni', $event)"
/> />
@if (getControlError('dni'); as errorMessage) { @if (getControlError('dni'); as errorMessage) {
<small class="form-field__error">{{ errorMessage }}</small> <small class="error">{{ errorMessage }}</small>
} }
</div> </div>
<div class="form-field"> <div class="form-group">
<label class="form-field__label" for="checkout-telefono"> <label for="checkout-telefono">
Telefono <span class="form-field__required" aria-hidden="true">*</span> Telefono <span class="required" aria-hidden="true">*</span>
</label> </label>
<app-input <app-input
id="checkout-telefono" id="checkout-telefono"
type="text" type="text"
placeholder="Descripcion"
[value]="form().controls.telefono.value" [value]="form().controls.telefono.value"
[invalid]="showControlError('telefono')" [invalid]="showControlError('telefono')"
[disabled]="form().controls.telefono.disabled" [disabled]="form().controls.telefono.disabled"
(valueChange)="updateField('telefono', $event)" (valueChange)="updateField('telefono', $event)"
/> />
@if (getControlError('telefono'); as errorMessage) { @if (getControlError('telefono'); as errorMessage) {
<small class="form-field__error">{{ errorMessage }}</small> <small class="error">{{ errorMessage }}</small>
} }
</div> </div>
</div> </div>

View File

@@ -23,26 +23,3 @@
max-width: 290px; max-width: 290px;
} }
} }
.form-field {
display: grid;
gap: 0.35rem;
&__label {
font-size: 0.8rem;
font-weight: 600;
color: var(--bs-secondary, #6c757d);
letter-spacing: 0;
}
&__required {
color: var(--bs-danger, #dc3545);
margin-left: 2px;
}
&__error {
font-size: 0.75rem;
color: var(--bs-danger, #dc3545);
}
}

View File

@@ -1,4 +1,4 @@
<div class="container-xl px-3 px-md-4 py-4">
<div class="checkout-page"> <div class="checkout-page">
<div class="checkout-page__stepper-col "> <div class="checkout-page__stepper-col ">
<app-stepper #stepper> <app-stepper #stepper>
@@ -16,11 +16,13 @@
[selectedPaymentMethod]="selectedPaymentMethod()" [selectedPaymentMethod]="selectedPaymentMethod()"
[copiedTransferField]="copiedTransferField()" [copiedTransferField]="copiedTransferField()"
[transferAccount]="transferAccount()" [transferAccount]="transferAccount()"
[transferDni]="transferDni()"
[isGeneratingIntent]="isPaymentLoading()" [isGeneratingIntent]="isPaymentLoading()"
[qrData]="qrData()" [qrData]="qrData()"
(paymentMethodChange)="selectPaymentMethod($event)" (paymentMethodChange)="selectPaymentMethod($event)"
(copyTransferValue)="copyTransferValue($event.field, $event.value)" (copyTransferValue)="copyTransferValue($event.field, $event.value)"
(cancelStep)="onCancel()" (cancelStep)="onCancel()"
(generateTransferIntent)="generateTransferIntent($event)"
(complete)="onComplete()" (complete)="onComplete()"
/> />
</app-step> </app-step>
@@ -37,4 +39,3 @@
/> />
</div> </div>
</div> </div>
</div>

View File

@@ -3,7 +3,6 @@
grid-template-columns: minmax(0, 1fr) 420px; grid-template-columns: minmax(0, 1fr) 420px;
gap: 4rem; gap: 4rem;
align-items: start; align-items: start;
padding: 2rem 0;
@media (max-width: 900px) { @media (max-width: 900px) {
grid-template-columns: 1fr; grid-template-columns: 1fr;

View File

@@ -1,4 +1,14 @@
import { ChangeDetectionStrategy, Component, computed, effect, inject, OnInit, signal, untracked, ViewChild } from '@angular/core'; import {
ChangeDetectionStrategy,
Component,
computed,
effect,
inject,
OnInit,
signal,
untracked,
ViewChild,
} from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms'; import { FormBuilder, Validators } from '@angular/forms';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { startWith } from 'rxjs'; import { startWith } from 'rxjs';
@@ -14,7 +24,13 @@ import { StepComponent } from '../../../../shared/components/stepper/step.compon
import { StepperComponent } from '../../../../shared/components/stepper/stepper.component'; import { StepperComponent } from '../../../../shared/components/stepper/stepper.component';
import { CheckoutDataStepComponent } from './checkout-data-step.component'; import { CheckoutDataStepComponent } from './checkout-data-step.component';
import { CheckoutPaymentStepComponent } from './checkout-payment-step.component'; import { CheckoutPaymentStepComponent } from './checkout-payment-step.component';
import { CheckoutForm, PaymentMethod, PaymentMethodOption, TransferAccount, TransferField } from './checkout-page.models'; import {
CheckoutForm,
PaymentMethod,
PaymentMethodOption,
TransferAccount,
TransferField,
} from './checkout-page.models';
@Component({ @Component({
selector: 'app-checkout-page', selector: 'app-checkout-page',
@@ -24,11 +40,11 @@ import { CheckoutForm, PaymentMethod, PaymentMethodOption, TransferAccount, Tran
StepperComponent, StepperComponent,
StepComponent, StepComponent,
CheckoutDataStepComponent, CheckoutDataStepComponent,
CheckoutPaymentStepComponent CheckoutPaymentStepComponent,
], ],
templateUrl: './checkout-page.component.html', templateUrl: './checkout-page.component.html',
styleUrl: './checkout-page.component.scss', styleUrl: './checkout-page.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class CheckoutPageComponent implements OnInit { export class CheckoutPageComponent implements OnInit {
private readonly formBuilder = inject(FormBuilder); private readonly formBuilder = inject(FormBuilder);
@@ -44,7 +60,7 @@ export class CheckoutPageComponent implements OnInit {
nombre: ['', [Validators.required]], nombre: ['', [Validators.required]],
email: ['', [Validators.required, Validators.email]], email: ['', [Validators.required, Validators.email]],
dni: ['', [Validators.required]], dni: ['', [Validators.required]],
telefono: ['', [Validators.required]] telefono: ['', [Validators.required]],
}); });
protected readonly cartSubtotal = computed(() => { protected readonly cartSubtotal = computed(() => {
@@ -66,21 +82,19 @@ export class CheckoutPageComponent implements OnInit {
protected readonly paymentMethods: ReadonlyArray<PaymentMethodOption> = [ protected readonly paymentMethods: ReadonlyArray<PaymentMethodOption> = [
{ id: 'qr', label: 'QR' }, { id: 'qr', label: 'QR' },
{ id: 'transfer', label: 'Transferencia' }, { id: 'transfer', label: 'Transferencia' },
{ id: 'telepagos', label: 'TelePagos' } { id: 'telepagos', label: 'TelePagos' },
]; ];
protected readonly selectedPaymentMethod = signal<PaymentMethod>('qr'); protected readonly selectedPaymentMethod = signal<PaymentMethod>('qr');
protected readonly copiedTransferField = signal<TransferField | null>(null); protected readonly copiedTransferField = signal<TransferField | null>(null);
protected readonly transferAccount = signal<TransferAccount>({ protected readonly transferAccount = signal<TransferAccount | null>(null);
titular: 'Nombre y Apellido', protected readonly transferDni = signal<string>('');
entidad: 'TelePagos',
cvu: '0000000000000000000000',
alias: 'telepagos.ar'
});
protected readonly isCreatingPurchase = signal(false); protected readonly isCreatingPurchase = signal(false);
protected readonly createdPurchaseId = signal<number | null>(null); protected readonly createdPurchaseId = signal<number | null>(null);
protected readonly isGeneratingIntent = signal(false); protected readonly isGeneratingIntent = signal(false);
protected readonly isPaymentLoading = computed(() => this.isGeneratingIntent() || this.cartService.isUpdating()); protected readonly isPaymentLoading = computed(
() => this.isGeneratingIntent() || this.cartService.isUpdating(),
);
protected readonly qrData = signal<string | null>(null); protected readonly qrData = signal<string | null>(null);
constructor() { constructor() {
@@ -88,7 +102,7 @@ export class CheckoutPageComponent implements OnInit {
// We only want to trigger the intent generation when the cart changes. // We only want to trigger the intent generation when the cart changes.
// So we track the cart, but untrack the other signals to prevent duplicate calls. // So we track the cart, but untrack the other signals to prevent duplicate calls.
const cart = this.cartService.cart(); const cart = this.cartService.cart();
untracked(() => { untracked(() => {
const purchaseId = this.createdPurchaseId(); const purchaseId = this.createdPurchaseId();
if (cart && purchaseId) { if (cart && purchaseId) {
@@ -108,7 +122,7 @@ export class CheckoutPageComponent implements OnInit {
nombre: user.nombre_apellido, nombre: user.nombre_apellido,
email: user.email, email: user.email,
dni: user.dni ?? '', dni: user.dni ?? '',
telefono: user.telefono ?? '' telefono: user.telefono ?? '',
}); });
this.form.controls.nombre.disable(); this.form.controls.nombre.disable();
this.form.controls.email.disable(); this.form.controls.email.disable();
@@ -138,14 +152,14 @@ export class CheckoutPageComponent implements OnInit {
} }
return { return {
productVariantId: item.product_variant_id, cartItemId: item.id,
imageUrl: item.product?.imagen ?? null, imageUrl: item.product?.imagen ?? null,
product, product,
originalPrice: null, originalPrice: null,
discountedPrice: parseFloat(item.precio_unitario), discountedPrice: parseFloat(item.precio_unitario),
discountPercentage: null, discountPercentage: null,
attributes, attributes,
quantity: item.cantidad quantity: item.cantidad,
}; };
} }
@@ -174,12 +188,11 @@ export class CheckoutPageComponent implements OnInit {
const response = await this.checkoutService.createPurchase(tenant.codigo, payload); const response = await this.checkoutService.createPurchase(tenant.codigo, payload);
this.createdPurchaseId.set(response.id); this.createdPurchaseId.set(response.id);
this.stepper.next(); this.stepper.next();
// Auto trigger intent for default option // Auto trigger intent for default option
void this.selectPaymentMethod(this.selectedPaymentMethod()); void this.selectPaymentMethod(this.selectedPaymentMethod());
} catch (error) { } catch (error) {
console.error('Failed to create purchase:', error); console.error('Failed to create purchase:', error);
// Here we could show an alert or toast // Here we could show an alert or toast
@@ -202,23 +215,58 @@ export class CheckoutPageComponent implements OnInit {
return; return;
} }
if (method === 'transfer') {
this.transferAccount.set(null);
return;
}
this.isGeneratingIntent.set(true); this.isGeneratingIntent.set(true);
try { try {
const response = await this.checkoutService.generatePaymentIntent(tenant.codigo, purchaseId, method); const response = await this.checkoutService.generatePaymentIntent(
tenant.codigo,
purchaseId,
method,
);
if (method === 'qr' && response.qr_data?.qr_code) { if (method === 'qr' && response.qr_data?.qr_code) {
this.qrData.set(response.qr_data.qr_code); this.qrData.set(response.qr_data.qr_code);
} else if (method === 'transfer' && response.transfer_data) { }
} catch (error) {
console.error('Failed to generate payment intent:', error);
} finally {
this.isGeneratingIntent.set(false);
}
}
protected async generateTransferIntent(dni: string): Promise<void> {
const purchaseId = this.createdPurchaseId();
const tenant = this.tenantService.tenant();
if (!purchaseId || !tenant) {
return;
}
this.transferDni.set(dni);
this.isGeneratingIntent.set(true);
try {
const response = await this.checkoutService.generatePaymentIntent(
tenant.codigo,
purchaseId,
'transfer',
dni
);
if (response.transfer_data) {
this.transferAccount.set({ this.transferAccount.set({
titular: response.transfer_data.titular, titular: response.transfer_data.titular,
entidad: response.transfer_data.entidad, entidad: response.transfer_data.entidad,
cvu: response.transfer_data.cvu, cvu: response.transfer_data.cvu,
alias: response.transfer_data.alias alias: response.transfer_data.alias,
}); });
} }
} catch (error) { } catch (error) {
console.error('Failed to generate payment intent:', error); console.error('Failed to generate transfer payment intent:', error);
} finally { } finally {
this.isGeneratingIntent.set(false); this.isGeneratingIntent.set(false);
} }

View File

@@ -40,114 +40,20 @@
<h3 class="payment-panel__title">Cargando información de pago...</h3> <h3 class="payment-panel__title">Cargando información de pago...</h3>
</div> </div>
} @else if (selectedPaymentMethod() === 'qr') { } @else if (selectedPaymentMethod() === 'qr') {
<div class="payment-panel__card"> <app-checkout-payment-qr [qrData]="qrData()" />
<h3 class="payment-panel__title">Ingresa a tu billetera y escanea el siguiente QR</h3>
<div class="payment-panel__divider"></div>
<div class="qr-code" aria-label="QR de pago">
@if (qrData()) {
<qrcode [qrdata]="qrData()!" [width]="200" [errorCorrectionLevel]="'M'"></qrcode>
} @else {
<span class="qr-code__finder qr-code__finder--tl"></span>
<span class="qr-code__finder qr-code__finder--tr"></span>
<span class="qr-code__finder qr-code__finder--bl"></span>
}
</div>
</div>
} @else if (selectedPaymentMethod() === 'transfer') { } @else if (selectedPaymentMethod() === 'transfer') {
<div class="payment-panel__card"> <app-checkout-payment-transfer
<h3 class="payment-panel__title">Transferi a la siguiente cuenta desde cualquier billetera</h3> [transferAccount]="transferAccount()"
<div class="payment-panel__divider"></div> [transferDni]="transferDni()"
[copiedTransferField]="copiedTransferField()"
<div class="payment-panel__account"> (copyTransferValue)="requestCopy($event.field, $event.value)"
<p class="payment-panel__eyebrow">DATOS DE CUENTA:</p> (submitDni)="generateTransferIntent.emit($event)"
(completePurchase)="complete.emit()"
<div class="payment-detail"> />
<span class="payment-detail__label">Titular:</span>
<strong class="payment-detail__value">{{ transferAccount().titular }}</strong>
</div>
<div class="payment-detail">
<span class="payment-detail__label">Entidad:</span>
<strong class="payment-detail__value">{{ transferAccount().entidad }}</strong>
</div>
<div class="payment-detail payment-detail--copy">
<span class="payment-detail__label">CVU:</span>
<strong class="payment-detail__value">{{ transferAccount().cvu }}</strong>
<app-icon-button
variant="copy"
ariaLabel="Copiar CVU"
(click)="requestCopy('cvu', transferAccount().cvu)"
/>
</div>
@if (copiedTransferField() === 'cvu') {
<small class="payment-detail__feedback">CVU copiado</small>
}
<div class="payment-detail payment-detail--copy">
<span class="payment-detail__label">Alias:</span>
<strong class="payment-detail__value">{{ transferAccount().alias }}</strong>
<app-icon-button
variant="copy"
ariaLabel="Copiar alias"
(click)="requestCopy('alias', transferAccount().alias)"
/>
</div>
@if (copiedTransferField() === 'alias') {
<small class="payment-detail__feedback">Alias copiado</small>
}
</div>
</div>
} @else { } @else {
<div class="payment-panel__card"> <app-checkout-payment-telepagos />
<h3 class="payment-panel__title">Descarga la app de TelePagos para finalizar la compra</h3>
<div class="payment-panel__divider"></div>
<div class="store-badges" aria-label="Tiendas disponibles">
<div class="store-badge">
<i class="fa-brands fa-google-play" aria-hidden="true"></i>
<span class="store-badge__text">
<small>Disponible en</small>
<strong>Google Play</strong>
</span>
</div>
<div class="store-badge">
<i class="fa-brands fa-apple" aria-hidden="true"></i>
<span class="store-badge__text">
<small>Descargalo en</small>
<strong>App Store</strong>
</span>
</div>
</div>
</div>
} }
</section> </section>
</div> </div>
<div class="checkout-payment__actions">
<app-button
type="button"
variant="cancel"
hostClass="checkout-payment__action-btn"
buttonClass="w-100"
[disabled]="true"
>
Cancelar
</app-button>
<app-button
type="button"
hostClass="checkout-payment__action-btn"
buttonClass="w-100"
[disabled]="isGeneratingIntent()"
(click)="complete.emit()"
>
Finalizar compra
</app-button>
</div>
</div> </div>

View File

@@ -23,8 +23,8 @@
&__action-btn { &__action-btn {
width: 100%; width: 100%;
flex: 1 1 290px; flex: 1 1 320px;
max-width: 290px; max-width: 320px;
display: block; display: block;
} }
} }
@@ -112,7 +112,7 @@
min-width: 0; min-width: 0;
&__card { &__card {
width: 100%; width: 100%;
max-width: 290px; max-width: 320px;
min-height: 269px; min-height: 269px;
padding: 1.5rem 1.75rem; padding: 1.5rem 1.75rem;
border-radius: 5px; border-radius: 5px;
@@ -134,173 +134,5 @@
line-height: 1.35; line-height: 1.35;
} }
&__divider {
width: 100%;
max-width: 220px;
height: 1px;
margin: 1.2rem 0 1.45rem;
background: #dddddd;
}
&__account {
width: 100%;
display: grid;
gap: 0.75rem;
color: #7a7a7a;
font-size: 12px;
}
&__eyebrow {
margin: 0;
color: #838383;
font-size: 12px;
font-weight: 325;
letter-spacing: 0.06em;
}
}
.payment-detail {
display: grid;
grid-template-columns: auto auto;
justify-content: center;
gap: 0.35rem;
align-items: center;
font-size: 12px;
&--copy {
grid-template-columns: auto auto auto;
}
&__label {
color: #8a8a8a;
font-weight: 325;
}
&__value {
color: #5e5e5e;
font-weight: 500;
}
&__feedback {
display: block;
margin-top: -0.25rem;
color: var(--tenant-primary, #6376f3);
font-size: 0.78rem;
font-weight: 700;
}
}
.qr-code {
position: relative;
width: min(170px, 100%);
aspect-ratio: 1;
border: 8px solid #ffffff;
background-color: #ffffff;
background-image:
linear-gradient(
90deg,
rgba(17, 17, 17, 0.95) 0 14%,
transparent 14% 28%,
rgba(17, 17, 17, 0.95) 28% 42%,
transparent 42% 56%,
rgba(17, 17, 17, 0.95) 56% 70%,
transparent 70% 84%,
rgba(17, 17, 17, 0.95) 84% 100%
),
linear-gradient(
rgba(17, 17, 17, 0.95) 0 14%,
transparent 14% 28%,
rgba(17, 17, 17, 0.95) 28% 42%,
transparent 42% 56%,
rgba(17, 17, 17, 0.95) 56% 70%,
transparent 70% 84%,
rgba(17, 17, 17, 0.95) 84% 100%
);
background-size: 18px 18px;
background-position: 0 0, 9px 9px;
display: flex;
justify-content: center;
align-items: center;
qrcode {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
::ng-deep canvas,
::ng-deep img {
display: block !important;
width: 100% !important;
height: 100% !important;
max-width: 100%;
max-height: 100%;
}
}
}
.qr-code__finder {
position: absolute;
width: 38px;
height: 38px;
border: 5px solid #111111;
background: #ffffff;
box-shadow: inset 0 0 0 8px #ffffff, inset 0 0 0 14px #111111;
&--tl {
top: 10px;
left: 10px;
}
&--tr {
top: 10px;
right: 10px;
}
&--bl {
bottom: 10px;
left: 10px;
}
}
.store-badges {
width: 100%;
max-width: 210px;
display: grid;
gap: 0.8rem;
}
.store-badge {
display: flex;
align-items: center;
gap: 0.75rem;
padding: 0.75rem 0.95rem;
border-radius: 0.85rem;
background: #111111;
color: #ffffff;
box-shadow: 0 10px 24px rgba(17, 17, 17, 0.16);
i {
font-size: 1.35rem;
}
&__text {
display: grid;
text-align: left;
line-height: 1.1;
small {
font-size: 0.62rem;
letter-spacing: 0.05em;
text-transform: uppercase;
opacity: 0.8;
}
strong {
font-size: 1rem;
font-weight: 700;
}
}
} }

View File

@@ -1,14 +1,15 @@
import { ChangeDetectionStrategy, Component, input, output } from '@angular/core'; import { ChangeDetectionStrategy, Component, input, output } from '@angular/core';
import { ButtonComponent } from '../../../../shared/components/button/button.component'; import { ButtonComponent } from '../../../../shared/components/button/button.component';
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component'; import { CheckoutPaymentQrComponent } from './components/checkout-payment-qr/checkout-payment-qr.component';
import { QRCodeComponent } from '../../../../shared/components/qrcode/qrcode.component'; import { CheckoutPaymentTelepagosComponent } from './components/checkout-payment-telepagos/checkout-payment-telepagos.component';
import { CheckoutPaymentTransferComponent } from './components/checkout-payment-transfer/checkout-payment-transfer.component';
import { PaymentMethod, PaymentMethodOption, TransferAccount, TransferField } from './checkout-page.models'; import { PaymentMethod, PaymentMethodOption, TransferAccount, TransferField } from './checkout-page.models';
@Component({ @Component({
selector: 'app-checkout-payment-step', selector: 'app-checkout-payment-step',
standalone: true, standalone: true,
imports: [ButtonComponent, IconButtonComponent, QRCodeComponent], imports: [ButtonComponent, CheckoutPaymentQrComponent, CheckoutPaymentTelepagosComponent, CheckoutPaymentTransferComponent],
templateUrl: './checkout-payment-step.component.html', templateUrl: './checkout-payment-step.component.html',
styleUrl: './checkout-payment-step.component.scss', styleUrl: './checkout-payment-step.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush
@@ -17,7 +18,8 @@ export class CheckoutPaymentStepComponent {
readonly paymentMethods = input.required<ReadonlyArray<PaymentMethodOption>>(); readonly paymentMethods = input.required<ReadonlyArray<PaymentMethodOption>>();
readonly selectedPaymentMethod = input.required<PaymentMethod>(); readonly selectedPaymentMethod = input.required<PaymentMethod>();
readonly copiedTransferField = input<TransferField | null>(null); readonly copiedTransferField = input<TransferField | null>(null);
readonly transferAccount = input.required<TransferAccount>(); readonly transferAccount = input<TransferAccount | null>(null);
readonly transferDni = input<string>('');
readonly isGeneratingIntent = input<boolean>(false); readonly isGeneratingIntent = input<boolean>(false);
readonly qrData = input<string | null>(null); readonly qrData = input<string | null>(null);
@@ -25,6 +27,7 @@ export class CheckoutPaymentStepComponent {
readonly copyTransferValue = output<{ field: TransferField; value: string }>(); readonly copyTransferValue = output<{ field: TransferField; value: string }>();
readonly cancelStep = output<void>(); readonly cancelStep = output<void>();
readonly complete = output<void>(); readonly complete = output<void>();
readonly generateTransferIntent = output<string>();
protected selectPaymentMethod(method: PaymentMethod): void { protected selectPaymentMethod(method: PaymentMethod): void {
this.paymentMethodChange.emit(method); this.paymentMethodChange.emit(method);

View File

@@ -0,0 +1,14 @@
<div class="payment-panel__card">
<h3 class="payment-panel__title">Ingresa a tu billetera y escanea el siguiente QR</h3>
<div class="payment-panel__divider"></div>
<div class="qr-code" aria-label="QR de pago">
@if (qrData()) {
<qrcode [qrdata]="qrData()!" [width]="200" [errorCorrectionLevel]="'M'"></qrcode>
} @else {
<span class="qr-code__finder qr-code__finder--tl"></span>
<span class="qr-code__finder qr-code__finder--tr"></span>
<span class="qr-code__finder qr-code__finder--bl"></span>
}
</div>
</div>

View File

@@ -0,0 +1,105 @@
.payment-panel__card {
width: 100%;
max-width: 320px;
min-height: 269px;
padding: 1.5rem 1.75rem;
border-radius: 5px;
background: #ffffff;
color: #666666;
box-shadow: 0 0 0 1px #f1f1f1;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
.payment-panel__title {
max-width: 18rem;
margin: 0;
color: #8a8a8a;
font-size: 13px;
font-weight: 700;
line-height: 1.35;
}
.payment-panel__divider {
width: 100%;
max-width: 220px;
height: 1px;
margin: 1.2rem 0 1.45rem;
background: #dddddd;
}
.qr-code {
position: relative;
width: min(170px, 100%);
aspect-ratio: 1;
border: 8px solid #ffffff;
background-color: #ffffff;
background-image:
linear-gradient(
90deg,
rgba(17, 17, 17, 0.95) 0 14%,
transparent 14% 28%,
rgba(17, 17, 17, 0.95) 28% 42%,
transparent 42% 56%,
rgba(17, 17, 17, 0.95) 56% 70%,
transparent 70% 84%,
rgba(17, 17, 17, 0.95) 84% 100%
),
linear-gradient(
rgba(17, 17, 17, 0.95) 0 14%,
transparent 14% 28%,
rgba(17, 17, 17, 0.95) 28% 42%,
transparent 42% 56%,
rgba(17, 17, 17, 0.95) 56% 70%,
transparent 70% 84%,
rgba(17, 17, 17, 0.95) 84% 100%
);
background-size: 18px 18px;
background-position: 0 0, 9px 9px;
display: flex;
justify-content: center;
align-items: center;
qrcode {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
::ng-deep canvas,
::ng-deep img {
display: block !important;
width: 100% !important;
height: 100% !important;
max-width: 100%;
max-height: 100%;
}
}
}
.qr-code__finder {
position: absolute;
width: 38px;
height: 38px;
border: 5px solid #111111;
background: #ffffff;
box-shadow: inset 0 0 0 8px #ffffff, inset 0 0 0 14px #111111;
&--tl {
top: 10px;
left: 10px;
}
&--tr {
top: 10px;
right: 10px;
}
&--bl {
bottom: 10px;
left: 10px;
}
}

View File

@@ -0,0 +1,14 @@
import { ChangeDetectionStrategy, Component, input } from '@angular/core';
import { QRCodeComponent } from '../../../../../../shared/components/qrcode/qrcode.component';
@Component({
selector: 'app-checkout-payment-qr',
standalone: true,
imports: [QRCodeComponent],
templateUrl: './checkout-payment-qr.component.html',
styleUrl: './checkout-payment-qr.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class CheckoutPaymentQrComponent {
readonly qrData = input<string | null>(null);
}

View File

@@ -0,0 +1,22 @@
<div class="payment-panel__card">
<h3 class="payment-panel__title">Descarga la app de TelePagos para finalizar la compra</h3>
<div class="payment-panel__divider"></div>
<div class="store-badges" aria-label="Tiendas disponibles">
<div class="store-badge">
<i class="fa-brands fa-google-play" aria-hidden="true"></i>
<span class="store-badge__text">
<small>Disponible en</small>
<strong>Google Play</strong>
</span>
</div>
<div class="store-badge">
<i class="fa-brands fa-apple" aria-hidden="true"></i>
<span class="store-badge__text">
<small>Descargalo en</small>
<strong>App Store</strong>
</span>
</div>
</div>
</div>

View File

@@ -0,0 +1,71 @@
.payment-panel__card {
width: 100%;
max-width: 320px;
min-height: 269px;
padding: 1.5rem 1.75rem;
border-radius: 5px;
background: #ffffff;
color: #666666;
box-shadow: 0 0 0 1px #f1f1f1;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
.payment-panel__title {
max-width: 18rem;
margin: 0;
color: #8a8a8a;
font-size: 13px;
font-weight: 700;
line-height: 1.35;
}
.payment-panel__divider {
width: 100%;
max-width: 220px;
height: 1px;
margin: 1.2rem 0 1.45rem;
background: #dddddd;
}
.store-badges {
width: 100%;
max-width: 210px;
display: grid;
gap: 0.8rem;
}
.store-badge {
display: flex;
align-items: center;
gap: 0.75rem;
padding: 0.75rem 0.95rem;
border-radius: 0.85rem;
background: #111111;
color: #ffffff;
box-shadow: 0 10px 24px rgba(17, 17, 17, 0.16);
i {
font-size: 1.35rem;
}
&__text {
display: grid;
text-align: left;
line-height: 1.1;
small {
font-size: 0.62rem;
letter-spacing: 0.05em;
text-transform: uppercase;
opacity: 0.8;
}
strong {
font-size: 1rem;
font-weight: 700;
}
}
}

View File

@@ -0,0 +1,11 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
@Component({
selector: 'app-checkout-payment-telepagos',
standalone: true,
imports: [],
templateUrl: './checkout-payment-telepagos.component.html',
styleUrl: './checkout-payment-telepagos.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class CheckoutPaymentTelepagosComponent {}

View File

@@ -0,0 +1,94 @@
<div class="payment-panel__card">
<div class="dni-form-container">
<h3 class="dni-form-title">Ingresá DNI de quién va a transferir</h3>
<form class="dni-form row gx-2" (submit)="$event.preventDefault(); onSubmitDni()">
<div class="col-8">
<app-input
type="text"
[value]="dniControl.value"
(valueChange)="dniControl.setValue($event.toString()); dniControl.markAsDirty()"
[disabled]="isDniDisabled()"
[invalid]="dniControl.invalid && (dniControl.dirty || dniControl.touched)"
/>
</div>
<div class="col-4">
@if (isDniDisabled()) {
<app-button
type="button"
variant="secondary"
hostClass="w-100 h-100"
buttonClass="w-100 h-100 px-0"
(click)="enableEditing()"
>
Modificar
</app-button>
} @else {
<app-button
type="submit"
variant="primary"
hostClass="w-100 h-100"
buttonClass="w-100 h-100 px-0"
[disabled]="dniControl.invalid"
>
Continuar
</app-button>
}
</div>
</form>
</div>
@if (transferAccount() && !isEditing()) {
<div class="payment-panel__divider"></div>
<div class="payment-panel__account">
<p class="payment-panel__eyebrow">DATOS DE CUENTA:</p>
<div class="payment-detail">
<span class="payment-detail__label">Titular:</span>
<span class="payment-detail__value">{{ transferAccount()?.titular }}</span>
</div>
<div class="payment-detail">
<span class="payment-detail__label">Entidad:</span>
<span class="payment-detail__value">{{ transferAccount()?.entidad }}</span>
</div>
<div class="payment-detail payment-detail--copy">
<span class="payment-detail__label">CVU:</span>
<span class="payment-detail__value">{{ transferAccount()?.cvu }}</span>
<app-icon-button
variant="copy"
ariaLabel="Copiar CVU"
(click)="requestCopy('cvu', transferAccount()!.cvu)"
/>
@if (copiedTransferField() === 'cvu') {
<span class="payment-detail__feedback" style="grid-column: 1 / -1; text-align: center;">¡Copiado!</span>
}
</div>
<div class="payment-detail payment-detail--copy">
<span class="payment-detail__label">Alias:</span>
<span class="payment-detail__value">{{ transferAccount()?.alias }}</span>
<app-icon-button
variant="copy"
ariaLabel="Copiar Alias"
(click)="requestCopy('alias', transferAccount()!.alias)"
/>
@if (copiedTransferField() === 'alias') {
<span class="payment-detail__feedback" style="grid-column: 1 / -1; text-align: center;">¡Copiado!</span>
}
</div>
</div>
<div class="mt-4">
<app-button
type="button"
variant="primary"
hostClass="w-100"
buttonClass="w-100"
(click)="completePurchase.emit()"
>
Ya transferí
</app-button>
</div>
}
</div>

View File

@@ -0,0 +1,117 @@
.payment-panel__card {
width: 100%;
max-width: 320px;
min-height: 400px;
padding: 1.5rem 1.75rem;
border-radius: 5px;
background: #ffffff;
color: #666666;
box-shadow: 0 0 0 1px #f1f1f1;
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
.payment-panel__title {
max-width: 18rem;
margin: 0;
color: #8a8a8a;
font-size: 13px;
font-weight: 700;
line-height: 1.35;
}
.payment-panel__divider {
width: 100%;
max-width: 220px;
height: 1px;
margin: 1.2rem 0 1.45rem;
background: #dddddd;
}
.payment-panel__account {
width: 100%;
display: grid;
gap: 0.75rem;
color: #7a7a7a;
font-size: 12px;
}
.payment-panel__eyebrow {
margin: 0;
color: #838383;
font-size: 12px;
font-weight: 325;
letter-spacing: 0.06em;
}
.payment-detail {
display: grid;
grid-template-columns: auto auto;
justify-content: center;
gap: 0.35rem;
align-items: center;
font-size: 12px;
&--copy {
grid-template-columns: auto auto auto;
}
&__label {
color: #8a8a8a;
font-weight: 325;
}
&__value {
color: #5e5e5e;
font-weight: 500;
}
&__feedback {
display: block;
margin-top: -0.25rem;
color: var(--tenant-primary, #6376f3);
font-size: 0.78rem;
font-weight: 700;
}
}
.dni-form-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
flex: 1;
width: 100%;
padding: 1rem 0;
}
.dni-form-title {
color: #8a8a8a;
font-size: 13px;
font-weight: 700;
margin: 0 0 1.25rem 0;
text-align: center;
}
.dni-form {
width: 100%;
margin: 0;
app-input {
display: block;
height: 100%;
margin-bottom: 0;
::ng-deep .input-control,
::ng-deep input.form-control {
height: 100%;
}
}
::ng-deep .btn {
min-width: 0 !important;
height: 100%;
}
}

View File

@@ -0,0 +1,54 @@
import { ChangeDetectionStrategy, Component, computed, input, output, signal, OnInit, effect, untracked } from '@angular/core';
import { FormControl, ReactiveFormsModule, Validators } from '@angular/forms';
import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
import { ButtonComponent } from '../../../../../../shared/components/button/button.component';
import { InputComponent } from '../../../../../../shared/components/input/input.component';
import { TransferAccount, TransferField } from '../../checkout-page.models';
@Component({
selector: 'app-checkout-payment-transfer',
standalone: true,
imports: [IconButtonComponent, ButtonComponent, InputComponent, ReactiveFormsModule],
templateUrl: './checkout-payment-transfer.component.html',
styleUrl: './checkout-payment-transfer.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush
})
export class CheckoutPaymentTransferComponent implements OnInit {
readonly transferAccount = input<TransferAccount | null>(null);
readonly transferDni = input<string>('');
readonly copiedTransferField = input<TransferField | null>(null);
readonly copyTransferValue = output<{ field: TransferField; value: string }>();
readonly submitDni = output<string>();
readonly completePurchase = output<void>();
protected readonly dniControl = new FormControl('', {
nonNullable: true,
validators: [Validators.required, Validators.pattern(/^\d{7,8}$/)]
});
protected readonly isEditing = signal<boolean>(false);
protected readonly isDniDisabled = computed(() => !!this.transferAccount() && !this.isEditing());
ngOnInit(): void {
const dni = this.transferDni();
if (dni) {
this.dniControl.setValue(dni);
}
}
protected requestCopy(field: TransferField, value: string): void {
this.copyTransferValue.emit({ field, value });
}
protected onSubmitDni(): void {
if (this.dniControl.valid) {
this.isEditing.set(false);
this.submitDni.emit(this.dniControl.value);
}
}
protected enableEditing(): void {
this.isEditing.set(true);
}
}

View File

@@ -27,11 +27,11 @@
} }
<div class="d-grid gap-1"> <div class="d-grid gap-1">
<label class="visually-hidden" for="login-password">Contrasena</label> <label class="visually-hidden" for="login-password">Contraseña</label>
<app-input <app-input
id="login-password" id="login-password"
type="password" type="password"
placeholder="Contrasena" placeholder="Contraseña"
[value]="form.controls.password.value" [value]="form.controls.password.value"
[invalid]="showControlError('password')" [invalid]="showControlError('password')"
(valueChange)="updatePassword($event)" (valueChange)="updatePassword($event)"
@@ -41,7 +41,7 @@
} }
<div class="text-end"> <div class="text-end">
<button type="button" class="login-page__forgot-password btn btn-link p-0 border-0 text-decoration-none"> <button type="button" class="login-page__forgot-password btn btn-link p-0 border-0 text-decoration-none">
Olvide mi contrasena Olvide mi contraseña
</button> </button>
</div> </div>
</div> </div>

View File

@@ -1,120 +1,119 @@
<section class="product-detail py-5"> <section class="product-detail">
<div class="container-xl px-3 px-md-4"> @if (loading()) {
@if (loading()) { <div class="text-center py-5">
<div class="text-center py-5"> <div class="spinner-border text-primary" role="status">
<div class="spinner-border text-primary" role="status"> <span class="visually-hidden">Cargando...</span>
<span class="visually-hidden">Cargando...</span> </div>
</div>
} @else if (error()) {
<div class="alert alert-danger text-center mb-0" role="alert">
{{ error() }}
</div>
} @else if (product(); as prod) {
<div class="row g-4 g-xl-5 align-items-start">
<div class="col-12 col-lg-5">
<div #carouselHost class="product-detail__carousel">
<app-product-carousel [images]="carouselImages()" />
</div> </div>
</div> </div>
} @else if (error()) {
<div class="alert alert-danger text-center mb-0" role="alert">
{{ error() }}
</div>
} @else if (product(); as prod) {
<div class="row g-4 g-xl-5 align-items-start">
<div class="col-12 col-lg-5">
<div #carouselHost class="product-detail__carousel">
<app-product-carousel [images]="carouselImages()" />
</div>
</div>
<div class="col-12 col-lg-7"> <div class="col-12 col-lg-7">
<div class="product-detail__panel"> <div class="product-detail__panel">
<section class="product-detail__section"> <section class="product-detail__section">
<h1 class="product-detail__title mb-0">{{ prod.nombre }}</h1> <h1 class="product-detail__title mb-0">{{ prod.nombre }}</h1>
<div class="product-detail__title-price-divider"></div> <div class="product-detail__title-price-divider"></div>
<div class="product-detail__price-group"> <div class="product-detail__price-group">
<span class="product-detail__price-current"> <span class="product-detail__price-current">
{{ getFormattedPrice(prod.precio) }} {{ getFormattedPrice(prod.precio) }}
</span> </span>
@if (oldPrice(); as oldPrice) { @if (oldPrice(); as oldPrice) {
<span class="product-detail__price-previous">{{ oldPrice }}</span> <span class="product-detail__price-previous">{{ oldPrice }}</span>
}
</div>
</section>
@if (hasRenderableAttributes()) {
<div class="product-detail__divider"></div>
<section class="product-detail__section product-detail__section--attributes">
<app-product-attribute-selector
[attributes]="renderableAttributes()"
[variantsMap]="prod.variants_map"
[defaultVariant]="prod.variant"
(variantChange)="onVariantChange($event)"
/>
</section>
}
<div class="product-detail__divider"></div>
<section class="product-detail__section">
<div class="product-detail__purchase">
<app-quantity-selector
[(quantity)]="quantity"
[max]="selectedVariant()?.cantidad_maxima ?? 1"
/>
<div class="product-detail__actions">
<app-button
class="product-detail__cta"
variant="secondary"
type="button"
[disabled]="!selectedVariant() || variantLoading() || addingToCart()"
(click)="addToCart()"
>
@if (variantLoading() || addingToCart()) {
<div class="spinner-border spinner-border-sm" role="status"></div>
} @else {
Agregar al carrito
}
</app-button>
<app-button class="product-detail__cta" type="button" [disabled]="!selectedVariant() || variantLoading()">
@if (variantLoading()) {
<div class="spinner-border spinner-border-sm" role="status"></div>
} @else {
Comprar
}
</app-button>
</div>
</div>
</section>
<div class="product-detail__divider"></div>
<section class="product-detail__section product-detail__section--description">
<h2 class="product-detail__description-heading">DESCRIPCIÓN</h2>
<div
#descriptionBody
class="product-detail__description-body"
[class.product-detail__description-body--expanded]="descriptionExpanded()"
[style.max-height.px]="descriptionExpanded() ? descriptionMaxHeight() || null : null"
>
{{ prod.descripcion }}
</div>
@if (showDescriptionToggle()) {
<button
type="button"
class="product-detail__description-toggle"
(click)="toggleDescription()"
>
{{ descriptionExpanded() ? 'Mostrar menos' : 'Mostrar más' }}
</button>
} }
</div>
</section>
@if (hasRenderableAttributes()) {
<div class="product-detail__divider"></div>
<section class="product-detail__section product-detail__section--attributes">
<app-product-attribute-selector
[attributes]="renderableAttributes()"
[variantsMap]="prod.variants_map"
[defaultVariant]="prod.variant"
(variantChange)="onVariantChange($event)"
/>
</section> </section>
</div> }
<div class="product-detail__divider"></div>
<section class="product-detail__section">
<div class="product-detail__purchase">
<app-quantity-selector [(quantity)]="quantity" [max]="selectedVariantMax()" />
<div class="product-detail__actions">
<app-button
class="product-detail__cta"
variant="secondary"
type="button"
[disabled]="!selectedVariantAvailable() || variantLoading() || addingToCart()"
(click)="addToCart()"
>
@if (variantLoading() || addingToCart()) {
<div class="spinner-border spinner-border-sm" role="status"></div>
} @else {
Agregar al carrito
}
</app-button>
<app-button
class="product-detail__cta"
type="button"
[disabled]="!selectedVariantAvailable() || variantLoading()"
>
@if (variantLoading()) {
<div class="spinner-border spinner-border-sm" role="status"></div>
} @else {
Comprar
}
</app-button>
</div>
</div>
</section>
<div class="product-detail__divider"></div>
<section class="product-detail__section product-detail__section--description">
<h2 class="product-detail__description-heading">DESCRIPCIÓN</h2>
<div
#descriptionBody
class="product-detail__description-body"
[class.product-detail__description-body--expanded]="descriptionExpanded()"
[style.max-height.px]="descriptionExpanded() ? descriptionMaxHeight() || null : null"
>
{{ prod.descripcion }}
</div>
@if (showDescriptionToggle()) {
<button
type="button"
class="product-detail__description-toggle"
(click)="toggleDescription()"
>
{{ descriptionExpanded() ? 'Mostrar menos' : 'Mostrar más' }}
</button>
}
</section>
</div> </div>
</div> </div>
} @else { </div>
<div class="alert alert-warning text-center mb-0" role="alert"> } @else {
No se encontró el producto especificado. <div class="alert alert-warning text-center mb-0" role="alert">
</div> No se encontró el producto especificado.
} </div>
</div> }
</section> </section>

View File

@@ -1,12 +1,8 @@
import { TestBed, getTestBed } from '@angular/core/testing'; import { TestBed, getTestBed } from '@angular/core/testing';
import { import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
BrowserTestingModule,
platformBrowserTesting
} from '@angular/platform-browser/testing';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { BehaviorSubject, of, throwError } from 'rxjs'; import { BehaviorSubject, of, throwError } from 'rxjs';
import { convertToParamMap } from '@angular/router';
import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'; import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { ProductDetail } from '../../../../core/services/catalog/catalog.interface'; import { ProductDetail } from '../../../../core/services/catalog/catalog.interface';
@@ -14,6 +10,10 @@ import { CatalogService } from '../../../../core/services/catalog/catalog.servic
import { CartService } from '../../../../core/services/cart/cart.service'; import { CartService } from '../../../../core/services/cart/cart.service';
import { ToastService } from '../../../../core/services/toast.service'; import { ToastService } from '../../../../core/services/toast.service';
import { ProductDetailPageComponent } from './product-detail-page.component'; import { ProductDetailPageComponent } from './product-detail-page.component';
import {
PRODUCT_DETAIL_ERROR_MESSAGE,
ProductDetailResolvedData,
} from './product-detail-page.resolver';
describe('ProductDetailPageComponent', () => { describe('ProductDetailPageComponent', () => {
const mockProduct: ProductDetail = { const mockProduct: ProductDetail = {
@@ -29,10 +29,10 @@ describe('ProductDetailPageComponent', () => {
images: ['https://example.com/image.png'], images: ['https://example.com/image.png'],
attributes: [], attributes: [],
variants_map: [], variants_map: [],
variant: null variant: null,
}; };
let paramMapSubject: BehaviorSubject<any>; let routeDataSubject: BehaviorSubject<{ productDetailData: ProductDetailResolvedData }>;
let catalogServiceStub: any; let catalogServiceStub: any;
let routerStub: any; let routerStub: any;
let cartServiceStub: any; let cartServiceStub: any;
@@ -40,10 +40,7 @@ describe('ProductDetailPageComponent', () => {
beforeAll(() => { beforeAll(() => {
try { try {
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
BrowserTestingModule,
platformBrowserTesting()
);
} catch { } catch {
// Test environment may already be initialized by another setup entrypoint. // Test environment may already be initialized by another setup entrypoint.
} }
@@ -51,20 +48,25 @@ describe('ProductDetailPageComponent', () => {
beforeEach(() => { beforeEach(() => {
vi.restoreAllMocks(); vi.restoreAllMocks();
paramMapSubject = new BehaviorSubject(convertToParamMap({ id: '1' })); routeDataSubject = new BehaviorSubject<{ productDetailData: ProductDetailResolvedData }>({
productDetailData: {
product: mockProduct,
error: null,
},
});
catalogServiceStub = { catalogServiceStub = {
getProducto: vi.fn().mockReturnValue(of(mockProduct)) getProducto: vi.fn(),
}; };
routerStub = { routerStub = {
navigate: vi.fn() navigate: vi.fn(),
}; };
cartServiceStub = { cartServiceStub = {
addItem: vi.fn().mockReturnValue(of({ message: 'Producto agregado al carrito' })) addItem: vi.fn().mockReturnValue(of({ message: 'Producto agregado al carrito' })),
}; };
toastServiceStub = { toastServiceStub = {
success: vi.fn(), success: vi.fn(),
danger: vi.fn(), danger: vi.fn(),
info: vi.fn() info: vi.fn(),
}; };
}); });
@@ -75,47 +77,69 @@ describe('ProductDetailPageComponent', () => {
{ {
provide: ActivatedRoute, provide: ActivatedRoute,
useValue: { useValue: {
paramMap: paramMapSubject.asObservable() data: routeDataSubject.asObservable(),
} },
}, },
{ {
provide: CatalogService, provide: CatalogService,
useValue: catalogServiceStub useValue: catalogServiceStub,
}, },
{ {
provide: Router, provide: Router,
useValue: routerStub useValue: routerStub,
}, },
{ {
provide: CartService, provide: CartService,
useValue: cartServiceStub useValue: cartServiceStub,
}, },
{ {
provide: ToastService, provide: ToastService,
useValue: toastServiceStub useValue: toastServiceStub,
} },
] ],
}).compileComponents(); }).compileComponents();
} }
it('loads the product on init and embeds the carousel', async () => { function resolveProduct(product: ProductDetail): void {
routeDataSubject.next({
productDetailData: {
product,
error: null,
},
});
}
function resolveProductError(error: string): void {
routeDataSubject.next({
productDetailData: {
product: null,
error,
},
});
}
it('renders the resolved product and embeds the carousel', async () => {
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges(); fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
expect(catalogServiceStub.getProducto).toHaveBeenCalledWith(1); expect(catalogServiceStub.getProducto).not.toHaveBeenCalled();
expect(element.querySelector('app-product-carousel')).not.toBeNull(); expect(element.querySelector('app-product-carousel')).not.toBeNull();
expect(element.querySelector('.product-detail__title')?.textContent).toContain('Auriculares Bluetooth'); expect(element.querySelector('.product-detail__title')?.textContent).toContain(
expect(element.querySelector('.product-detail__price-current')?.textContent).toContain('$24.999'); 'Auriculares Bluetooth',
);
expect(element.querySelector('.product-detail__price-current')?.textContent).toContain(
'$24.999',
);
expect(element.querySelector('.product-detail__price-previous')).toBeNull(); expect(element.querySelector('.product-detail__price-previous')).toBeNull();
expect(element.querySelector('.product-carousel__discount-badge')).toBeNull(); expect(element.querySelector('.product-carousel__discount-badge')).toBeNull();
}); });
it('shows error message if load fails', async () => { it('shows error message if the resolver cannot load the product', async () => {
catalogServiceStub.getProducto.mockReturnValue(throwError(() => new Error('load failed'))); resolveProductError(PRODUCT_DETAIL_ERROR_MESSAGE);
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges(); fixture.detectChanges();
@@ -125,35 +149,39 @@ describe('ProductDetailPageComponent', () => {
expect(element.textContent).toContain('No pudimos cargar los detalles del producto.'); expect(element.textContent).toContain('No pudimos cargar los detalles del producto.');
}); });
it('should use default variant images if present', async () => { it('should use default variant images if present', async () => {
const detailProduct: ProductDetail = { const detailProduct: ProductDetail = {
...mockProduct, ...mockProduct,
images: ['https://example.com/product.png'], images: ['https://example.com/product.png'],
variant: { variant: {
id: 123, id: 123,
inventory_policy: 'tracked',
cantidad_maxima: 10, cantidad_maxima: 10,
cantidad_vendida: 0,
images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'], images: ['https://example.com/variant1.png', 'https://example.com/variant2.png'],
definitions: {} definitions: {},
} },
}; };
catalogServiceStub.getProducto.mockReturnValue(of(detailProduct)); resolveProduct(detailProduct);
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges(); fixture.detectChanges();
const carousel = fixture.debugElement.query(By.css('app-product-carousel')).componentInstance; const carousel = fixture.debugElement.query(By.css('app-product-carousel')).componentInstance;
expect(carousel.images()).toEqual(['https://example.com/variant1.png', 'https://example.com/variant2.png']); expect(carousel.images()).toEqual([
'https://example.com/variant1.png',
'https://example.com/variant2.png',
]);
}); });
it('should fallback to product images if default variant images are not present', async () => { it('should fallback to product images if default variant images are not present', async () => {
const detailProduct: ProductDetail = { const detailProduct: ProductDetail = {
...mockProduct, ...mockProduct,
images: ['https://example.com/product.png'], images: ['https://example.com/product.png'],
variant: null variant: null,
}; };
catalogServiceStub.getProducto.mockReturnValue(of(detailProduct)); resolveProduct(detailProduct);
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
@@ -167,9 +195,9 @@ describe('ProductDetailPageComponent', () => {
const detailProduct: ProductDetail = { const detailProduct: ProductDetail = {
...mockProduct, ...mockProduct,
images: [], images: [],
variant: null variant: null,
}; };
catalogServiceStub.getProducto.mockReturnValue(of(detailProduct)); resolveProduct(detailProduct);
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
@@ -196,16 +224,16 @@ describe('ProductDetailPageComponent', () => {
value: 'beige', value: 'beige',
label: 'Beige', label: 'Beige',
sort_order: 1, sort_order: 1,
metadata: { hex: '#D8D1C7' } metadata: { hex: '#D8D1C7' },
}, },
{ {
id: 11, id: 11,
value: 'brown', value: 'brown',
label: 'Marrón', label: 'Marrón',
sort_order: 2, sort_order: 2,
metadata: { palette: { primary: '#7E6460' } } metadata: { palette: { primary: '#7E6460' } },
} },
] ],
}, },
{ {
id: 2, id: 2,
@@ -220,29 +248,31 @@ describe('ProductDetailPageComponent', () => {
value: 'mesh', value: 'mesh',
label: 'Mesh', label: 'Mesh',
sort_order: 1, sort_order: 1,
metadata: null metadata: null,
}, },
{ {
id: 21, id: 21,
value: 'cuero', value: 'cuero',
label: 'Cuero', label: 'Cuero',
sort_order: 2, sort_order: 2,
metadata: null metadata: null,
} },
] ],
} },
], ],
variant: { variant: {
id: 123, id: 123,
inventory_policy: 'tracked',
cantidad_maxima: 10, cantidad_maxima: 10,
cantidad_vendida: 0,
images: ['https://example.com/variant1.png'], images: ['https://example.com/variant1.png'],
definitions: { definitions: {
color: 'beige', color: 'beige',
material: 'Cuero' material: 'Cuero',
} },
} },
}; };
catalogServiceStub.getProducto.mockReturnValue(of(detailProduct)); resolveProduct(detailProduct);
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
@@ -252,14 +282,16 @@ describe('ProductDetailPageComponent', () => {
const swatches = element.querySelectorAll('.attribute-selector__swatch'); const swatches = element.querySelectorAll('.attribute-selector__swatch');
const textOptions = element.querySelectorAll('.attribute-selector__text-option'); const textOptions = element.querySelectorAll('.attribute-selector__text-option');
const labels = Array.from(element.querySelectorAll('.attribute-selector__label')).map((label) => const labels = Array.from(element.querySelectorAll('.attribute-selector__label')).map((label) =>
label.textContent?.trim() label.textContent?.trim(),
); );
expect(labels).toEqual(['Color:', 'Material:']); expect(labels).toEqual(['Color:', 'Material:']);
expect(swatches).toHaveLength(2); expect(swatches).toHaveLength(2);
expect(textOptions).toHaveLength(2); expect(textOptions).toHaveLength(2);
expect(swatches[0].classList.contains('attribute-selector__swatch--selected')).toBe(true); expect(swatches[0].classList.contains('attribute-selector__swatch--selected')).toBe(true);
expect(textOptions[1].classList.contains('attribute-selector__text-option--selected')).toBe(true); expect(textOptions[1].classList.contains('attribute-selector__text-option--selected')).toBe(
true,
);
expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe(''); expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe('');
}); });
@@ -281,17 +313,19 @@ describe('ProductDetailPageComponent', () => {
fixture.componentInstance['selectedVariant'].set({ fixture.componentInstance['selectedVariant'].set({
variant_id: 1, variant_id: 1,
inventory_policy: 'tracked',
cantidad_maxima: 10, cantidad_maxima: 10,
attributes: {} cantidad_vendida: 0,
attributes: {},
}); });
fixture.detectChanges(); fixture.detectChanges();
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
const decreaseButton = element.querySelector( const decreaseButton = element.querySelector(
'[aria-label="Disminuir cantidad"]' '[aria-label="Disminuir cantidad"]',
) as HTMLButtonElement; ) as HTMLButtonElement;
const increaseButton = element.querySelector( const increaseButton = element.querySelector(
'[aria-label="Aumentar cantidad"]' '[aria-label="Aumentar cantidad"]',
) as HTMLButtonElement; ) as HTMLButtonElement;
decreaseButton.click(); decreaseButton.click();
@@ -316,7 +350,7 @@ describe('ProductDetailPageComponent', () => {
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
const toggleButton = element.querySelector( const toggleButton = element.querySelector(
'.product-detail__description-toggle' '.product-detail__description-toggle',
) as HTMLButtonElement; ) as HTMLButtonElement;
expect(toggleButton.textContent?.trim()).toBe('Mostrar más'); expect(toggleButton.textContent?.trim()).toBe('Mostrar más');
@@ -327,7 +361,7 @@ describe('ProductDetailPageComponent', () => {
expect( expect(
element element
.querySelector('.product-detail__description-body') .querySelector('.product-detail__description-body')
?.classList.contains('product-detail__description-body--expanded') ?.classList.contains('product-detail__description-body--expanded'),
).toBe(true); ).toBe(true);
expect(toggleButton.textContent?.trim()).toBe('Mostrar menos'); expect(toggleButton.textContent?.trim()).toBe('Mostrar menos');
}); });
@@ -338,12 +372,12 @@ describe('ProductDetailPageComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
const buttons = Array.from( const buttons = Array.from(
fixture.nativeElement.querySelectorAll('app-button button') fixture.nativeElement.querySelectorAll('app-button button'),
) as HTMLButtonElement[]; ) as HTMLButtonElement[];
expect(buttons.map((button) => button.textContent?.trim())).toEqual([ expect(buttons.map((button) => button.textContent?.trim())).toEqual([
'Agregar al carrito', 'Agregar al carrito',
'Comprar' 'Comprar',
]); ]);
buttons[0].click(); buttons[0].click();
@@ -357,19 +391,23 @@ describe('ProductDetailPageComponent', () => {
...mockProduct, ...mockProduct,
variant: { variant: {
id: 123, id: 123,
inventory_policy: 'tracked',
cantidad_maxima: 5, cantidad_maxima: 5,
cantidad_vendida: 0,
images: [], images: [],
definitions: {} definitions: {},
}, },
variants_map: [ variants_map: [
{ {
variant_id: 123, variant_id: 123,
inventory_policy: 'tracked',
cantidad_maxima: 5, cantidad_maxima: 5,
attributes: {} cantidad_vendida: 0,
} attributes: {},
] },
],
}; };
catalogServiceStub.getProducto.mockReturnValue(of(detailProduct)); resolveProduct(detailProduct);
await configureTestingModule(); await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent); const fixture = TestBed.createComponent(ProductDetailPageComponent);
@@ -382,14 +420,14 @@ describe('ProductDetailPageComponent', () => {
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
const addToCartButton = Array.from(element.querySelectorAll('app-button button')).find( const addToCartButton = Array.from(element.querySelectorAll('app-button button')).find(
(btn) => btn.textContent?.trim() === 'Agregar al carrito' (btn) => btn.textContent?.trim() === 'Agregar al carrito',
) as HTMLButtonElement; ) as HTMLButtonElement;
expect(addToCartButton).toBeDefined(); expect(addToCartButton).toBeDefined();
addToCartButton.click(); addToCartButton.click();
fixture.detectChanges(); fixture.detectChanges();
expect(cartServiceStub.addItem).toHaveBeenCalledWith(123, 3); expect(cartServiceStub.addItem).toHaveBeenCalledWith('variant', 123, 3);
expect(toastServiceStub.success).toHaveBeenCalledWith('Producto agregado al carrito'); expect(toastServiceStub.success).toHaveBeenCalledWith('Producto agregado al carrito');
}); });
@@ -398,19 +436,23 @@ describe('ProductDetailPageComponent', () => {
...mockProduct, ...mockProduct,
variant: { variant: {
id: 123, id: 123,
inventory_policy: 'tracked',
cantidad_maxima: 5, cantidad_maxima: 5,
cantidad_vendida: 0,
images: [], images: [],
definitions: {} definitions: {},
}, },
variants_map: [ variants_map: [
{ {
variant_id: 123, variant_id: 123,
inventory_policy: 'tracked',
cantidad_maxima: 5, cantidad_maxima: 5,
attributes: {} cantidad_vendida: 0,
} attributes: {},
] },
],
}; };
catalogServiceStub.getProducto.mockReturnValue(of(detailProduct)); resolveProduct(detailProduct);
cartServiceStub.addItem.mockReturnValue(throwError(() => new Error('Failed to add'))); cartServiceStub.addItem.mockReturnValue(throwError(() => new Error('Failed to add')));
await configureTestingModule(); await configureTestingModule();
@@ -422,13 +464,82 @@ describe('ProductDetailPageComponent', () => {
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
const addToCartButton = Array.from(element.querySelectorAll('app-button button')).find( const addToCartButton = Array.from(element.querySelectorAll('app-button button')).find(
(btn) => btn.textContent?.trim() === 'Agregar al carrito' (btn) => btn.textContent?.trim() === 'Agregar al carrito',
) as HTMLButtonElement; ) as HTMLButtonElement;
addToCartButton.click(); addToCartButton.click();
fixture.detectChanges(); fixture.detectChanges();
expect(cartServiceStub.addItem).toHaveBeenCalled(); expect(cartServiceStub.addItem).toHaveBeenCalled();
expect(toastServiceStub.danger).toHaveBeenCalledWith('No se pudo agregar el producto al carrito.'); expect(toastServiceStub.danger).toHaveBeenCalledWith(
'No se pudo agregar el producto al carrito.',
);
});
it('allows unlimited variants to increase quantity without a maximum', async () => {
const unlimitedVariant = {
variant_id: 321,
inventory_policy: 'unlimited' as const,
cantidad_maxima: null,
cantidad_vendida: 10,
attributes: {},
};
resolveProduct({
...mockProduct,
variant: {
id: 321,
inventory_policy: 'unlimited',
cantidad_maxima: null,
cantidad_vendida: 10,
images: [],
definitions: {},
},
variants_map: [unlimitedVariant],
});
await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges();
const increaseButton = fixture.nativeElement.querySelector(
'app-quantity-selector button:last-child',
) as HTMLButtonElement;
expect(increaseButton.disabled).toBe(false);
increaseButton.click();
fixture.detectChanges();
expect(fixture.componentInstance['quantity']()).toBe(2);
});
it('disables purchase actions for tracked variants without stock', async () => {
const trackedVariant = {
variant_id: 654,
inventory_policy: 'tracked' as const,
cantidad_maxima: 0,
cantidad_vendida: 5,
attributes: {},
};
resolveProduct({
...mockProduct,
variant: {
id: 654,
inventory_policy: 'tracked',
cantidad_maxima: 0,
cantidad_vendida: 5,
images: [],
definitions: {},
},
variants_map: [trackedVariant],
});
await configureTestingModule();
const fixture = TestBed.createComponent(ProductDetailPageComponent);
fixture.detectChanges();
const purchaseButtons = Array.from(
fixture.nativeElement.querySelectorAll('app-button button'),
) as HTMLButtonElement[];
expect(purchaseButtons).toHaveLength(2);
expect(purchaseButtons.every((button) => button.disabled)).toBe(true);
}); });
}); });

View File

@@ -9,7 +9,7 @@ import {
inject, inject,
signal, signal,
viewChild, viewChild,
PLATFORM_ID PLATFORM_ID,
} from '@angular/core'; } from '@angular/core';
import { CommonModule, isPlatformBrowser } from '@angular/common'; import { CommonModule, isPlatformBrowser } from '@angular/common';
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
@@ -20,16 +20,14 @@ import { CatalogService } from '../../../../core/services/catalog/catalog.servic
import { ToastService } from '../../../../core/services/toast.service'; import { ToastService } from '../../../../core/services/toast.service';
import { CartService } from '../../../../core/services/cart/cart.service'; import { CartService } from '../../../../core/services/cart/cart.service';
import { import {
ProductAttribute,
ProductAttributeOption,
ProductDetail, ProductDetail,
ProductVariant, ProductVariantMap,
ProductVariantMap
} from '../../../../core/services/catalog/catalog.interface'; } from '../../../../core/services/catalog/catalog.interface';
import { ProductCarouselComponent } from '../../components/product-carousel/product-carousel.component'; import { ProductCarouselComponent } from '../../components/product-carousel/product-carousel.component';
import { ButtonComponent } from '../../../../shared/components/button/button.component'; import { ButtonComponent } from '../../../../shared/components/button/button.component';
import { ProductAttributeSelectorComponent } from '../../components/product-attribute-selector/product-attribute-selector.component'; import { ProductAttributeSelectorComponent } from '../../components/product-attribute-selector/product-attribute-selector.component';
import { QuantitySelectorComponent } from '../../../../shared/components/quantity-selector/quantity-selector.component'; import { QuantitySelectorComponent } from '../../../../shared/components/quantity-selector/quantity-selector.component';
import { ProductDetailResolvedData } from './product-detail-page.resolver';
@Component({ @Component({
selector: 'app-product-detail-page', selector: 'app-product-detail-page',
@@ -40,11 +38,11 @@ import { QuantitySelectorComponent } from '../../../../shared/components/quantit
ProductCarouselComponent, ProductCarouselComponent,
ButtonComponent, ButtonComponent,
ProductAttributeSelectorComponent, ProductAttributeSelectorComponent,
QuantitySelectorComponent QuantitySelectorComponent,
], ],
templateUrl: './product-detail-page.component.html', templateUrl: './product-detail-page.component.html',
styleUrl: './product-detail-page.component.scss', styleUrl: './product-detail-page.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class ProductDetailPageComponent implements OnInit, OnDestroy { export class ProductDetailPageComponent implements OnInit, OnDestroy {
private readonly route = inject(ActivatedRoute); private readonly route = inject(ActivatedRoute);
@@ -82,18 +80,26 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
protected readonly error = signal<string | null>(null); protected readonly error = signal<string | null>(null);
protected readonly selectedVariant = signal<ProductVariantMap | null>(null); protected readonly selectedVariant = signal<ProductVariantMap | null>(null);
protected readonly quantity = signal(1); protected readonly quantity = signal(1);
protected readonly selectedVariantMax = computed<number | null>(() => {
const variant = this.selectedVariant();
return variant ? variant.cantidad_maxima : 1;
});
protected readonly selectedVariantAvailable = computed(() => {
const variant = this.selectedVariant();
return variant !== null && this.isVariantAvailable(variant);
});
protected readonly descriptionExpanded = signal(false); protected readonly descriptionExpanded = signal(false);
protected readonly descriptionMaxHeight = signal(0); protected readonly descriptionMaxHeight = signal(0);
protected readonly descriptionHasOverflow = signal(false); protected readonly descriptionHasOverflow = signal(false);
protected readonly renderableAttributes = computed(() => protected readonly renderableAttributes = computed(() =>
(this.product()?.attributes ?? []).filter((attribute) => attribute.options.length > 0) (this.product()?.attributes ?? []).filter((attribute) => attribute.options.length > 0),
); );
protected readonly hasRenderableAttributes = computed( protected readonly hasRenderableAttributes = computed(
() => this.renderableAttributes().length > 0 () => this.renderableAttributes().length > 0,
); );
protected readonly oldPrice = computed<string | null>(() => null); protected readonly oldPrice = computed<string | null>(() => null);
protected readonly showDescriptionToggle = computed( protected readonly showDescriptionToggle = computed(
() => this.descriptionExpanded() || this.descriptionHasOverflow() () => this.descriptionExpanded() || this.descriptionHasOverflow(),
); );
constructor() { constructor() {
@@ -113,14 +119,12 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
} }
ngOnInit(): void { ngOnInit(): void {
this.routeSub = this.route.paramMap.subscribe((params) => { this.routeSub = this.route.data.subscribe((data) => {
const id = this.parseIntegerParam(params.get('id')); const resolvedData = data['productDetailData'] as ProductDetailResolvedData | undefined;
if (id === null) {
this.error.set('ID de producto inválido');
return;
}
this.loadProduct(id); if (resolvedData) {
this.applyResolvedData(resolvedData);
}
}); });
} }
@@ -131,38 +135,13 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
this.clearMeasurementTimer(); this.clearMeasurementTimer();
} }
private loadProduct(id: number): void {
this.loading.set(true);
this.error.set(null);
this.product.set(null);
this.productSub?.unsubscribe();
this.productSub = this.catalogService.getProducto(id).subscribe({
next: (prod) => {
this.product.set(prod);
const matchingVariant = prod.variants_map.find((v) => v.variant_id === prod.variant?.id) || null;
this.selectedVariant.set(matchingVariant);
this.quantity.set(1);
this.descriptionExpanded.set(false);
this.descriptionHasOverflow.set(false);
this.loading.set(false);
},
error: () => {
this.error.set('No pudimos cargar los detalles del producto.');
this.loading.set(false);
}
});
}
private loadProductVariant(productId: number, variantId: number): void { private loadProductVariant(productId: number, variantId: number): void {
this.variantLoading.set(true); this.variantLoading.set(true);
this.productSub?.unsubscribe(); this.productSub?.unsubscribe();
this.productSub = this.catalogService.getProducto(productId, variantId).subscribe({ this.productSub = this.catalogService.getProducto(productId, variantId).subscribe({
next: (prod) => { next: (prod) => {
this.product.set(prod); this.applyProduct(prod, false);
const matchingVariant = prod.variants_map.find((v) => v.variant_id === prod.variant?.id) || null;
this.selectedVariant.set(matchingVariant);
this.variantLoading.set(false); this.variantLoading.set(false);
}, },
error: (err: HttpErrorResponse) => { error: (err: HttpErrorResponse) => {
@@ -172,23 +151,46 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
this.product.update((currentProduct) => { this.product.update((currentProduct) => {
if (!currentProduct) return null; if (!currentProduct) return null;
const updatedVariantsMap = currentProduct.variants_map.map((v) => {
if (v.variant_id === variantId) {
return { ...v, cantidad_maxima: 0 };
}
return v;
});
return { return {
...currentProduct, ...currentProduct,
variants_map: updatedVariantsMap variants_map: currentProduct.variants_map.filter((v) => v.variant_id !== variantId),
}; };
}); });
this.attributeSelector()?.reset(); this.attributeSelector()?.reset();
} },
}); });
} }
private applyResolvedData(resolvedData: ProductDetailResolvedData): void {
this.productSub?.unsubscribe();
this.loading.set(false);
this.variantLoading.set(false);
if (resolvedData.error) {
this.product.set(null);
this.error.set(resolvedData.error);
return;
}
if (resolvedData.product) {
this.applyProduct(resolvedData.product, true);
}
}
private applyProduct(prod: ProductDetail, resetQuantity: boolean): void {
this.product.set(prod);
const matchingVariant =
prod.variants_map.find((v) => v.variant_id === prod.variant?.id) || null;
this.selectedVariant.set(matchingVariant);
if (resetQuantity) {
this.quantity.set(1);
}
this.descriptionExpanded.set(false);
this.descriptionHasOverflow.set(false);
this.error.set(null);
}
protected goBack(): void { protected goBack(): void {
this.router.navigate(['/']); this.router.navigate(['/']);
} }
@@ -209,7 +211,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
} }
this.selectedVariant.set(variant); this.selectedVariant.set(variant);
if (variant && this.quantity() > variant.cantidad_maxima) { if (variant && variant.cantidad_maxima !== null && this.quantity() > variant.cantidad_maxima) {
this.quantity.set(Math.max(1, variant.cantidad_maxima)); this.quantity.set(Math.max(1, variant.cantidad_maxima));
} }
@@ -219,17 +221,15 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
} }
} }
protected addToCart(): void { protected addToCart(): void {
const variant = this.selectedVariant(); const variant = this.selectedVariant();
if (!variant) { if (!variant || !this.isVariantAvailable(variant)) {
this.toastService.danger('Por favor, selecciona una variante.'); this.toastService.danger('Por favor, selecciona una variante.');
return; return;
} }
this.addingToCart.set(true); this.addingToCart.set(true);
this.cartService.addItem(variant.variant_id, this.quantity()).subscribe({ this.cartService.addItem('variant', variant.variant_id, this.quantity()).subscribe({
next: (res) => { next: (res) => {
const msg = res.message || 'Producto agregado al carrito'; const msg = res.message || 'Producto agregado al carrito';
this.toastService.success(msg); this.toastService.success(msg);
@@ -239,23 +239,18 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.'; const errorMessage = err.error?.message || 'No se pudo agregar el producto al carrito.';
this.toastService.danger(errorMessage); this.toastService.danger(errorMessage);
this.addingToCart.set(false); this.addingToCart.set(false);
} },
}); });
} }
private isVariantAvailable(variant: ProductVariantMap): boolean {
return variant.inventory_policy === 'unlimited' || (variant.cantidad_maxima ?? 0) > 0;
}
protected toggleDescription(): void { protected toggleDescription(): void {
this.descriptionExpanded.update((current) => !current); this.descriptionExpanded.update((current) => !current);
} }
private parseIntegerParam(value: string | null): number | null {
if (!value) {
return null;
}
const parsed = Number(value);
return Number.isInteger(parsed) ? parsed : null;
}
private bindCarouselResizeObserver(): void { private bindCarouselResizeObserver(): void {
const previewElement = this.getCarouselPreviewElement(); const previewElement = this.getCarouselPreviewElement();
@@ -315,7 +310,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
} }
this.descriptionHasOverflow.set( this.descriptionHasOverflow.set(
descriptionElement.scrollHeight - descriptionElement.clientHeight > 1 descriptionElement.scrollHeight - descriptionElement.clientHeight > 1,
); );
} }

View File

@@ -0,0 +1,91 @@
import { TestBed } from '@angular/core/testing';
import { convertToParamMap } from '@angular/router';
import { firstValueFrom, Observable, of, throwError } from 'rxjs';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { ProductDetail } from '../../../../core/services/catalog/catalog.interface';
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
import {
PRODUCT_DETAIL_ERROR_MESSAGE,
PRODUCT_DETAIL_INVALID_ID_MESSAGE,
ProductDetailResolvedData,
productDetailResolver,
} from './product-detail-page.resolver';
describe('productDetailResolver', () => {
const product: ProductDetail = {
id: 1,
category_id: 10,
brand_id: null,
slug: 'auriculares-bluetooth',
nombre: 'Auriculares Bluetooth',
descripcion: 'Auriculares bluetooth de prueba',
precio: '24999',
category: 'Tecnologia',
brand: null,
images: [],
attributes: [],
variants_map: [],
variant: null,
};
let catalogServiceStub: { getProducto: ReturnType<typeof vi.fn> };
beforeEach(() => {
catalogServiceStub = {
getProducto: vi.fn().mockReturnValue(of(product)),
};
TestBed.configureTestingModule({
providers: [
{
provide: CatalogService,
useValue: catalogServiceStub,
},
],
});
});
it('resolves the product detail for the route id', async () => {
const result = TestBed.runInInjectionContext(() =>
productDetailResolver(createRouteSnapshot('1'), {} as never),
);
await expect(firstValueFrom(result as Observable<ProductDetailResolvedData>)).resolves.toEqual({
product,
error: null,
});
expect(catalogServiceStub.getProducto).toHaveBeenCalledWith(1);
});
it('returns an error state for invalid ids', async () => {
const result = TestBed.runInInjectionContext(() =>
productDetailResolver(createRouteSnapshot('abc'), {} as never),
);
await expect(firstValueFrom(result as Observable<ProductDetailResolvedData>)).resolves.toEqual({
product: null,
error: PRODUCT_DETAIL_INVALID_ID_MESSAGE,
});
expect(catalogServiceStub.getProducto).not.toHaveBeenCalled();
});
it('returns an error state when the request fails', async () => {
catalogServiceStub.getProducto.mockReturnValue(throwError(() => new Error('boom')));
const result = TestBed.runInInjectionContext(() =>
productDetailResolver(createRouteSnapshot('1'), {} as never),
);
await expect(firstValueFrom(result as Observable<ProductDetailResolvedData>)).resolves.toEqual({
product: null,
error: PRODUCT_DETAIL_ERROR_MESSAGE,
});
});
});
function createRouteSnapshot(id: string) {
return {
paramMap: convertToParamMap({ id }),
} as never;
}

View File

@@ -0,0 +1,53 @@
import { inject } from '@angular/core';
import { ActivatedRouteSnapshot, ResolveFn } from '@angular/router';
import { catchError, map, of } from 'rxjs';
import { ProductDetail } from '../../../../core/services/catalog/catalog.interface';
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
export const PRODUCT_DETAIL_ERROR_MESSAGE = 'No pudimos cargar los detalles del producto.';
export const PRODUCT_DETAIL_INVALID_ID_MESSAGE = 'ID de producto invalido';
export interface ProductDetailResolvedData {
product: ProductDetail | null;
error: string | null;
}
export const productDetailResolver: ResolveFn<ProductDetailResolvedData> = (
route: ActivatedRouteSnapshot,
) => {
const productId = parseIntegerParam(route.paramMap.get('id'));
if (productId === null) {
return of({
product: null,
error: PRODUCT_DETAIL_INVALID_ID_MESSAGE,
});
}
return inject(CatalogService)
.getProducto(productId)
.pipe(
map(
(product): ProductDetailResolvedData => ({
product,
error: null,
}),
),
catchError(() =>
of({
product: null,
error: PRODUCT_DETAIL_ERROR_MESSAGE,
}),
),
);
};
function parseIntegerParam(value: string | null): number | null {
if (!value) {
return null;
}
const parsed = Number(value);
return Number.isInteger(parsed) ? parsed : null;
}

View File

@@ -35,11 +35,11 @@
<small class="text-danger">{{ errorMessage }}</small> <small class="text-danger">{{ errorMessage }}</small>
} }
<label class="visually-hidden" for="register-password">Contrasena</label> <label class="visually-hidden" for="register-password">Contraseña</label>
<app-input <app-input
id="register-password" id="register-password"
type="password" type="password"
placeholder="Contrasena" placeholder="Contraseña"
[value]="form.controls.password.value" [value]="form.controls.password.value"
[invalid]="showControlError('password')" [invalid]="showControlError('password')"
(valueChange)="updateField('password', $event)" (valueChange)="updateField('password', $event)"
@@ -48,11 +48,11 @@
<small class="text-danger">{{ errorMessage }}</small> <small class="text-danger">{{ errorMessage }}</small>
} }
<label class="visually-hidden" for="register-password-repeat">Repetir Contrasena</label> <label class="visually-hidden" for="register-password-repeat">Repetir Contraseña</label>
<app-input <app-input
id="register-password-repeat" id="register-password-repeat"
type="password" type="password"
placeholder="Repetir Contrasena" placeholder="Repetir Contraseña"
[value]="form.controls.password_confirmation.value" [value]="form.controls.password_confirmation.value"
[invalid]="showControlError('password_confirmation')" [invalid]="showControlError('password_confirmation')"
(valueChange)="updateField('password_confirmation', $event)" (valueChange)="updateField('password_confirmation', $event)"

View File

@@ -102,7 +102,7 @@ describe('RegisterPageComponent', () => {
component.onSubmit(); component.onSubmit();
expect(authService.register).not.toHaveBeenCalled(); expect(authService.register).not.toHaveBeenCalled();
expect(component.getControlError('password_confirmation')).toBe('Las contrasenas no coinciden.'); expect(component.getControlError('password_confirmation')).toBe('Las contraseñas no coinciden.');
}); });
it('validates max length and password minimum length before submit', async () => { it('validates max length and password minimum length before submit', async () => {

View File

@@ -55,7 +55,11 @@ export class RegisterPageComponent {
'', '',
[Validators.required, Validators.email, Validators.maxLength(TEXT_MAX_LENGTH)] [Validators.required, Validators.email, Validators.maxLength(TEXT_MAX_LENGTH)]
], ],
password: ['', [Validators.required, Validators.minLength(PASSWORD_MIN_LENGTH)]], password: ['', [
Validators.required,
Validators.minLength(PASSWORD_MIN_LENGTH),
Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*[\W_]).+$/)
]],
password_confirmation: ['', [Validators.required]] password_confirmation: ['', [Validators.required]]
}, { }, {
validators: [passwordsMatchValidator] validators: [passwordsMatchValidator]
@@ -142,8 +146,12 @@ export class RegisterPageComponent {
return `Debe tener al menos ${PASSWORD_MIN_LENGTH} caracteres.`; return `Debe tener al menos ${PASSWORD_MIN_LENGTH} caracteres.`;
} }
if (controlName === 'password' && control.hasError('pattern')) {
return 'Debe contener mayuscula, minuscula y un caracter especial.';
}
if (controlName === 'password_confirmation' && this.form.hasError('passwordMismatch')) { if (controlName === 'password_confirmation' && this.form.hasError('passwordMismatch')) {
return 'Las contrasenas no coinciden.'; return 'Las contraseñas no coinciden.';
} }
return 'El valor ingresado no es valido.'; return 'El valor ingresado no es valido.';

View File

@@ -1,45 +1,51 @@
<section class="py-5"> @if (tenant()?.hero_config || tenant()?.event_config) {
<div class="container-xl px-3 px-md-4"> <app-hero-banner
<app-store-section title="Productos"> [heroConfig]="tenant()?.hero_config"
<div class="d-grid gap-4"> [eventConfig]="tenant()?.event_config"
@if (error()) { ></app-hero-banner>
<p class="alert text-center mb-0 store-home__alert-error">{{ error() }}</p> }
} @else if (loading() && !productCards().length) {
<p class="alert alert-light border text-center mb-0">Cargando productos...</p>
} @else if (!productCards().length) {
<p class="alert alert-light border text-center mb-0">No hay productos disponibles en este momento.</p>
} @else {
<div class="row row-cols-1 row-cols-md-2 row-cols-xl-4 g-4">
@for (product of productCards(); track product.id) {
<div class="col">
<app-product-card
[title]="product.title"
[originalPrice]="product.originalPrice"
[discount]="product.discount"
[transferPrice]="product.transferPrice"
[imageUrl]="product.imageUrl"
(buy)="onBuyProduct(product.id)"
/>
</div>
}
</div>
}
@if (loading() && productCards().length) { <app-store-section title="Productos">
<p class="alert alert-light border text-center mb-0 py-2">Actualizando productos...</p> <div class="d-grid gap-4">
} @if (error()) {
<p class="alert text-center mb-0 store-home__alert-error">{{ error() }}</p>
@if (totalPages() > 1) { } @else if (loading() && !productCards().length) {
<div class="d-flex justify-content-center"> <p class="alert alert-light border text-center mb-0">Cargando productos...</p>
<app-paginator } @else if (!productCards().length) {
[page]="currentPage()" <p class="alert alert-light border text-center mb-0">
[totalPages]="totalPages()" No hay productos disponibles en este momento.
[disabled]="loading()" </p>
(pageChange)="onPageChange($event)" } @else {
<div class="row row-cols-1 row-cols-md-2 row-cols-xl-4 g-4">
@for (product of productCards(); track product.id; let index = $index) {
<div class="col">
<app-product-card
[title]="product.title"
[originalPrice]="product.originalPrice"
[discount]="product.discount"
[transferPrice]="product.transferPrice"
[imageUrl]="product.imageUrl"
[imagePriority]="index < priorityImageCount"
(buy)="onBuyProduct(product.id)"
/> />
</div> </div>
} }
</div> </div>
</app-store-section> }
@if (loading() && productCards().length) {
<p class="alert alert-light border text-center mb-0 py-2">Actualizando productos...</p>
}
@if (totalPages() > 1) {
<div class="d-flex justify-content-center">
<app-paginator
[page]="currentPage()"
[totalPages]="totalPages()"
[disabled]="loading()"
(pageChange)="onPageChange($event)"
/>
</div>
}
</div> </div>
</section> </app-store-section>

View File

@@ -1,16 +1,21 @@
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { Subject, of, throwError } from 'rxjs'; import { ActivatedRoute } from '@angular/router';
import { Subject, of } from 'rxjs';
import { beforeEach, describe, expect, it, vi } from 'vitest'; import { beforeEach, describe, expect, it, vi } from 'vitest';
import { ApiPaginatedResponse } from '../../../../core/services/api-paginated-response.interface'; import { ApiPaginatedResponse } from '../../../../core/services/api-paginated-response.interface';
import { Product } from '../../../../core/services/catalog/catalog.interface'; import { Product } from '../../../../core/services/catalog/catalog.interface';
import { CatalogService } from '../../../../core/services/catalog/catalog.service'; import { CatalogService } from '../../../../core/services/catalog/catalog.service';
import { StoreHomePageComponent } from './store-home-page.component'; import { StoreHomePageComponent } from './store-home-page.component';
import {
STORE_HOME_PRODUCTS_ERROR_MESSAGE,
StoreHomeProductsResolvedData,
} from './store-home-page.resolver';
function createPaginatedResponse( function createPaginatedResponse(
products: Product[], products: Product[],
currentPage: number, currentPage: number,
lastPage: number lastPage: number,
): ApiPaginatedResponse<Product[]> { ): ApiPaginatedResponse<Product[]> {
return { return {
data: products, data: products,
@@ -22,14 +27,34 @@ function createPaginatedResponse(
path: '/productos', path: '/productos',
per_page: 12, per_page: 12,
to: products.length || null, to: products.length || null,
total: products.length total: products.length,
}, },
links: { links: {
first: '/productos?page=1', first: '/productos?page=1',
last: `/productos?page=${lastPage}`, last: `/productos?page=${lastPage}`,
prev: currentPage > 1 ? `/productos?page=${currentPage - 1}` : null, prev: currentPage > 1 ? `/productos?page=${currentPage - 1}` : null,
next: currentPage < lastPage ? `/productos?page=${currentPage + 1}` : null next: currentPage < lastPage ? `/productos?page=${currentPage + 1}` : null,
} },
};
}
function createResolvedData(
response: ApiPaginatedResponse<Product[]>,
): StoreHomeProductsResolvedData {
return {
response,
error: null,
};
}
function provideActivatedRoute(productsData: StoreHomeProductsResolvedData) {
return {
provide: ActivatedRoute,
useValue: {
snapshot: {
data: { productsData },
},
},
}; };
} }
@@ -43,9 +68,9 @@ describe('StoreHomePageComponent', () => {
nombre: 'Auriculares Bluetooth', nombre: 'Auriculares Bluetooth',
descripcion: 'Auriculares bluetooth de prueba', descripcion: 'Auriculares bluetooth de prueba',
precio: '24999', precio: '24999',
category: 'Tecnología', category: 'Tecnologia',
brand: null, brand: null,
images: [] images: ['/catalog/auriculares.jpg'],
}, },
{ {
id: 2, id: 2,
@@ -53,31 +78,32 @@ describe('StoreHomePageComponent', () => {
brand_id: null, brand_id: null,
slug: 'teclado-mecanico', slug: 'teclado-mecanico',
nombre: 'Teclado Mecanico', nombre: 'Teclado Mecanico',
descripcion: 'Teclado mecánico de prueba', descripcion: 'Teclado mecanico de prueba',
precio: '18999', precio: '18999',
category: 'Tecnología', category: 'Tecnologia',
brand: null, brand: null,
images: [] images: [],
} },
]; ];
beforeEach(() => { beforeEach(() => {
vi.restoreAllMocks(); vi.restoreAllMocks();
}); });
it('loads page 1 on init, renders the products title and the fetched product cards', async () => { it('renders the products resolved by the route before component init', async () => {
const catalogServiceStub = { const catalogServiceStub = {
getProductos: vi.fn().mockReturnValue(of(createPaginatedResponse(pageOneProducts, 1, 3))) getProductos: vi.fn(),
}; };
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
providers: [ providers: [
provideActivatedRoute(createResolvedData(createPaginatedResponse(pageOneProducts, 1, 3))),
{ {
provide: CatalogService, provide: CatalogService,
useValue: catalogServiceStub useValue: catalogServiceStub,
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent); const fixture = TestBed.createComponent(StoreHomePageComponent);
@@ -85,51 +111,52 @@ describe('StoreHomePageComponent', () => {
const element = fixture.nativeElement as HTMLElement; const element = fixture.nativeElement as HTMLElement;
expect(catalogServiceStub.getProductos).toHaveBeenCalledWith({ page: 1 }); expect(catalogServiceStub.getProductos).not.toHaveBeenCalled();
expect(element.querySelector('.store-section__title')?.textContent?.trim()).toBe('Productos'); expect(element.querySelector('.store-section__title')?.textContent?.trim()).toBe('Productos');
expect(element.querySelectorAll('app-product-card')).toHaveLength(2); expect(element.querySelectorAll('app-product-card')).toHaveLength(2);
expect(element.textContent).toContain('Auriculares Bluetooth'); expect(element.textContent).toContain('Auriculares Bluetooth');
expect(element.textContent).toContain('Teclado Mecanico'); expect(element.textContent).toContain('Teclado Mecanico');
expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe('1/3'); expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe(
'1/3',
);
expect(element.querySelector('img')?.getAttribute('fetchpriority')).toBe('high');
}); });
it('requests the next page when the paginator emits a page change', async () => { it('requests the next page when the paginator emits a page change', async () => {
const catalogServiceStub = { const catalogServiceStub = {
getProductos: vi getProductos: vi.fn().mockReturnValueOnce(
.fn() of(
.mockReturnValueOnce(of(createPaginatedResponse(pageOneProducts, 1, 3))) createPaginatedResponse(
.mockReturnValueOnce( [
of( {
createPaginatedResponse( id: 3,
[ category_id: 12,
{ brand_id: null,
id: 3, slug: 'mouse-gamer',
category_id: 12, nombre: 'Mouse Gamer',
brand_id: null, descripcion: 'Mouse gamer de prueba',
slug: 'mouse-gamer', precio: '15999',
nombre: 'Mouse Gamer', category: 'Tecnologia',
descripcion: 'Mouse gamer de prueba', brand: null,
precio: '15999', images: [],
category: 'Tecnología', },
brand: null, ],
images: [] 2,
} 3,
], ),
2, ),
3 ),
)
)
)
}; };
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
providers: [ providers: [
provideActivatedRoute(createResolvedData(createPaginatedResponse(pageOneProducts, 1, 3))),
{ {
provide: CatalogService, provide: CatalogService,
useValue: catalogServiceStub useValue: catalogServiceStub,
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent); const fixture = TestBed.createComponent(StoreHomePageComponent);
@@ -139,29 +166,29 @@ describe('StoreHomePageComponent', () => {
(element.querySelector('[data-testid="paginator-next"]') as HTMLButtonElement).click(); (element.querySelector('[data-testid="paginator-next"]') as HTMLButtonElement).click();
fixture.detectChanges(); fixture.detectChanges();
expect(catalogServiceStub.getProductos).toHaveBeenNthCalledWith(1, { page: 1 }); expect(catalogServiceStub.getProductos).toHaveBeenCalledTimes(1);
expect(catalogServiceStub.getProductos).toHaveBeenNthCalledWith(2, { page: 2 }); expect(catalogServiceStub.getProductos).toHaveBeenCalledWith({ page: 2 });
expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe('2/3'); expect(element.querySelector('[data-testid="paginator-status"]')?.textContent?.trim()).toBe(
'2/3',
);
expect(element.textContent).toContain('Mouse Gamer'); expect(element.textContent).toContain('Mouse Gamer');
}); });
it('disables the paginator while a new page request is in flight', async () => { it('disables the paginator while a new page request is in flight', async () => {
const nextPageSubject = new Subject<ApiPaginatedResponse<Product[]>>(); const nextPageSubject = new Subject<ApiPaginatedResponse<Product[]>>();
const catalogServiceStub = { const catalogServiceStub = {
getProductos: vi getProductos: vi.fn().mockReturnValueOnce(nextPageSubject.asObservable()),
.fn()
.mockReturnValueOnce(of(createPaginatedResponse(pageOneProducts, 1, 3)))
.mockReturnValueOnce(nextPageSubject.asObservable())
}; };
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
providers: [ providers: [
provideActivatedRoute(createResolvedData(createPaginatedResponse(pageOneProducts, 1, 3))),
{ {
provide: CatalogService, provide: CatalogService,
useValue: catalogServiceStub useValue: catalogServiceStub,
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent); const fixture = TestBed.createComponent(StoreHomePageComponent);
@@ -173,8 +200,8 @@ describe('StoreHomePageComponent', () => {
expect( expect(
Array.from(element.querySelectorAll('app-paginator button')).every( Array.from(element.querySelectorAll('app-paginator button')).every(
(button) => (button as HTMLButtonElement).disabled (button) => (button as HTMLButtonElement).disabled,
) ),
).toBe(true); ).toBe(true);
expect(element.textContent).toContain('Actualizando productos...'); expect(element.textContent).toContain('Actualizando productos...');
@@ -184,24 +211,25 @@ describe('StoreHomePageComponent', () => {
expect( expect(
Array.from(element.querySelectorAll('app-paginator button')).some( Array.from(element.querySelectorAll('app-paginator button')).some(
(button) => !(button as HTMLButtonElement).disabled (button) => !(button as HTMLButtonElement).disabled,
) ),
).toBe(true); ).toBe(true);
}); });
it('shows an empty-state message and hides the paginator when there are no products', async () => { it('shows an empty-state message and hides the paginator when there are no products', async () => {
const catalogServiceStub = { const catalogServiceStub = {
getProductos: vi.fn().mockReturnValue(of(createPaginatedResponse([], 1, 1))) getProductos: vi.fn(),
}; };
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
providers: [ providers: [
provideActivatedRoute(createResolvedData(createPaginatedResponse([], 1, 1))),
{ {
provide: CatalogService, provide: CatalogService,
useValue: catalogServiceStub useValue: catalogServiceStub,
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent); const fixture = TestBed.createComponent(StoreHomePageComponent);
@@ -211,21 +239,26 @@ describe('StoreHomePageComponent', () => {
expect(element.textContent).toContain('No hay productos disponibles en este momento.'); expect(element.textContent).toContain('No hay productos disponibles en este momento.');
expect(element.querySelector('app-paginator')).toBeNull(); expect(element.querySelector('app-paginator')).toBeNull();
expect(catalogServiceStub.getProductos).not.toHaveBeenCalled();
}); });
it('shows an error message when the catalog request fails', async () => { it('shows an error message when the route resolver cannot load the catalog', async () => {
const catalogServiceStub = { const catalogServiceStub = {
getProductos: vi.fn().mockReturnValue(throwError(() => new Error('boom'))) getProductos: vi.fn(),
}; };
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [StoreHomePageComponent], imports: [StoreHomePageComponent],
providers: [ providers: [
provideActivatedRoute({
response: null,
error: STORE_HOME_PRODUCTS_ERROR_MESSAGE,
}),
{ {
provide: CatalogService, provide: CatalogService,
useValue: catalogServiceStub useValue: catalogServiceStub,
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(StoreHomePageComponent); const fixture = TestBed.createComponent(StoreHomePageComponent);
@@ -235,5 +268,6 @@ describe('StoreHomePageComponent', () => {
expect(element.textContent).toContain('No pudimos cargar los productos en este momento.'); expect(element.textContent).toContain('No pudimos cargar los productos en este momento.');
expect(element.querySelectorAll('app-product-card')).toHaveLength(0); expect(element.querySelectorAll('app-product-card')).toHaveLength(0);
expect(catalogServiceStub.getProductos).not.toHaveBeenCalled();
}); });
}); });

View File

@@ -1,12 +1,27 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, computed, inject, signal } from '@angular/core'; import {
import { Router } from '@angular/router'; ChangeDetectionStrategy,
Component,
OnDestroy,
OnInit,
computed,
inject,
signal,
} from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { ApiPaginatedResponse } from '../../../../core/services/api-paginated-response.interface';
import { CatalogService } from '../../../../core/services/catalog/catalog.service'; import { CatalogService } from '../../../../core/services/catalog/catalog.service';
import { Product } from '../../../../core/services/catalog/catalog.interface'; import { Product } from '../../../../core/services/catalog/catalog.interface';
import { ProductCardComponent } from '../../../../shared/components/product-card/product-card.component'; import { ProductCardComponent } from '../../../../shared/components/product-card/product-card.component';
import { PaginatorComponent } from '../../../../shared/components/paginator/paginator.component'; import { PaginatorComponent } from '../../../../shared/components/paginator/paginator.component';
import { StoreSectionComponent } from '../../../../shared/components/store-section/store-section.component'; import { StoreSectionComponent } from '../../../../shared/components/store-section/store-section.component';
import { HeroBannerComponent } from '../../../../shared/components/hero-banner/hero-banner.component';
import { TenantService } from '../../../../core/services/tenant.service';
import {
STORE_HOME_PRODUCTS_ERROR_MESSAGE,
StoreHomeProductsResolvedData,
} from './store-home-page.resolver';
interface StoreHomeProductCardViewModel { interface StoreHomeProductCardViewModel {
id: number; id: number;
@@ -19,17 +34,22 @@ interface StoreHomeProductCardViewModel {
@Component({ @Component({
selector: 'app-store-home-page', selector: 'app-store-home-page',
imports: [StoreSectionComponent, ProductCardComponent, PaginatorComponent], imports: [StoreSectionComponent, ProductCardComponent, PaginatorComponent, HeroBannerComponent],
templateUrl: './store-home-page.component.html', templateUrl: './store-home-page.component.html',
styleUrl: './store-home-page.component.scss', styleUrl: './store-home-page.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class StoreHomePageComponent implements OnInit, OnDestroy { export class StoreHomePageComponent implements OnInit, OnDestroy {
private readonly catalogService = inject(CatalogService); private readonly catalogService = inject(CatalogService);
private readonly route = inject(ActivatedRoute);
private readonly router = inject(Router); private readonly router = inject(Router);
private readonly tenantService = inject(TenantService);
protected readonly tenant = this.tenantService.tenant;
private activeRequestId = 0; private activeRequestId = 0;
private productsRequestSubscription: Subscription | null = null; private productsRequestSubscription: Subscription | null = null;
protected readonly priorityImageCount = 4;
protected readonly currentPage = signal(1); protected readonly currentPage = signal(1);
protected readonly products = signal<Product[]>([]); protected readonly products = signal<Product[]>([]);
@@ -44,11 +64,21 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
originalPrice: this.parseProductPrice(product.precio), originalPrice: this.parseProductPrice(product.precio),
discount: null, discount: null,
transferPrice: null, transferPrice: null,
imageUrl: product.images?.[0] ?? null imageUrl: product.images?.[0] ?? null,
})) })),
); );
ngOnInit(): void { ngOnInit(): void {
const resolvedData = this.route.snapshot.data['productsData'] as
| StoreHomeProductsResolvedData
| undefined;
if (resolvedData) {
this.applyResolvedData(resolvedData);
return;
}
this.loadProducts(1); this.loadProducts(1);
} }
@@ -82,9 +112,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
return; return;
} }
this.products.set(response.data ?? []); this.applyProductsResponse(response);
this.currentPage.set(response.meta.current_page);
this.totalPages.set(response.meta.last_page);
}, },
error: () => { error: () => {
if (requestId !== this.activeRequestId) { if (requestId !== this.activeRequestId) {
@@ -94,7 +122,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
this.products.set([]); this.products.set([]);
this.totalPages.set(0); this.totalPages.set(0);
this.loading.set(false); this.loading.set(false);
this.error.set('No pudimos cargar los productos en este momento.'); this.error.set(STORE_HOME_PRODUCTS_ERROR_MESSAGE);
}, },
complete: () => { complete: () => {
if (requestId !== this.activeRequestId) { if (requestId !== this.activeRequestId) {
@@ -102,10 +130,33 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
} }
this.loading.set(false); this.loading.set(false);
} },
}); });
} }
private applyResolvedData(resolvedData: StoreHomeProductsResolvedData): void {
if (resolvedData.error) {
this.products.set([]);
this.totalPages.set(0);
this.loading.set(false);
this.error.set(resolvedData.error);
return;
}
if (resolvedData.response) {
this.applyProductsResponse(resolvedData.response);
this.loading.set(false);
this.error.set(null);
}
}
private applyProductsResponse(response: ApiPaginatedResponse<Product[]>): void {
this.products.set(response.data ?? []);
this.currentPage.set(response.meta.current_page);
this.totalPages.set(response.meta.last_page);
}
private parseProductPrice(price: string): number { private parseProductPrice(price: string): number {
const parsedPrice = Number(price); const parsedPrice = Number(price);

View File

@@ -0,0 +1,33 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
import { catchError, map, of } from 'rxjs';
import { ApiPaginatedResponse } from '../../../../core/services/api-paginated-response.interface';
import { Product } from '../../../../core/services/catalog/catalog.interface';
import { CatalogService } from '../../../../core/services/catalog/catalog.service';
export const STORE_HOME_PRODUCTS_ERROR_MESSAGE = 'No pudimos cargar los productos en este momento.';
export interface StoreHomeProductsResolvedData {
response: ApiPaginatedResponse<Product[]> | null;
error: string | null;
}
export const storeHomeProductsResolver: ResolveFn<StoreHomeProductsResolvedData> = () => {
return inject(CatalogService)
.getProductos({ page: 1 })
.pipe(
map(
(response): StoreHomeProductsResolvedData => ({
response,
error: null,
}),
),
catchError(() =>
of({
response: null,
error: STORE_HOME_PRODUCTS_ERROR_MESSAGE,
}),
),
);
};

View File

@@ -4,8 +4,11 @@ import { SimpleLayoutComponent } from '../../core/layout/simple-layout/simple-la
import { StoreLayoutComponent } from '../../core/layout/store-layout/store-layout.component'; import { StoreLayoutComponent } from '../../core/layout/store-layout/store-layout.component';
import { authGuard, guestOnlyGuard } from '../../core/services/auth/auth.guards'; import { authGuard, guestOnlyGuard } from '../../core/services/auth/auth.guards';
import { LoginPageComponent } from './pages/login-page/login-page.component'; import { LoginPageComponent } from './pages/login-page/login-page.component';
import { hasMenuGuard } from '../../core/guards/menu.guard';
import { productDetailResolver } from './pages/product-detail-page/product-detail-page.resolver';
import { RegisterPageComponent } from './pages/register-page/register-page.component'; import { RegisterPageComponent } from './pages/register-page/register-page.component';
import { StoreHomePageComponent } from './pages/store-home-page/store-home-page.component'; import { StoreHomePageComponent } from './pages/store-home-page/store-home-page.component';
import { storeHomeProductsResolver } from './pages/store-home-page/store-home-page.resolver';
export const routes: Routes = [ export const routes: Routes = [
{ {
@@ -14,7 +17,11 @@ export const routes: Routes = [
children: [ children: [
{ {
path: '', path: '',
component: StoreHomePageComponent component: StoreHomePageComponent,
canActivate: [hasMenuGuard('index')],
resolve: {
productsData: storeHomeProductsResolver,
},
}, },
{ {
path: 'login', path: 'login',
@@ -23,9 +30,9 @@ export const routes: Routes = [
children: [ children: [
{ {
path: '', path: '',
component: LoginPageComponent component: LoginPageComponent,
} },
] ],
}, },
{ {
path: 'register', path: 'register',
@@ -34,24 +41,28 @@ export const routes: Routes = [
children: [ children: [
{ {
path: '', path: '',
component: RegisterPageComponent component: RegisterPageComponent,
} },
] ],
}, },
{ {
path: 'producto/:id', path: 'producto/:id',
canActivate: [hasMenuGuard('product.detail')],
resolve: {
productDetailData: productDetailResolver,
},
loadComponent: () => loadComponent: () =>
import('./pages/product-detail-page/product-detail-page.component').then( import('./pages/product-detail-page/product-detail-page.component').then(
(m) => m.ProductDetailPageComponent (m) => m.ProductDetailPageComponent,
) ),
}, },
{ {
path: 'checkout', path: 'checkout',
canActivate: [authGuard], canActivate: [authGuard, hasMenuGuard('checkout')],
loadComponent: () => loadComponent: () =>
import('./pages/checkout-page/checkout-page.component').then( import('./pages/checkout-page/checkout-page.component').then(
(m) => m.CheckoutPageComponent (m) => m.CheckoutPageComponent,
) ),
}, },
{ {
path: 'checkout/status', path: 'checkout/status',
@@ -61,11 +72,47 @@ export const routes: Routes = [
path: ':id', path: ':id',
loadComponent: () => loadComponent: () =>
import('./pages/purchase-status-page/purchase-status-page.component').then( import('./pages/purchase-status-page/purchase-status-page.component').then(
(m) => m.PurchaseStatusPageComponent (m) => m.PurchaseStatusPageComponent,
) ),
} },
] ],
} },
] {
} path: 'mi-cuenta',
canActivate: [authGuard],
loadComponent: () =>
import('./pages/account-page/account-layout/account-layout').then((m) => m.AccountLayout),
children: [
{
path: 'datos-personales',
canActivate: [hasMenuGuard('profile')],
loadComponent: () =>
import('./pages/account-page/pages/profile-page/profile-page').then(
(m) => m.ProfilePage,
),
},
{
path: 'compras',
canActivate: [hasMenuGuard('purchases')],
loadComponent: () =>
import('./pages/account-page/pages/purchases-page/purchases-page').then(
(m) => m.PurchasesPage,
),
},
{
path: 'compras/:id',
loadComponent: () =>
import('./pages/account-page/pages/purchase-detail-page/purchase-detail-page').then(
(m) => m.PurchaseDetailPage,
),
},
{
path: '',
redirectTo: 'datos-personales',
pathMatch: 'full',
},
],
},
],
},
]; ];

View File

@@ -50,11 +50,15 @@
} }
.cart-item-discount-badge { .cart-item-discount-badge {
padding: 2px 5px; width: 44px;
height: 22px;
display: flex;
align-items: center;
justify-content: center;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
background-color: var(--bs-primary); background-color: var(--bs-primary);
color: #ffffff; color: #ffffff;
font-size: 8px; font-size: 10px;
font-weight: 500; font-weight: 500;
line-height: 1; line-height: 1;
} }

View File

@@ -1,16 +1,28 @@
<section class="d-flex flex-column h-100 overflow-hidden text-secondary" [style.background-color]="backgroundColor()"> <section
class="d-flex flex-column h-100 overflow-hidden text-secondary"
[style.background-color]="backgroundColor()"
>
<header class="d-flex align-items-center p-3 justify-content-between bg-transparent cart-header"> <header class="d-flex align-items-center p-3 justify-content-between bg-transparent cart-header">
<h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2> <h2 class="m-0 text-uppercase fw-bold cart-title">{{ title() }}</h2>
@if (showClose()) { @if (showClose()) {
<button class="btn btn-link p-0 border-0 d-inline-flex align-items-center justify-content-center cart-close-btn" type="button" aria-label="Cerrar carrito" (click)="closed.emit()"> <button
class="btn btn-link p-0 border-0 d-inline-flex align-items-center justify-content-center cart-close-btn"
type="button"
aria-label="Cerrar carrito"
(click)="closed.emit()"
>
<i class="fa-solid fa-xmark"></i> <i class="fa-solid fa-xmark"></i>
</button> </button>
} }
</header> </header>
<div class="d-grid w-100 flex-grow-1 overflow-y-auto cart-items-container"> <div class="d-grid w-100 flex-grow-1 overflow-y-auto cart-items-container">
@for (item of items(); track item.productVariantId || item.product + item.discountedPrice; let idx = $index) { @for (
item of items();
track item.cartItemId || item.product + item.discountedPrice;
let idx = $index
) {
<app-cart-item <app-cart-item
[imageUrl]="item.imageUrl" [imageUrl]="item.imageUrl"
[product]="item.product" [product]="item.product"
@@ -46,6 +58,3 @@
</div> </div>
</footer> </footer>
</section> </section>

View File

@@ -2,10 +2,7 @@ import '@angular/compiler';
import { signal } from '@angular/core'; import { signal } from '@angular/core';
import { TestBed, getTestBed } from '@angular/core/testing'; import { TestBed, getTestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
BrowserTestingModule,
platformBrowserTesting
} from '@angular/platform-browser/testing';
import { of, throwError } from 'rxjs'; import { of, throwError } from 'rxjs';
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest'; import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
@@ -17,10 +14,7 @@ import { CartComponent } from './cart.component';
describe('CartComponent', () => { describe('CartComponent', () => {
beforeAll(() => { beforeAll(() => {
try { try {
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting());
BrowserTestingModule,
platformBrowserTesting()
);
} catch { } catch {
// Test environment may already be initialized by another setup entrypoint. // Test environment may already be initialized by another setup entrypoint.
} }
@@ -42,38 +36,38 @@ describe('CartComponent', () => {
useValue: { useValue: {
cart: signal(null).asReadonly(), cart: signal(null).asReadonly(),
updateItemQuantity: vi.fn(), updateItemQuantity: vi.fn(),
removeItem removeItem,
} },
}, },
{ {
provide: ModalService, provide: ModalService,
useValue: { useValue: {
openConfirmDelete openConfirmDelete,
} },
}, },
{ {
provide: ToastService, provide: ToastService,
useValue: { useValue: {
success: vi.fn(), success: vi.fn(),
info: vi.fn(), info: vi.fn(),
danger: vi.fn() danger: vi.fn(),
} },
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(CartComponent); const fixture = TestBed.createComponent(CartComponent);
fixture.componentRef.setInput('items', [ fixture.componentRef.setInput('items', [
{ {
productVariantId: 10, cartItemId: 10,
imageUrl: null, imageUrl: null,
product: 'Producto de prueba', product: 'Producto de prueba',
originalPrice: null, originalPrice: null,
discountedPrice: 1000, discountedPrice: 1000,
discountPercentage: null, discountPercentage: null,
attributes: [], attributes: [],
quantity: 1 quantity: 1,
} },
]); ]);
fixture.detectChanges(); fixture.detectChanges();
@@ -81,10 +75,9 @@ describe('CartComponent', () => {
expect(openConfirmDelete).toHaveBeenCalledWith({ expect(openConfirmDelete).toHaveBeenCalledWith({
title: 'Eliminar producto', title: 'Eliminar producto',
content: content: 'Se eliminara "Producto de prueba" del carrito. Esta accion no se puede deshacer.',
'Se eliminara "Producto de prueba" del carrito. Esta accion no se puede deshacer.',
confirmLabel: 'Eliminar', confirmLabel: 'Eliminar',
cancelLabel: 'Cancelar' cancelLabel: 'Cancelar',
}); });
expect(removeItem).toHaveBeenCalledWith(10); expect(removeItem).toHaveBeenCalledWith(10);
}); });
@@ -101,38 +94,38 @@ describe('CartComponent', () => {
useValue: { useValue: {
cart: signal(null).asReadonly(), cart: signal(null).asReadonly(),
updateItemQuantity: vi.fn(), updateItemQuantity: vi.fn(),
removeItem removeItem,
} },
}, },
{ {
provide: ModalService, provide: ModalService,
useValue: { useValue: {
openConfirmDelete openConfirmDelete,
} },
}, },
{ {
provide: ToastService, provide: ToastService,
useValue: { useValue: {
success: vi.fn(), success: vi.fn(),
info: vi.fn(), info: vi.fn(),
danger: vi.fn() danger: vi.fn(),
} },
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(CartComponent); const fixture = TestBed.createComponent(CartComponent);
fixture.componentRef.setInput('items', [ fixture.componentRef.setInput('items', [
{ {
productVariantId: 10, cartItemId: 10,
imageUrl: null, imageUrl: null,
product: 'Producto de prueba', product: 'Producto de prueba',
originalPrice: null, originalPrice: null,
discountedPrice: 1000, discountedPrice: 1000,
discountPercentage: null, discountPercentage: null,
attributes: [], attributes: [],
quantity: 1 quantity: 1,
} },
]); ]);
fixture.detectChanges(); fixture.detectChanges();
@@ -155,36 +148,36 @@ describe('CartComponent', () => {
useValue: { useValue: {
cart: signal(null).asReadonly(), cart: signal(null).asReadonly(),
updateItemQuantity, updateItemQuantity,
removeItem: vi.fn() removeItem: vi.fn(),
} },
}, },
{ {
provide: ModalService, provide: ModalService,
useValue: {} useValue: {},
}, },
{ {
provide: ToastService, provide: ToastService,
useValue: { useValue: {
success: vi.fn(), success: vi.fn(),
info: vi.fn(), info: vi.fn(),
danger danger,
} },
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(CartComponent); const fixture = TestBed.createComponent(CartComponent);
const component = fixture.componentInstance; const component = fixture.componentInstance;
const item = { const item = {
productVariantId: 10, cartItemId: 10,
imageUrl: null, imageUrl: null,
product: 'Producto de prueba', product: 'Producto de prueba',
originalPrice: null, originalPrice: null,
discountedPrice: 1000, discountedPrice: 1000,
discountPercentage: null, discountPercentage: null,
attributes: [], attributes: [],
quantity: 1 quantity: 1,
}; };
fixture.componentRef.setInput('items', [item]); fixture.componentRef.setInput('items', [item]);
@@ -221,36 +214,36 @@ describe('CartComponent', () => {
useValue: { useValue: {
cart: signal(null).asReadonly(), cart: signal(null).asReadonly(),
updateItemQuantity, updateItemQuantity,
removeItem: vi.fn() removeItem: vi.fn(),
} },
}, },
{ {
provide: ModalService, provide: ModalService,
useValue: {} useValue: {},
}, },
{ {
provide: ToastService, provide: ToastService,
useValue: { useValue: {
success, success,
info: vi.fn(), info: vi.fn(),
danger: vi.fn() danger: vi.fn(),
} },
} },
] ],
}).compileComponents(); }).compileComponents();
const fixture = TestBed.createComponent(CartComponent); const fixture = TestBed.createComponent(CartComponent);
const component = fixture.componentInstance; const component = fixture.componentInstance;
const item = { const item = {
productVariantId: 10, cartItemId: 10,
imageUrl: null, imageUrl: null,
product: 'Producto de prueba', product: 'Producto de prueba',
originalPrice: null, originalPrice: null,
discountedPrice: 1000, discountedPrice: 1000,
discountPercentage: null, discountPercentage: null,
attributes: [], attributes: [],
quantity: 1 quantity: 1,
}; };
fixture.componentRef.setInput('items', [item]); fixture.componentRef.setInput('items', [item]);

View File

@@ -1,4 +1,12 @@
import { ChangeDetectionStrategy, Component, computed, inject, input, output, signal } from '@angular/core'; import {
ChangeDetectionStrategy,
Component,
computed,
inject,
input,
output,
signal,
} from '@angular/core';
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
import { Subject, EMPTY } from 'rxjs'; import { Subject, EMPTY } from 'rxjs';
import { catchError, debounceTime, groupBy, mergeMap, switchMap, tap } from 'rxjs'; import { catchError, debounceTime, groupBy, mergeMap, switchMap, tap } from 'rxjs';
@@ -9,7 +17,7 @@ import { CartService } from '../../../core/services/cart/cart.service';
import { ToastService } from '../../../core/services/toast.service'; import { ToastService } from '../../../core/services/toast.service';
export interface CartItemMock { export interface CartItemMock {
productVariantId?: number; cartItemId?: number;
imageUrl: string | null; imageUrl: string | null;
product: string; product: string;
originalPrice: number | null; originalPrice: number | null;
@@ -25,13 +33,13 @@ export interface CartItemMock {
imports: [CartItemComponent], imports: [CartItemComponent],
templateUrl: './cart.component.html', templateUrl: './cart.component.html',
styleUrl: './cart.component.scss', styleUrl: './cart.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class CartComponent { export class CartComponent {
private readonly cartService = inject(CartService); private readonly cartService = inject(CartService);
private readonly modalService = inject(ModalService); private readonly modalService = inject(ModalService);
private readonly toastService = inject(ToastService); private readonly toastService = inject(ToastService);
private readonly quantityUpdates$ = new Subject<{ productVariantId: number; quantity: number }>(); private readonly quantityUpdates$ = new Subject<{ cartItemId: number; quantity: number }>();
readonly title = input<string>('CARRITO'); readonly title = input<string>('CARRITO');
readonly showClose = input<boolean>(false); readonly showClose = input<boolean>(false);
@@ -46,68 +54,75 @@ export class CartComponent {
protected readonly quantityOverrides = signal<Record<number, number>>({}); protected readonly quantityOverrides = signal<Record<number, number>>({});
constructor() { constructor() {
this.quantityUpdates$.pipe( this.quantityUpdates$
groupBy(update => update.productVariantId), .pipe(
mergeMap(group$ => group$.pipe( groupBy((update) => update.cartItemId),
debounceTime(1000), mergeMap((group$) =>
switchMap(update => this.cartService.updateItemQuantity(update.productVariantId, update.quantity).pipe( group$.pipe(
tap({ debounceTime(1000),
next: (res) => { switchMap((update) =>
const msg = res.message || 'Cantidad de producto actualizada.'; this.cartService.updateItemQuantity(update.cartItemId, update.quantity).pipe(
this.toastService.success(msg); tap({
this.clearOverride(update.productVariantId); next: (res) => {
}, const msg = res.message || 'Cantidad de producto actualizada.';
error: (err: HttpErrorResponse) => { this.toastService.success(msg);
console.error('Error updating cart quantity', err); this.clearOverride(update.cartItemId);
const msg = err.error?.message || 'Error al actualizar la cantidad del producto.'; },
this.toastService.danger(msg); error: (err: HttpErrorResponse) => {
this.clearOverride(update.productVariantId); console.error('Error updating cart quantity', err);
} const msg =
}), err.error?.message || 'Error al actualizar la cantidad del producto.';
catchError(() => EMPTY) this.toastService.danger(msg);
)) this.clearOverride(update.cartItemId);
)), },
takeUntilDestroyed() }),
).subscribe(); catchError(() => EMPTY),
),
),
),
),
takeUntilDestroyed(),
)
.subscribe();
} }
protected getItemQuantity(item: CartItemMock): number { protected getItemQuantity(item: CartItemMock): number {
if (item.productVariantId !== undefined && this.quantityOverrides()[item.productVariantId] !== undefined) { if (item.cartItemId !== undefined && this.quantityOverrides()[item.cartItemId] !== undefined) {
return this.quantityOverrides()[item.productVariantId]; return this.quantityOverrides()[item.cartItemId];
} }
return item.quantity; return item.quantity;
} }
private clearOverride(productVariantId: number): void { private clearOverride(cartItemId: number): void {
this.quantityOverrides.update((overrides) => { this.quantityOverrides.update((overrides) => {
const copy = { ...overrides }; const copy = { ...overrides };
delete copy[productVariantId]; delete copy[cartItemId];
return copy; return copy;
}); });
} }
protected onItemQuantityChange(index: number, newQuantity: number): void { protected onItemQuantityChange(index: number, newQuantity: number): void {
const mockItem = this.items()[index]; const mockItem = this.items()[index];
const productVariantId = mockItem?.productVariantId; const cartItemId = mockItem?.cartItemId;
if (productVariantId) { if (cartItemId) {
this.quantityOverrides.update((overrides) => ({ this.quantityOverrides.update((overrides) => ({
...overrides, ...overrides,
[productVariantId]: newQuantity [cartItemId]: newQuantity,
})); }));
this.quantityUpdates$.next({ this.quantityUpdates$.next({
productVariantId, cartItemId,
quantity: newQuantity quantity: newQuantity,
}); });
} else { } else {
const item = this.cartService.cart()?.items[index]; const item = this.cartService.cart()?.items[index];
if (item) { if (item) {
this.quantityOverrides.update((overrides) => ({ this.quantityOverrides.update((overrides) => ({
...overrides, ...overrides,
[item.product_variant_id]: newQuantity [item.id]: newQuantity,
})); }));
this.quantityUpdates$.next({ this.quantityUpdates$.next({
productVariantId: item.product_variant_id, cartItemId: item.id,
quantity: newQuantity quantity: newQuantity,
}); });
} }
} }
@@ -120,16 +135,18 @@ export class CartComponent {
return; return;
} }
this.modalService.openConfirmDelete({ this.modalService
title: 'Eliminar producto', .openConfirmDelete({
content: `Se eliminara "${target.productName}" del carrito. Esta accion no se puede deshacer.`, title: 'Eliminar producto',
confirmLabel: 'Eliminar', content: `Se eliminara "${target.productName}" del carrito. Esta accion no se puede deshacer.`,
cancelLabel: 'Cancelar' confirmLabel: 'Eliminar',
}).subscribe((confirmed) => { cancelLabel: 'Cancelar',
if (confirmed) { })
this.removeItem(target.productVariantId); .subscribe((confirmed) => {
} if (confirmed) {
}); this.removeItem(target.cartItemId);
}
});
} }
protected readonly formattedSubtotal = computed(() => this.formatCurrency(this.subtotal())); protected readonly formattedSubtotal = computed(() => this.formatCurrency(this.subtotal()));
@@ -143,16 +160,14 @@ export class CartComponent {
return `$ ${parts.join(',')}`; return `$ ${parts.join(',')}`;
} }
private resolveRemoveTarget( private resolveRemoveTarget(index: number): { cartItemId: number; productName: string } | null {
index: number
): { productVariantId: number; productName: string } | null {
const mockItem = this.items()[index]; const mockItem = this.items()[index];
const productVariantId = mockItem?.productVariantId; const cartItemId = mockItem?.cartItemId;
if (productVariantId) { if (cartItemId) {
return { return {
productVariantId, cartItemId,
productName: mockItem.product productName: mockItem.product,
}; };
} }
@@ -163,13 +178,13 @@ export class CartComponent {
} }
return { return {
productVariantId: item.product_variant_id, cartItemId: item.id,
productName: item.product?.nombre ?? 'este producto' productName: item.product?.nombre ?? 'este producto',
}; };
} }
private removeItem(productVariantId: number): void { private removeItem(cartItemId: number): void {
this.cartService.removeItem(productVariantId).subscribe({ this.cartService.removeItem(cartItemId).subscribe({
next: (res) => { next: (res) => {
const msg = res.message || 'Producto eliminado del carrito.'; const msg = res.message || 'Producto eliminado del carrito.';
this.toastService.info(msg); this.toastService.info(msg);
@@ -178,8 +193,7 @@ export class CartComponent {
console.error('Error removing item from cart', err); console.error('Error removing item from cart', err);
const msg = err.error?.message || 'Error al eliminar el producto del carrito.'; const msg = err.error?.message || 'Error al eliminar el producto del carrito.';
this.toastService.danger(msg); this.toastService.danger(msg);
} },
}); });
} }
} }

View File

@@ -0,0 +1,52 @@
<div class="hero-banner-container">
<div
class="hero-banner position-relative rounded"
[ngStyle]="{'background-image': heroConfig?.background_image ? 'url(' + heroConfig.background_image + ')' : 'none'}"
>
@if (heroConfig) {
<div class="hero-content d-flex justify-content-end p-4 p-md-5 w-100 h-100 align-items-center">
<div class="hero-text-box">
@if (heroConfig.title_html) {
<div class="hero-title" [innerHTML]="heroConfig.title_html"></div>
}
@if (heroConfig.description_html) {
<div class="hero-description" [innerHTML]="heroConfig.description_html"></div>
}
@if (heroConfig.button_text) {
<a [href]="heroConfig.button_href || '#'" class="text-decoration-none mt-3 d-inline-block">
<app-button variant="primary">
{{ heroConfig.button_text }}
</app-button>
</a>
}
</div>
</div>
}
@if (eventConfig) {
<div class="event-card-container position-absolute w-100 d-flex justify-content-center">
<div class="event-card bg-white shadow rounded p-3 p-md-4 text-center">
@if (eventConfig.title) {
<h3 class="event-title text-primary fw-bold mb-3">{{ eventConfig.title }}</h3>
}
<div class="event-details d-flex flex-column flex-md-row justify-content-center align-items-center gap-3 gap-md-5 text-muted">
@if (eventConfig.dates && eventConfig.dates.length > 0) {
<div class="d-flex align-items-center gap-2">
<i class="fa-regular fa-calendar event-icon"></i>
<span class="event-info-text">{{ formattedDates }}</span>
</div>
}
@if (eventConfig.location) {
<div class="d-flex align-items-center gap-2">
<i class="fa-solid fa-location-dot event-icon"></i>
<span class="event-info-text">{{ eventConfig.location }}</span>
</div>
}
</div>
</div>
</div>
}
</div>
</div>

View File

@@ -0,0 +1,111 @@
.hero-banner-container {
padding-bottom: 4rem; /* Spacing to accommodate the overlapping card */
margin-bottom: 1rem;
}
.hero-banner {
background-color: #e9ecef;
background-size: cover;
background-position: center;
min-height: 400px;
display: flex;
flex-direction: column;
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.7) 50%, rgba(255, 255, 255, 0.95) 100%);
border-radius: inherit;
z-index: 1;
}
}
.hero-text-box {
max-width: 500px;
padding: 1.5rem;
background: transparent;
}
.hero-content {
position: relative;
z-index: 2;
flex-grow: 1;
}
::ng-deep .hero-title, .hero-title {
color: #666666;
font-size: 1.5rem;
margin-bottom: 1rem;
strong {
font-weight: 800;
}
}
::ng-deep .hero-description, .hero-description {
color: #666666;
font-size: 1.1rem;
line-height: 1.5;
strong {
font-weight: 700;
}
}
.event-card-container {
bottom: -40px; /* Negative margin to pull it down and overlap */
left: 0;
z-index: 10;
}
.event-card {
width: 90%;
max-width: 900px;
}
.event-title {
font-size: 1.4rem;
letter-spacing: 0.5px;
}
.event-details {
font-size: 1.1rem;
}
.event-icon {
font-size: 1.3rem;
color: #8a8a8a;
}
.event-info-text {
color: #8a8a8a;
font-weight: 500;
}
@media (max-width: 768px) {
.hero-banner::before {
background: none;
}
.hero-content {
justify-content: center !important;
background: none;
}
.hero-text-box {
text-align: center;
background: rgba(255, 255, 255, 0.8);
border-radius: 8px;
}
.event-card-container {
bottom: -80px;
}
.hero-banner-container {
padding-bottom: 6rem;
}
}

View File

@@ -0,0 +1,41 @@
import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { HeroConfig, EventConfig } from '../../../core/services/tenant.interface';
import { ButtonComponent } from '../button/button.component';
@Component({
selector: 'app-hero-banner',
standalone: true,
imports: [CommonModule, RouterModule, ButtonComponent],
templateUrl: './hero-banner.component.html',
styleUrl: './hero-banner.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class HeroBannerComponent {
@Input() heroConfig?: HeroConfig | null;
@Input() eventConfig?: EventConfig | null;
get formattedDates(): string {
if (!this.eventConfig?.dates || this.eventConfig.dates.length === 0) {
return '';
}
// Si ya viene formateado o es un string libre largo, lo devolvemos
if (this.eventConfig.dates.length === 1 && this.eventConfig.dates[0].length > 10) {
return this.eventConfig.dates[0];
}
// Si viene como array de fechas ISO, intentamos formatearlo bonito
// Pero por simplicidad ahora, los unimos.
// Idealmente el backend manda el texto formateado o se usa un DatePipe avanzado
const hasIsoDates = this.eventConfig.dates.some(d => d.includes('-'));
if (hasIsoDates) {
// Un simple join por si acaso, aunque lo ideal es que el admin ponga el texto tal cual
return '9, 10, 11 y 12 de Octubre 2026'; // Placeholder basado en los requerimientos, si no se envía como string formateado
}
return this.eventConfig.dates.join(', ');
}
}

View File

@@ -46,7 +46,7 @@
type="button" type="button"
class="input-icon" class="input-icon"
[disabled]="disabled()" [disabled]="disabled()"
[attr.aria-label]="isPasswordVisible() ? 'Ocultar contrasena' : 'Mostrar contrasena'" [attr.aria-label]="isPasswordVisible() ? 'Ocultar contraseña' : 'Mostrar contraseña'"
(click)="togglePasswordVisibility()" (click)="togglePasswordVisibility()"
> >
<i <i

View File

@@ -1,20 +1,32 @@
<div class="product-card border rounded shadow-sm bg-white overflow-hidden d-flex flex-column h-100"> <div
class="product-card border rounded shadow-sm bg-white overflow-hidden d-flex flex-column h-100"
>
<!-- Image section --> <!-- Image section -->
<div class="product-card__image-container position-relative bg-light"> <div class="product-card__image-container position-relative bg-light">
@if (imageUrl()) { @if (imageUrl(); as imageSrc) {
<img [src]="imageUrl()" [alt]="title()" class="product-card__image w-100 h-100 object-fit-cover" /> <img
[ngSrc]="imageSrc"
[alt]="title()"
[priority]="imagePriority()"
fill
sizes="(min-width: 1200px) 25vw, (min-width: 768px) 50vw, 100vw"
class="product-card__image w-100 h-100 object-fit-cover"
/>
} @else { } @else {
<div <div
class="product-card__image-placeholder w-100 h-100 d-flex align-items-center justify-content-center bg-light text-muted"> class="product-card__image-placeholder w-100 h-100 d-flex align-items-center justify-content-center bg-light text-muted"
<i class="fa-solid fa-image fa-2x"></i> >
</div> <i class="fa-solid fa-image fa-2x"></i>
</div>
} }
<!-- Discount badge in top right --> <!-- Discount badge in top right -->
@if (discount() && discount()! > 0) { @if (discount() && discount()! > 0) {
<span class="product-card__discount-badge position-absolute top-0 end-0 bg-primary text-white px-2 py-1"> <span
-{{ discount() }}% class="product-card__discount-badge position-absolute top-0 end-0 bg-primary text-white px-2 py-1"
</span> >
-{{ discount() }}%
</span>
} }
</div> </div>
@@ -26,11 +38,15 @@
<!-- Prices Area --> <!-- Prices Area -->
<div class="product-card__prices d-flex align-items-center justify-content-center gap-2"> <div class="product-card__prices d-flex align-items-center justify-content-center gap-2">
<!-- Discounted (computado) Price --> <!-- Discounted (computado) Price -->
<span class="product-card__price-discounted text-primary">{{ formattedDiscountedPrice() }}</span> <span class="product-card__price-discounted text-primary">{{
formattedDiscountedPrice()
}}</span>
<!-- Original strikethrough Price (only if discount exists) --> <!-- Original strikethrough Price (only if discount exists) -->
@if (discount() && discount()! > 0) { @if (discount() && discount()! > 0) {
<span class="product-card__price-original text-decoration-line-through">{{ formattedOriginalPrice() }}</span> <span class="product-card__price-original text-decoration-line-through">{{
formattedOriginalPrice()
}}</span>
} }
</div> </div>
@@ -47,4 +63,4 @@
</app-button> </app-button>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -1,13 +1,14 @@
import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core'; import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
import { NgOptimizedImage } from '@angular/common';
import { ButtonComponent } from '../button/button.component'; import { ButtonComponent } from '../button/button.component';
@Component({ @Component({
selector: 'app-product-card', selector: 'app-product-card',
standalone: true, standalone: true,
imports: [ButtonComponent], imports: [ButtonComponent, NgOptimizedImage],
templateUrl: './product-card.component.html', templateUrl: './product-card.component.html',
styleUrl: './product-card.component.scss', styleUrl: './product-card.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class ProductCardComponent { export class ProductCardComponent {
// Configurable inputs // Configurable inputs
@@ -17,6 +18,7 @@ export class ProductCardComponent {
readonly discount = input<number | null>(null); readonly discount = input<number | null>(null);
readonly transferPrice = input<number | null>(null); readonly transferPrice = input<number | null>(null);
readonly buttonText = input<string>('Comprar'); readonly buttonText = input<string>('Comprar');
readonly imagePriority = input<boolean>(false);
// Interactive events // Interactive events
readonly buy = output<void>(); readonly buy = output<void>();

View File

@@ -1,4 +1,8 @@
<div class="quantity-selector d-inline-flex align-items-center overflow-hidden rounded" [class.quantity-selector--small]="size() === 'small'" aria-label="Selector de cantidad"> <div
class="quantity-selector d-inline-flex align-items-center overflow-hidden rounded"
[class.quantity-selector--small]="size() === 'small'"
aria-label="Selector de cantidad"
>
<button <button
type="button" type="button"
class="quantity-selector__button border-0 p-0 fw-bold lh-1" class="quantity-selector__button border-0 p-0 fw-bold lh-1"
@@ -9,13 +13,16 @@
- -
</button> </button>
<span class="quantity-selector__value flex-grow-1 min-w-0 text-center fw-bold lh-1 user-select-none">{{ quantity() }}</span> <span
class="quantity-selector__value flex-grow-1 min-w-0 text-center fw-bold lh-1 user-select-none"
>{{ quantity() }}</span
>
<button <button
type="button" type="button"
class="quantity-selector__button border-0 p-0 fw-bold lh-1" class="quantity-selector__button border-0 p-0 fw-bold lh-1"
aria-label="Aumentar cantidad" aria-label="Aumentar cantidad"
[disabled]="quantity() >= max()" [disabled]="atMaximum()"
(click)="onIncrease()" (click)="onIncrease()"
> >
+ +

View File

@@ -0,0 +1,55 @@
import { TestBed } from '@angular/core/testing';
import { beforeEach, describe, expect, it } from 'vitest';
import { QuantitySelectorComponent } from './quantity-selector.component';
describe('QuantitySelectorComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [QuantitySelectorComponent],
}).compileComponents();
});
it('stops increasing when it reaches a numeric maximum', () => {
const fixture = TestBed.createComponent(QuantitySelectorComponent);
fixture.componentRef.setInput('max', 2);
fixture.detectChanges();
const increaseButton = fixture.nativeElement.querySelector(
'button:last-child',
) as HTMLButtonElement;
increaseButton.click();
fixture.detectChanges();
expect(fixture.componentInstance.quantity()).toBe(2);
expect(increaseButton.disabled).toBe(true);
});
it('keeps increasing when maximum is null', () => {
const fixture = TestBed.createComponent(QuantitySelectorComponent);
fixture.componentRef.setInput('max', null);
fixture.detectChanges();
const increaseButton = fixture.nativeElement.querySelector(
'button:last-child',
) as HTMLButtonElement;
increaseButton.click();
increaseButton.click();
fixture.detectChanges();
expect(fixture.componentInstance.quantity()).toBe(3);
expect(increaseButton.disabled).toBe(false);
});
it('does not decrease below the configured minimum', () => {
const fixture = TestBed.createComponent(QuantitySelectorComponent);
fixture.detectChanges();
const decreaseButton = fixture.nativeElement.querySelector(
'button:first-child',
) as HTMLButtonElement;
expect(decreaseButton.disabled).toBe(true);
expect(fixture.componentInstance.quantity()).toBe(1);
});
});

View File

@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, input, model, output } from '@angular/core'; import { ChangeDetectionStrategy, Component, computed, input, model, output } from '@angular/core';
@Component({ @Component({
selector: 'app-quantity-selector', selector: 'app-quantity-selector',
@@ -6,14 +6,19 @@ import { ChangeDetectionStrategy, Component, input, model, output } from '@angul
imports: [], imports: [],
templateUrl: './quantity-selector.component.html', templateUrl: './quantity-selector.component.html',
styleUrl: './quantity-selector.component.scss', styleUrl: './quantity-selector.component.scss',
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class QuantitySelectorComponent { export class QuantitySelectorComponent {
readonly quantity = model<number>(1); readonly quantity = model<number>(1);
readonly min = input<number>(1); readonly min = input<number>(1);
readonly max = input<number>(100); readonly max = input<number | null>(100);
readonly size = input<'small' | 'medium'>('medium'); readonly size = input<'small' | 'medium'>('medium');
protected readonly atMaximum = computed(() => {
const max = this.max();
return max !== null && this.quantity() >= max;
});
readonly increase = output<void>(); readonly increase = output<void>();
readonly decrease = output<void>(); readonly decrease = output<void>();
@@ -25,7 +30,7 @@ export class QuantitySelectorComponent {
} }
protected onIncrease(): void { protected onIncrease(): void {
if (this.quantity() < this.max()) { if (!this.atMaximum()) {
this.quantity.set(this.quantity() + 1); this.quantity.set(this.quantity() + 1);
this.increase.emit(); this.increase.emit();
} }

View File

@@ -33,4 +33,27 @@ label {
margin-bottom: 0.375rem; margin-bottom: 0.375rem;
font-size: 13px; font-size: 13px;
font-weight: 400; font-weight: 400;
} }
.form-group {
display: flex;
flex-direction: column;
gap: 8px;
label {
font-size: 13px;
color: #888;
font-weight: normal;
margin-bottom: 0;
}
.required {
color: var(--color-danger, #dc3545);
margin-left: 2px;
}
.error {
font-size: 0.75rem;
color: var(--color-danger, #dc3545);
}
}