diff --git a/src/modules/cart/cart.module.ts b/src/modules/cart/cart.module.ts
index 25dafc8..c3fb424 100644
--- a/src/modules/cart/cart.module.ts
+++ b/src/modules/cart/cart.module.ts
@@ -4,12 +4,19 @@ import { CartService } from './providers/cart.service';
 import { CartController } from './controllers/cart.controller';
 import { Food } from '../foods/entities/food.entity';
 import { Restaurant } from '../restaurants/entities/restaurant.entity';
+import { PaymentMethod } from '../payments/entities/payment-method.entity';
+import { UserAddress } from '../users/entities/user-address.entity';
 import { AuthModule } from '../auth/auth.module';
 import { JwtModule } from '@nestjs/jwt';
 import { UtilsModule } from '../utils/utils.module';
 
 @Module({
-  imports: [MikroOrmModule.forFeature([Food, Restaurant]), AuthModule, JwtModule, UtilsModule],
+  imports: [
+    MikroOrmModule.forFeature([Food, Restaurant, PaymentMethod, UserAddress]),
+    AuthModule,
+    JwtModule,
+    UtilsModule,
+  ],
   controllers: [CartController],
   providers: [CartService],
   exports: [CartService],
diff --git a/src/modules/cart/providers/cart.service.ts b/src/modules/cart/providers/cart.service.ts
index e51c699..a67d239 100644
--- a/src/modules/cart/providers/cart.service.ts
+++ b/src/modules/cart/providers/cart.service.ts
@@ -10,7 +10,7 @@ import { ApplyCouponDto } from '../dto/apply-coupon.dto';
 import { SetAddressDto } from '../dto/set-address.dto';
 import { SetPaymentMethodDto } from '../dto/set-payment-method.dto';
 import { UserAddress } from '../../users/entities/user-address.entity';
-import { RestaurantPaymentMethod } from '../../payments/entities/restaurant-payment-method.entity';
+import { PaymentMethod } from '../../payments/entities/payment-method.entity';
 import { Cart, CartItem, CartCoupon } from '../interfaces/cart.interface';
 
 @Injectable()
@@ -423,35 +423,29 @@ export class CartService {
     const cart = await this.findOne(userId, restaurantId);
 
     // Find and validate payment method belongs to restaurant
-    const restaurantPaymentMethod = await this.em.findOne(
-      RestaurantPaymentMethod,
+    const paymentMethod = await this.em.findOne(
+      PaymentMethod,
       {
+        id: setPaymentMethodDto.paymentMethodId,
         restaurant: { id: restaurantId },
-        paymentMethod: { id: setPaymentMethodDto.paymentMethodId },
       },
-      { populate: ['restaurant', 'paymentMethod'] },
+      { populate: ['restaurant'] },
     );
 
-    if (!restaurantPaymentMethod) {
+    if (!paymentMethod) {
       throw new NotFoundException(
         `Payment method with ID ${setPaymentMethodDto.paymentMethodId} not found for restaurant ${restaurantId}`,
       );
     }
 
-    // Verify payment method is active
-    if (!restaurantPaymentMethod.isActive) {
-      throw new BadRequestException('Payment method is not active for this restaurant');
-    }
-
-    // Verify the payment method itself is active
-    if (!restaurantPaymentMethod.paymentMethod.isActive) {
-      throw new BadRequestException('Payment method is not active');
+    // Verify payment method is enabled
+    if (!paymentMethod.enabled) {
+      throw new BadRequestException('Payment method is not enabled for this restaurant');
     }
 
     cart.paymentMethodId = setPaymentMethodDto.paymentMethodId;
-    // cart.shipmentFee = Number(restaurantPaymentMethod.price) || 0;
 
-    // Recalculate cart totals to include delivery fee
+    // Recalculate cart totals
     await this.recalculateCartTotals(cart);
     await this.saveCart(cart);
 
@@ -505,22 +499,12 @@ export class CartService {
 
     cart.tax = tax;
 
-    // Get shipment fee if payment method is set
-    let shipmentFee = 0;
-    // if (cart.paymentMethodId) {
-    //   const restaurantPaymentMethod = await this.em.findOne(RestaurantPaymentMethod, {
-    //     restaurant: { id: cart.restaurantId },
-    //     paymentMethod: { id: cart.paymentMethodId },
-    //   });
-    //   if (restaurantPaymentMethod) {
-    //     shipmentFee = Number(restaurantPaymentMethod.price) || 0;
-    //     shipmentFee = 1;
-    //   }
-    // }
-    cart.shipmentFee = shipmentFee;
+    // Shipment fee is calculated separately via delivery method
+    // For now, it's set to 0. It should be set when a delivery method is selected
+    cart.shipmentFee = 0;
 
     // Calculate total: total = subtotal – totalDiscount + tax + shipmentFee
-    cart.total = subTotal - cart.totalDiscount + tax + shipmentFee;
+    cart.total = subTotal - cart.totalDiscount + tax + cart.shipmentFee;
     cart.totalItems = totalItems;
     cart.updatedAt = new Date().toISOString();
   }
diff --git a/src/modules/orders/entities/order.entity.ts b/src/modules/orders/entities/order.entity.ts
index 3ce3c32..e883836 100644
--- a/src/modules/orders/entities/order.entity.ts
+++ b/src/modules/orders/entities/order.entity.ts
@@ -5,7 +5,7 @@ import { OrderStatus } from '../interface/order-status';
 import { User } from '../../users/entities/user.entity';
 import { Restaurant } from '../../restaurants/entities/restaurant.entity';
 import { UserAddress } from '../../users/entities/user-address.entity';
-import { RestaurantPaymentMethod } from '../../payments/entities/restaurant-payment-method.entity';
+import { PaymentMethod } from '../../payments/entities/payment-method.entity';
 import { OrderItem } from './order-item.entity';
 
 @Entity({ tableName: 'orders' })
@@ -25,8 +25,8 @@ export class Order extends BaseEntity {
   @ManyToOne(() => UserAddress, { nullable: true })
   address?: UserAddress;
 
-  @ManyToOne(() => RestaurantPaymentMethod, { nullable: true })
-  paymentMethod?: RestaurantPaymentMethod;
+  @ManyToOne(() => PaymentMethod, { nullable: true })
+  paymentMethod?: PaymentMethod;
 
   @Property({ type: 'decimal', precision: 10, scale: 0, default: 0 })
   couponDiscount: number = 0;
diff --git a/src/modules/orders/orders.module.ts b/src/modules/orders/orders.module.ts
index 8b5a8e5..7c6eb05 100644
--- a/src/modules/orders/orders.module.ts
+++ b/src/modules/orders/orders.module.ts
@@ -8,7 +8,7 @@ import { User } from '../users/entities/user.entity';
 import { Restaurant } from '../restaurants/entities/restaurant.entity';
 import { Food } from '../foods/entities/food.entity';
 import { UserAddress } from '../users/entities/user-address.entity';
-import { RestaurantPaymentMethod } from '../payments/entities/restaurant-payment-method.entity';
+import { PaymentMethod } from '../payments/entities/payment-method.entity';
 import { CartModule } from '../cart/cart.module';
 import { UtilsModule } from '../utils/utils.module';
 import { AuthModule } from '../auth/auth.module';
@@ -17,7 +17,7 @@ import { JwtModule } from '@nestjs/jwt';
 
 @Module({
   imports: [
-    MikroOrmModule.forFeature([Order, OrderItem, User, Restaurant, Food, UserAddress, RestaurantPaymentMethod]),
+    MikroOrmModule.forFeature([Order, OrderItem, User, Restaurant, Food, UserAddress, PaymentMethod]),
     CartModule,
     UtilsModule,
     AuthModule,
diff --git a/src/modules/orders/orders.service.ts b/src/modules/orders/orders.service.ts
index f329855..2088f92 100644
--- a/src/modules/orders/orders.service.ts
+++ b/src/modules/orders/orders.service.ts
@@ -6,12 +6,11 @@ import { User } from '../users/entities/user.entity';
 import { Restaurant } from '../restaurants/entities/restaurant.entity';
 import { Food } from '../foods/entities/food.entity';
 import { UserAddress } from '../users/entities/user-address.entity';
-import { RestaurantPaymentMethod } from '../payments/entities/restaurant-payment-method.entity';
 import { CartService } from '../cart/providers/cart.service';
 import { OrderStatus } from './interface/order-status';
 import { PaymentStatusEnum } from '../payments/interface/payment';
 import { Cart } from '../cart/interfaces/cart.interface';
-import { RestaurantPaymentMethodRepository } from '../payments/repositories/restaurant-payment-method.repository';
+import { PaymentMethod } from '../payments/entities/payment-method.entity';
 // import { PaymentGatewayService } from '../payments/services/payment-gateway.service.tss';
 import { PaymentsService } from '../payments/services/payments.service';
 
@@ -21,14 +20,13 @@ export class OrdersService {
     private readonly em: EntityManager,
     private readonly cartService: CartService,
     private readonly paymentsService: PaymentsService,
-    private readonly RestaurantPaymentMethodRepository: RestaurantPaymentMethodRepository,
     // private readonly paymentGatewayService: PaymentGatewayService,
   ) {}
 
   async checkout(userId: string, restaurantId: string) {
     const cart = await this.cartService.findOne(userId, restaurantId);
 
-    const { order } = await this.create(userId, restaurantId, cart);
+    const { order } = await this.createOrder(userId, restaurantId, cart);
 
     await this.cartService.clearCart(userId, restaurantId);
 
@@ -40,7 +38,7 @@ export class OrdersService {
     return { order, paymentUrl };
   }
 
-  async create(userId: string, restaurantId: string, cart: Cart) {
+  async createOrder(userId: string, restaurantId: string, cart: Cart) {
     const validationResult = await this.validateCartForOrder(userId, restaurantId, cart);
     // Create order within a transaction
     return this.em.transactional(async em => {
@@ -108,7 +106,7 @@ export class OrdersService {
     user: User;
     restaurant: Restaurant;
     address: UserAddress;
-    paymentMethod: RestaurantPaymentMethod;
+    paymentMethod: PaymentMethod;
     orderItemsData: Array<{ food: Food; quantity: number; unitPrice: number; discount: number }>;
   }> {
     // Validate cart has items
@@ -150,12 +148,12 @@ export class OrdersService {
     }
 
     const paymentMethod = await this.em.findOne(
-      RestaurantPaymentMethod,
+      PaymentMethod,
       {
+        id: cart.paymentMethodId,
         restaurant: { id: restaurantId },
-        paymentMethod: { id: cart.paymentMethodId },
       },
-      { populate: ['restaurant', 'paymentMethod'] },
+      { populate: ['restaurant'] },
     );
 
     if (!paymentMethod) {
@@ -164,8 +162,8 @@ export class OrdersService {
       );
     }
 
-    if (!paymentMethod.isActive) {
-      throw new BadRequestException('Payment method is not active for this restaurant');
+    if (!paymentMethod.enabled) {
+      throw new BadRequestException('Payment method is not enabled for this restaurant');
     }
 
     // Validate stock and prepare order items data