@bash-app/bash-common 30.95.0 → 30.97.0

package/src/utils/paymentUtils.ts

@@ -1,38 +1,10 @@
 import { BashEventPromoCode, MembershipTier, TicketTier, VenuePricingPlan as VenuePricingPlanOption } from "@prisma/client";
 import {
-  BASH_FEE_PERCENTAGE,
-  SERVICE_FEE_PERCENTAGE,
-  PARTNER_FEE_PERCENTAGE,
-  BASH_FEE_BASIC,
-  BASH_FEE_PRO,
-  BASH_FEE_CREATOR,
-  BASH_FEE_ELITE,
-  BASH_FEE_LEGEND,
-  SERVICE_FEE_BASIC,
-  SERVICE_FEE_PRO,
-  SERVICE_FEE_CREATOR,
-  SERVICE_FEE_ELITE,
-  SERVICE_FEE_LEGEND,
-  PARTNER_FEE_BASIC,
-  PARTNER_FEE_PRO,
-  PARTNER_FEE_CREATOR,
-  PARTNER_FEE_ELITE,
-  PARTNER_FEE_LEGEND,
-  BASH_FEE_CAP_BASIC,
-  BASH_FEE_CAP_PRO,
-  BASH_FEE_CAP_CREATOR,
-  BASH_FEE_CAP_ELITE,
-  BASH_FEE_CAP_LEGEND,
-  SERVICE_FEE_CAP_BASIC,
-  SERVICE_FEE_CAP_PRO,
-  SERVICE_FEE_CAP_CREATOR,
-  SERVICE_FEE_CAP_ELITE,
-  SERVICE_FEE_CAP_LEGEND,
-  PARTNER_FEE_CAP_BASIC,
-  PARTNER_FEE_CAP_PRO,
-  PARTNER_FEE_CAP_CREATOR,
-  PARTNER_FEE_CAP_ELITE,
-  PARTNER_FEE_CAP_LEGEND,
+  BASH_EVENT_FEES,
+  SERVICE_BOOKING_FEES,
+  PARTNER_PAYMENT_FEES,
+} from "../membershipDefinitions";
+import {
   NumberOfTicketsForDate,
   PRICE_DOLLARS_AND_CENTS_RATIO,
 } from "../definitions";
@@ -98,81 +70,13 @@ export function convertDollarsToCents(
   return price * PRICE_DOLLARS_AND_CENTS_RATIO;
 }
 
-export function calculateBashAppFee(total: number): number {
-  return parseFloat((total * BASH_FEE_PERCENTAGE).toFixed(2));
-}
-
-/**
- * Bash ticket/donation fee percentages by membership tier
- * Imported from definitions.ts
- */
-const BASH_FEE_PERCENTAGES: Record<MembershipTier, number> = {
-  Basic: BASH_FEE_BASIC,
-  Pro: BASH_FEE_PRO,
-  Creator: BASH_FEE_CREATOR,
-  Elite: BASH_FEE_ELITE,
-  Legend: BASH_FEE_LEGEND,
-};
-
-/**
- * Service booking fee percentages by membership tier (Allies, Patrons)
- * Imported from definitions.ts
- */
-const SERVICE_FEE_PERCENTAGES: Record<MembershipTier, number> = {
-  Basic: SERVICE_FEE_BASIC,
-  Pro: SERVICE_FEE_PRO,
-  Creator: SERVICE_FEE_CREATOR,
-  Elite: SERVICE_FEE_ELITE,
-  Legend: SERVICE_FEE_LEGEND,
-};
-
-/**
- * Bash ticket/donation fee caps by membership tier (in cents)
- * Imported from definitions.ts
- */
-const BASH_FEE_CAPS: Record<MembershipTier, number> = {
-  Basic: BASH_FEE_CAP_BASIC,
-  Pro: BASH_FEE_CAP_PRO,
-  Creator: BASH_FEE_CAP_CREATOR,
-  Elite: BASH_FEE_CAP_ELITE,
-  Legend: BASH_FEE_CAP_LEGEND,
-};
-
 /**
- * Service booking fee caps by membership tier (in cents)
- * Imported from definitions.ts
+ * Legacy function - calculates basic Bash fee without membership tier
+ * @deprecated Use calculateBashAppFeeWithMembershipDiscount instead
  */
