bb0be19dac
CI/CD / CI · API (dotnet build + test) (push) Successful in 1m1s
CI/CD / CI · Admin API (dotnet build) (push) Successful in 49s
CI/CD / CI · Dashboard (tsc) (push) Successful in 1m3s
CI/CD / CI · Admin Web (tsc) (push) Successful in 34s
CI/CD / CI · Website (tsc) (push) Successful in 45s
CI/CD / CI · Koja (tsc) (push) Successful in 48s
CI/CD / Deploy · all services (push) Successful in 3m9s
Before, buying a plan immediately switched the tier and stacked the duration.
Now a purchase made while the café still has paid coverage is QUEUED to start
when the current coverage ends, and the owner can cancel a queued one.
Model:
- SubscriptionPayment gains EffectiveFrom/EffectiveTo; status gains Scheduled
(paid, queued) and Cancelled. EF migration AddSubscriptionScheduling (nullable).
BillingService:
- On payment completion, compute coverage end (latest of active expiry + furthest
queued period). If it is in the future → Scheduled (queued, café tier/expiry
untouched); else activate immediately as before. Periods chain correctly.
- GetStatusAsync lazily promotes any due queued period to active, and returns the
queue (QueuedPlans).
- CancelQueuedAsync cancels a Scheduled period (owner-only) and re-packs the queue
so later periods slide earlier. Active prepaid plan is never cut short; no
automatic refund (manual, per product decision).
- Confirmation SMS distinguishes "activated until X" vs "queued, starts X".
API: BillingStatusDto.QueuedPlans + DELETE /api/billing/queued/{paymentId}.
Dashboard:
- Subscription screen shows a "Queued subscriptions" card (tier, window, cancel
with confirm).
- Checkout shows "you already have an active subscription — this will start on
{date}" when the café is still covered.
- i18n fa/en/ar.
81 API tests pass; dashboard typechecks.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
128 lines
4.6 KiB
C#
128 lines
4.6 KiB
C#
using FluentValidation;
|
|
using Microsoft.AspNetCore.Authorization;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Meezi.API.Models.Billing;
|
|
using Meezi.API.Services;
|
|
using Meezi.Core.Interfaces;
|
|
using Meezi.Shared;
|
|
|
|
namespace Meezi.API.Controllers;
|
|
|
|
[ApiController]
|
|
public class BillingController : ControllerBase
|
|
{
|
|
private readonly IBillingService _billing;
|
|
private readonly IValidator<SubscribeRequest> _subscribeValidator;
|
|
|
|
public BillingController(IBillingService billing, IValidator<SubscribeRequest> subscribeValidator)
|
|
{
|
|
_billing = billing;
|
|
_subscribeValidator = subscribeValidator;
|
|
}
|
|
|
|
[Authorize]
|
|
[HttpPost("api/billing/subscribe")]
|
|
public async Task<IActionResult> Subscribe(
|
|
[FromBody] SubscribeRequest request,
|
|
ITenantContext tenant,
|
|
CancellationToken ct)
|
|
{
|
|
if (string.IsNullOrEmpty(tenant.CafeId))
|
|
return Unauthorized();
|
|
if (tenant.Role != Core.Enums.EmployeeRole.Owner)
|
|
{
|
|
return StatusCode(403, new ApiResponse<object>(false, null,
|
|
new ApiError("OWNER_REQUIRED", "Only the cafe owner can manage subscription billing.")));
|
|
}
|
|
|
|
var validation = await _subscribeValidator.ValidateAsync(request, ct);
|
|
if (!validation.IsValid)
|
|
{
|
|
var first = validation.Errors.First();
|
|
return BadRequest(new ApiResponse<object>(false, null, new ApiError("VALIDATION_ERROR", first.ErrorMessage, first.PropertyName)));
|
|
}
|
|
|
|
var (data, code, message) = await _billing.InitiateSubscriptionAsync(tenant.CafeId, request, ct);
|
|
if (data is null)
|
|
return BadRequest(new ApiResponse<object>(false, null, new ApiError(code ?? "ERROR", message ?? "Failed.")));
|
|
|
|
return Ok(new ApiResponse<SubscribeResponse>(true, data));
|
|
}
|
|
|
|
[AllowAnonymous]
|
|
[HttpGet("api/billing/verify")]
|
|
public async Task<IActionResult> Verify(
|
|
[FromQuery] string Authority,
|
|
[FromQuery] string? Status,
|
|
CancellationToken ct)
|
|
{
|
|
var result = await _billing.VerifyZarinPalAsync(Authority, Status, ct);
|
|
return Redirect(result.RedirectUrl);
|
|
}
|
|
|
|
[AllowAnonymous]
|
|
[HttpGet("api/billing/verify/snapppay")]
|
|
public async Task<IActionResult> VerifySnappPay(
|
|
[FromQuery] string? paymentToken,
|
|
[FromQuery] string? state,
|
|
CancellationToken ct)
|
|
{
|
|
var result = await _billing.VerifySnappPayAsync(paymentToken, state, ct);
|
|
return Redirect(result.RedirectUrl);
|
|
}
|
|
|
|
[AllowAnonymous]
|
|
[HttpGet("api/billing/verify/tara")]
|
|
public async Task<IActionResult> VerifyTara(
|
|
[FromQuery] string? traceNumber,
|
|
[FromQuery] string? status,
|
|
CancellationToken ct)
|
|
{
|
|
var result = await _billing.VerifyTaraAsync(traceNumber, status, ct);
|
|
return Redirect(result.RedirectUrl);
|
|
}
|
|
|
|
[Authorize]
|
|
[HttpGet("api/billing/payment-methods")]
|
|
public async Task<IActionResult> PaymentMethods(CancellationToken ct)
|
|
{
|
|
var methods = await _billing.GetPaymentMethodsAsync(ct);
|
|
return Ok(new ApiResponse<IReadOnlyList<PaymentMethodDto>>(true, methods));
|
|
}
|
|
|
|
[Authorize]
|
|
[HttpGet("api/billing/status")]
|
|
public async Task<IActionResult> Status(ITenantContext tenant, CancellationToken ct)
|
|
{
|
|
if (string.IsNullOrEmpty(tenant.CafeId) || tenant.PlanTier is null)
|
|
return Unauthorized();
|
|
|
|
var data = await _billing.GetStatusAsync(tenant.CafeId, tenant.PlanTier.Value, ct);
|
|
if (data is null)
|
|
return NotFound(new ApiResponse<object>(false, null, new ApiError("NOT_FOUND", "Cafe not found.")));
|
|
|
|
return Ok(new ApiResponse<BillingStatusDto>(true, data));
|
|
}
|
|
|
|
[Authorize]
|
|
[HttpDelete("api/billing/queued/{paymentId}")]
|
|
public async Task<IActionResult> CancelQueued(string paymentId, ITenantContext tenant, CancellationToken ct)
|
|
{
|
|
if (string.IsNullOrEmpty(tenant.CafeId))
|
|
return Unauthorized();
|
|
if (tenant.Role != Core.Enums.EmployeeRole.Owner)
|
|
return StatusCode(403, new ApiResponse<object>(false, null,
|
|
new ApiError("OWNER_REQUIRED", "Only the cafe owner can manage subscription billing.")));
|
|
|
|
var (ok, code, message) = await _billing.CancelQueuedAsync(tenant.CafeId, paymentId, ct);
|
|
if (!ok)
|
|
{
|
|
return code == "NOT_FOUND"
|
|
? NotFound(new ApiResponse<object>(false, null, new ApiError(code, message ?? "Not found.")))
|
|
: BadRequest(new ApiResponse<object>(false, null, new ApiError(code ?? "ERROR", message ?? "Failed.")));
|
|
}
|
|
|
|
return Ok(new ApiResponse<object>(true, new { id = paymentId }));
|
|
}
|
|
}
|