diff --git a/src/app/features/store/pages/search-page/search-page.component.ts b/src/app/features/store/pages/search-page/search-page.component.ts
index 17c83c0..6124719 100644
--- a/src/app/features/store/pages/search-page/search-page.component.ts
+++ b/src/app/features/store/pages/search-page/search-page.component.ts
@@ -3,6 +3,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   DestroyRef,
+  Injector,
   computed,
   inject,
   signal,
@@ -28,7 +29,6 @@ import {
   ProductListCartEvent,
   ProductListBuyEvent,
   ProductListComponent,
-  ProductListItem,
 } from '../../../../shared/components/product-list/product-list.component';
 
 interface SearchRouteState {
@@ -46,9 +46,8 @@ interface SearchRouteState {
 export class SearchPageComponent {
   private readonly minSearchLength = 3;
   private readonly cartService = inject(CartService);
-  private readonly authService = inject(AuthService);
   private readonly catalogService = inject(CatalogService);
-  private readonly checkoutService = inject(CheckoutService);
+  private readonly injector = inject(Injector);
   private readonly destroyRef = inject(DestroyRef);
   private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
@@ -147,7 +146,7 @@ export class SearchPageComponent {
       return;
     }
 
-    if (!this.authService.user()) {
+    if (!this.injector.get(AuthService).user()) {
       await this.router.navigate(['/login'], {
         queryParams: { returnUrl: `/producto/${event.product.id}` },
       });
@@ -162,7 +161,7 @@ export class SearchPageComponent {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
+      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
         direct_item: {
           catalog_item_id: event.product.id,
           variant_id: event.variant ?? null,
diff --git a/src/app/features/store/pages/store-home-page/store-home-page.component.ts b/src/app/features/store/pages/store-home-page/store-home-page.component.ts
index d981436..63fd104 100644
--- a/src/app/features/store/pages/store-home-page/store-home-page.component.ts
+++ b/src/app/features/store/pages/store-home-page/store-home-page.component.ts
@@ -1,6 +1,7 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  Injector,
   OnDestroy,
   OnInit,
   computed,
@@ -22,7 +23,6 @@ import {
   ProductListComponent,
   ProductListCartEvent,
   ProductListBuyEvent,
-  ProductListItem,
 } from '../../../../shared/components/product-list/product-list.component';
 import { HeroBannerComponent } from '../../../../shared/components/hero-banner/hero-banner.component';
 import { MainCarouselComponent } from '../../../../shared/components/main-carousel/main-carousel.component';
@@ -46,9 +46,8 @@ import {
 })
 export class StoreHomePageComponent implements OnInit, OnDestroy {
   private readonly cartService = inject(CartService);
-  private readonly authService = inject(AuthService);
   private readonly catalogService = inject(CatalogService);
-  private readonly checkoutService = inject(CheckoutService);
+  private readonly injector = inject(Injector);
   private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
   private readonly tenantService = inject(TenantService);
@@ -70,7 +69,8 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     const resolvedData = this.route.snapshot.data['catalogData'] as
-      StoreHomeCatalogResolvedData | undefined;
+      | StoreHomeCatalogResolvedData
+      | undefined;
 
     if (resolvedData) {
       this.applyResolvedData(resolvedData);
@@ -134,7 +134,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
       return;
     }
 
-    if (!this.authService.user()) {
+    if (!this.injector.get(AuthService).user()) {
       await this.router.navigate(['/login'], {
         queryParams: { returnUrl: `/producto/${event.product.id}` },
       });
@@ -149,7 +149,7 @@ export class StoreHomePageComponent implements OnInit, OnDestroy {
 
     this.creatingDirectPurchase.set(true);
     try {
-      const purchase = await this.checkoutService.startCheckout(tenant.codigo, {
+      const purchase = await this.injector.get(CheckoutService).startCheckout(tenant.codigo, {
         direct_item: {
           catalog_item_id: event.product.id,
           variant_id: event.variant ?? null,
diff --git a/src/app/shared/components/product-list/product-list.component.spec.ts b/src/app/shared/components/product-list/product-list.component.spec.ts
index 5beaa26..d70622e 100644
--- a/src/app/shared/components/product-list/product-list.component.spec.ts
+++ b/src/app/shared/components/product-list/product-list.component.spec.ts
@@ -126,6 +126,40 @@ describe('ProductListComponent', () => {
     ).toHaveLength(2);
   });
 
+  it('emits a direct-purchase event with the row quantity and selected variant', async () => {
+    const fixture = await render('row');
+    const buySpy = vi.fn();
+    fixture.componentInstance.buy.subscribe(buySpy);
+    const rowCard = fixture.nativeElement.querySelector('app-product-row-card') as HTMLElement;
+
+    (rowCard.querySelector('.btn-primary') as HTMLButtonElement).click();
+
+    expect(buySpy).toHaveBeenCalledWith({
+      product: items[0],
+      quantity: 1,
+      variant: null,
+      directPurchase: true,
+    });
+  });
+
+  it('emits a direct-purchase event with the column quantity', async () => {
+    const fixture = await render('column_with_cart');
+    const buySpy = vi.fn();
+    fixture.componentInstance.buy.subscribe(buySpy);
+    const card = fixture.nativeElement.querySelector(
+      'app-product-vertical-with-cart-card',
+    ) as HTMLElement;
+
+    (card.querySelector('.btn-primary') as HTMLButtonElement).click();
+
+    expect(buySpy).toHaveBeenCalledWith({
+      product: items[0],
+      quantity: 1,
+      variant: null,
+      directPurchase: true,
+    });
+  });
+
   it('renders pagination and emits the requested page', async () => {
     const fixture = await render('row');
     const pageChangeSpy = vi.fn();
diff --git a/src/app/shared/components/product-row-card/product-row-card.component.html b/src/app/shared/components/product-row-card/product-row-card.component.html
index 3010393..9e73b5e 100644
--- a/src/app/shared/components/product-row-card/product-row-card.component.html
+++ b/src/app/shared/components/product-row-card/product-row-card.component.html
@@ -1,4 +1,6 @@
-<div class="product-row-card border rounded bg-white shadow-sm d-flex justify-content-between p-3 gap-3">
+<div
+  class="product-row-card border rounded bg-white shadow-sm d-flex justify-content-between p-3 gap-3"
+>
   <!-- Left Side: Title and Description -->
   <div class="product-row-card__info d-flex flex-column justify-content-center flex-grow-1">
     <h3 class="product-row-card__title text-uppercase mb-1 m-0">
@@ -19,9 +21,7 @@
         {{ formattedPrice() }}
       </span>
       <div class="product-row-card__btn-wrapper">
-        <app-button variant="primary" (click)="onBuy()">
-          Comprar
-        </app-button>
+        <app-button variant="primary" (click)="onBuy()"> Comprar </app-button>
       </div>
     </div>
 
@@ -35,12 +35,10 @@
         </select>
       }
 
-      <app-quantity-selector [(quantity)]="quantity" ></app-quantity-selector>
+      <app-quantity-selector [(quantity)]="quantity"></app-quantity-selector>
 
       <div class="product-row-card__btn-wrapper">
-        <app-button variant="secondary" (click)="onAddToCart()">
-          Agregar al carrito
-        </app-button>
+        <app-button variant="secondary" (click)="onAddToCart()"> Agregar al carrito </app-button>
       </div>
     </div>
   </div>
diff --git a/src/app/shared/components/product-row-card/product-row-card.component.ts b/src/app/shared/components/product-row-card/product-row-card.component.ts
index 0b7e31a..e1c87ad 100644
--- a/src/app/shared/components/product-row-card/product-row-card.component.ts
+++ b/src/app/shared/components/product-row-card/product-row-card.component.ts
@@ -1,4 +1,12 @@
-import { ChangeDetectionStrategy, Component, computed, effect, input, output, model } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  effect,
+  input,
+  output,
+  model,
+} from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { ButtonComponent } from '../button/button.component';
 import { QuantitySelectorComponent } from '../quantity-selector/quantity-selector.component';
@@ -53,7 +61,7 @@ export class ProductRowCardComponent {
   protected onAddToCart(): void {
     this.addToCart.emit({
       quantity: this.quantity(),
-      variant: this.selectedVariant()
+      variant: this.selectedVariant(),
     });
   }
 
diff --git a/src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.spec.ts b/src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.spec.ts
index 2497df1..ce0c4ba 100644
--- a/src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.spec.ts
+++ b/src/app/shared/components/product-vertical-with-cart-card/product-vertical-with-cart-card.component.spec.ts
@@ -83,7 +83,7 @@ describe('ProductVerticalWithCartCardComponent', () => {
     ) as HTMLButtonElement;
     button.click();
 
-    expect(buySpy).toHaveBeenCalledOnce();
+    expect(buySpy).toHaveBeenCalledWith({ quantity: 1 });
   });
 
   it('emits addToCart with the current quantity', async () => {