Compare commits
42 Commits
f289e9e2e4
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| f428a88ba8 | |||
| caa1fddcc1 | |||
| 5f0c99c395 | |||
| 832fad19bc | |||
| 28ed5d71b2 | |||
| 23a5ac32cc | |||
| 1b19d36e26 | |||
| 86533b9ab4 | |||
| 369cfb0a40 | |||
| 7b0c9831f1 | |||
| ede2173a5a | |||
| 5d760bfd80 | |||
| e3599a48e4 | |||
| 5d629e27b1 | |||
| 563e4634d1 | |||
| c75787a59c | |||
| f6f3a997f7 | |||
| 019c9df23b | |||
| 9ea85b7924 | |||
| 0769bb8683 | |||
| c645feba80 | |||
| 56f602d876 | |||
| d6bab24e1d | |||
| dd828d9a4e | |||
| 7c2a098696 | |||
| 1977df6765 | |||
| c6ac974459 | |||
| 8d88e1bb13 | |||
| 50f986dd2f | |||
| 393aeec7a5 | |||
| a012f94198 | |||
| 6b9087262a | |||
| 4b98df4058 | |||
| 2b3e054ccf | |||
| 1b238cb1bc | |||
| c9f9e6cc3e | |||
| 5da341dde2 | |||
| 21786d7b34 | |||
| 8aea54959f | |||
| 12ca45bdd8 | |||
| fa6fc53f8d | |||
| 78970573a8 |
13
angular.json
13
angular.json
@@ -64,7 +64,13 @@
|
||||
"local": {
|
||||
"optimization": false,
|
||||
"extractLicenses": false,
|
||||
"sourceMap": true
|
||||
"sourceMap": true,
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.local.ts"
|
||||
}
|
||||
]
|
||||
},
|
||||
"homo": {
|
||||
"fileReplacements": [
|
||||
@@ -79,6 +85,9 @@
|
||||
},
|
||||
"serve": {
|
||||
"builder": "@angular/build:dev-server",
|
||||
"options": {
|
||||
"port": 4300
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"buildTarget": "shopit-front:build:production"
|
||||
@@ -93,7 +102,7 @@
|
||||
"buildTarget": "shopit-front:build:homo"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
"defaultConfiguration": "local"
|
||||
},
|
||||
"test": {
|
||||
"builder": "@angular/build:unit-test"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
.tenant-status__card {
|
||||
width: min(100%, 34rem);
|
||||
padding: 2rem;
|
||||
border: 1px solid rgba(32, 32, 32, 0.1);
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 1.5rem;
|
||||
background-color: rgba(255, 255, 255, 0.92);
|
||||
box-shadow: 0 1.25rem 3rem rgba(0, 0, 0, 0.1);
|
||||
@@ -55,7 +55,7 @@
|
||||
.tenant-status__spinner {
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
border: 0.25rem solid rgba(32, 32, 32, 0.08);
|
||||
border: 0.25rem solid var(--border-color);
|
||||
border-top-color: var(--tenant-primary);
|
||||
border-radius: 999px;
|
||||
animation: tenant-status-spin 0.8s linear infinite;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<footer class="store-layout__footer mt-auto text-light">
|
||||
<div class="container-xl px-3 px-md-4 py-4 py-md-5">
|
||||
<div class="row g-4">
|
||||
<div class="col-12">
|
||||
<div class="container-xl px-3 px-md-4 py-4 py-md-5 store-layout__footer-content">
|
||||
<div class="row g-4 store-layout__footer-grid">
|
||||
<div class="col-12 store-layout__brand-column">
|
||||
<div
|
||||
class="store-layout__brand-slot d-inline-flex align-items-center gap-3"
|
||||
data-testid="store-footer-brand-slot"
|
||||
@@ -17,30 +17,29 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start">
|
||||
<div class="d-grid gap-2">
|
||||
<div class="d-flex align-items-center gap-2 ">
|
||||
<div class="col-12 col-md-6 col-xl-5 d-grid gap-3 align-content-start store-layout__contact">
|
||||
<div class="d-grid gap-2 store-layout__contact-details">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<i class="fa-solid fa-location-dot" aria-hidden="true"></i>
|
||||
<span>Av. San Lorenzo 1542, Rosario</span>
|
||||
</div>
|
||||
<div class="d-flex align-items-center gap-2 ">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<i class="fa-solid fa-phone" aria-hidden="true"></i>
|
||||
<span>54 9 (0341) 6658247</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="mb-0 small store-layout__muted-text">Copyright © {{ currentYear }} - Sonder</p>
|
||||
<p class="mb-0 small store-layout__muted-text store-layout__copyright">
|
||||
Copyright © {{ currentYear }} - {{ storeName || 'Sonder' }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@for (section of footerSections; track section.heading) {
|
||||
<div class="col-12 col-md-6 col-xl-2 d-grid align-content-start">
|
||||
<div class="col-12 col-md-6 col-xl-2 d-grid align-content-start store-layout__links-column">
|
||||
<div class="d-grid gap-2">
|
||||
@for (link of section.links; track link.label) {
|
||||
@if (link.routerLink) {
|
||||
<a
|
||||
class="store-layout__footer-link"
|
||||
[routerLink]="link.routerLink"
|
||||
>
|
||||
<a class="store-layout__footer-link" [routerLink]="link.routerLink">
|
||||
{{ link.label }}
|
||||
</a>
|
||||
} @else if (link.action === 'logout') {
|
||||
@@ -59,8 +58,10 @@
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="col-12 col-md-6 col-xl-3 d-grid align-content-start">
|
||||
<div class="d-flex align-items-center gap-3">
|
||||
<div class="store-layout__mobile-divider" aria-hidden="true"></div>
|
||||
|
||||
<div class="col-12 col-md-6 col-xl-3 d-grid align-content-start store-layout__social-column">
|
||||
<div class="d-flex align-items-center gap-3 store-layout__social-list">
|
||||
@for (social of socialMedia; track social.code) {
|
||||
<app-social-media
|
||||
class="text-white"
|
||||
|
||||
@@ -2,22 +2,26 @@
|
||||
background-color: var(--tenant-footer-bg);
|
||||
}
|
||||
|
||||
.store-layout__mobile-divider {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.store-layout__brand-slot {
|
||||
width: min(100%, 12rem);
|
||||
width: min(100%, 230px);
|
||||
min-width: 10rem;
|
||||
}
|
||||
|
||||
.store-layout__brand-logo-shell {
|
||||
position: relative;
|
||||
width: min(100%, 12rem);
|
||||
height: 2.75rem;
|
||||
width: min(100%, 230px);
|
||||
height: 65px;
|
||||
}
|
||||
|
||||
.store-layout__brand-logo {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
max-height: 2.75rem;
|
||||
max-height: 65px;
|
||||
object-fit: contain;
|
||||
object-position: left center;
|
||||
}
|
||||
@@ -42,7 +46,7 @@
|
||||
place-items: center;
|
||||
width: 2.75rem;
|
||||
height: 2.75rem;
|
||||
border: 1px dashed rgba(255, 255, 255, 0.35);
|
||||
border: 1px dashed var(--border-color);
|
||||
border-radius: 999px;
|
||||
font-size: 1.05rem;
|
||||
font-weight: 700;
|
||||
@@ -63,7 +67,7 @@
|
||||
|
||||
.store-layout__footer-link {
|
||||
width: fit-content;
|
||||
color: rgba(255, 255, 255, 0.72);
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
|
||||
&:hover,
|
||||
@@ -92,11 +96,97 @@
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.store-layout__footer-content {
|
||||
padding: 1.45rem 2.5rem 1.8rem !important;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.store-layout__footer-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
gap: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.store-layout__footer-grid > * {
|
||||
margin-top: 0;
|
||||
padding-right: 0;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.store-layout__links-column {
|
||||
order: 1;
|
||||
width: auto;
|
||||
padding-bottom: 1.65rem;
|
||||
line-height: 1.25;
|
||||
|
||||
&:nth-of-type(even) {
|
||||
padding-left: 0.65rem;
|
||||
}
|
||||
|
||||
> div {
|
||||
gap: 0.5rem !important;
|
||||
}
|
||||
}
|
||||
|
||||
.store-layout__mobile-divider {
|
||||
display: block;
|
||||
order: 2;
|
||||
grid-column: 1 / -1;
|
||||
width: 100%;
|
||||
border-top: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.store-layout__brand-column,
|
||||
.store-layout__social-column {
|
||||
order: 3;
|
||||
width: auto;
|
||||
padding-top: 2rem;
|
||||
}
|
||||
|
||||
.store-layout__brand-slot {
|
||||
width: min(100%, 150px);
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.store-layout__brand-logo {
|
||||
max-height: 55px;
|
||||
}
|
||||
|
||||
.store-layout__brand-logo-shell {
|
||||
width: min(100%, 150px);
|
||||
height: 55px;
|
||||
}
|
||||
|
||||
.store-layout__brand-text {
|
||||
font-size: 1.45rem;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.store-layout__social-column {
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.store-layout__social-list {
|
||||
justify-content: flex-end;
|
||||
gap: 0 !important;
|
||||
}
|
||||
|
||||
.store-layout__contact {
|
||||
order: 4;
|
||||
grid-column: 1 / -1;
|
||||
width: auto;
|
||||
gap: 1.25rem !important;
|
||||
padding-top: 0.9rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.store-layout__contact-details {
|
||||
justify-items: center;
|
||||
gap: 0.4rem !important;
|
||||
}
|
||||
|
||||
.store-layout__copyright {
|
||||
font-size: 11px;
|
||||
line-height: 1.3;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,5 +25,6 @@ export class StoreFooterComponent {
|
||||
@Input({ required: true }) footerSections: StoreFooterSection[] = [];
|
||||
@Input({ required: true }) socialMedia: SocialMedia[] = [];
|
||||
@Input() logoUrl: string | null = null;
|
||||
@Input() storeName: string | null = null;
|
||||
readonly logoutClick = output<void>();
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<header class="store-layout__header">
|
||||
<div class="store-layout__header-main">
|
||||
<div
|
||||
class="container-xl px-3 px-md-4 py-3 py-lg-4 d-flex flex-row flex-wrap align-items-center justify-content-between gap-3"
|
||||
>
|
||||
<div class="container-xl px-3 px-md-4 py-3 py-lg-4">
|
||||
<div class="row align-items-center gy-3 gy-md-0">
|
||||
<div class="col-auto col-md-auto order-1 store-layout__brand-column">
|
||||
<a
|
||||
routerLink="/"
|
||||
class="store-layout__brand-slot d-inline-flex align-items-center gap-3 flex-shrink-0 text-decoration-none"
|
||||
class="store-layout__brand-slot d-inline-flex align-items-center gap-3 text-decoration-none"
|
||||
data-testid="store-header-brand-slot"
|
||||
aria-label="Logo del comercio"
|
||||
>
|
||||
@@ -17,11 +17,15 @@
|
||||
</div>
|
||||
}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="d-flex flex-row align-items-center gap-3 ms-auto flex-nowrap flex-grow-1 justify-content-between justify-content-md-end"
|
||||
>
|
||||
<div class="store-layout__search-wrapper">
|
||||
@if (displaySeachBar()) {
|
||||
<div class="col-12 px-0 d-md-none order-3">
|
||||
<hr class="store-layout__mobile-separator" />
|
||||
</div>
|
||||
|
||||
<div class="col-12 col-md order-4 order-md-2">
|
||||
<div class="store-layout__search-wrapper ms-md-auto">
|
||||
<div class="input-group store-layout__search" role="search">
|
||||
<label class="visually-hidden" for="store-search-input">Buscar productos</label>
|
||||
<input
|
||||
@@ -53,11 +57,16 @@
|
||||
</p>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div
|
||||
class="store-layout__actions-column col-auto col-md-auto order-2 order-md-3 ms-auto d-flex flex-row align-items-center justify-content-end gap-2 gap-md-3"
|
||||
>
|
||||
@if (ticketsMenu(); as menu) {
|
||||
<app-button
|
||||
variant="primary"
|
||||
hostClass="flex-shrink-0"
|
||||
hostClass="store-layout__tickets-btn-host"
|
||||
data-testid="store-header-tickets"
|
||||
(click)="ticketsClick.emit()"
|
||||
>
|
||||
@@ -65,17 +74,14 @@
|
||||
</app-button>
|
||||
}
|
||||
|
||||
<div
|
||||
class="d-flex align-items-center justify-content-end gap-1"
|
||||
aria-label="Acciones de usuario"
|
||||
>
|
||||
<app-cart-icon
|
||||
[quantity]="cartQuantity()"
|
||||
ariaLabel="Carrito de compras"
|
||||
title="Carrito"
|
||||
(click)="cartClick.emit()"
|
||||
/>
|
||||
<div class="store-layout__user-menu">
|
||||
|
||||
<div class="store-layout__user-menu d-none d-md-inline-flex position-relative">
|
||||
<app-icon-button
|
||||
variant="user"
|
||||
ariaLabel="Mi cuenta"
|
||||
@@ -94,17 +100,57 @@
|
||||
/>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="store-layout__mobile-menu d-inline-flex d-md-none position-relative">
|
||||
<app-icon-button
|
||||
variant="bars"
|
||||
ariaLabel="Menu"
|
||||
ariaControls="store-mobile-menu"
|
||||
[ariaExpanded]="isMobileMenuOpen()"
|
||||
title="Menu"
|
||||
(clicked)="toggleMobileMenu()"
|
||||
/>
|
||||
|
||||
@if (isMobileMenuOpen()) {
|
||||
<div
|
||||
id="store-mobile-menu"
|
||||
class="position-absolute end-0 bg-white rounded shadow mt-2 py-2 store-layout__mobile-dropdown-menu"
|
||||
>
|
||||
<a
|
||||
class="dropdown-item d-flex align-items-center gap-2 px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item"
|
||||
(click)="onMobileAccountClick()"
|
||||
>
|
||||
<i class="fa-regular fa-circle-user fa-lg"></i>
|
||||
<span class="fw-medium">Mi cuenta</span>
|
||||
</a>
|
||||
|
||||
@if (displayCategories()) {
|
||||
<hr class="my-1 border-secondary opacity-25" />
|
||||
|
||||
@for (category of categories(); track category.id) {
|
||||
<a
|
||||
class="dropdown-item px-3 py-2 text-decoration-none store-layout__mobile-dropdown-item"
|
||||
(click)="onCategorySelect(category)"
|
||||
>
|
||||
<span class="fw-medium">{{ category.nombre }}</span>
|
||||
</a>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="store-layout__categories">
|
||||
@if (displayCategories()) {
|
||||
<div class="store-layout__categories d-none d-md-block">
|
||||
<div class="container-xl px-3 px-md-4">
|
||||
<div class="store-layout__category-menu">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-link d-inline-flex align-items-center gap-2 px-0 py-2 text-uppercase fw-bold text-decoration-none store-layout__category-trigger"
|
||||
class="btn btn-link d-inline-flex align-items-center gap-2 px-0 py-3 text-uppercase fw-bold text-decoration-none store-layout__category-trigger"
|
||||
aria-label="Categorias"
|
||||
aria-controls="store-category-dropdown"
|
||||
[attr.aria-expanded]="isCategoryDropdownOpen()"
|
||||
@@ -123,4 +169,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</header>
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
.store-layout__header {
|
||||
color: #ffffff;
|
||||
background-color: var(--tenant-header-bg);
|
||||
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.08);
|
||||
}
|
||||
|
||||
.store-layout__header-main {
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.store-layout__brand-slot {
|
||||
min-width: 150px;
|
||||
max-width:40px;
|
||||
}
|
||||
|
||||
.store-layout__brand-column {
|
||||
max-width: 12rem;
|
||||
}
|
||||
|
||||
.store-layout__brand-logo-shell {
|
||||
@@ -42,10 +44,25 @@
|
||||
}
|
||||
|
||||
.store-layout__search-wrapper {
|
||||
width: min(100%, 260px);
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.store-layout__search-wrapper {
|
||||
width: min(100%, 260px);
|
||||
}
|
||||
|
||||
.store-layout__actions-column {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
::ng-deep .store-layout__tickets-btn-host {
|
||||
flex: 0 0 clamp(8rem, 15vw, 13.5rem);
|
||||
width: clamp(8rem, 15vw, 13.5rem);
|
||||
}
|
||||
}
|
||||
|
||||
.store-layout__search {
|
||||
width: 100%;
|
||||
}
|
||||
@@ -59,7 +76,7 @@
|
||||
|
||||
.store-layout__search-input {
|
||||
color: #666666;
|
||||
border-color: #cccccc;
|
||||
border-color: var(--border-color);
|
||||
background-color: rgba(255, 255, 255, 0.96);
|
||||
}
|
||||
|
||||
@@ -68,21 +85,21 @@
|
||||
}
|
||||
|
||||
.store-layout__search-input:focus {
|
||||
border-color: #cccccc;
|
||||
border-color: var(--border-color);
|
||||
box-shadow: none;
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.store-layout__search-button {
|
||||
color: #a0a0a0;
|
||||
border-color: #cccccc;
|
||||
border-color: var(--border-color);
|
||||
background-color: rgba(255, 255, 255, 0.96);
|
||||
}
|
||||
|
||||
.store-layout__search-button:hover,
|
||||
.store-layout__search-button:focus-visible {
|
||||
color: #8a8a8a;
|
||||
border-color: #cccccc;
|
||||
border-color: var(--border-color);
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
@@ -137,5 +154,70 @@
|
||||
@media (max-width: 767.98px) {
|
||||
.store-layout__brand-slot {
|
||||
min-width: 0;
|
||||
max-width: 150px;
|
||||
}
|
||||
|
||||
.store-layout__actions-column {
|
||||
flex: 1 1 auto;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
::ng-deep .store-layout__tickets-btn-host {
|
||||
flex: 1 1 0;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
max-width: 50vw;
|
||||
}
|
||||
|
||||
.store-layout__mobile-separator {
|
||||
border-color: var(--border-color);
|
||||
opacity: 1;
|
||||
margin: 0 -1rem;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 399.98px) {
|
||||
.store-layout__brand-column {
|
||||
flex: 1 1 0;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
padding-right: 0.25rem;
|
||||
}
|
||||
|
||||
.store-layout__brand-slot {
|
||||
width: 100%;
|
||||
max-width: 6.5rem;
|
||||
}
|
||||
|
||||
.store-layout__actions-column {
|
||||
flex: 1 1 auto;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
margin-left: 0 !important;
|
||||
padding-left: 0.25rem;
|
||||
gap: 0.25rem !important;
|
||||
}
|
||||
|
||||
::ng-deep .store-layout__tickets-btn-host .btn {
|
||||
padding-inline: 0.75rem;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
}
|
||||
|
||||
.store-layout__mobile-dropdown-menu {
|
||||
top: 100%;
|
||||
min-width: 220px;
|
||||
z-index: 1050;
|
||||
}
|
||||
|
||||
.store-layout__mobile-dropdown-item {
|
||||
cursor: pointer;
|
||||
color: #8a8a8a;
|
||||
|
||||
&:hover,
|
||||
&:focus-visible {
|
||||
color: #666666;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Component, ElementRef, HostListener, inject, input, output, signal } from '@angular/core';
|
||||
import { RouterLink } from '@angular/router';
|
||||
import { Router, RouterLink } from '@angular/router';
|
||||
import { AuthUser } from '../../../services/auth/auth.interfaces';
|
||||
import { CartIconComponent } from '../../../../shared/components/cart-icon/cart-icon.component';
|
||||
import { IconButtonComponent } from '../../../../shared/components/icon-button/icon-button.component';
|
||||
@@ -26,6 +26,7 @@ import { CategoryDropdownComponent } from './category-dropdown/category-dropdown
|
||||
})
|
||||
export class StoreHeaderComponent {
|
||||
private readonly elementRef = inject(ElementRef<HTMLElement>);
|
||||
private readonly router = inject(Router);
|
||||
|
||||
readonly logoUrl = input<string | null>(null);
|
||||
readonly cartQuantity = input<number>(0);
|
||||
@@ -34,6 +35,8 @@ export class StoreHeaderComponent {
|
||||
readonly accountNavigationMenus = input<readonly Menu[]>([]);
|
||||
readonly ticketsMenu = input<Menu | null>(null);
|
||||
readonly categories = input<readonly Category[]>([]);
|
||||
readonly displayCategories = input(true);
|
||||
readonly displaySeachBar = input(true);
|
||||
readonly cartClick = output<void>();
|
||||
readonly ticketsClick = output<void>();
|
||||
readonly loginClick = output<void>();
|
||||
@@ -43,13 +46,14 @@ export class StoreHeaderComponent {
|
||||
|
||||
protected readonly isUserDropdownOpen = signal(false);
|
||||
protected readonly isCategoryDropdownOpen = signal(false);
|
||||
protected readonly isMobileMenuOpen = signal(false);
|
||||
protected readonly minSearchLength = 3;
|
||||
protected readonly showSearchError = signal(false);
|
||||
protected readonly searchControl = new FormControl('', { nonNullable: true });
|
||||
|
||||
@HostListener('document:click', ['$event'])
|
||||
protected onDocumentClick(event: MouseEvent): void {
|
||||
if (!this.isUserDropdownOpen() && !this.isCategoryDropdownOpen()) {
|
||||
if (!this.isUserDropdownOpen() && !this.isCategoryDropdownOpen() && !this.isMobileMenuOpen()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -57,6 +61,7 @@ export class StoreHeaderComponent {
|
||||
if (target instanceof Node && !this.elementRef.nativeElement.contains(target)) {
|
||||
this.isUserDropdownOpen.set(false);
|
||||
this.isCategoryDropdownOpen.set(false);
|
||||
this.isMobileMenuOpen.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,6 +69,7 @@ export class StoreHeaderComponent {
|
||||
protected onEscapeKey(): void {
|
||||
this.isUserDropdownOpen.set(false);
|
||||
this.isCategoryDropdownOpen.set(false);
|
||||
this.isMobileMenuOpen.set(false);
|
||||
}
|
||||
|
||||
protected toggleUserDropdown(): void {
|
||||
@@ -109,6 +115,25 @@ export class StoreHeaderComponent {
|
||||
|
||||
protected onCategorySelect(category: Category): void {
|
||||
this.isCategoryDropdownOpen.set(false);
|
||||
this.isMobileMenuOpen.set(false);
|
||||
this.categorySelect.emit(category);
|
||||
}
|
||||
|
||||
protected toggleMobileMenu(): void {
|
||||
this.isMobileMenuOpen.update((isOpen) => !isOpen);
|
||||
}
|
||||
|
||||
protected onMobileAccountClick(): void {
|
||||
this.isMobileMenuOpen.set(false);
|
||||
if (!this.isAuthenticated()) {
|
||||
this.loginClick.emit();
|
||||
} else {
|
||||
const menus = this.accountNavigationMenus();
|
||||
if (menus.length > 0) {
|
||||
this.router.navigate([menus[0].route]);
|
||||
} else {
|
||||
this.router.navigate(['/cuenta']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
.user-dropdown {
|
||||
display: grid;
|
||||
background: #ffffff;
|
||||
border: 1px solid rgba(32, 32, 32, 0.1);
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 18px 44px rgba(0, 0, 0, 0.16);
|
||||
padding: 0.75rem;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<div class="store-layout d-flex flex-column flex-grow-1">
|
||||
<app-store-header
|
||||
ngSkipHydration
|
||||
[cartQuantity]="cartQuantity()"
|
||||
[logoUrl]="tenant()?.header_logo ?? null"
|
||||
[user]="user()"
|
||||
@@ -7,6 +8,8 @@
|
||||
[accountNavigationMenus]="accountNavigationMenus()"
|
||||
[ticketsMenu]="ticketsMenu() ?? null"
|
||||
[categories]="tenant()?.categories ?? []"
|
||||
[displayCategories]="tenant()?.display_categories ?? true"
|
||||
[displaySeachBar]="tenant()?.display_seach_bar ?? true"
|
||||
(cartClick)="isCartOpen.set(!isCartOpen())"
|
||||
(ticketsClick)="onTicketsClick()"
|
||||
(loginClick)="onLoginClick()"
|
||||
@@ -16,10 +19,7 @@
|
||||
/>
|
||||
|
||||
@if (isCartOpen()) {
|
||||
<div
|
||||
class="store-layout__cart-overlay"
|
||||
(click)="isCartOpen.set(false)"
|
||||
></div>
|
||||
<div class="store-layout__cart-overlay" (click)="isCartOpen.set(false)"></div>
|
||||
<div class="store-layout__cart-dropdown card border-0 shadow-lg">
|
||||
<app-cart
|
||||
[showClose]="true"
|
||||
@@ -30,10 +30,7 @@
|
||||
[backgroundColor]="'#ffffff'"
|
||||
(closed)="isCartOpen.set(false)"
|
||||
>
|
||||
<app-button
|
||||
variant="secondary"
|
||||
class="flex-grow-1"
|
||||
(click)="isCartOpen.set(false)"
|
||||
<app-button variant="secondary" class="flex-grow-1" (click)="isCartOpen.set(false)"
|
||||
>Seguir comprando</app-button
|
||||
>
|
||||
<app-button
|
||||
@@ -61,6 +58,7 @@
|
||||
[footerSections]="footerSections()"
|
||||
[socialMedia]="tenant()?.social_media ?? []"
|
||||
[logoUrl]="tenant()?.footer_logo ?? null"
|
||||
[storeName]="tenant()?.nombre ?? null"
|
||||
(logoutClick)="onLogoutClick()"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -21,14 +21,15 @@
|
||||
|
||||
.store-layout__cart-dropdown {
|
||||
position: absolute;
|
||||
top: 76px;
|
||||
top: 100px;
|
||||
right: calc((100% - 1320px) / 2 + 1.5rem);
|
||||
|
||||
width: 100%;
|
||||
max-width: 400px;
|
||||
max-height: calc(100vh - 120px);
|
||||
z-index: 1050;
|
||||
background-color: #ffffff;
|
||||
border-radius: 8px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.08);
|
||||
border: 1px solid var(--border-color);
|
||||
box-shadow: 0 10px 25px rgba(0, 0, 0, 0.08);
|
||||
overflow: hidden;
|
||||
animation: store-layout-slide-down 0.2s ease-out;
|
||||
@@ -40,6 +41,7 @@
|
||||
right: 1rem;
|
||||
left: 1rem;
|
||||
width: auto;
|
||||
max-width: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -204,6 +204,29 @@ describe('StoreLayoutComponent', () => {
|
||||
expect(compiled.querySelector('app-store-footer .store-layout__footer')).not.toBeNull();
|
||||
});
|
||||
|
||||
it('hides the configured header elements when the tenant disables them', () => {
|
||||
tenantState.set({
|
||||
...tenant,
|
||||
categories: [{ id: 1, nombre: 'Remeras', subcategories: [] }],
|
||||
display_categories: false,
|
||||
display_seach_bar: false,
|
||||
});
|
||||
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
|
||||
expect(compiled.querySelector('#store-search-input')).toBeNull();
|
||||
expect(compiled.querySelector('.store-layout__category-trigger')).toBeNull();
|
||||
|
||||
const header = fixture.debugElement.query(By.directive(StoreHeaderComponent));
|
||||
(header.componentInstance as any).toggleMobileMenu();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(compiled.querySelectorAll('.store-layout__mobile-dropdown-item')).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('renders the tenant branding and action icons', () => {
|
||||
const fixture = TestBed.createComponent(StoreLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
@@ -6,7 +6,7 @@ import { StoreFooterComponent, StoreFooterSection } from './store-footer/store-f
|
||||
import { StoreHeaderComponent } from './store-header/store-header.component';
|
||||
import { CartComponent, CartItemMock } from '../../../shared/components/cart/cart.component';
|
||||
import { ButtonComponent } from '../../../shared/components/button/button.component';
|
||||
import { CartItem } from '../../services/cart/cart.interface';
|
||||
import { CartItem, CartItemVariantValue } from '../../services/cart/cart.interface';
|
||||
import { AuthService } from '../../services/auth/auth.service';
|
||||
import { findMenu } from '../../services/menu.utils';
|
||||
import { CheckoutService } from '../../services/checkout.service';
|
||||
@@ -69,6 +69,21 @@ export class StoreLayoutComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
const variants = (item.product?.variants ?? []).map((variant) => ({
|
||||
value: variant.id,
|
||||
values: variant.values,
|
||||
}));
|
||||
const selectedVariant = item.product?.variants?.find(
|
||||
(variant) => variant.id === item.variant_id,
|
||||
);
|
||||
|
||||
if (selectedVariant) {
|
||||
attributes = Object.entries(selectedVariant.values).map(([label, value]) => ({
|
||||
label: this.formatAttributeLabel(label),
|
||||
value: this.formatAttributeValue(value),
|
||||
}));
|
||||
}
|
||||
|
||||
return {
|
||||
cartItemId: item.id,
|
||||
imageUrl: item.product?.imagen ?? null,
|
||||
@@ -78,9 +93,21 @@ export class StoreLayoutComponent implements OnInit {
|
||||
discountPercentage: null,
|
||||
attributes,
|
||||
quantity: item.cantidad,
|
||||
variantId: item.variant_id,
|
||||
variants,
|
||||
};
|
||||
}
|
||||
|
||||
private formatAttributeLabel(value: string): string {
|
||||
const label = value.replace(/[_-]+/g, ' ');
|
||||
return label.charAt(0).toUpperCase() + label.slice(1);
|
||||
}
|
||||
|
||||
private formatAttributeValue(value: CartItemVariantValue): string {
|
||||
const values = Array.isArray(value) ? value : [value];
|
||||
return values.map((item) => (typeof item === 'string' ? item : item.label)).join(', ');
|
||||
}
|
||||
|
||||
protected readonly currentYear = new Date().getFullYear();
|
||||
protected readonly tenant = this.tenantService.tenant;
|
||||
protected readonly user = this.authService.user;
|
||||
|
||||
@@ -72,13 +72,13 @@ describe('AuthService', () => {
|
||||
expect(service.token()).toBe('plain-text-token');
|
||||
expect(service.user()?.email).toBe('ada@example.com');
|
||||
expect(service.isAuthenticated()).toBe(true);
|
||||
expect(cookieStore['shopit.auth.token']).toBe('plain-text-token');
|
||||
expect(cookieStore['shopit.front.auth.token']).toBe('plain-text-token');
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
it('hydrates token from cookies and loads the current user during bootstrap', async () => {
|
||||
cookieStore['shopit.auth.token'] = 'persisted-token';
|
||||
cookieStore['shopit.front.auth.token'] = 'persisted-token';
|
||||
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
@@ -152,7 +152,7 @@ describe('AuthService', () => {
|
||||
});
|
||||
|
||||
it('clears an expired session when /me returns 401', async () => {
|
||||
cookieStore['shopit.auth.token'] = 'expired-token';
|
||||
cookieStore['shopit.front.auth.token'] = 'expired-token';
|
||||
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
@@ -176,7 +176,7 @@ describe('AuthService', () => {
|
||||
expect(service.user()).toBeNull();
|
||||
expect(service.token()).toBeNull();
|
||||
expect(service.isAuthenticated()).toBe(false);
|
||||
expect(cookieStore['shopit.auth.token']).toBeUndefined();
|
||||
expect(cookieStore['shopit.front.auth.token']).toBeUndefined();
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
@@ -384,7 +384,7 @@ describe('AuthService', () => {
|
||||
|
||||
expect(service.token()).toBe('plain-text-token');
|
||||
expect(service.user()?.email).toBe('ada@example.com');
|
||||
expect(cookieStore['shopit.auth.token']).toBe('plain-text-token');
|
||||
expect(cookieStore['shopit.front.auth.token']).toBe('plain-text-token');
|
||||
|
||||
httpController.verify();
|
||||
});
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
import { CookieService } from '../cookie/cookie.service';
|
||||
import { TenantService } from '../tenant.service';
|
||||
|
||||
const AUTH_TOKEN_COOKIE_KEY = 'shopit.auth.token';
|
||||
const AUTH_TOKEN_COOKIE_KEY = 'shopit.front.auth.token';
|
||||
const AUTH_USER_SSR_STATE_KEY = makeStateKey<AuthUser>('shopit.auth.user');
|
||||
|
||||
@Injectable({
|
||||
|
||||
@@ -1,6 +1,24 @@
|
||||
export interface CartItemProduct {
|
||||
nombre: string;
|
||||
imagen: string | null;
|
||||
variants?: CartItemVariant[];
|
||||
}
|
||||
|
||||
export interface CartItemVariantOption {
|
||||
value: string;
|
||||
label: string;
|
||||
}
|
||||
|
||||
export type CartItemVariantValue =
|
||||
| string
|
||||
| CartItemVariantOption
|
||||
| Array<string | CartItemVariantOption>;
|
||||
|
||||
export interface CartItemVariant {
|
||||
id: number;
|
||||
precio: string;
|
||||
stock_tecnico: number | null;
|
||||
values: Record<string, CartItemVariantValue>;
|
||||
}
|
||||
|
||||
export interface CartItem {
|
||||
|
||||
@@ -50,9 +50,7 @@ export class CartService extends BaseApiService {
|
||||
): Observable<ApiResponse<Cart>> {
|
||||
this.isUpdatingState.set(true);
|
||||
return this.http
|
||||
.post<
|
||||
ApiResponse<Cart>
|
||||
>(
|
||||
.post<ApiResponse<Cart>>(
|
||||
`${this.tenantApiUrl}/cart/items`,
|
||||
{ catalog_item_id: catalogItemId, variant_id: variantId, cantidad },
|
||||
{
|
||||
@@ -71,21 +69,27 @@ export class CartService extends BaseApiService {
|
||||
);
|
||||
}
|
||||
|
||||
updateItemQuantity(
|
||||
updateItemQuantity(cartItemId: number, cantidad: number): Observable<ApiResponse<Cart>> {
|
||||
return this.updateItem(cartItemId, { cantidad });
|
||||
}
|
||||
|
||||
updateItemVariant(
|
||||
cartItemId: number,
|
||||
cantidad: number,
|
||||
variantId: number,
|
||||
): Observable<ApiResponse<Cart>> {
|
||||
return this.updateItem(cartItemId, { cantidad, variant_id: variantId });
|
||||
}
|
||||
|
||||
private updateItem(
|
||||
cartItemId: number,
|
||||
payload: { cantidad: number; variant_id?: number },
|
||||
): Observable<ApiResponse<Cart>> {
|
||||
this.isUpdatingState.set(true);
|
||||
return this.http
|
||||
.patch<
|
||||
ApiResponse<Cart>
|
||||
>(
|
||||
`${this.tenantApiUrl}/cart/items/${cartItemId}`,
|
||||
{ cantidad },
|
||||
{
|
||||
.patch<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, payload, {
|
||||
withCredentials: true,
|
||||
},
|
||||
)
|
||||
})
|
||||
.pipe(
|
||||
tap((response) => {
|
||||
this.cartState.set(response.data);
|
||||
@@ -101,9 +105,7 @@ export class CartService extends BaseApiService {
|
||||
removeItem(cartItemId: number): Observable<ApiResponse<Cart>> {
|
||||
this.isUpdatingState.set(true);
|
||||
return this.http
|
||||
.delete<
|
||||
ApiResponse<Cart>
|
||||
>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
|
||||
.delete<ApiResponse<Cart>>(`${this.tenantApiUrl}/cart/items/${cartItemId}`, {
|
||||
withCredentials: true,
|
||||
})
|
||||
.pipe(
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import { ApiPaginatedResponse } from '../api-paginated-response.interface';
|
||||
|
||||
export type CatalogItemType = 'product' | 'bundle';
|
||||
|
||||
export interface Product {
|
||||
id: number;
|
||||
type: CatalogItemType;
|
||||
category_id: number;
|
||||
brand_id: number | null;
|
||||
slug: string;
|
||||
@@ -15,19 +18,32 @@ export interface Product {
|
||||
|
||||
export interface ProductAttributeOption {
|
||||
id: number;
|
||||
validity_time_id?: number | null;
|
||||
value: string;
|
||||
label: string;
|
||||
sort_order: number;
|
||||
metadata: Record<string, unknown> | null;
|
||||
}
|
||||
|
||||
export type ProductAttributeType =
|
||||
| 'string'
|
||||
| 'number'
|
||||
| 'boolean'
|
||||
| 'select'
|
||||
| 'multiselect'
|
||||
| 'color'
|
||||
| 'image'
|
||||
| 'event_date';
|
||||
|
||||
export interface ProductAttribute {
|
||||
id: number;
|
||||
codigo: string;
|
||||
nombre: string;
|
||||
is_required: boolean;
|
||||
allow_multi_select?: boolean;
|
||||
show_in_selector?: boolean;
|
||||
metadata_schema: Record<string, unknown> | null;
|
||||
type: string;
|
||||
type: ProductAttributeType;
|
||||
options: ProductAttributeOption[];
|
||||
}
|
||||
|
||||
@@ -35,23 +51,17 @@ export type InventoryPolicy = 'tracked' | 'unlimited';
|
||||
|
||||
export interface CatalogItemVariant {
|
||||
id: number;
|
||||
descripcion?: string | null;
|
||||
precio?: string;
|
||||
event_date_id?: number | null;
|
||||
event_date_ids?: number[];
|
||||
event_dates?: string[];
|
||||
stock_tecnico: number | null;
|
||||
minimum_use_date?: string | null;
|
||||
maximum_use_date?: string | null;
|
||||
effective_minimum_use_date?: string | null;
|
||||
effective_maximum_use_date?: string | null;
|
||||
values: Record<string, string>;
|
||||
}
|
||||
|
||||
export interface CatalogItemEventDate {
|
||||
id: number;
|
||||
variant_id: number;
|
||||
date: string;
|
||||
starts_at: string;
|
||||
ends_at: string;
|
||||
label: string;
|
||||
stock_tecnico: number | null;
|
||||
values: Record<string, string | string[]>;
|
||||
}
|
||||
|
||||
export interface SelectedCatalogItemVariant extends CatalogItemVariant {
|
||||
@@ -60,6 +70,7 @@ export interface SelectedCatalogItemVariant extends CatalogItemVariant {
|
||||
|
||||
export interface CatalogItemDetail {
|
||||
id: number;
|
||||
type: CatalogItemType;
|
||||
purpose?: 'product' | 'entry';
|
||||
category_id: number | null;
|
||||
brand_id: number | null;
|
||||
@@ -70,12 +81,12 @@ export interface CatalogItemDetail {
|
||||
category: string | null;
|
||||
brand: string | null;
|
||||
inventory_policy: InventoryPolicy;
|
||||
max_units_per_user?: number | null;
|
||||
has_tickets: boolean;
|
||||
minimum_use_date: string | null;
|
||||
maximum_use_date: string | null;
|
||||
attributes: ProductAttribute[];
|
||||
variants: CatalogItemVariant[];
|
||||
event_dates?: CatalogItemEventDate[];
|
||||
selected_variant?: SelectedCatalogItemVariant;
|
||||
stock_tecnico?: number | null;
|
||||
images?: string[];
|
||||
@@ -86,12 +97,15 @@ export type CatalogGroupLayout = 'paginated' | 'simple' | 'simple_vertical' | 'c
|
||||
|
||||
export interface CatalogFeaturedItemVariant {
|
||||
id: number;
|
||||
descripcion?: string | null;
|
||||
precio?: string;
|
||||
stock_tecnico: number | null;
|
||||
values: Record<string, string>;
|
||||
values: Record<string, string | string[]>;
|
||||
}
|
||||
|
||||
export interface CatalogFeaturedItem {
|
||||
id: number;
|
||||
type: CatalogItemType;
|
||||
nombre: string;
|
||||
descripcion?: string | null;
|
||||
precio: number | string;
|
||||
|
||||
@@ -163,6 +163,8 @@ describe('ModalService', () => {
|
||||
const activeModal = service.activeModal();
|
||||
const resultPromise = firstValueFrom(result$);
|
||||
|
||||
expect(activeModal?.config.size).toBe('sm');
|
||||
|
||||
activeModal?.ref.dismiss('escape');
|
||||
|
||||
await expect(resultPromise).resolves.toBe(false);
|
||||
|
||||
@@ -166,7 +166,10 @@ export class ModalService {
|
||||
}
|
||||
|
||||
openConfirmDeleteRef(config: ConfirmModalConfig): ModalRef<boolean> {
|
||||
return this.open(ConfirmDeleteModalComponent, this.buildConfirmModalConfig(config));
|
||||
return this.open(
|
||||
ConfirmDeleteModalComponent,
|
||||
this.buildConfirmModalConfig({ size: 'sm', ...config }),
|
||||
);
|
||||
}
|
||||
|
||||
openSimple(config: SimpleModalConfig): Observable<void> {
|
||||
|
||||
@@ -54,10 +54,9 @@ export interface ActiveEventDate {
|
||||
time_end: string;
|
||||
}
|
||||
|
||||
export interface ActiveEvent {
|
||||
id: number;
|
||||
name: string;
|
||||
address: string;
|
||||
export interface TenantEvent {
|
||||
title: string;
|
||||
location: string;
|
||||
dates: ActiveEventDate[];
|
||||
}
|
||||
|
||||
@@ -107,14 +106,16 @@ export interface Tenant {
|
||||
footer_logo: string;
|
||||
website_type_code?: string | null;
|
||||
website_type?: WebsiteType | null;
|
||||
event_date_text?: string | null;
|
||||
extras?: WebsiteExtras;
|
||||
active_event_id?: number | null;
|
||||
active_event?: ActiveEvent | null;
|
||||
event?: TenantEvent | null;
|
||||
selected_bank_account_id?: number | null;
|
||||
selected_bank_account?: BankAccount | null;
|
||||
search_product_layout?: 'row' | 'column_with_image' | 'column_with_cart';
|
||||
search_group_layout?: 'paginated' | 'simple' | 'simple_vertical' | 'carousel';
|
||||
search_items_per_page?: number;
|
||||
display_categories?: boolean;
|
||||
display_seach_bar?: boolean;
|
||||
social_media?: SocialMedia[];
|
||||
menues?: Menu[];
|
||||
categories: Category[];
|
||||
|
||||
17
src/app/core/services/validity-time.interface.ts
Normal file
17
src/app/core/services/validity-time.interface.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
export interface TimeWindowValidityTime {
|
||||
id: number;
|
||||
type: 'time_window';
|
||||
is_valid: boolean;
|
||||
start_time?: string;
|
||||
end_time?: string;
|
||||
}
|
||||
|
||||
export interface FixedWindowValidityTime {
|
||||
id: number;
|
||||
type: 'fixed_window';
|
||||
is_valid: boolean;
|
||||
fixed_starts_at?: string;
|
||||
fixed_expires_at?: string;
|
||||
}
|
||||
|
||||
export type ValidityTime = TimeWindowValidityTime | FixedWindowValidityTime;
|
||||
@@ -77,7 +77,7 @@ h1 {
|
||||
|
||||
.modal-showcase__result {
|
||||
padding: 0.875rem 1rem;
|
||||
border: 1px dashed rgba(32, 32, 32, 0.14);
|
||||
border: 1px dashed var(--border-color);
|
||||
border-radius: 0.875rem;
|
||||
background: linear-gradient(180deg, rgba(248, 248, 248, 0.92), rgba(255, 255, 255, 0.98));
|
||||
color: #495057;
|
||||
@@ -231,7 +231,7 @@ h1 {
|
||||
justify-content: center;
|
||||
height: 120px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid #dee2e6;
|
||||
border: 1px solid var(--border-color);
|
||||
padding: 1rem;
|
||||
overflow: hidden;
|
||||
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
|
||||
@@ -281,7 +281,7 @@ h1 {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border-radius: 8px;
|
||||
border: 1px solid #dee2e6;
|
||||
border: 1px solid var(--border-color);
|
||||
overflow: hidden;
|
||||
background-color: #ffffff;
|
||||
transition:
|
||||
@@ -296,7 +296,7 @@ h1 {
|
||||
&__preview {
|
||||
height: 80px;
|
||||
width: 100%;
|
||||
border-bottom: 1px solid #dee2e6;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
transition: opacity 0.2s ease;
|
||||
|
||||
&:hover {
|
||||
@@ -337,7 +337,7 @@ h1 {
|
||||
background-color: #eaeaea;
|
||||
padding: 1.5rem;
|
||||
border-radius: 8px;
|
||||
border: 1px solid #dee2e6;
|
||||
border: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
&__row {
|
||||
|
||||
@@ -204,8 +204,9 @@ export class ReutilizablesTestPageComponent {
|
||||
'Acceso total al predio. No incluye acceso a estacionamiento. Niños menores de 5 años ingresan gratis.',
|
||||
price: 10000,
|
||||
variants: [
|
||||
{ label: '10 de Octubre', value: '10-oct' },
|
||||
{ label: '11 de Octubre', value: '11-oct' },
|
||||
{ value: '10-oct-manana', values: { fecha: '10 de Octubre', turno: 'Mañana' } },
|
||||
{ value: '10-oct-tarde', values: { fecha: '10 de Octubre', turno: 'Tarde' } },
|
||||
{ value: '11-oct-tarde', values: { fecha: '11 de Octubre', turno: 'Tarde' } },
|
||||
],
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
<section class="menu-content-section" [attr.aria-labelledby]="titleId()">
|
||||
<header class="menu-content-section__header">
|
||||
<div class="menu-content-section__prefix">
|
||||
<ng-content select="[menuContentPrefix]" />
|
||||
</div>
|
||||
|
||||
<h2 class="menu-content-section__title" [id]="titleId()">
|
||||
{{ title() | uppercase }}
|
||||
</h2>
|
||||
</header>
|
||||
|
||||
<div class="menu-content-section__body">
|
||||
<ng-content />
|
||||
</div>
|
||||
</section>
|
||||
@@ -0,0 +1,53 @@
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.menu-content-section {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.menu-content-section__header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
margin-bottom: 1.25rem;
|
||||
}
|
||||
|
||||
.menu-content-section__prefix:empty {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.menu-content-section__title {
|
||||
margin: 0;
|
||||
color: #888888;
|
||||
font-size: 1rem;
|
||||
font-weight: 600;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.menu-content-section__body {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.menu-content-section {
|
||||
margin-inline: auto;
|
||||
}
|
||||
|
||||
.menu-content-section__header {
|
||||
position: relative;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.menu-content-section__prefix:not(:empty) {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
}
|
||||
|
||||
.menu-content-section__title {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
import { Component, signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { Tenant } from '../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { MenuContentSectionComponent } from './menu-content-section.component';
|
||||
|
||||
@Component({
|
||||
imports: [MenuContentSectionComponent],
|
||||
template: `
|
||||
<app-menu-content-section menuCode="help.contact" titleId="contact-title">
|
||||
<a menuContentPrefix href="/ayuda">Volver</a>
|
||||
<p>Contenido proyectado</p>
|
||||
</app-menu-content-section>
|
||||
`,
|
||||
})
|
||||
class TestHostComponent {}
|
||||
|
||||
describe('MenuContentSectionComponent', () => {
|
||||
it('renders an accessible title and projects its content', async () => {
|
||||
const tenant = signal({
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'help.contact',
|
||||
label: 'Contacto del comercio',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'static',
|
||||
route: '/ayuda/contacto',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
} as unknown as Tenant);
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [TestHostComponent],
|
||||
providers: [{ provide: TenantService, useValue: { tenant: tenant.asReadonly() } }],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(TestHostComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const section = element.querySelector('section');
|
||||
|
||||
expect(section?.getAttribute('aria-labelledby')).toBe('contact-title');
|
||||
expect(element.querySelector('#contact-title')?.textContent?.trim()).toBe(
|
||||
'CONTACTO DEL COMERCIO',
|
||||
);
|
||||
expect(element.querySelector('.menu-content-section__prefix a')?.textContent).toContain(
|
||||
'Volver',
|
||||
);
|
||||
expect(element.querySelector('.menu-content-section__body')?.textContent).toContain(
|
||||
'Contenido proyectado',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,22 @@
|
||||
import { UpperCasePipe } from '@angular/common';
|
||||
import { Component, computed, inject, input } from '@angular/core';
|
||||
|
||||
import { findMenu } from '../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-menu-content-section',
|
||||
imports: [UpperCasePipe],
|
||||
templateUrl: './menu-content-section.component.html',
|
||||
styleUrl: './menu-content-section.component.scss',
|
||||
})
|
||||
export class MenuContentSectionComponent {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
readonly menuCode = input.required<string>();
|
||||
readonly titleId = input.required<string>();
|
||||
|
||||
protected readonly title = computed(
|
||||
() => findMenu(this.tenantService.tenant()?.menues ?? [], this.menuCode())?.label ?? '',
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<div class="menu-page-layout">
|
||||
<aside class="menu-page-layout__sidebar">
|
||||
<h1 class="menu-page-layout__title">{{ menu()?.label }}</h1>
|
||||
<div class="menu-page-layout__divider"></div>
|
||||
|
||||
<nav class="menu-page-layout__nav" [attr.aria-label]="navigationLabel">
|
||||
@for (submenu of submenues(); track submenu.code) {
|
||||
<a
|
||||
class="menu-page-layout__link"
|
||||
[routerLink]="submenu.route"
|
||||
routerLinkActive="menu-page-layout__link--active"
|
||||
>
|
||||
{{ submenu.label }}
|
||||
</a>
|
||||
}
|
||||
</nav>
|
||||
</aside>
|
||||
|
||||
<main class="menu-page-layout__content">
|
||||
<router-outlet />
|
||||
</main>
|
||||
</div>
|
||||
@@ -0,0 +1,88 @@
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.menu-page-layout {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(190px, 250px) minmax(0, 1fr);
|
||||
gap: clamp(3rem, 8vw, 6.25rem);
|
||||
width: 100%;
|
||||
|
||||
&__sidebar,
|
||||
&__content {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__sidebar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
&__title {
|
||||
margin: 0 0 0.75rem;
|
||||
color: #1a1a1a;
|
||||
font-size: 1rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.25;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
&__divider {
|
||||
height: 1px;
|
||||
margin-bottom: 1.25rem;
|
||||
background: #dedede;
|
||||
}
|
||||
|
||||
&__nav {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
&__link {
|
||||
color: #888888;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
line-height: 1.35;
|
||||
text-decoration: none;
|
||||
transition: color 150ms ease;
|
||||
|
||||
&:hover,
|
||||
&:focus-visible {
|
||||
color: #5a5a5a;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
border-radius: 2px;
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
||||
&--active {
|
||||
color: var(--color-primary);
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.menu-page-layout {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 2rem;
|
||||
|
||||
&__title {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&__nav {
|
||||
flex-flow: row wrap;
|
||||
justify-content: center;
|
||||
gap: 0.75rem 1.25rem;
|
||||
}
|
||||
|
||||
&__content {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { ActivatedRoute, provideRouter } from '@angular/router';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { Tenant } from '../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
import { MenuPageLayoutComponent } from './menu-page-layout.component';
|
||||
|
||||
function createTenant(): Tenant {
|
||||
return {
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#000000',
|
||||
secondary_color: '#000000',
|
||||
danger_color: '#000000',
|
||||
success_color: '#000000',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#ffffff',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
categories: [],
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'account',
|
||||
label: 'Mi cuenta',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'account.profile',
|
||||
label: 'Datos personales',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/datos-personales',
|
||||
submenues: [],
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
code: 'account.purchases',
|
||||
label: 'Mis compras',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/compras',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
code: 'help',
|
||||
label: 'Centro de ayuda',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda',
|
||||
submenues: [
|
||||
{
|
||||
id: 5,
|
||||
code: 'help.faq',
|
||||
label: 'Consultas habituales',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda/preguntas-frecuentes',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
async function renderLayout(menuCode: string, navigationLabel: string): Promise<HTMLElement> {
|
||||
const tenant = signal(createTenant());
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [MenuPageLayoutComponent],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{
|
||||
provide: ActivatedRoute,
|
||||
useValue: {
|
||||
snapshot: {
|
||||
data: { menuCode, navigationLabel },
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: tenant.asReadonly() },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(MenuPageLayoutComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
return fixture.nativeElement as HTMLElement;
|
||||
}
|
||||
|
||||
describe('MenuPageLayoutComponent', () => {
|
||||
it('renders the configured account menu and its navigation label', async () => {
|
||||
const element = await renderLayout('account', 'Secciones de mi cuenta');
|
||||
const links = Array.from(
|
||||
element.querySelectorAll<HTMLAnchorElement>('.menu-page-layout__link'),
|
||||
);
|
||||
|
||||
expect(element.querySelector('.menu-page-layout__title')?.textContent?.trim()).toBe(
|
||||
'Mi cuenta',
|
||||
);
|
||||
expect(element.querySelector('nav')?.getAttribute('aria-label')).toBe('Secciones de mi cuenta');
|
||||
expect(links.map((link) => link.textContent?.trim())).toEqual([
|
||||
'Datos personales',
|
||||
'Mis compras',
|
||||
]);
|
||||
expect(links.map((link) => link.getAttribute('href'))).toEqual([
|
||||
'/mi-cuenta/datos-personales',
|
||||
'/mi-cuenta/compras',
|
||||
]);
|
||||
});
|
||||
|
||||
it('uses the same component for the help menu', async () => {
|
||||
const element = await renderLayout('help', 'Secciones de ayuda');
|
||||
|
||||
expect(element.querySelector('.menu-page-layout__title')?.textContent?.trim()).toBe(
|
||||
'Centro de ayuda',
|
||||
);
|
||||
expect(element.querySelector('.menu-page-layout__link')?.textContent?.trim()).toBe(
|
||||
'Consultas habituales',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,26 @@
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
import { ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
|
||||
|
||||
import { findMenu } from '../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../core/services/tenant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-menu-page-layout',
|
||||
imports: [RouterLink, RouterLinkActive, RouterOutlet],
|
||||
templateUrl: './menu-page-layout.component.html',
|
||||
styleUrl: './menu-page-layout.component.scss',
|
||||
})
|
||||
export class MenuPageLayoutComponent {
|
||||
private readonly route = inject(ActivatedRoute);
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly navigationLabel =
|
||||
(this.route.snapshot.data['navigationLabel'] as string | undefined) ?? 'Secciones';
|
||||
|
||||
private readonly menuCode = this.route.snapshot.data['menuCode'] as string | undefined;
|
||||
|
||||
protected readonly menu = computed(() =>
|
||||
findMenu(this.tenantService.tenant()?.menues ?? [], this.menuCode ?? ''),
|
||||
);
|
||||
protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="attribute-selector">
|
||||
@for (attribute of attributes(); track attribute.id) {
|
||||
@for (attribute of visibleAttributes(); track attribute.codigo) {
|
||||
<div class="attribute-selector__row">
|
||||
<span class="attribute-selector__label">{{ attribute.nombre }}:</span>
|
||||
|
||||
@@ -10,12 +10,14 @@
|
||||
type="button"
|
||||
class="attribute-selector__swatch"
|
||||
[class.attribute-selector__swatch--selected]="hasSelectedOption(attribute, option)"
|
||||
[class.attribute-selector__swatch--disabled]="!availableOptions()[attribute.id][option.id]"
|
||||
[class.attribute-selector__swatch--disabled]="
|
||||
!availableOptions()[attribute.codigo][option.id]
|
||||
"
|
||||
[style.background-color]="getOptionSwatchColor(option)"
|
||||
[attr.aria-label]="option.label"
|
||||
[attr.aria-pressed]="hasSelectedOption(attribute, option)"
|
||||
[title]="option.label"
|
||||
[disabled]="!availableOptions()[attribute.id][option.id]"
|
||||
[disabled]="!availableOptions()[attribute.codigo][option.id]"
|
||||
(click)="selectAttributeOption(attribute, option)"
|
||||
>
|
||||
<span class="visually-hidden">{{ option.label }}</span>
|
||||
@@ -24,10 +26,14 @@
|
||||
<button
|
||||
type="button"
|
||||
class="attribute-selector__text-option"
|
||||
[class.attribute-selector__text-option--selected]="hasSelectedOption(attribute, option)"
|
||||
[class.attribute-selector__text-option--disabled]="!availableOptions()[attribute.id][option.id]"
|
||||
[class.attribute-selector__text-option--selected]="
|
||||
hasSelectedOption(attribute, option)
|
||||
"
|
||||
[class.attribute-selector__text-option--disabled]="
|
||||
!availableOptions()[attribute.codigo][option.id]
|
||||
"
|
||||
[attr.aria-pressed]="hasSelectedOption(attribute, option)"
|
||||
[disabled]="!availableOptions()[attribute.id][option.id]"
|
||||
[disabled]="!availableOptions()[attribute.codigo][option.id]"
|
||||
(click)="selectAttributeOption(attribute, option)"
|
||||
>
|
||||
{{ option.label }}
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
}
|
||||
|
||||
&__text-option {
|
||||
border: 1px solid #dcdcdc;
|
||||
border: 1px solid var(--border-color);
|
||||
background: #ffffff;
|
||||
color: #666666;
|
||||
transition: border-color 0.2s ease, color 0.2s ease, background-color 0.2s ease;
|
||||
|
||||
@@ -68,4 +68,85 @@ describe('ProductAttributeSelectorComponent', () => {
|
||||
expect(buttons[0].disabled).toBe(true);
|
||||
expect(buttons[1].disabled).toBe(false);
|
||||
});
|
||||
|
||||
it('allows multiple event dates and emits the exact matching variant', () => {
|
||||
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||
const emittedIds: Array<number | null> = [];
|
||||
fixture.componentInstance.variantChange.subscribe((variant) =>
|
||||
emittedIds.push(variant?.id ?? null),
|
||||
);
|
||||
fixture.componentRef.setInput('attributes', [
|
||||
{
|
||||
id: 2,
|
||||
codigo: 'event_date',
|
||||
nombre: 'Fecha',
|
||||
is_required: true,
|
||||
allow_multi_select: true,
|
||||
metadata_schema: null,
|
||||
type: 'event_date',
|
||||
options: [
|
||||
{ id: 101, value: '1', label: '09/10/2026', sort_order: 0, metadata: null },
|
||||
{ id: 102, value: '2', label: '10/10/2026', sort_order: 1, metadata: null },
|
||||
],
|
||||
} satisfies ProductAttribute,
|
||||
]);
|
||||
fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
|
||||
fixture.componentRef.setInput('variants', [
|
||||
{ id: 1, stock_tecnico: null, values: { event_date: '1' } },
|
||||
{ id: 2, stock_tecnico: null, values: { event_date: '2' } },
|
||||
{ id: 3, stock_tecnico: null, values: { event_date: ['1', '2'] } },
|
||||
]);
|
||||
fixture.detectChanges();
|
||||
|
||||
const buttons = Array.from(
|
||||
fixture.nativeElement.querySelectorAll('.attribute-selector__text-option'),
|
||||
) as HTMLButtonElement[];
|
||||
buttons[0].click();
|
||||
fixture.detectChanges();
|
||||
buttons[1].click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(buttons[0].getAttribute('aria-pressed')).toBe('true');
|
||||
expect(buttons[1].getAttribute('aria-pressed')).toBe('true');
|
||||
expect(emittedIds).toContain(3);
|
||||
});
|
||||
|
||||
it('hides configured attributes and matches variants using only visible selections', () => {
|
||||
const fixture = TestBed.createComponent(ProductAttributeSelectorComponent);
|
||||
const emittedIds: Array<number | null> = [];
|
||||
fixture.componentInstance.variantChange.subscribe((variant) =>
|
||||
emittedIds.push(variant?.id ?? null),
|
||||
);
|
||||
fixture.componentRef.setInput('attributes', [
|
||||
sizeAttribute,
|
||||
{
|
||||
id: 2,
|
||||
codigo: 'internal_type',
|
||||
nombre: 'Internal type',
|
||||
is_required: true,
|
||||
show_in_selector: false,
|
||||
metadata_schema: null,
|
||||
type: 'select',
|
||||
options: [
|
||||
{ id: 30, value: 'adult', label: 'Adult', sort_order: 0, metadata: null },
|
||||
{ id: 40, value: 'child', label: 'Child', sort_order: 1, metadata: null },
|
||||
],
|
||||
} satisfies ProductAttribute,
|
||||
]);
|
||||
fixture.componentRef.setInput('inventoryPolicy', 'unlimited');
|
||||
fixture.componentRef.setInput('variants', [
|
||||
{ id: 1, stock_tecnico: null, values: { size: 'S', internal_type: 'adult' } },
|
||||
{ id: 2, stock_tecnico: null, values: { size: 'M', internal_type: 'child' } },
|
||||
]);
|
||||
fixture.detectChanges();
|
||||
|
||||
const labels = fixture.nativeElement.querySelectorAll('.attribute-selector__label');
|
||||
const buttons = fixture.nativeElement.querySelectorAll('.attribute-selector__text-option');
|
||||
|
||||
expect(labels).toHaveLength(1);
|
||||
expect(labels[0].textContent).toContain('Size');
|
||||
buttons[1].click();
|
||||
fixture.detectChanges();
|
||||
expect(emittedIds).toContain(2);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -32,48 +32,69 @@ export class ProductAttributeSelectorComponent {
|
||||
|
||||
public variantChange = output<CatalogItemVariant | null>();
|
||||
|
||||
protected readonly selectedAttributeOptions = signal<Record<number, number>>({});
|
||||
protected readonly visibleAttributes = computed(() =>
|
||||
this.attributes().filter((attribute) => attribute.show_in_selector !== false),
|
||||
);
|
||||
|
||||
protected readonly selectedAttributeOptions = signal<Record<string, number[]>>({});
|
||||
|
||||
protected readonly availableOptions = computed(() => {
|
||||
const selections = this.selectedAttributeOptions();
|
||||
const variants = this.variants();
|
||||
const attributes = this.attributes();
|
||||
const attributes = this.visibleAttributes();
|
||||
|
||||
const availability: Record<number, Record<number, boolean>> = {};
|
||||
const availability: Record<string, Record<number, boolean>> = {};
|
||||
|
||||
for (const attribute of attributes) {
|
||||
availability[attribute.id] = {};
|
||||
availability[attribute.codigo] = {};
|
||||
for (const option of attribute.options) {
|
||||
const optionNormalized = this.normalizeText(option.value || option.label);
|
||||
const selectedForAttribute = selections[attribute.codigo] ?? [];
|
||||
|
||||
if (
|
||||
!attribute.allow_multi_select &&
|
||||
selectedForAttribute.length >= 1 &&
|
||||
!selectedForAttribute.includes(option.id)
|
||||
) {
|
||||
availability[attribute.codigo][option.id] = false;
|
||||
continue;
|
||||
}
|
||||
|
||||
const isAvailable = variants.some((variant) => {
|
||||
if (!this.isVariantAvailable(variant)) return false;
|
||||
|
||||
const variantAttrValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
|
||||
if (!variantAttrValue || this.normalizeText(variantAttrValue) !== optionNormalized) {
|
||||
const variantAttrValues = this.getVariantAttributeValues(attribute, variant.values);
|
||||
const desiredOptionIds = selectedForAttribute.includes(option.id)
|
||||
? selectedForAttribute
|
||||
: [...selectedForAttribute, option.id];
|
||||
const desiredValues = desiredOptionIds
|
||||
.map((id) => attribute.options.find((candidate) => candidate.id === id))
|
||||
.filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
|
||||
.map((candidate) => this.normalizeText(candidate.value || candidate.label));
|
||||
|
||||
if (
|
||||
!variantAttrValues.includes(optionNormalized) ||
|
||||
!desiredValues.every((value) => variantAttrValues.includes(value))
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const otherAttr of attributes) {
|
||||
if (otherAttr.id === attribute.id) continue;
|
||||
const selectedOptionId = selections[otherAttr.id];
|
||||
if (selectedOptionId !== undefined) {
|
||||
const selectedOption = otherAttr.options.find((o) => o.id === selectedOptionId);
|
||||
if (selectedOption) {
|
||||
const selectedNormalized = this.normalizeText(
|
||||
selectedOption.value || selectedOption.label,
|
||||
);
|
||||
const vAttrValue = this.getDefaultVariantAttributeValue(otherAttr, variant.values);
|
||||
if (!vAttrValue || this.normalizeText(vAttrValue) !== selectedNormalized) {
|
||||
if (otherAttr.codigo === attribute.codigo) continue;
|
||||
const selectedOptionIds = selections[otherAttr.codigo] ?? [];
|
||||
const selectedValues = selectedOptionIds
|
||||
.map((id) => otherAttr.options.find((candidate) => candidate.id === id))
|
||||
.filter((candidate): candidate is ProductAttributeOption => candidate !== undefined)
|
||||
.map((candidate) => this.normalizeText(candidate.value || candidate.label));
|
||||
const variantValues = this.getVariantAttributeValues(otherAttr, variant.values);
|
||||
if (!selectedValues.every((value) => variantValues.includes(value))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
availability[attribute.id][option.id] = isAvailable;
|
||||
availability[attribute.codigo][option.id] = isAvailable;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +107,7 @@ export class ProductAttributeSelectorComponent {
|
||||
|
||||
constructor() {
|
||||
effect(() => {
|
||||
const attributes = this.attributes();
|
||||
const attributes = this.visibleAttributes();
|
||||
const defaultVariant = this.selectedVariant();
|
||||
|
||||
untracked(() => {
|
||||
@@ -97,7 +118,7 @@ export class ProductAttributeSelectorComponent {
|
||||
effect(() => {
|
||||
const selections = this.selectedAttributeOptions();
|
||||
const variants = this.variants();
|
||||
const attributes = this.attributes();
|
||||
const attributes = this.visibleAttributes();
|
||||
|
||||
untracked(() => {
|
||||
this.emitMatchingVariant(selections, variants, attributes);
|
||||
@@ -109,17 +130,28 @@ export class ProductAttributeSelectorComponent {
|
||||
attribute: ProductAttribute,
|
||||
option: ProductAttributeOption,
|
||||
): boolean {
|
||||
return this.selectedAttributeOptions()[attribute.id] === option.id;
|
||||
return (this.selectedAttributeOptions()[attribute.codigo] ?? []).includes(option.id);
|
||||
}
|
||||
|
||||
protected selectAttributeOption(
|
||||
attribute: ProductAttribute,
|
||||
option: ProductAttributeOption,
|
||||
): void {
|
||||
this.selectedAttributeOptions.update((current) => ({
|
||||
...current,
|
||||
[attribute.id]: option.id,
|
||||
}));
|
||||
this.selectedAttributeOptions.update((current) => {
|
||||
const selected = current[attribute.codigo] ?? [];
|
||||
const isMultiple = attribute.allow_multi_select ?? false;
|
||||
let next: number[];
|
||||
|
||||
if (!isMultiple) {
|
||||
next = [option.id];
|
||||
} else if (selected.includes(option.id)) {
|
||||
next = selected.filter((id) => id !== option.id);
|
||||
} else {
|
||||
next = [...selected, option.id];
|
||||
}
|
||||
|
||||
return { ...current, [attribute.codigo]: next };
|
||||
});
|
||||
}
|
||||
|
||||
protected isColorOption(option: ProductAttributeOption): boolean {
|
||||
@@ -134,51 +166,44 @@ export class ProductAttributeSelectorComponent {
|
||||
attributes: ProductAttribute[],
|
||||
defaultVariant: CatalogItemVariant | null,
|
||||
): void {
|
||||
const selections: Record<number, number> = {};
|
||||
const selections: Record<string, number[]> = {};
|
||||
|
||||
for (const attribute of attributes) {
|
||||
const optionId = this.findDefaultOptionId(attribute, defaultVariant);
|
||||
if (optionId !== null) {
|
||||
selections[attribute.id] = optionId;
|
||||
const optionIds = this.findDefaultOptionIds(attribute, defaultVariant);
|
||||
if (optionIds.length > 0) {
|
||||
selections[attribute.codigo] = optionIds;
|
||||
}
|
||||
}
|
||||
|
||||
this.selectedAttributeOptions.set(selections);
|
||||
}
|
||||
|
||||
private findDefaultOptionId(
|
||||
private findDefaultOptionIds(
|
||||
attribute: ProductAttribute,
|
||||
variant: CatalogItemVariant | null,
|
||||
): number | null {
|
||||
): number[] {
|
||||
if (!variant) {
|
||||
return null;
|
||||
return [];
|
||||
}
|
||||
|
||||
const defaultValue = this.getDefaultVariantAttributeValue(attribute, variant.values);
|
||||
if (!defaultValue) {
|
||||
return null;
|
||||
const defaultValues = this.getVariantAttributeValues(attribute, variant.values);
|
||||
if (defaultValues.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const normalizedValue = this.normalizeText(defaultValue);
|
||||
const matchByValue = attribute.options.find(
|
||||
(option) => this.normalizeText(option.value) === normalizedValue,
|
||||
);
|
||||
|
||||
if (matchByValue) {
|
||||
return matchByValue.id;
|
||||
return attribute.options
|
||||
.filter(
|
||||
(option) =>
|
||||
defaultValues.includes(this.normalizeText(option.value)) ||
|
||||
defaultValues.includes(this.normalizeText(option.label)),
|
||||
)
|
||||
.map((option) => option.id);
|
||||
}
|
||||
|
||||
const matchByLabel = attribute.options.find(
|
||||
(option) => this.normalizeText(option.label) === normalizedValue,
|
||||
);
|
||||
|
||||
return matchByLabel?.id ?? null;
|
||||
}
|
||||
|
||||
private getDefaultVariantAttributeValue(
|
||||
private getVariantAttributeValues(
|
||||
attribute: ProductAttribute,
|
||||
variantAttributes: Record<string, string>,
|
||||
): string | null {
|
||||
variantAttributes: Record<string, string | string[]>,
|
||||
): string[] {
|
||||
const normalizedCodigo = this.normalizeText(attribute.codigo);
|
||||
const normalizedNombre = this.normalizeText(attribute.nombre);
|
||||
|
||||
@@ -186,11 +211,11 @@ export class ProductAttributeSelectorComponent {
|
||||
const normalizedKey = this.normalizeText(key);
|
||||
|
||||
if (normalizedKey === normalizedCodigo || normalizedKey === normalizedNombre) {
|
||||
return value;
|
||||
return (Array.isArray(value) ? value : [value]).map((item) => this.normalizeText(item));
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
return [];
|
||||
}
|
||||
|
||||
private normalizeText(value: string | null | undefined): string {
|
||||
@@ -234,7 +259,7 @@ export class ProductAttributeSelectorComponent {
|
||||
}
|
||||
|
||||
private emitMatchingVariant(
|
||||
selections: Record<number, number>,
|
||||
selections: Record<string, number[]>,
|
||||
variants: CatalogItemVariant[],
|
||||
attributes: ProductAttribute[],
|
||||
): void {
|
||||
@@ -243,18 +268,22 @@ export class ProductAttributeSelectorComponent {
|
||||
return;
|
||||
}
|
||||
|
||||
const selectedValuesById: Record<number, string> = {};
|
||||
const selectedValuesByCode: Record<string, string[]> = {};
|
||||
let allSelected = true;
|
||||
for (const attr of attributes) {
|
||||
const selectedOptionId = selections[attr.id];
|
||||
if (selectedOptionId === undefined) {
|
||||
const selectedOptionIds = selections[attr.codigo] ?? [];
|
||||
if (
|
||||
selectedOptionIds.length === 0 ||
|
||||
(!attr.allow_multi_select && selectedOptionIds.length !== 1)
|
||||
) {
|
||||
allSelected = false;
|
||||
break;
|
||||
}
|
||||
const option = attr.options.find((o) => o.id === selectedOptionId);
|
||||
if (option) {
|
||||
selectedValuesById[attr.id] = this.normalizeText(option.value || option.label);
|
||||
}
|
||||
selectedValuesByCode[attr.codigo] = selectedOptionIds
|
||||
.map((id) => attr.options.find((option) => option.id === id))
|
||||
.filter((option): option is ProductAttributeOption => option !== undefined)
|
||||
.map((option) => this.normalizeText(option.value || option.label))
|
||||
.sort();
|
||||
}
|
||||
|
||||
if (!allSelected) {
|
||||
@@ -264,10 +293,12 @@ export class ProductAttributeSelectorComponent {
|
||||
|
||||
const matchingVariant = variants.find((variant) => {
|
||||
return attributes.every((attr) => {
|
||||
const selectedValue = selectedValuesById[attr.id];
|
||||
const variantValue = this.getDefaultVariantAttributeValue(attr, variant.values);
|
||||
if (!variantValue) return false;
|
||||
return this.normalizeText(variantValue) === selectedValue;
|
||||
const selectedValues = selectedValuesByCode[attr.codigo];
|
||||
const variantValues = this.getVariantAttributeValues(attr, variant.values).sort();
|
||||
return (
|
||||
selectedValues.length === variantValues.length &&
|
||||
selectedValues.every((value, index) => value === variantValues[index])
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
<div class="sidebar-container">
|
||||
<h2 class="sidebar-title">{{ menu()?.label }}</h2>
|
||||
<div class="divider"></div>
|
||||
<nav class="sidebar-nav" aria-label="Secciones de mi cuenta">
|
||||
@for (menu of submenues(); track menu.code) {
|
||||
<a [routerLink]="menu.route" routerLinkActive="active" class="nav-link">
|
||||
{{ menu.label }}
|
||||
</a>
|
||||
}
|
||||
</nav>
|
||||
</div>
|
||||
@@ -1,35 +0,0 @@
|
||||
.sidebar-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
.sidebar-title {
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
color: #1a1a1a;
|
||||
margin-bottom: 12px;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { provideRouter } from '@angular/router';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { Tenant } from '../../../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { AccountSidebar } from './account-sidebar';
|
||||
|
||||
describe('AccountSidebar', () => {
|
||||
it('renders only the account submenus configured for the tenant', async () => {
|
||||
const tenant = signal<Tenant>({
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#000000',
|
||||
secondary_color: '#000000',
|
||||
danger_color: '#000000',
|
||||
success_color: '#000000',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#ffffff',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
categories: [],
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'account',
|
||||
label: 'Mi cuenta',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'account.profile',
|
||||
label: 'Datos personales',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/datos-personales',
|
||||
submenues: [],
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
code: 'account.purchases',
|
||||
label: 'Mis compras',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/compras',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [AccountSidebar],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: tenant.asReadonly() },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(AccountSidebar);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
const links = Array.from(element.querySelectorAll<HTMLAnchorElement>('.nav-link'));
|
||||
|
||||
expect(element.querySelector('.sidebar-title')?.textContent?.trim()).toBe('Mi cuenta');
|
||||
expect(links.map((link) => link.textContent?.trim())).toEqual([
|
||||
'Datos personales',
|
||||
'Mis compras',
|
||||
]);
|
||||
expect(links.map((link) => link.getAttribute('href'))).toEqual([
|
||||
'/mi-cuenta/datos-personales',
|
||||
'/mi-cuenta/compras',
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -1,21 +0,0 @@
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-account-sidebar',
|
||||
standalone: true,
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './account-sidebar.html',
|
||||
styleUrl: './account-sidebar.scss',
|
||||
})
|
||||
export class AccountSidebar {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly menu = computed(() =>
|
||||
findMenu(this.tenantService.tenant()?.menues ?? [], 'account'),
|
||||
);
|
||||
protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
|
||||
}
|
||||
@@ -13,3 +13,13 @@
|
||||
flex: 1;
|
||||
display: block;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.form-actions {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.action-btn {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
:host {
|
||||
display: block;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
:host(:last-child) {
|
||||
@@ -24,7 +24,7 @@
|
||||
aspect-ratio: 4 / 3;
|
||||
border-radius: 5px 0 0 5px;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #eaeaea;
|
||||
border: 1px solid var(--border-color);
|
||||
overflow: hidden;
|
||||
|
||||
img {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 1rem 0;
|
||||
border-bottom: 1px solid #DDDDDD;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.skeleton-item:last-child {
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
<div class="page-container">
|
||||
<h2 class="page-title">DATOS PERSONALES</h2>
|
||||
<app-profile-form></app-profile-form>
|
||||
</div>
|
||||
<app-menu-content-section
|
||||
class="account-page"
|
||||
menuCode="account.profile"
|
||||
titleId="profile-page-title"
|
||||
>
|
||||
<app-profile-form />
|
||||
</app-menu-content-section>
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
.page-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.account-page {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 600px;
|
||||
}
|
||||
|
||||
.page-title {
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
color: #A0A0A0;
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
import { ProfileForm } from '../../components/profile-form/profile-form';
|
||||
|
||||
@Component({
|
||||
selector: 'app-profile-page',
|
||||
standalone: true,
|
||||
imports: [ProfileForm],
|
||||
imports: [ProfileForm, MenuContentSectionComponent],
|
||||
templateUrl: './profile-page.html',
|
||||
styleUrl: './profile-page.scss',
|
||||
})
|
||||
|
||||
@@ -1,26 +1,35 @@
|
||||
<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>
|
||||
<app-menu-content-section
|
||||
class="account-page"
|
||||
menuCode="account.purchases"
|
||||
titleId="purchase-detail-page-title"
|
||||
>
|
||||
<a
|
||||
menuContentPrefix
|
||||
routerLink="../"
|
||||
class="purchase-back-link text-decoration-none"
|
||||
aria-label="Volver a mis compras"
|
||||
>
|
||||
<i class="bi bi-arrow-left fs-5" aria-hidden="true"></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="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 ">
|
||||
<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>
|
||||
<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) {
|
||||
@@ -30,4 +39,4 @@
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</app-menu-content-section>
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
.page-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.account-page {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 600px;
|
||||
}
|
||||
|
||||
.page-title {
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
color: #A0A0A0;
|
||||
.purchase-back-link {
|
||||
color: #888888;
|
||||
|
||||
&:hover,
|
||||
&:focus-visible {
|
||||
color: var(--color-primary);
|
||||
}
|
||||
}
|
||||
|
||||
.purchase-info {
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
} from '../../../../../../core/services/checkout.service';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
import { PurchaseItem, PurchaseItemViewModel } from '../../components/purchase-item/purchase-item';
|
||||
|
||||
type PurchaseDetailViewModel = {
|
||||
@@ -20,7 +21,7 @@ type PurchaseDetailViewModel = {
|
||||
@Component({
|
||||
selector: 'app-purchase-detail-page',
|
||||
standalone: true,
|
||||
imports: [CommonModule, RouterLink, PurchaseItem],
|
||||
imports: [CommonModule, RouterLink, PurchaseItem, MenuContentSectionComponent],
|
||||
templateUrl: './purchase-detail-page.html',
|
||||
styleUrl: './purchase-detail-page.scss',
|
||||
})
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
<div class="page-container">
|
||||
<h2 class="page-title">MIS COMPRAS</h2>
|
||||
<app-purchase-list></app-purchase-list>
|
||||
</div>
|
||||
<app-menu-content-section
|
||||
class="account-page"
|
||||
menuCode="account.purchases"
|
||||
titleId="purchases-page-title"
|
||||
>
|
||||
<app-purchase-list />
|
||||
</app-menu-content-section>
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
.page-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.account-page {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 600px;
|
||||
}
|
||||
|
||||
.page-title {
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
color: #A0A0A0;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
import { PurchaseList } from '../../components/purchase-list/purchase-list';
|
||||
|
||||
@Component({
|
||||
selector: 'app-purchases-page',
|
||||
standalone: true,
|
||||
imports: [PurchaseList],
|
||||
imports: [PurchaseList, MenuContentSectionComponent],
|
||||
templateUrl: './purchases-page.html',
|
||||
styleUrl: './purchases-page.scss',
|
||||
})
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
|
||||
.ticket__actions {
|
||||
display: flex;
|
||||
grid-column: 4;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
@@ -91,6 +92,10 @@
|
||||
color: #8a8a8a;
|
||||
}
|
||||
|
||||
.ticket--disabled .ticket__actions {
|
||||
grid-column: 3;
|
||||
}
|
||||
|
||||
:host ::ng-deep .ticket--disabled button.ticket__qr-button:disabled {
|
||||
--bs-btn-disabled-bg: #8a8a8a;
|
||||
--bs-btn-disabled-border-color: #8a8a8a;
|
||||
|
||||
@@ -3,6 +3,16 @@ import { firstValueFrom } from 'rxjs';
|
||||
|
||||
import { BaseApiService } from '../../../../../../core/services/base-api.service';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { ValidityTime } from '../../../../../../core/services/validity-time.interface';
|
||||
|
||||
export interface TicketValidityGroupResponse {
|
||||
id: number;
|
||||
validity_times: ValidityTime[];
|
||||
starts_at: string | null;
|
||||
expires_at: string | null;
|
||||
is_valid: boolean;
|
||||
is_expired: boolean;
|
||||
}
|
||||
|
||||
export interface TicketResponse {
|
||||
id: number;
|
||||
@@ -12,6 +22,8 @@ export interface TicketResponse {
|
||||
description: string | null;
|
||||
source_catalog_item_id: number | null;
|
||||
source_variant_id: number | null;
|
||||
validity_times?: ValidityTime[];
|
||||
validity_groups?: TicketValidityGroupResponse[];
|
||||
starts_at: string | null;
|
||||
expires_at: string | null;
|
||||
used_at: string | null;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
<section class="tickets-page">
|
||||
<h1 class="tickets-page__title">MIS TICKETS</h1>
|
||||
|
||||
<app-menu-content-section
|
||||
class="tickets-page"
|
||||
menuCode="account.tickets"
|
||||
titleId="tickets-page-title"
|
||||
>
|
||||
<div class="tickets-list" [attr.aria-busy]="isLoading() || isGeneratingPdf()">
|
||||
@if (isGeneratingPdf()) {
|
||||
<div class="tickets-list__generating" role="status" aria-live="polite">
|
||||
@@ -106,4 +108,4 @@
|
||||
<p class="tickets-list__empty">Aún no tenés tickets disponibles.</p>
|
||||
}
|
||||
</div>
|
||||
</section>
|
||||
</app-menu-content-section>
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
.tickets-page {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 720px;
|
||||
}
|
||||
|
||||
.tickets-page__title {
|
||||
margin: 0 0 20px;
|
||||
color: #a0a0a0;
|
||||
font-size: 15px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.tickets-list {
|
||||
position: relative;
|
||||
}
|
||||
@@ -33,7 +27,7 @@
|
||||
.tickets-list__generating-spinner {
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
border: 3px solid #dce8e0;
|
||||
border: 3px solid var(--border-color);
|
||||
border-top-color: var(--tenant-primary, #009933);
|
||||
border-radius: 50%;
|
||||
animation: tickets-spinner 0.75s linear infinite;
|
||||
@@ -45,7 +39,7 @@
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 12px;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.tickets-list__header--inactive {
|
||||
@@ -95,7 +89,7 @@
|
||||
}
|
||||
|
||||
.tickets-list app-ticket {
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.tickets-list__empty {
|
||||
@@ -110,7 +104,7 @@
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 12px;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.tickets-list__skeleton-selection,
|
||||
@@ -136,7 +130,7 @@
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
padding: 16px 0;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
.tickets-list__skeleton-check,
|
||||
@@ -206,10 +200,6 @@
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.tickets-page__title {
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
.tickets-list__skeleton {
|
||||
grid-template-columns: auto minmax(0, 1fr) auto;
|
||||
gap: 10px;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { describe, expect, it, vi } from 'vitest';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||
import { ModalService } from '../../../../../../core/services/modal.service';
|
||||
import { TicketComponent } from './components/ticket/ticket.component';
|
||||
import { TicketResponse, TicketService } from './ticket.service';
|
||||
import { TicketsPage } from './tickets-page';
|
||||
|
||||
function withCustomLoading<T extends object>(
|
||||
service: T,
|
||||
): T & { withCustomLoading: () => T } {
|
||||
function withCustomLoading<T extends object>(service: T): T & { withCustomLoading: () => T } {
|
||||
return Object.assign(service, {
|
||||
withCustomLoading: () => service,
|
||||
});
|
||||
@@ -34,6 +34,31 @@ const ticket = (overrides: Partial<TicketResponse>): TicketResponse => ({
|
||||
});
|
||||
|
||||
describe('TicketsPage', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: {
|
||||
tenant: signal({
|
||||
menues: [
|
||||
{
|
||||
id: 4,
|
||||
code: 'account.tickets',
|
||||
label: 'Entradas disponibles',
|
||||
parent_menu_code: 'account',
|
||||
content_type: 'dynamic',
|
||||
route: '/mi-cuenta/tickets',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
}).asReadonly(),
|
||||
},
|
||||
},
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it('shares the generated PDF as a file without text that Windows could prioritize', async () => {
|
||||
const share = vi.fn().mockResolvedValue(undefined);
|
||||
const canShare = vi.fn().mockReturnValue(true);
|
||||
@@ -92,9 +117,9 @@ describe('TicketsPage', () => {
|
||||
const createObjectUrl = vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:ticket');
|
||||
const revokeObjectUrl = vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => undefined);
|
||||
let downloadedFilename = '';
|
||||
const linkClick = vi
|
||||
.spyOn(HTMLAnchorElement.prototype, 'click')
|
||||
.mockImplementation(function (this: HTMLAnchorElement) {
|
||||
const linkClick = vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(function (
|
||||
this: HTMLAnchorElement,
|
||||
) {
|
||||
downloadedFilename = this.download;
|
||||
});
|
||||
|
||||
|
||||
@@ -3,12 +3,13 @@ import { Component, computed, inject, OnInit, signal } from '@angular/core';
|
||||
import { ModalService } from '../../../../../../core/services/modal.service';
|
||||
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||
import { IconButtonComponent } from '../../../../../../shared/components/icon-button/icon-button.component';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
import { TicketComponent } from './components/ticket/ticket.component';
|
||||
import { TicketResponse, TicketService } from './ticket.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tickets-page',
|
||||
imports: [IconButtonComponent, TicketComponent],
|
||||
imports: [IconButtonComponent, TicketComponent, MenuContentSectionComponent],
|
||||
providers: [TicketService],
|
||||
templateUrl: './tickets-page.html',
|
||||
styleUrl: './tickets-page.scss',
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
<div class="sidebar-layout">
|
||||
<app-account-sidebar class="account-sidebar"></app-account-sidebar>
|
||||
<div class="account-content">
|
||||
<router-outlet></router-outlet>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,17 +0,0 @@
|
||||
.sidebar-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;
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
import { AccountSidebar } from '../components/account-sidebar/account-sidebar';
|
||||
|
||||
@Component({
|
||||
selector: 'app-sidebar-layout',
|
||||
standalone: true,
|
||||
imports: [RouterOutlet, AccountSidebar],
|
||||
templateUrl: './sidebar-layout.html',
|
||||
styleUrl: './sidebar-layout.scss',
|
||||
})
|
||||
export class SidebarLayout {}
|
||||
@@ -20,6 +20,6 @@
|
||||
display: block;
|
||||
width: 100%;
|
||||
flex: 1 1 290px;
|
||||
max-width: 290px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,6 +6,15 @@
|
||||
|
||||
@media (max-width: 900px) {
|
||||
grid-template-columns: 1fr;
|
||||
|
||||
.checkout-page__cart-col {
|
||||
order: 1;
|
||||
}
|
||||
|
||||
.checkout-page__stepper-col,
|
||||
.checkout-page__editing-notice {
|
||||
order: 2;
|
||||
}
|
||||
}
|
||||
|
||||
&__stepper-col {
|
||||
@@ -55,7 +64,7 @@
|
||||
.checkout-page__spinner {
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
border: 0.25rem solid rgba(32, 32, 32, 0.08);
|
||||
border: 0.25rem solid var(--border-color);
|
||||
border-top-color: var(--tenant-primary);
|
||||
border-radius: 50%;
|
||||
animation: checkout-page-spin 0.8s linear infinite;
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="payment-panel d-flex justify-content-end" aria-live="polite">
|
||||
<section class="payment-panel" aria-live="polite">
|
||||
@if (isGeneratingIntent()) {
|
||||
<div class="payment-panel__card" style="text-align: center; padding: 2rem">
|
||||
<h3 class="payment-panel__title">Cargando información de pago...</h3>
|
||||
|
||||
@@ -32,6 +32,11 @@
|
||||
.payment-methods {
|
||||
min-width: 0;
|
||||
|
||||
@media (max-width: 760px) {
|
||||
width: min(100%, 300px);
|
||||
justify-self: center;
|
||||
}
|
||||
|
||||
&__title {
|
||||
margin: 0 0 1.75rem;
|
||||
color: #8a8a8a;
|
||||
@@ -109,7 +114,22 @@
|
||||
}
|
||||
|
||||
.payment-panel {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
min-width: 0;
|
||||
|
||||
> app-checkout-payment-qr,
|
||||
> app-checkout-payment-transfer,
|
||||
> app-checkout-payment-telepagos {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 320px;
|
||||
}
|
||||
|
||||
@media (max-width: 760px) {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
&__card {
|
||||
width: 100%;
|
||||
max-width: 320px;
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
<aside class="help-sidebar">
|
||||
<h1 class="help-sidebar__title">{{ menu()?.label }}</h1>
|
||||
<div class="help-sidebar__divider"></div>
|
||||
|
||||
<nav class="help-sidebar__nav" aria-label="Secciones de ayuda">
|
||||
@for (menu of submenues(); track menu.code) {
|
||||
<a
|
||||
class="help-sidebar__link"
|
||||
[routerLink]="menu.route"
|
||||
routerLinkActive="help-sidebar__link--active"
|
||||
>
|
||||
{{ menu.label }}
|
||||
</a>
|
||||
}
|
||||
</nav>
|
||||
</aside>
|
||||
@@ -1,57 +0,0 @@
|
||||
.help-sidebar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.help-sidebar__title {
|
||||
margin: 0 0 0.75rem;
|
||||
color: #1a1a1a;
|
||||
font-size: 1rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.25;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.help-sidebar__divider {
|
||||
height: 1px;
|
||||
margin-bottom: 1.25rem;
|
||||
background: #dedede;
|
||||
}
|
||||
|
||||
.help-sidebar__nav {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.help-sidebar__link {
|
||||
color: #888888;
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
line-height: 1.35;
|
||||
text-decoration: none;
|
||||
transition: color 150ms ease;
|
||||
|
||||
&:hover,
|
||||
&:focus-visible {
|
||||
color: #5a5a5a;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
border-radius: 2px;
|
||||
outline: 2px solid var(--color-primary);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
}
|
||||
|
||||
.help-sidebar__link--active {
|
||||
color: var(--color-primary);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.help-sidebar__nav {
|
||||
flex-flow: row wrap;
|
||||
gap: 0.75rem 1.25rem;
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
import { signal } from '@angular/core';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { provideRouter } from '@angular/router';
|
||||
import { describe, expect, it } from 'vitest';
|
||||
|
||||
import { Tenant } from '../../../../../../core/services/tenant.interface';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { HelpSidebar } from './help-sidebar';
|
||||
|
||||
describe('HelpSidebar', () => {
|
||||
it('renders the parent and submenu labels supplied by the tenant', async () => {
|
||||
const tenant = signal<Tenant>({
|
||||
id: 1,
|
||||
codigo: 'test',
|
||||
nombre: 'Test',
|
||||
dominio: 'localhost',
|
||||
primary_color: '#000000',
|
||||
secondary_color: '#000000',
|
||||
danger_color: '#000000',
|
||||
success_color: '#000000',
|
||||
header_bg_color: '#ffffff',
|
||||
footer_bg_color: '#ffffff',
|
||||
header_logo: '',
|
||||
footer_logo: '',
|
||||
categories: [],
|
||||
menues: [
|
||||
{
|
||||
id: 1,
|
||||
code: 'help',
|
||||
label: 'Centro de ayuda',
|
||||
parent_menu_code: null,
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda',
|
||||
submenues: [
|
||||
{
|
||||
id: 2,
|
||||
code: 'help.faq',
|
||||
label: 'Consultas habituales',
|
||||
parent_menu_code: 'help',
|
||||
content_type: 'dynamic',
|
||||
route: '/ayuda/preguntas-frecuentes',
|
||||
submenues: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [HelpSidebar],
|
||||
providers: [
|
||||
provideRouter([]),
|
||||
{
|
||||
provide: TenantService,
|
||||
useValue: { tenant: tenant.asReadonly() },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(HelpSidebar);
|
||||
fixture.detectChanges();
|
||||
|
||||
const element = fixture.nativeElement as HTMLElement;
|
||||
|
||||
expect(element.querySelector('.help-sidebar__title')?.textContent?.trim()).toBe(
|
||||
'Centro de ayuda',
|
||||
);
|
||||
expect(element.querySelector('.help-sidebar__link')?.textContent?.trim()).toBe(
|
||||
'Consultas habituales',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1,20 +0,0 @@
|
||||
import { Component, computed, inject } from '@angular/core';
|
||||
import { RouterLink, RouterLinkActive } from '@angular/router';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-help-sidebar',
|
||||
imports: [RouterLink, RouterLinkActive],
|
||||
templateUrl: './help-sidebar.html',
|
||||
styleUrl: './help-sidebar.scss',
|
||||
})
|
||||
export class HelpSidebar {
|
||||
private readonly tenantService = inject(TenantService);
|
||||
|
||||
protected readonly menu = computed(() =>
|
||||
findMenu(this.tenantService.tenant()?.menues ?? [], 'help'),
|
||||
);
|
||||
protected readonly submenues = computed(() => this.menu()?.submenues ?? []);
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
<section class="contact-page" aria-labelledby="contact-page-title">
|
||||
<app-menu-content-section menuCode="help.contact" titleId="contact-page-title">
|
||||
<div class="contact-page">
|
||||
<div class="contact-page__details">
|
||||
<h2 id="contact-page-title" class="contact-page__title">CONTACTO</h2>
|
||||
|
||||
@if (contact().whatsappUrl && contact().whatsappLabel) {
|
||||
<a
|
||||
class="contact-page__contact-link"
|
||||
@@ -50,4 +49,5 @@
|
||||
ariaLabel="Mapa de sucursales y puntos de atención"
|
||||
/>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
</app-menu-content-section>
|
||||
|
||||
@@ -20,14 +20,6 @@
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.contact-page__title {
|
||||
margin: 0 0 1.25rem;
|
||||
color: inherit;
|
||||
font-size: 1rem;
|
||||
font-weight: 400;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.contact-page__contact-link {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -122,6 +114,26 @@
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.contact-page__details {
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.contact-page__location {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.contact-page__location-title {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.contact-page__addresses {
|
||||
padding-left: 0;
|
||||
list-style-position: inside;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 575.98px) {
|
||||
.contact-page__map::ng-deep .location-map {
|
||||
min-height: 16rem;
|
||||
|
||||
@@ -2,6 +2,7 @@ import { Component, computed, inject } from '@angular/core';
|
||||
|
||||
import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
import {
|
||||
LocationMapComponent,
|
||||
MapLocation,
|
||||
@@ -30,7 +31,7 @@ type ContactContent = {
|
||||
|
||||
@Component({
|
||||
selector: 'app-contact-page',
|
||||
imports: [LocationMapComponent],
|
||||
imports: [LocationMapComponent, MenuContentSectionComponent],
|
||||
templateUrl: './contact-page.html',
|
||||
styleUrl: './contact-page.scss',
|
||||
})
|
||||
|
||||
@@ -1,14 +1,8 @@
|
||||
<section class="faq-page" aria-labelledby="faq-page-title">
|
||||
<h2 id="faq-page-title" class="faq-page__title">PREGUNTAS FRECUENTES</h2>
|
||||
|
||||
<app-menu-content-section class="faq-page" menuCode="help.faq" titleId="faq-page-title">
|
||||
@if (faqs().length > 0) {
|
||||
<app-accordion [flush]="true">
|
||||
@for (faq of faqs(); track $index; let last = $last) {
|
||||
<app-accordion-item
|
||||
[title]="faq.question"
|
||||
[headingLevel]="3"
|
||||
[open]="last"
|
||||
>
|
||||
<app-accordion-item [title]="faq.question" [headingLevel]="3" [open]="last">
|
||||
<p>{{ faq.answer }}</p>
|
||||
</app-accordion-item>
|
||||
}
|
||||
@@ -16,4 +10,4 @@
|
||||
} @else {
|
||||
<p class="faq-page__empty">No hay preguntas frecuentes disponibles.</p>
|
||||
}
|
||||
</section>
|
||||
</app-menu-content-section>
|
||||
|
||||
@@ -4,25 +4,18 @@
|
||||
}
|
||||
|
||||
.faq-page {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 760px;
|
||||
}
|
||||
|
||||
.faq-page__title {
|
||||
margin: 0 0 0.5rem;
|
||||
color: #a0a0a0;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.3;
|
||||
}
|
||||
|
||||
.faq-page p {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.faq-page__empty {
|
||||
padding: 1rem 0;
|
||||
border-bottom: 1px solid #dedede;
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
color: #888888;
|
||||
font-size: 0.8125rem;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { findMenu } from '../../../../../../core/services/menu.utils';
|
||||
import { TenantService } from '../../../../../../core/services/tenant.service';
|
||||
import { AccordionItemComponent } from '../../../../../../shared/components/accordion/accordion-item.component';
|
||||
import { AccordionComponent } from '../../../../../../shared/components/accordion/accordion.component';
|
||||
import { MenuContentSectionComponent } from '../../../../components/menu-content-section/menu-content-section.component';
|
||||
|
||||
type Faq = {
|
||||
question: string;
|
||||
@@ -12,7 +13,7 @@ type Faq = {
|
||||
|
||||
@Component({
|
||||
selector: 'app-faq-page',
|
||||
imports: [AccordionComponent, AccordionItemComponent],
|
||||
imports: [AccordionComponent, AccordionItemComponent, MenuContentSectionComponent],
|
||||
templateUrl: './faq-page.html',
|
||||
styleUrl: './faq-page.scss',
|
||||
})
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
<div class="help-layout">
|
||||
<app-help-sidebar class="help-layout__sidebar" />
|
||||
|
||||
<div class="help-layout__content">
|
||||
<router-outlet />
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,25 +0,0 @@
|
||||
:host {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.help-layout {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(190px, 250px) minmax(0, 1fr);
|
||||
gap: clamp(3rem, 8vw, 6.25rem);
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.help-layout__sidebar {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.help-layout__content {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.help-layout {
|
||||
grid-template-columns: 1fr;
|
||||
gap: 2rem;
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { RouterOutlet } from '@angular/router';
|
||||
|
||||
import { HelpSidebar } from '../components/help-sidebar/help-sidebar';
|
||||
|
||||
@Component({
|
||||
selector: 'app-help-sidebar-layout',
|
||||
imports: [RouterOutlet, HelpSidebar],
|
||||
templateUrl: './help-sidebar-layout.html',
|
||||
styleUrl: './help-sidebar-layout.scss',
|
||||
})
|
||||
export class HelpSidebarLayout {}
|
||||
@@ -31,6 +31,6 @@
|
||||
.login-page__divider-dot {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
border-color: #d9d9d9 !important;
|
||||
border-color: var(--border-color) !important;
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
<div class="product-detail__price-group">
|
||||
<span class="product-detail__price-current">
|
||||
{{ getFormattedPrice(prod.precio) }}
|
||||
{{ getFormattedPrice(effectivePrice()) }}
|
||||
</span>
|
||||
|
||||
@if (oldPrice(); as oldPrice) {
|
||||
@@ -35,31 +35,6 @@
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@if (hasEventDates()) {
|
||||
<div class="product-detail__divider"></div>
|
||||
|
||||
<section class="product-detail__section product-detail__section--event-date">
|
||||
<label class="form-label" for="event-date-selector">Fecha</label>
|
||||
<select
|
||||
id="event-date-selector"
|
||||
class="form-select"
|
||||
[value]="selectedVariant()?.id ?? ''"
|
||||
(change)="onEventDateChange($event)"
|
||||
>
|
||||
@for (eventDate of eventDates(); track eventDate.id) {
|
||||
<option
|
||||
[value]="eventDate.variant_id"
|
||||
[disabled]="
|
||||
prod.inventory_policy !== 'unlimited' && (eventDate.stock_tecnico ?? 0) <= 0
|
||||
"
|
||||
>
|
||||
{{ eventDate.label }}
|
||||
</option>
|
||||
}
|
||||
</select>
|
||||
</section>
|
||||
}
|
||||
|
||||
@if (hasRenderableAttributes()) {
|
||||
<div class="product-detail__divider"></div>
|
||||
|
||||
@@ -124,7 +99,7 @@
|
||||
[class.product-detail__description-body--expanded]="descriptionExpanded()"
|
||||
[style.max-height.px]="descriptionExpanded() ? descriptionMaxHeight() || null : null"
|
||||
>
|
||||
{{ prod.descripcion }}
|
||||
{{ effectiveDescription() }}
|
||||
</div>
|
||||
|
||||
@if (showDescriptionToggle()) {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
}
|
||||
|
||||
&__divider {
|
||||
border-top: 1px solid #e6e6e6;
|
||||
border-top: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
&__title {
|
||||
@@ -25,7 +25,7 @@
|
||||
}
|
||||
|
||||
&__title-price-divider {
|
||||
border-top: 1px solid #e6e6e6;
|
||||
border-top: 1px solid var(--border-color);
|
||||
}
|
||||
|
||||
&__price-group {
|
||||
|
||||
@@ -22,6 +22,7 @@ import {
|
||||
describe('ProductDetailPageComponent', () => {
|
||||
const mockProduct: CatalogItemDetail = {
|
||||
id: 1,
|
||||
type: 'product',
|
||||
category_id: 10,
|
||||
brand_id: null,
|
||||
slug: 'auriculares-bluetooth',
|
||||
@@ -327,33 +328,39 @@ describe('ProductDetailPageComponent', () => {
|
||||
expect((swatches[0] as HTMLElement).style.backgroundColor).not.toBe('');
|
||||
});
|
||||
|
||||
it('renders event dates and resolves the selected date through its variant', async () => {
|
||||
it('renders event dates as a dynamic attribute and resolves their variants', async () => {
|
||||
const detailProduct: CatalogItemDetail = {
|
||||
...mockProduct,
|
||||
purpose: 'entry',
|
||||
has_tickets: true,
|
||||
variants: [
|
||||
{ id: 101, event_date_id: 20, stock_tecnico: 10, values: {} },
|
||||
{ id: 102, event_date_id: 21, stock_tecnico: 10, values: {} },
|
||||
{ id: 101, event_date_id: 20, stock_tecnico: 10, values: { event_date: '20' } },
|
||||
{ id: 102, event_date_id: 21, stock_tecnico: 10, values: { event_date: '21' } },
|
||||
],
|
||||
event_dates: [
|
||||
attributes: [
|
||||
{
|
||||
id: 99,
|
||||
codigo: 'event_date',
|
||||
nombre: 'Fecha',
|
||||
is_required: true,
|
||||
metadata_schema: null,
|
||||
type: 'event_date',
|
||||
options: [
|
||||
{
|
||||
id: 20,
|
||||
variant_id: 101,
|
||||
date: '2026-10-09',
|
||||
starts_at: '2026-10-09T10:00:00.000000Z',
|
||||
ends_at: '2026-10-09T20:00:00.000000Z',
|
||||
label: 'Viernes 9 de octubre - 10:00 a 20:00',
|
||||
stock_tecnico: 10,
|
||||
value: '20',
|
||||
label: '09/10/2026',
|
||||
sort_order: 0,
|
||||
metadata: null,
|
||||
},
|
||||
{
|
||||
id: 21,
|
||||
variant_id: 102,
|
||||
date: '2026-10-10',
|
||||
starts_at: '2026-10-10T10:00:00.000000Z',
|
||||
ends_at: '2026-10-10T20:00:00.000000Z',
|
||||
label: 'Sábado 10 de octubre - 10:00 a 20:00',
|
||||
stock_tecnico: 10,
|
||||
value: '21',
|
||||
label: '10/10/2026',
|
||||
sort_order: 1,
|
||||
metadata: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
selected_variant: {
|
||||
@@ -373,12 +380,13 @@ describe('ProductDetailPageComponent', () => {
|
||||
const fixture = TestBed.createComponent(ProductDetailPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const select = fixture.nativeElement.querySelector('#event-date-selector') as HTMLSelectElement;
|
||||
expect(select.options).toHaveLength(2);
|
||||
expect(select.value).toBe('101');
|
||||
const options = fixture.nativeElement.querySelectorAll(
|
||||
'.attribute-selector__text-option',
|
||||
) as NodeListOf<HTMLButtonElement>;
|
||||
expect(options).toHaveLength(2);
|
||||
expect(options[0].classList.contains('attribute-selector__text-option--selected')).toBe(true);
|
||||
|
||||
select.value = '102';
|
||||
select.dispatchEvent(new Event('change'));
|
||||
options[1].click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(catalogServiceStub.getCatalogItem).toHaveBeenCalledWith(1, 102);
|
||||
@@ -621,6 +629,39 @@ describe('ProductDetailPageComponent', () => {
|
||||
expect(fixture.componentInstance['quantity']()).toBe(2);
|
||||
});
|
||||
|
||||
it('caps an unlimited variant at the per-user purchase limit', async () => {
|
||||
const unlimitedVariant = {
|
||||
id: 322,
|
||||
stock_tecnico: null,
|
||||
values: {},
|
||||
};
|
||||
resolveProduct({
|
||||
...mockProduct,
|
||||
inventory_policy: 'unlimited',
|
||||
max_units_per_user: 2,
|
||||
selected_variant: {
|
||||
id: 322,
|
||||
stock_tecnico: null,
|
||||
images: [],
|
||||
values: { event_date: '20' },
|
||||
},
|
||||
variants: [unlimitedVariant],
|
||||
});
|
||||
|
||||
await configureTestingModule();
|
||||
const fixture = TestBed.createComponent(ProductDetailPageComponent);
|
||||
fixture.detectChanges();
|
||||
|
||||
const increaseButton = fixture.nativeElement.querySelector(
|
||||
'app-quantity-selector button:last-child',
|
||||
) as HTMLButtonElement;
|
||||
increaseButton.click();
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(fixture.componentInstance['quantity']()).toBe(2);
|
||||
expect(increaseButton.disabled).toBe(true);
|
||||
});
|
||||
|
||||
it('disables purchase actions for tracked variants without stock', async () => {
|
||||
const trackedVariant = {
|
||||
id: 654,
|
||||
|
||||
@@ -86,13 +86,28 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly creatingDirectPurchase = signal(false);
|
||||
protected readonly error = signal<string | null>(null);
|
||||
protected readonly selectedVariant = signal<CatalogItemVariant | null>(null);
|
||||
protected readonly effectiveDescription = computed(
|
||||
() => this.selectedVariant()?.descripcion ?? this.product()?.descripcion ?? '',
|
||||
);
|
||||
protected readonly effectivePrice = computed(
|
||||
() => this.selectedVariant()?.precio ?? this.product()?.precio,
|
||||
);
|
||||
protected readonly quantity = signal(1);
|
||||
protected readonly selectedVariantMax = computed<number | null>(() => {
|
||||
const prod = this.product();
|
||||
const variant = this.selectedVariant();
|
||||
if (variant) return variant.stock_tecnico;
|
||||
if (prod && prod.variants.length === 0) return prod.stock_tecnico ?? null;
|
||||
return 0;
|
||||
if (!prod) return 0;
|
||||
|
||||
const stockLimit = variant
|
||||
? variant.stock_tecnico
|
||||
: prod.variants.length === 0
|
||||
? (prod.stock_tecnico ?? null)
|
||||
: 0;
|
||||
const userLimit = prod.max_units_per_user ?? null;
|
||||
|
||||
if (stockLimit === null) return userLimit;
|
||||
if (userLimit === null) return stockLimit;
|
||||
return Math.min(stockLimit, userLimit);
|
||||
});
|
||||
protected readonly selectedVariantAvailable = computed(() => {
|
||||
const prod = this.product();
|
||||
@@ -110,13 +125,9 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
protected readonly descriptionHasOverflow = signal(false);
|
||||
protected readonly renderableAttributes = computed(() =>
|
||||
(this.product()?.attributes ?? []).filter(
|
||||
(attribute) =>
|
||||
attribute.options.length > 0 &&
|
||||
!(this.product()?.purpose === 'entry' && attribute.codigo === 'fecha'),
|
||||
(attribute) => attribute.show_in_selector !== false && attribute.options.length > 0,
|
||||
),
|
||||
);
|
||||
protected readonly eventDates = computed(() => this.product()?.event_dates ?? []);
|
||||
protected readonly hasEventDates = computed(() => this.eventDates().length > 0);
|
||||
protected readonly hasRenderableAttributes = computed(
|
||||
() => this.renderableAttributes().length > 0,
|
||||
);
|
||||
@@ -130,6 +141,7 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
this.carouselHost();
|
||||
this.descriptionBody();
|
||||
this.product();
|
||||
this.selectedVariant();
|
||||
this.descriptionExpanded();
|
||||
|
||||
if (this.isBrowser) {
|
||||
@@ -237,8 +249,11 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
this.selectedVariant.set(variant);
|
||||
if (variant && variant.stock_tecnico !== null && this.quantity() > variant.stock_tecnico) {
|
||||
this.quantity.set(Math.max(1, variant.stock_tecnico));
|
||||
this.descriptionExpanded.set(false);
|
||||
this.descriptionHasOverflow.set(false);
|
||||
const maximum = this.selectedVariantMax();
|
||||
if (maximum !== null && this.quantity() > maximum) {
|
||||
this.quantity.set(Math.max(1, maximum));
|
||||
}
|
||||
|
||||
const currentProduct = this.product();
|
||||
@@ -247,12 +262,6 @@ export class ProductDetailPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
}
|
||||
|
||||
protected onEventDateChange(event: Event): void {
|
||||
const variantId = Number((event.target as HTMLSelectElement).value);
|
||||
const variant = this.product()?.variants.find((item) => item.id === variantId) ?? null;
|
||||
this.onVariantChange(variant);
|
||||
}
|
||||
|
||||
protected addToCart(): void {
|
||||
const currentProduct = this.product();
|
||||
const variant = this.selectedVariant();
|
||||
|
||||
@@ -18,9 +18,10 @@
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__inputs .form-control {
|
||||
min-height: 52px;
|
||||
padding: 0.5rem;
|
||||
padding: 0.5rem !important;
|
||||
text-align: center;
|
||||
font-size: 20px;
|
||||
background-image: none !important;
|
||||
}
|
||||
|
||||
:host ::ng-deep .recover-password-code-page__resend-action {
|
||||
|
||||
@@ -30,6 +30,13 @@ app-store-section + app-store-section {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
:host > app-hero-banner:first-child {
|
||||
display: block;
|
||||
margin-top: -3rem;
|
||||
}
|
||||
}
|
||||
|
||||
.store-home__alert-error {
|
||||
margin: 0;
|
||||
border-color: rgba(var(--tenant-danger-rgb, 220, 53, 69), 0.18);
|
||||
|
||||
@@ -195,11 +195,9 @@ describe('StoreHomePageComponent', () => {
|
||||
background_image_id: 'https://example.com/hero.jpg',
|
||||
},
|
||||
});
|
||||
tenant.active_event_id = 10;
|
||||
tenant.active_event = {
|
||||
id: 10,
|
||||
name: 'Fiesta Fútbol Infantil',
|
||||
address: 'Rosario, Santa Fe',
|
||||
tenant.event = {
|
||||
title: 'Fiesta Fútbol Infantil',
|
||||
location: 'Rosario, Santa Fe',
|
||||
dates: [
|
||||
{
|
||||
id: 20,
|
||||
@@ -215,6 +213,7 @@ describe('StoreHomePageComponent', () => {
|
||||
},
|
||||
],
|
||||
};
|
||||
tenant.event_date_text = '5 y 6 de Diciembre 2026';
|
||||
tenant.website_type_code = 'onticket';
|
||||
tenant.social_media = [
|
||||
{
|
||||
@@ -261,7 +260,7 @@ describe('StoreHomePageComponent', () => {
|
||||
expect(hero.textContent).toContain('Fiesta Fútbol Infantil');
|
||||
expect(hero.textContent).toContain('Viví una jornada inolvidable de fútbol infantil.');
|
||||
expect(hero.textContent).toContain('Rosario, Santa Fe');
|
||||
expect(hero.textContent).toContain('2026-12-05, 2026-12-06');
|
||||
expect(hero.textContent).toContain('5 y 6 de Diciembre 2026');
|
||||
const heroComponent = fixture.debugElement.query(By.directive(HeroBannerComponent))
|
||||
.componentInstance as HeroBannerComponent;
|
||||
expect(heroComponent.eventConfig?.contact).toEqual(tenant.social_media);
|
||||
@@ -331,11 +330,9 @@ describe('StoreHomePageComponent', () => {
|
||||
|
||||
it('renders only the active event data when the tenant does not have the hero extra', async () => {
|
||||
const tenant = createTenant();
|
||||
tenant.active_event_id = 12;
|
||||
tenant.active_event = {
|
||||
id: 12,
|
||||
name: 'Fiesta Fútbol Infantil',
|
||||
address: 'Sunchales, Santa Fe',
|
||||
tenant.event = {
|
||||
title: 'Fiesta Fútbol Infantil',
|
||||
location: 'Sunchales, Santa Fe',
|
||||
dates: [
|
||||
{
|
||||
id: 25,
|
||||
|
||||
@@ -68,14 +68,15 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
|
||||
protected readonly eventConfig = computed(() => {
|
||||
const tenant = this.tenant();
|
||||
const contact = tenant?.social_media ?? [];
|
||||
const activeEvent = tenant?.active_event;
|
||||
const event = tenant?.event;
|
||||
|
||||
if (activeEvent) {
|
||||
if (event) {
|
||||
return {
|
||||
id: activeEvent.id,
|
||||
title: activeEvent.name,
|
||||
location: activeEvent.address,
|
||||
dates: activeEvent.dates.map((eventDate) => ({
|
||||
id: tenant.id,
|
||||
title: event.title,
|
||||
location: event.location,
|
||||
dates_text: tenant.event_date_text,
|
||||
dates: event.dates.map((eventDate) => ({
|
||||
id: eventDate.id,
|
||||
date: eventDate.date,
|
||||
start_time: eventDate.time_start,
|
||||
|
||||
@@ -116,9 +116,13 @@ export const routes: Routes = [
|
||||
{
|
||||
path: 'ayuda',
|
||||
canActivate: [hasMenuGuard('help')],
|
||||
data: {
|
||||
menuCode: 'help',
|
||||
navigationLabel: 'Secciones de ayuda',
|
||||
},
|
||||
loadComponent: () =>
|
||||
import('./pages/help-page/sidebar-layout/help-sidebar-layout').then(
|
||||
(m) => m.HelpSidebarLayout,
|
||||
import('./components/menu-page-layout/menu-page-layout.component').then(
|
||||
(m) => m.MenuPageLayoutComponent,
|
||||
),
|
||||
children: [
|
||||
{
|
||||
@@ -152,8 +156,14 @@ export const routes: Routes = [
|
||||
{
|
||||
path: 'mi-cuenta',
|
||||
canActivate: [authGuard, hasMenuGuard('account')],
|
||||
data: {
|
||||
menuCode: 'account',
|
||||
navigationLabel: 'Secciones de mi cuenta',
|
||||
},
|
||||
loadComponent: () =>
|
||||
import('./pages/account-page/sidebar-layout/sidebar-layout').then((m) => m.SidebarLayout),
|
||||
import('./components/menu-page-layout/menu-page-layout.component').then(
|
||||
(m) => m.MenuPageLayoutComponent,
|
||||
),
|
||||
children: [
|
||||
{
|
||||
path: 'datos-personales',
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
}
|
||||
|
||||
.accordion {
|
||||
--bs-accordion-border-color: #dedede;
|
||||
--bs-accordion-border-color: var(--border-color);
|
||||
--bs-accordion-border-radius: 0;
|
||||
--bs-accordion-inner-border-radius: 0;
|
||||
--bs-accordion-bg: transparent;
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
:host {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
:host(.product-detail__cta) {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
@@ -11,10 +7,6 @@
|
||||
min-height: 40px;
|
||||
font-weight: 700;
|
||||
font-size: 15px;
|
||||
min-width: 216px;
|
||||
}
|
||||
|
||||
:host(.product-detail__cta) .btn {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
<article
|
||||
class="w-100 p-3 rounded-0 cart-item"
|
||||
[class.cart-item-with-media]="imageUrl()"
|
||||
>
|
||||
<article class="w-100 p-3 rounded-0 cart-item" [class.cart-item-with-media]="imageUrl()">
|
||||
@if (imageUrl()) {
|
||||
<div class="position-relative overflow-hidden cart-item-media">
|
||||
@if (discountPercentage() && discountPercentage()! > 0) {
|
||||
<span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge">-{{ discountPercentage() }}%</span>
|
||||
<span class="position-absolute top-0 start-0 z-1 rounded-0 cart-item-discount-badge"
|
||||
>-{{ discountPercentage() }}%</span
|
||||
>
|
||||
}
|
||||
|
||||
<img class="w-100 h-100 object-fit-cover d-block" [src]="imageUrl()" [alt]="product()" />
|
||||
@@ -18,13 +17,24 @@
|
||||
|
||||
<div class="text-nowrap cart-item-prices">
|
||||
@if (formattedOriginalPrice(); as originalPrice) {
|
||||
<span class="text-decoration-line-through mb-1 fw-light cart-item-original-price">{{ originalPrice }}</span>
|
||||
<span class="text-decoration-line-through mb-1 fw-light cart-item-original-price">{{
|
||||
originalPrice
|
||||
}}</span>
|
||||
}
|
||||
|
||||
<span class="fw-bold cart-item-discounted-price">{{ formattedDiscountedPrice() }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (hasVariantSelectors() && !quantityDisabled()) {
|
||||
<app-variant-selector
|
||||
class="cart-item-variant-selector"
|
||||
[variants]="variants()"
|
||||
[selectedVariant]="selectedVariant()"
|
||||
[compact]="true"
|
||||
(selectedVariantChange)="onVariantChange($event)"
|
||||
/>
|
||||
} @else {
|
||||
<div class="d-grid cart-item-attributes">
|
||||
@for (attribute of attributes(); track attribute.label + attribute.value) {
|
||||
<div class="cart-item-attribute">
|
||||
@@ -33,6 +43,7 @@
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (!readonly()) {
|
||||
<div class="d-flex justify-content-end align-items-center mt-auto cart-item-actions">
|
||||
@@ -45,15 +56,9 @@
|
||||
(decrease)="onDecrease()"
|
||||
/>
|
||||
@if (!quantityDisabled() && showRemove()) {
|
||||
<app-icon-button
|
||||
variant="trash"
|
||||
class="cart-item-remove-btn"
|
||||
(click)="onRemove()"
|
||||
/>
|
||||
<app-icon-button variant="trash" class="cart-item-remove-btn" (click)="onRemove()" />
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</article>
|
||||
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
:host(:first-child) .cart-item::before,
|
||||
:host .cart-item::after {
|
||||
content: "";
|
||||
content: '';
|
||||
position: absolute;
|
||||
right: var(--item-divider-inset);
|
||||
left: var(--item-divider-inset);
|
||||
@@ -43,7 +43,7 @@
|
||||
aspect-ratio: 1 / 1;
|
||||
border-radius: 5px 0 0 5px;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #eaeaea;
|
||||
border: 1px solid var(--border-color);
|
||||
overflow: hidden;
|
||||
|
||||
img {
|
||||
@@ -119,6 +119,11 @@
|
||||
gap: 0.125rem;
|
||||
}
|
||||
|
||||
.cart-item-variant-selector {
|
||||
display: block;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.cart-item-remove-btn {
|
||||
margin-left: 0.35rem;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
|
||||
import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
|
||||
import { IconButtonComponent } from '../icon-button/icon-button.component';
|
||||
import {
|
||||
VariantSelectorComponent,
|
||||
VariantSelectorVariant,
|
||||
} from '../variant-selector/variant-selector.component';
|
||||
|
||||
export interface CartItemAttribute {
|
||||
label: string;
|
||||
@@ -10,10 +14,10 @@ export interface CartItemAttribute {
|
||||
@Component({
|
||||
selector: 'app-cart-item',
|
||||
standalone: true,
|
||||
imports: [QuantitySelectorComponent, IconButtonComponent],
|
||||
imports: [QuantitySelectorComponent, IconButtonComponent, VariantSelectorComponent],
|
||||
templateUrl: './cart-item.component.html',
|
||||
styleUrl: './cart-item.component.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class CartItemComponent {
|
||||
readonly imageUrl = input<string | null>(null);
|
||||
@@ -22,6 +26,8 @@ export class CartItemComponent {
|
||||
readonly discountedPrice = input<number>(0);
|
||||
readonly discountPercentage = input<number | null>(null);
|
||||
readonly attributes = input<CartItemAttribute[]>([]);
|
||||
readonly variants = input<VariantSelectorVariant[]>([]);
|
||||
readonly selectedVariant = input<unknown>(null);
|
||||
readonly quantity = input<number>(1);
|
||||
readonly readonly = input<boolean>(false);
|
||||
readonly quantityDisabled = input<boolean>(false);
|
||||
@@ -31,6 +37,11 @@ export class CartItemComponent {
|
||||
readonly remove = output<void>();
|
||||
readonly increase = output<void>();
|
||||
readonly decrease = output<void>();
|
||||
readonly variantChange = output<number>();
|
||||
|
||||
protected readonly hasVariantSelectors = computed(() =>
|
||||
this.variants().some((variant) => Object.keys(variant.values).length > 0),
|
||||
);
|
||||
|
||||
protected onQuantityChange(newQuantity: number): void {
|
||||
if (this.quantityDisabled()) return;
|
||||
@@ -49,12 +60,20 @@ export class CartItemComponent {
|
||||
this.decrease.emit();
|
||||
}
|
||||
|
||||
protected onVariantChange(variant: unknown): void {
|
||||
if (!this.quantityDisabled() && typeof variant === 'number') {
|
||||
this.variantChange.emit(variant);
|
||||
}
|
||||
}
|
||||
|
||||
protected readonly formattedOriginalPrice = computed(() => {
|
||||
const price = this.originalPrice();
|
||||
return price === null ? null : this.formatCurrency(price);
|
||||
});
|
||||
|
||||
protected readonly formattedDiscountedPrice = computed(() => this.formatCurrency(this.discountedPrice()));
|
||||
protected readonly formattedDiscountedPrice = computed(() =>
|
||||
this.formatCurrency(this.discountedPrice()),
|
||||
);
|
||||
|
||||
private formatCurrency(value: number): string {
|
||||
const rounded = Math.round(value);
|
||||
|
||||
@@ -44,11 +44,14 @@
|
||||
[discountedPrice]="item.discountedPrice"
|
||||
[discountPercentage]="item.discountPercentage"
|
||||
[attributes]="item.attributes"
|
||||
[variants]="item.variants ?? []"
|
||||
[selectedVariant]="getItemVariant(item)"
|
||||
[quantity]="getItemQuantity(item)"
|
||||
[readonly]="readonly()"
|
||||
[quantityDisabled]="editingDisabled() || (allowEditing() && !editing())"
|
||||
[showRemove]="allowRemove()"
|
||||
(quantityChange)="onItemQuantityChange(idx, $event)"
|
||||
(variantChange)="onItemVariantChange(idx, $event)"
|
||||
(remove)="onItemRemove(idx)"
|
||||
/>
|
||||
} @empty {
|
||||
|
||||
@@ -87,3 +87,13 @@
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
@media (max-width: 767.98px) {
|
||||
.cart-actions {
|
||||
flex-direction: column;
|
||||
|
||||
::ng-deep app-button {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,7 +115,7 @@ describe('CartComponent', () => {
|
||||
|
||||
expect(openConfirmDelete).toHaveBeenCalledWith({
|
||||
title: 'Eliminar producto',
|
||||
content: 'Se eliminara "Producto de prueba" del carrito. Esta accion no se puede deshacer.',
|
||||
content: 'Se eliminará “Producto de prueba” del carrito. Esta acción no se puede deshacer.',
|
||||
confirmLabel: 'Eliminar',
|
||||
cancelLabel: 'Cancelar',
|
||||
});
|
||||
@@ -407,4 +407,57 @@ describe('CartComponent', () => {
|
||||
fixture.debugElement.query(By.css('app-cart-item')).componentInstance.quantityDisabled(),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it('persists a variant selected from a cart row', async () => {
|
||||
const updateItemVariant = vi.fn().mockReturnValue(
|
||||
of({
|
||||
message: 'Variante actualizada.',
|
||||
data: {},
|
||||
}),
|
||||
);
|
||||
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [CartComponent],
|
||||
providers: [
|
||||
{
|
||||
provide: CartService,
|
||||
useValue: {
|
||||
cart: signal(null).asReadonly(),
|
||||
updateItemQuantity: vi.fn(),
|
||||
updateItemVariant,
|
||||
removeItem: vi.fn(),
|
||||
},
|
||||
},
|
||||
{ provide: ModalService, useValue: {} },
|
||||
{
|
||||
provide: ToastService,
|
||||
useValue: { success: vi.fn(), info: vi.fn(), danger: vi.fn() },
|
||||
},
|
||||
],
|
||||
}).compileComponents();
|
||||
|
||||
const fixture = TestBed.createComponent(CartComponent);
|
||||
fixture.componentRef.setInput('items', [
|
||||
{
|
||||
cartItemId: 10,
|
||||
imageUrl: null,
|
||||
product: 'Comida',
|
||||
originalPrice: null,
|
||||
discountedPrice: 1000,
|
||||
discountPercentage: null,
|
||||
attributes: [{ label: 'Servicio', value: 'Almuerzo' }],
|
||||
quantity: 2,
|
||||
variantId: 20,
|
||||
variants: [
|
||||
{ value: 20, values: { servicio: 'Almuerzo' } },
|
||||
{ value: 21, values: { servicio: 'Cena' } },
|
||||
],
|
||||
},
|
||||
]);
|
||||
fixture.detectChanges();
|
||||
|
||||
fixture.debugElement.query(By.css('app-cart-item')).triggerEventHandler('variantChange', 21);
|
||||
|
||||
expect(updateItemVariant).toHaveBeenCalledWith(10, 2, 21);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -16,6 +16,7 @@ import { CartItemAttribute, CartItemComponent } from '../cart-item/cart-item.com
|
||||
import { ModalService } from '../../../core/services/modal.service';
|
||||
import { CartService } from '../../../core/services/cart/cart.service';
|
||||
import { ToastService } from '../../../core/services/toast.service';
|
||||
import { VariantSelectorVariant } from '../variant-selector/variant-selector.component';
|
||||
|
||||
export interface CartItemMock {
|
||||
cartItemId?: number;
|
||||
@@ -26,6 +27,8 @@ export interface CartItemMock {
|
||||
discountPercentage: number | null;
|
||||
attributes: CartItemAttribute[];
|
||||
quantity: number;
|
||||
variantId?: number | null;
|
||||
variants?: VariantSelectorVariant[];
|
||||
}
|
||||
|
||||
@Component({
|
||||
@@ -64,6 +67,7 @@ export class CartComponent {
|
||||
}>();
|
||||
|
||||
protected readonly quantityOverrides = signal<Record<number, number>>({});
|
||||
protected readonly variantOverrides = signal<Record<number, number>>({});
|
||||
constructor() {
|
||||
this.quantityUpdates$
|
||||
.pipe(
|
||||
@@ -104,6 +108,13 @@ export class CartComponent {
|
||||
return item.quantity;
|
||||
}
|
||||
|
||||
protected getItemVariant(item: CartItemMock): number | null {
|
||||
if (item.cartItemId !== undefined && this.variantOverrides()[item.cartItemId] !== undefined) {
|
||||
return this.variantOverrides()[item.cartItemId];
|
||||
}
|
||||
return item.variantId ?? null;
|
||||
}
|
||||
|
||||
private clearOverride(cartItemId: number): void {
|
||||
this.quantityOverrides.update((overrides) => {
|
||||
const copy = { ...overrides };
|
||||
@@ -153,6 +164,36 @@ export class CartComponent {
|
||||
}
|
||||
}
|
||||
|
||||
protected onItemVariantChange(index: number, variantId: number): void {
|
||||
const item = this.items()[index];
|
||||
const cartItemId = item?.cartItemId;
|
||||
|
||||
if (!item || !cartItemId || variantId === this.getItemVariant(item)) return;
|
||||
|
||||
this.variantOverrides.update((overrides) => ({ ...overrides, [cartItemId]: variantId }));
|
||||
this.cartService
|
||||
.updateItemVariant(cartItemId, this.getItemQuantity(item), variantId)
|
||||
.subscribe({
|
||||
next: (response) => {
|
||||
this.clearVariantOverride(cartItemId);
|
||||
this.toastService.success(response.message || 'Variante actualizada.');
|
||||
},
|
||||
error: (error: HttpErrorResponse) => {
|
||||
console.error('Error updating cart item variant', error);
|
||||
this.clearVariantOverride(cartItemId);
|
||||
this.toastService.danger(error.error?.message || 'No se pudo actualizar la variante.');
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private clearVariantOverride(cartItemId: number): void {
|
||||
this.variantOverrides.update((overrides) => {
|
||||
const copy = { ...overrides };
|
||||
delete copy[cartItemId];
|
||||
return copy;
|
||||
});
|
||||
}
|
||||
|
||||
protected onItemRemove(index: number): void {
|
||||
const target = this.resolveRemoveTarget(index);
|
||||
|
||||
@@ -163,7 +204,7 @@ export class CartComponent {
|
||||
this.modalService
|
||||
.openConfirmDelete({
|
||||
title: 'Eliminar producto',
|
||||
content: `Se eliminara "${target.productName}" del carrito. Esta accion no se puede deshacer.`,
|
||||
content: `Se eliminará “${target.productName}” del carrito. Esta acción no se puede deshacer.`,
|
||||
confirmLabel: 'Eliminar',
|
||||
cancelLabel: 'Cancelar',
|
||||
})
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
.confirm-modal {
|
||||
display: grid;
|
||||
gap: 1.5rem;
|
||||
justify-items: center;
|
||||
width: 100%;
|
||||
gap: 1.25rem;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.confirm-modal__content {
|
||||
margin: 0;
|
||||
color: #666666;
|
||||
line-height: 1.5;
|
||||
color: #5f6368;
|
||||
line-height: 1.55;
|
||||
}
|
||||
|
||||
.confirm-modal__actions {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
width: 100%;
|
||||
gap: 0.75rem;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
@media (max-width: 380px) {
|
||||
.confirm-modal__actions {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
.global-loading__spinner {
|
||||
width: 3rem;
|
||||
height: 3rem;
|
||||
border: 0.25rem solid rgba(32, 32, 32, 0.12);
|
||||
border: 0.25rem solid var(--border-color);
|
||||
border-top-color: var(--tenant-primary, #6376f3);
|
||||
border-radius: 50%;
|
||||
animation: global-loading-spin 0.75s linear infinite;
|
||||
|
||||
@@ -1,14 +1,15 @@
|
||||
<div [class.hero-banner-container]="heroConfig">
|
||||
<div class="hero-banner-container">
|
||||
<div class="hero-banner position-relative rounded">
|
||||
<div
|
||||
[class.hero-banner]="heroConfig"
|
||||
[class.position-relative]="heroConfig"
|
||||
[class.rounded]="heroConfig"
|
||||
class="hero-media"
|
||||
aria-hidden="true"
|
||||
[ngStyle]="{
|
||||
'background-image': heroConfig?.background_image_id
|
||||
? 'url(' + heroConfig.background_image_id + ')'
|
||||
: 'none',
|
||||
}"
|
||||
>
|
||||
></div>
|
||||
|
||||
@if (heroConfig) {
|
||||
<div
|
||||
class="hero-content d-flex justify-content-end p-4 p-md-5 w-100 h-100 align-items-center"
|
||||
@@ -23,7 +24,7 @@
|
||||
@if (heroConfig.button_text) {
|
||||
<a
|
||||
[href]="heroConfig.button_href || '#'"
|
||||
class="text-decoration-none mt-3 d-inline-block"
|
||||
class="hero-action text-decoration-none mt-3 d-inline-block"
|
||||
>
|
||||
<app-button variant="primary">
|
||||
{{ heroConfig.button_text }}
|
||||
@@ -33,13 +34,11 @@
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
@if (eventConfig) {
|
||||
<div
|
||||
class="event-card-container w-100 d-flex justify-content-center"
|
||||
[class.position-absolute]="heroConfig"
|
||||
>
|
||||
<div class="event-card bg-white shadow rounded p-3 p-md-4 text-center">
|
||||
<div class="event-card-container w-100 d-flex justify-content-center">
|
||||
<div id="event-details" 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>
|
||||
}
|
||||
@@ -60,8 +59,53 @@
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
@if (eventConfig.dates && eventConfig.dates.length > 0) {
|
||||
<button
|
||||
type="button"
|
||||
class="event-schedule-toggle"
|
||||
[attr.aria-expanded]="schedulesExpanded"
|
||||
aria-controls="event-schedules"
|
||||
(click)="toggleSchedules()"
|
||||
>
|
||||
<i
|
||||
class="fa-solid"
|
||||
[class.fa-chevron-down]="!schedulesExpanded"
|
||||
[class.fa-chevron-up]="schedulesExpanded"
|
||||
aria-hidden="true"
|
||||
></i>
|
||||
<span>{{ schedulesExpanded ? 'Ocultar horarios' : 'Ver horarios' }}</span>
|
||||
</button>
|
||||
|
||||
@if (schedulesExpanded) {
|
||||
<div id="event-schedules" class="event-schedules">
|
||||
<table class="table table-striped table-borderless mb-0">
|
||||
<tbody>
|
||||
@for (eventDate of eventConfig.dates; track eventDate.id ?? eventDate.date) {
|
||||
<tr>
|
||||
<td>
|
||||
<span class="event-schedule-value">
|
||||
<i class="fa-regular fa-calendar" aria-hidden="true"></i>
|
||||
<span>{{ formatScheduleDate(eventDate.date) }}</span>
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="event-schedule-value">
|
||||
<i class="fa-regular fa-clock" aria-hidden="true"></i>
|
||||
<span>
|
||||
{{ formatScheduleTime(eventDate.start_time) }} -
|
||||
{{ formatScheduleTime(eventDate.end_time) }}
|
||||
</span>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user