-const SERVICE_FEE_CAPS: Record<MembershipTier, number> = {
-  Basic: SERVICE_FEE_CAP_BASIC,
-  Pro: SERVICE_FEE_CAP_PRO,
-  Creator: SERVICE_FEE_CAP_CREATOR,
-  Elite: SERVICE_FEE_CAP_ELITE,
-  Legend: SERVICE_FEE_CAP_LEGEND,
-};
-
-/**
- * Partner payment fee percentages by membership tier (Vendors, Exhibitors, Sponsors)
- * Imported from definitions.ts
- */
-const PARTNER_FEE_PERCENTAGES: Record<MembershipTier, number> = {
-  Basic: PARTNER_FEE_BASIC,
-  Pro: PARTNER_FEE_PRO,
-  Creator: PARTNER_FEE_CREATOR,
-  Elite: PARTNER_FEE_ELITE,
-  Legend: PARTNER_FEE_LEGEND,
-};
-
-/**
- * Partner payment fee caps by membership tier (in cents)
- * Imported from definitions.ts
- */
-const PARTNER_FEE_CAPS: Record<MembershipTier, number> = {
-  Basic: PARTNER_FEE_CAP_BASIC,
-  Pro: PARTNER_FEE_CAP_PRO,
-  Creator: PARTNER_FEE_CAP_CREATOR,
-  Elite: PARTNER_FEE_CAP_ELITE,
-  Legend: PARTNER_FEE_CAP_LEGEND,
-};
+export function calculateBashAppFee(total: number): number {
+  return parseFloat((total * BASH_EVENT_FEES.Basic.percent).toFixed(2));
+}
 
 /**
  * Calculate platform fee for bash tickets/donations with membership tier discounts and caps
@@ -187,16 +91,20 @@ export function calculateBashAppFeeWithMembershipDiscount(
   // Default to Basic tier if no membership provided
   const tier = membershipTier || 'Basic';
   
+  // Get fee config for this tier
+  const config = BASH_EVENT_FEES[tier];
+  
   // Calculate fee based on membership tier percentage
-  const feePercentage = BASH_FEE_PERCENTAGES[tier] || BASH_FEE_PERCENTAGE;
-  const calculatedFee = total * feePercentage;
+  let calculatedFee = total * config.percent;
+  
+  // Apply minimum fee
+  calculatedFee = Math.max(calculatedFee, config.minimumCents);
   
   // Apply cap for the membership tier
-  const feeCap = BASH_FEE_CAPS[tier] || BASH_FEE_CAPS.Basic;
-  const cappedFee = Math.min(calculatedFee, feeCap);
+  calculatedFee = Math.min(calculatedFee, config.capCents);
   
   // Round to 2 decimal places (cents precision)
-  return parseFloat(cappedFee.toFixed(2));
+  return parseFloat(calculatedFee.toFixed(2));
 }
 
 /**
@@ -212,16 +120,17 @@ export function calculateServiceFeeWithMembershipDiscount(
   // Default to Basic tier if no membership provided
   const tier = membershipTier || 'Basic';
   
+  // Get fee config for this tier
+  const config = SERVICE_BOOKING_FEES[tier];
+  
   // Calculate fee based on membership tier percentage
-  const feePercentage = SERVICE_FEE_PERCENTAGES[tier] || SERVICE_FEE_PERCENTAGE;
-  const calculatedFee = total * feePercentage;
+  let calculatedFee = total * config.percent;
   
   // Apply cap for the membership tier
-  const feeCap = SERVICE_FEE_CAPS[tier] || SERVICE_FEE_CAPS.Basic;
-  const cappedFee = Math.min(calculatedFee, feeCap);
+  calculatedFee = Math.min(calculatedFee, config.capCents);
   
   // Round to 2 decimal places (cents precision)
-  return parseFloat(cappedFee.toFixed(2));
+  return parseFloat(calculatedFee.toFixed(2));
 }
 
 /**
@@ -238,16 +147,17 @@ export function calculatePartnerFeeWithMembershipDiscount(
   // Default to Basic tier if no membership provided
   const tier = membershipTier || 'Basic';
   
+  // Get fee config for this tier
+  const config = PARTNER_PAYMENT_FEES[tier];
+  
   // Calculate fee based on membership tier percentage
-  const feePercentage = PARTNER_FEE_PERCENTAGES[tier] || PARTNER_FEE_PERCENTAGE;
-  const calculatedFee = total * feePercentage;
+  let calculatedFee = total * config.percent;
   
   // Apply cap for the membership tier
-  const feeCap = PARTNER_FEE_CAPS[tier] || PARTNER_FEE_CAPS.Basic;
-  const cappedFee = Math.min(calculatedFee, feeCap);
+  calculatedFee = Math.min(calculatedFee, config.capCents);
   
   // Round to 2 decimal places (cents precision)
-  return parseFloat(cappedFee.toFixed(2));
+  return parseFloat(calculatedFee.toFixed(2));
 }
 
 // ============================================
@@ -270,14 +180,14 @@ export type VenuePricingPlanMap = {
  * Venue pricing plan options
  * Moved from venueUtils.ts for centralization
  * 
- * Note: Uses SERVICE_FEE_PERCENTAGE (15% base rate) for percentage-based plan.
- * Actual fees may be lower based on membership tier (see SERVICE_FEE_BASIC, SERVICE_FEE_PRO, etc.)
+ * Note: Uses Basic tier service booking fee (15%) for percentage-based plan.
+ * Actual fees may be lower based on membership tier (see SERVICE_BOOKING_FEES)
  */
 export const VENUE_PRICING_PLAN_DATA: VenuePricingPlanMap = {
   [VenuePricingPlanOption.Percentage]: {
     name: "Pay per booking",
     description: "15% of each booking goes to Bash.",
-    percentageFee: SERVICE_FEE_PERCENTAGE, // Use centralized constant (15%)
+    percentageFee: SERVICE_BOOKING_FEES.Basic.percent, // Use centralized constant (15%)
     monthlyFee: 0.0,
     flatFee: 0.0,
   },

package/src/utils/service/apiServiceBookingApiUtils.ts

@@ -167,6 +167,7 @@ export function serviceGetPriceToBookFromBooking(
     daysTotalBeforeTaxesCents: booking.daysTotalATBCents,
     subtotalBeforeTaxesCents: booking.subtotalATBCents,
     totalBeforeTaxesCents: booking.totalATBCents,
+    totalWithFees: booking.totalATBCents, // Same as totalATBCents
   } as FrontendServiceGetPriceToBookResult;
 }
 

