@bash-app/bash-common 30.75.2 → 30.76.0

package/src/utils/paymentUtils.ts

@@ -1,6 +1,38 @@
-import { BashEventPromoCode, TicketTier } from "@prisma/client";
+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,
   NumberOfTicketsForDate,
   PRICE_DOLLARS_AND_CENTS_RATIO,
 } from "../definitions";
@@ -69,3 +101,191 @@ export function convertDollarsToCents(
 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
+ */
+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,
+};
+
+/**
+ * Calculate platform fee for bash tickets/donations with membership tier discounts and caps
+ * @param total - Transaction amount in cents
+ * @param membershipTier - User's membership tier (defaults to Basic if not provided)
+ * @returns Platform fee in cents, respecting both percentage discount and cap
+ */
+export function calculateBashAppFeeWithMembershipDiscount(
+  total: number,
+  membershipTier?: MembershipTier | null
+): number {
+  // Default to Basic tier if no membership provided
+  const tier = membershipTier || 'Basic';
+  
+  // Calculate fee based on membership tier percentage
+  const feePercentage = BASH_FEE_PERCENTAGES[tier] || BASH_FEE_PERCENTAGE;
+  const calculatedFee = total * feePercentage;
+  
+  // Apply cap for the membership tier
+  const feeCap = BASH_FEE_CAPS[tier] || BASH_FEE_CAPS.Basic;
+  const cappedFee = Math.min(calculatedFee, feeCap);
+  
+  // Round to 2 decimal places (cents precision)
+  return parseFloat(cappedFee.toFixed(2));
+}
+
+/**
+ * Calculate platform fee for service bookings (Allies, Patrons) with membership tier discounts and caps
+ * @param total - Transaction amount in cents
+ * @param membershipTier - User's membership tier (defaults to Basic if not provided)
+ * @returns Platform fee in cents, respecting both percentage discount and cap
+ */
+export function calculateServiceFeeWithMembershipDiscount(
+  total: number,
+  membershipTier?: MembershipTier | null
+): number {
+  // Default to Basic tier if no membership provided
+  const tier = membershipTier || 'Basic';
+  
+  // Calculate fee based on membership tier percentage
+  const feePercentage = SERVICE_FEE_PERCENTAGES[tier] || SERVICE_FEE_PERCENTAGE;
+  const calculatedFee = total * feePercentage;
+  
+  // Apply cap for the membership tier
+  const feeCap = SERVICE_FEE_CAPS[tier] || SERVICE_FEE_CAPS.Basic;
+  const cappedFee = Math.min(calculatedFee, feeCap);
+  
+  // Round to 2 decimal places (cents precision)
+  return parseFloat(cappedFee.toFixed(2));
+}
+
+/**
+ * Calculate platform fee for Partner payments (Vendors, Exhibitors, Sponsors) with membership tier discounts and caps
+ * Partners pay the host for booth/sponsorship space, and platform takes a small fee
+ * @param total - Transaction amount in cents
+ * @param membershipTier - Partner's membership tier (defaults to Basic if not provided)
+ * @returns Platform fee in cents, respecting both percentage discount and cap
+ */
+export function calculatePartnerFeeWithMembershipDiscount(
+  total: number,
+  membershipTier?: MembershipTier | null
+): number {
+  // Default to Basic tier if no membership provided
+  const tier = membershipTier || 'Basic';
+  
+  // Calculate fee based on membership tier percentage
+  const feePercentage = PARTNER_FEE_PERCENTAGES[tier] || PARTNER_FEE_PERCENTAGE;
+  const calculatedFee = total * feePercentage;
+  
+  // Apply cap for the membership tier
+  const feeCap = PARTNER_FEE_CAPS[tier] || PARTNER_FEE_CAPS.Basic;
+  const cappedFee = Math.min(calculatedFee, feeCap);
+  
+  // Round to 2 decimal places (cents precision)
+  return parseFloat(cappedFee.toFixed(2));
+}
+
+// ============================================
+// VENUE PRICING PLANS
+// ============================================
+
+export type VenuePricingPlanData = {
+  name: string;
+  description: string;
+  percentageFee: number;
+  monthlyFee: number;
+  flatFee: number;
+};
+
+export type VenuePricingPlanMap = {
+  [key in VenuePricingPlanOption]: VenuePricingPlanData;
+};
+
+/**
+ * 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.)
+ */
+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%)
+    monthlyFee: 0.0,
+    flatFee: 0.0,
+  },
+  [VenuePricingPlanOption.Subscription]: {
+    name: "Monthly subscription",
+    description: "Pay $100/month and keep 100% of each booking.",
+    percentageFee: 0.0,
+    monthlyFee: 100.0,
+    flatFee: 0.0,
+  },
+} as const;

package/src/utils/service/frontendServiceBookingUtils.ts

@@ -33,8 +33,12 @@ import {
   ServiceBookingAddOnBase,
 } from "./serviceBookingTypes";
 import { convertDollarsToCents } from "../paymentUtils";
