@bash-app/bash-common 29.32.0 → 29.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash-app/bash-common",
-  "version": "29.32.0",
+  "version": "29.34.0",
   "description": "Common data and scripts to use on the frontend and backend",
   "type": "module",
   "main": "src/index.ts",

package/prisma/schema.prisma

@@ -1168,7 +1168,7 @@ model Venue {
   vibe                 String?
   dress                String?
 
-  pricingPlan           VenuePricingPlan?   @default(Percentage)
+  pricingPlan           VenuePricingPlan?
   subscriptionStatus    SubscriptionStatus?
   subscriptionStartDate DateTime?
 
@@ -1374,6 +1374,7 @@ model ServiceRate {
   rateType                ServiceRateType
   hourlyRate              Int?
   dailyRate               Int?
+  cleaningFeePerBooking   Int?
   minimumTimeBlockHours   Int?
   serviceSpecialRates     ServiceSpecialRates?
   serviceDailyRates       ServiceDailyRates?

package/src/definitions.ts

@@ -283,6 +283,14 @@ export interface StripeCreateBashEventDonationCheckoutSessionArgs {
   donationAmount: number;
 }
 
+export interface StripeCreateServiceSubscriptionCheckoutSessionArgs {
+  serviceId: string;
+  currency: string;
+  paymentMethodType: string;
+  promoCode?: string;
+}
+
+
 export type StripeSessionRedirect = {
   stripeAccountIdDB: string;
   redirectUrl: string;

package/src/utils/service/serviceUtils.ts

@@ -19,7 +19,8 @@ export type ServiceCancelationPolicyMap = {
 export const ServiceCancelationPolicyData: ServiceCancelationPolicyMap = {
     [ServiceCancelationPolicyOption.None]: {
         name: "None",
-        refundPolicy: []
+        refundPolicy: [],
+        description: "No cancelation policy."
     },
     [ServiceCancelationPolicyOption.VeryFlexible]: {
         name: "Very Flexible",
@@ -94,7 +95,7 @@ function generateDescription(refundPolicy: ServiceCancelationRefundPolicy[]): st
     return descriptions.join(" ");
 }
 
-Object.keys(ServiceCancelationPolicyData).forEach((policyKey) => {
+Object.keys(ServiceCancelationPolicyData).filter((policyKey) => policyKey as ServiceCancelationPolicyOption != ServiceCancelationPolicyOption.None).forEach((policyKey) => {
     const policy = ServiceCancelationPolicyData[policyKey as ServiceCancelationPolicyOption];
     policy.description = generateDescription(policy.refundPolicy);
 });

package/src/utils/service/venueUtils.ts

@@ -14,7 +14,7 @@ export type VenuePricingPlanMap = {
 
 export const VenuePricingPlanData: VenuePricingPlanMap = {
     [VenuePricingPlanOption.Percentage]: {
-        name: "Pay per booking,",
+        name: "Pay per booking",
         description: "15% of each booking goes to Bash.",
         percentageFee: 0.15,
         monthlyFee: 0.0,