Fix Split Bill

internal/repository/order_repository.go

@@ -90,7 +90,8 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter
 		Preload("OrderItems.Product").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
-		Preload("Payments.PaymentMethod")
+		Preload("Payments.PaymentMethod").
+		Preload("Payments.PaymentOrderItems")
 
 	for key, value := range filters {
 		switch key {

internal/repository/payment_order_item_repository.go

@@ -0,0 +1,62 @@
+package repository
+
+import (
+	"context"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type PaymentOrderItemRepository interface {
+	Create(ctx context.Context, paymentOrderItem *entities.PaymentOrderItem) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.PaymentOrderItem, error)
+	GetByPaymentID(ctx context.Context, paymentID uuid.UUID) ([]*entities.PaymentOrderItem, error)
+	Update(ctx context.Context, paymentOrderItem *entities.PaymentOrderItem) error
+	Delete(ctx context.Context, id uuid.UUID) error
+}
+
+type PaymentOrderItemRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewPaymentOrderItemRepositoryImpl(db *gorm.DB) *PaymentOrderItemRepositoryImpl {
+	return &PaymentOrderItemRepositoryImpl{
+		db: db,
+	}
+}
+
+func (r *PaymentOrderItemRepositoryImpl) Create(ctx context.Context, paymentOrderItem *entities.PaymentOrderItem) error {
+	return r.db.WithContext(ctx).Create(paymentOrderItem).Error
+}
+
+func (r *PaymentOrderItemRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.PaymentOrderItem, error) {
+	var paymentOrderItem entities.PaymentOrderItem
+	err := r.db.WithContext(ctx).
+		Preload("Payment").
+		Preload("OrderItem").
+		First(&paymentOrderItem, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &paymentOrderItem, nil
+}
+
+func (r *PaymentOrderItemRepositoryImpl) GetByPaymentID(ctx context.Context, paymentID uuid.UUID) ([]*entities.PaymentOrderItem, error) {
+	var paymentOrderItems []*entities.PaymentOrderItem
+	err := r.db.WithContext(ctx).
+		Preload("Payment").
+		Preload("OrderItem").
+		Where("payment_id = ?", paymentID).
+		Find(&paymentOrderItems).Error
+	return paymentOrderItems, err
+}
+
+func (r *PaymentOrderItemRepositoryImpl) Update(ctx context.Context, paymentOrderItem *entities.PaymentOrderItem) error {
+	return r.db.WithContext(ctx).Save(paymentOrderItem).Error
+}
+
+func (r *PaymentOrderItemRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.PaymentOrderItem{}, "id = ?", id).Error
+}

internal/repository/payment_repository.go

@@ -122,17 +122,9 @@ func (r *PaymentRepositoryImpl) CreatePaymentWithInventoryMovement(ctx context.C
 			if order.PaymentStatus != entities.PaymentStatusCompleted {
 				orderJustCompleted = true
 			}
-			if err := tx.Model(&entities.Order{}).Where("id = ?", req.OrderID).Update("payment_status", entities.PaymentStatusCompleted).Error; err != nil {
-				return fmt.Errorf("failed to update order payment status: %w", err)
-			}
-
 			if err := tx.Model(&entities.Order{}).Where("id = ?", req.OrderID).Update("status", entities.OrderStatusCompleted).Error; err != nil {
 				return fmt.Errorf("failed to update order status: %w", err)
 			}
-		} else {
-			if err := tx.Model(&entities.Order{}).Where("id = ?", req.OrderID).Update("payment_status", entities.PaymentStatusPartiallyRefunded).Error; err != nil {
-				return fmt.Errorf("failed to update order payment status: %w", err)
-			}
 		}
 
 		if orderJustCompleted {