+import { SERVICE_FEE_PERCENTAGE } from "../../definitions";
 
-export const SERVICE_BOOKING_PROCESSING_FEE_PERCENT = 0.15;
+// 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;
 
 export interface ServiceAddonInput extends ServiceAddon {
   chosenQuantity?: number;

package/src/utils/userSubscriptionUtils.ts

@@ -1,22 +1,19 @@
 import { ServiceTypes, MembershipTier } from "@prisma/client";
 
+// Re-export from definitions.ts for backwards compatibility
+export { 
+  SERVICE_SUBSCRIPTION_TIERS,
+  type UserSubscriptionServiceTierInfo,
+  type UserSubscriptionServiceTierInfoMap 
+} from "../definitions";
+
 export const ServiceSubscriptionTier = {
-  Ally: "Ally",
+  Free: "Free",
+  Ally: "Ally", 
   Partner: "Partner",
-  Patreon: "Patron",
+  Patron: "Patron",
 } as const;
-export type ServiceSubscriptionTier = "Ally" | "Partner" | "Patron";
-
-export type UserSubscriptionServiceTierInfo = {
-  name: string;
-  type?: ServiceSubscriptionTier;
-  description: string;
-  price: number;
-};
-
-export type UserSubscriptionServiceTierInfoMap = {
-  [key in ServiceSubscriptionTier]: UserSubscriptionServiceTierInfo;
-};
+export type ServiceSubscriptionTier = "Free" | "Ally" | "Partner" | "Patron";
 
 export type UserSubscriptionInfo = {
   name: string;
@@ -40,6 +37,7 @@ export type UserServiceSubscriptionTierFromServiceTypes = {
 };
 
 export const SERVICE_TIER_TO_SERVICES_LIST = {
+  Free: ["EventServices", "EntertainmentServices"],
   Ally: ["EventServices", "EntertainmentServices"],
   Partner: ["Vendors", "Exhibitors", "Sponsors"],
   Patron: ["Venues", "Organizations"],
@@ -48,9 +46,13 @@ export const SERVICE_TIER_TO_SERVICES_LIST = {
 export const SERVICE_TIER_FROM_SERVICE_TYPE = Object.entries(
   SERVICE_TIER_TO_SERVICES_LIST
 ).reduce((sofar, [type, serviceTypes]) => {
-  serviceTypes.forEach(
-    (serviceType) => (sofar[serviceType] = type as ServiceSubscriptionTier)
-  );
+  serviceTypes.forEach((serviceType) => {
+    // Default to Free tier for EventServices and EntertainmentServices
+    // Higher tiers can be chosen by the user
+    if (!sofar[serviceType] || type === "Free") {
+      sofar[serviceType] = type as ServiceSubscriptionTier;
+    }
+  });
   return sofar;
 }, {} as UserServiceSubscriptionTierFromServiceTypes);
 
@@ -77,27 +79,7 @@ export const USER_SUBSCRIPTION_TYPES = {
   // }
 } as UserSubscriptionServiceInfoMap;
 
-export const SERVICE_SUBSCRIPTION_TIERS = {
-  Ally: {
-    name: "Ally",
-    description: "Ally",
-    price: 14,
-  },
-  Partner: {
-    name: "Partner",
-    description: "Partner",
-    price: 49.0,
-  },
-  Patron: {
-    name: "Patron",
-    description: "Patron",
-    price: 99.0,
-  },
-} as UserSubscriptionServiceTierInfoMap;
-
+// Set the type field on each tier info object
 Object.entries(USER_SUBSCRIPTION_TYPES).forEach(
   ([type, info]) => (info.type = type as MembershipTier)
 );
-Object.entries(SERVICE_SUBSCRIPTION_TIERS).forEach(
-  ([type, info]) => (info.type = type as ServiceSubscriptionTier)
-);

package/src/utils/service/venueUtils.ts

@@ -1,30 +0,0 @@
-import { VenuePricingPlan as VenuePricingPlanOption } from "@prisma/client";
-
-export type VenuePricingPlanData = {
-  name: string;
-  description: string;
-  percentageFee: number;
-  monthlyFee: number;
-  flatFee: number;
-};
-
-export type VenuePricingPlanMap = {
-  [key in VenuePricingPlanOption]: VenuePricingPlanData;
-};
-
-export const VENUE_PRICING_PLAN_DATA: VenuePricingPlanMap = {
-  [VenuePricingPlanOption.Percentage]: {
-    name: "Pay per booking",
-    description: "15% of each booking goes to Bash.",
-    percentageFee: 0.15,
-    monthlyFee: 0.0,
-    flatFee: 0.0,
-  },
-  [VenuePricingPlanOption.Subscription]: {
-    name: "Monthly subscription",
-    description: "Pay $100/month and keep 100% of each booking.",
-    percentageFee: 0.0,
-    monthlyFee: 100.0,
-    flatFee: 0.0,
-  },
-} as const;