order update

Application/DTOs/OrderDTOs/PayOrderDTO.cs

@@ -21,5 +21,10 @@ namespace Application.DTOs.OrderDTOs
         /// Payment method: PayPal, GooglePay, or Stripe
         /// </summary>
         public string PaymentMethod { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Optional token for Stripe payments
+        /// </summary>
+        public string? StripeCardToken { get; set; }
     }
 }

Application/DTOs/UserDTOs/UserProfileDTO.cs

@@ -15,5 +15,6 @@ namespace Application.DTOs.UserDTOs
         public string? Address { get; set; }
         public double? Latitude { get; set; }
         public double? Longitude { get; set; }
+        public decimal Balance { get; set; }
     }
 }

Application/Services/OrderService.cs

@@ -88,7 +88,7 @@ namespace Application.Services
                 IsProductPaid = orderDto.IsProductPaid,
                 DeliveryPayer = orderDto.DeliveryPayer,
                 IsDeliveryPaid = false,
-                Status = OrderStatus.Pending,
+                Status = orderDto.DeliveryPayer == DeliveryPayer.Sender ? OrderStatus.AwaitingPayment : OrderStatus.AwaitingConfirmation,
                 SenderId = senderId,
                 RecipientId = orderDto.RecipientId,
                 PickupNodeId = sender.PersonalNodeId.Value,
@@ -312,6 +312,8 @@ namespace Application.Services
             // Define valid status transitions
             return currentStatus switch
             {
+                OrderStatus.AwaitingPayment => newStatus == OrderStatus.AwaitingConfirmation || newStatus == OrderStatus.Cancelled,
+                OrderStatus.AwaitingConfirmation => newStatus == OrderStatus.Pending || newStatus == OrderStatus.Cancelled,
                 OrderStatus.Pending => newStatus == OrderStatus.Processing || newStatus == OrderStatus.Cancelled,
                 OrderStatus.Processing => newStatus == OrderStatus.EnRoute || newStatus == OrderStatus.Cancelled,
                 OrderStatus.EnRoute => newStatus == OrderStatus.Delivered || newStatus == OrderStatus.Cancelled,
@@ -341,6 +343,11 @@ namespace Application.Services
                 throw new InvalidOperationException($"Cannot execute order with status {order.Status}. Only Pending orders can be executed.");
             }
 
+            if (!order.IsProductPaid || !order.IsDeliveryPaid)
+            {
+                throw new InvalidOperationException("Cannot execute order until both product and delivery are paid.");
+            }
+
             // Get pickup and dropoff nodes
             var pickupNode = await _nodeRepository.GetByIdAsync(order.PickupNodeId);
             var dropoffNode = await _nodeRepository.GetByIdAsync(order.DropoffNodeId);

Application/Services/UserService.cs

@@ -57,7 +57,8 @@ namespace Application.Services
                 PersonalNodeId = user.PersonalNodeId,
                 Address = user.PersonalNode?.Name,
                 Latitude = user.PersonalNode?.Latitude,
-                Longitude = user.PersonalNode?.Longitude
+                Longitude = user.PersonalNode?.Longitude,
+                Balance = user.Balance
             };
         }
 
@@ -79,7 +80,8 @@ namespace Application.Services
                 PersonalNodeId = user.PersonalNodeId,
                 Address = user.PersonalNode?.Name,
                 Latitude = user.PersonalNode?.Latitude,
-                Longitude = user.PersonalNode?.Longitude
+                Longitude = user.PersonalNode?.Longitude,
+                Balance = user.Balance
             }).ToList();
         }
 
@@ -126,7 +128,8 @@ namespace Application.Services
                 PersonalNodeId = user.PersonalNodeId,
                 Address = user.PersonalNode?.Name,
                 Latitude = user.PersonalNode?.Latitude,
-                Longitude = user.PersonalNode?.Longitude
+                Longitude = user.PersonalNode?.Longitude,
+                Balance = user.Balance
             };
         }
 
@@ -244,7 +247,8 @@ namespace Application.Services
                 PersonalNodeId = user.PersonalNodeId,
                 Address = user.PersonalNode?.Name,
                 Latitude = user.PersonalNode?.Latitude,