package/src/utils/service/frontendServiceBookingUtils.ts

@@ -33,12 +33,12 @@ import {
   ServiceBookingAddOnBase,
 } from "./serviceBookingTypes";
 import { convertDollarsToCents } from "../paymentUtils";
-import { SERVICE_FEE_PERCENTAGE } from "../../definitions";
+import { SERVICE_BOOKING_FEES } from "../../membershipDefinitions";
 
 // Use centralized service fee percentage (15% base rate for Basic tier)
 // Note: This is the DEFAULT processing fee. Actual fees may be lower based on membership tier.
-// See definitions.ts for SERVICE_FEE_BASIC, SERVICE_FEE_PRO, etc.
-export const SERVICE_BOOKING_PROCESSING_FEE_PERCENT = SERVICE_FEE_PERCENTAGE;
+// See SERVICE_BOOKING_FEES in membershipDefinitions.ts for all tier-based fees.
+export const SERVICE_BOOKING_PROCESSING_FEE_PERCENT = SERVICE_BOOKING_FEES.Basic.percent;
 
 export interface ServiceAddonInput extends ServiceAddon {
   chosenQuantity?: number;
@@ -77,6 +77,7 @@ export interface FrontendServiceGetPriceToBookResult {
   daysTotalBeforeTaxesCents: number;
   subtotalBeforeTaxesCents: number; //sum of all daysTotalBeforeTaxesCents, plus addOns/packages
   totalBeforeTaxesCents: number;
+  totalWithFees: number; // Total including all fees (same as totalBeforeTaxesCents, kept for compatibility)
 
   minimumTimeBlockHours?: number; //only valid on generalRate
 }
@@ -317,6 +318,7 @@ export function frontendServiceGetPriceToBookFees(
     daysTotalBeforeTaxesCents: daysTotalBeforeTaxesCents,
     subtotalBeforeTaxesCents: subtotalBeforeTaxesCents,
     totalBeforeTaxesCents: totalBeforeTaxesCents,
+    totalWithFees: totalBeforeTaxesCents, // Same as totalBeforeTaxesCents
     additionalFees: allAdditionalFees,
     addOns: usedAddons,
     minimumTimeBlockHours: minimumTimeBlockHours,