diff --git a/src/modules/cart/providers/cart.service.ts b/src/modules/cart/providers/cart.service.ts
index 9ef7592..5c1dda3 100644
--- a/src/modules/cart/providers/cart.service.ts
+++ b/src/modules/cart/providers/cart.service.ts
@@ -18,12 +18,13 @@ import { Delivery } from '../../delivery/entities/delivery.entity';
 import { DeliveryMethodEnum } from '../../delivery/interface/delivery';
 import { Cart, CartItem } from '../interfaces/cart.interface';
 import { CouponService } from 'src/modules/coupons/providers/coupon.service';
-import { OrderCouponDetail } from 'src/modules/orders/interface/order.interface';
+import { OrderCouponDetail, OrderStatus } from 'src/modules/orders/interface/order.interface';
 import { CouponType } from 'src/modules/coupons/interface/coupon';
 import { UserWallet } from 'src/modules/users/entities/user-wallet.entity';
 import { PaymentMethodEnum } from 'src/modules/payments/interface/payment';
 import { SetAllCartParmsDto } from '../dto/set-all-cart-params.dto';
-
+import { Order } from 'src/modules/orders/entities/order.entity';
+  
 @Injectable()
 export class CartService {
   private readonly CART_TTL = 3600; // 1 hour in seconds
@@ -319,7 +320,7 @@ export class CartService {
     latitude?: number | null,
     longitude?: number | null,
   ): Promise<void> {
-     if (latitude === undefined || latitude === null || longitude === undefined || longitude === null) {
+    if (latitude === undefined || latitude === null || longitude === undefined || longitude === null) {
       throw new BadRequestException('Address does not have coordinates');
     }
 
@@ -343,7 +344,7 @@ export class CartService {
     const polygon: [number, number][] = ring.map(
       coord => [Number(coord[0] ?? 0), Number(coord[1] ?? 0)] as [number, number],
     );
-     if (!this.isPointInPolygon(point, polygon)) {
+    if (!this.isPointInPolygon(point, polygon)) {
       throw new BadRequestException('Address is outside the restaurant service area');
     }
   }
@@ -817,18 +818,25 @@ export class CartService {
   private async assertCouponUsageLimit(userId: string, couponId: string, maxUsesPerUser?: number): Promise<void> {
     if (!maxUsesPerUser) return;
 
-    const knex = this.em.getKnex();
-    const result = await knex.raw(
-      `SELECT COUNT(*)::int as count 
-       FROM orders 
-       WHERE user_id = ? 
-       AND coupon_detail IS NOT NULL 
-       AND coupon_detail->>'couponId' = ? 
-       AND deleted_at IS NULL`,
-      [userId, couponId],
-    );
-    const userCouponUsageCount = result.rows?.[0]?.count ?? result[0]?.count ?? 0;
-    if (userCouponUsageCount >= maxUsesPerUser) {
+    // const knex = this.em.getKnex();
+    // const result = await knex.raw(
+    //   `SELECT COUNT(*)::int as count
+    //    FROM orders
+    //    WHERE user_id = ?
+    //    AND coupon_detail IS NOT NULL
+    //    AND coupon_detail->>'couponId' = ?
+    //    AND deleted_at IS NULL`,
+    //   [userId, couponId],
+    // );
+    const ordersThatUSedTheCouponCount = await this.em.count(Order, {
+      user: { id: userId },
+      couponDetail: { couponId: couponId },
+      status: { $ne: OrderStatus.CANCELED },
+      deletedAt: null,
+    });
+
+    console.log('ordersThatUSedTheCouponCount', ordersThatUSedTheCouponCount);
+    if (ordersThatUSedTheCouponCount >= maxUsesPerUser) {
       throw new BadRequestException(`You have reached the maximum number of uses (${maxUsesPerUser}) for this coupon`);
     }
   }
diff --git a/src/modules/orders/providers/orders.service.ts b/src/modules/orders/providers/orders.service.ts
index 76ad5f0..c6215ee 100644
--- a/src/modules/orders/providers/orders.service.ts
+++ b/src/modules/orders/providers/orders.service.ts
@@ -71,6 +71,7 @@ export class OrdersService {
         carAddress: validated.carAddress,
         paymentMethod: validated.paymentMethod,
         couponDiscount: cart.couponDiscount || 0,
+        couponDetail: cart.coupon,
         itemsDiscount: cart.itemsDiscount || 0,
         totalDiscount: cart.totalDiscount || 0,
         subTotal: cart.subTotal || 0,