-                Longitude = user.PersonalNode?.Longitude
+                Longitude = user.PersonalNode?.Longitude,
+                Balance = user.Balance
             };
         }
 
@@ -299,7 +303,8 @@ namespace Application.Services
                 PersonalNodeId = user.PersonalNodeId,
                 Address = user.PersonalNode?.Name,
                 Latitude = user.PersonalNode?.Latitude,
-                Longitude = user.PersonalNode?.Longitude
+                Longitude = user.PersonalNode?.Longitude,
+                Balance = user.Balance
             };
         }
 

Entities/Enums/OrderStatus.cs

@@ -1,5 +1,7 @@
-public enum OrderStatus
+public enum OrderStatus
 {
+    AwaitingPayment,
+    AwaitingConfirmation,
     Pending,       
     Processing,    
     EnRoute,       

Entities/Models/User.cs

@@ -13,6 +13,8 @@ namespace Entities.Models
         public string? PhoneNumber { get; set; }
         public string PasswordHash { get; set; }
         public UserRole? Role { get; set; }
+        
+        public decimal Balance { get; set; } = 0;
 
         // User's personal location node
         public int? PersonalNodeId { get; set; }

RobDeliveryAPI/Controllers/PaymentsController.cs

@@ -16,13 +16,16 @@ public class PaymentsController : ControllerBase
 {
     private readonly IPaymentProcessorService _paymentProcessorService;
     private readonly IOrderRepository _orderRepository;
+    private readonly IUserRepository _userRepository;
 
     public PaymentsController(
         IPaymentProcessorService paymentProcessorService,
-        IOrderRepository orderRepository)
+        IOrderRepository orderRepository,
+        IUserRepository userRepository)
     {
         _paymentProcessorService = paymentProcessorService;
         _orderRepository = orderRepository;
+        _userRepository = userRepository;
     }
 
     /// <summary>
@@ -177,6 +180,26 @@ public class PaymentsController : ControllerBase
             // Check if there's anything to pay
             if (totalAmount == 0)
             {
+                if (order.Status == OrderStatus.AwaitingConfirmation && order.IsProductPaid && order.IsDeliveryPaid)
+                {
+                    // Allow simple confirmation if everything is already paid
+                    order.Status = OrderStatus.Pending;
+                    await _orderRepository.UpdateAsync(order);
+                    
+                    return Ok(new PaymentResultDTO
+                    {
+                        Success = true,
+                        TransactionId = "CONFIRM_ONLY",
+                        PaymentMethod = paymentDto.PaymentMethod,
+                        Amount = 0,
+                        Currency = "UAH",
+                        OrderId = order.Id,
+                        ProductPaid = true,
+                        DeliveryPaid = true,
+                        ProcessedAt = DateTime.UtcNow
+                    });
+                }
+
                 return BadRequest(new PaymentResultDTO
                 {
                     Success = false,
@@ -188,13 +211,13 @@ public class PaymentsController : ControllerBase
                 });
             }
 
-            // Process payment through payment processor
             var paymentRequest = new PaymentRequestDTO
             {
                 Amount = totalAmount,
                 Currency = "UAH",
                 OrderId = order.Id,
-                PaymentMethod = paymentDto.PaymentMethod
+                PaymentMethod = paymentDto.PaymentMethod,
+                StripeCardToken = paymentDto.StripeCardToken
             };
 
             var paymentResult = await _paymentProcessorService.ProcessPaymentAsync(paymentRequest);
@@ -214,12 +237,29 @@ public class PaymentsController : ControllerBase
             if (willPayProduct)
             {
                 order.IsProductPaid = true;
+                // Add ProductPrice to Sender's balance
+                var sender = await _userRepository.GetByIdAsync(order.SenderId);
+                if (sender != null)
+                {
+                    sender.Balance += order.ProductPrice;
+                    await _userRepository.UpdateAsync(sender);
+                }
             }
             if (willPayDelivery)
             {
                 order.IsDeliveryPaid = true;
             }
 
+            // Update order status
+            if (order.Status == OrderStatus.AwaitingPayment && order.IsDeliveryPaid)
+            {
+                order.Status = OrderStatus.AwaitingConfirmation;
+            }
+            if (order.Status == OrderStatus.AwaitingConfirmation && order.IsProductPaid && order.IsDeliveryPaid)
+            {
+                order.Status = OrderStatus.Pending;
+            }
+
             await _orderRepository.UpdateAsync(order);
 
             // Return success result

RobDeliveryAPI/Controllers/WalletController.cs

@@ -0,0 +1,97 @@
+using Application.Abstractions.Interfaces;
+using Entities.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.Security.Claims;
+
+namespace RobDeliveryAPI.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+[Authorize]
+public class WalletController : ControllerBase
+{
+    private readonly IUserRepository _userRepository;
+
+    public WalletController(IUserRepository userRepository)
+    {
+        _userRepository = userRepository;
+    }
+
+    private int GetAuthenticatedUserId()
+    {
+        var userIdClaim = User.FindFirst("Id") ?? User.FindFirst(ClaimTypes.NameIdentifier);
+        if (userIdClaim == null || !int.TryParse(userIdClaim.Value, out int userId))
+        {
+            throw new UnauthorizedAccessException("User ID not found in token");
+        }
+        return userId;
+    }
+
+    [HttpGet("balance")]
+    public async Task<ActionResult<object>> GetBalance()
+    {
+        try
+        {
+            int userId = GetAuthenticatedUserId();
+            var user = await _userRepository.GetByIdAsync(userId);
+            
+            if (user == null)
+            {
+                return NotFound(new { success = false, message = "User not found" });
+            }
+
+            return Ok(new { success = true, balance = user.Balance });
+        }
+        catch (UnauthorizedAccessException ex)
+        {
+            return StatusCode(403, new { success = false, message = ex.Message });
+        }
+        catch (Exception ex)
+        {
+            return StatusCode(500, new { success = false, message = $"Internal server error: {ex.Message}" });
+        }
+    }
+
+    [HttpPost("withdraw")]
+    public async Task<ActionResult<object>> Withdraw()
+    {
+        try
+        {
+            int userId = GetAuthenticatedUserId();
+            var user = await _userRepository.GetByIdAsync(userId);
+
+            if (user == null)
+            {
+                return NotFound(new { success = false, message = "User not found" });
+            }
+
+            if (user.Balance <= 0)
+            {
+                return BadRequest(new { success = false, message = "No funds to withdraw" });
+            }
+
+            decimal withdrawnAmount = user.Balance;
+            // Simulate Payout - just reset to 0
+            user.Balance = 0;
+            await _userRepository.UpdateAsync(user);
+
+            return Ok(new
+            {
+                success = true,
+                message = "Withdrawal successful",
+                withdrawnAmount = withdrawnAmount,
+                newBalance = user.Balance,
+                processedAt = DateTime.UtcNow
+            });
+        }
+        catch (UnauthorizedAccessException ex)
+        {
+            return StatusCode(403, new { success = false, message = ex.Message });
+        }
+        catch (Exception ex)
+        {
+            return StatusCode(500, new { success = false, message = $"Internal server error: {ex.Message}" });
+        }
+    }
+}

RobDeliveryAPI/appsettings.json

@@ -31,8 +31,8 @@
       "Mode": "sandbox"
     },
     "Stripe": {
-      "SecretKey": "sk_test_YOUR_STRIPE_SECRET_KEY",
-      "PublishableKey": "pk_test_YOUR_STRIPE_PUBLISHABLE_KEY",
+      "SecretKey": "sk_test_51SaF97AXzGI3BHqbQQ46nn8L4gSByN4FnGuzuAlOPhLxNPhtC00dLrx1gqeZq5j0LyPmRGBEWJSFVao6GaMRh7ak00n2cWO4fV",
+      "PublishableKey": "pk_test_51SaF97AXzGI3BHqbx7tGtlNcbB2MEU4SNLqFcE0fgjf6S8QjyDRIpyhMuw27ytANFCNV7PtkcOVQZ4NwJGwkHmtO00FUQtAwwN",
       "WebhookSecret": "whsec_YOUR_WEBHOOK_SECRET"
     },
     "GooglePay": {