@bash-app/bash-common 1.14.0 → 2.1.0

package/package.json

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

package/src/definitions.ts

@@ -157,6 +157,7 @@ export interface StripeCreateBashEventTicketsCheckoutSessionArgs {
   currency: string;
   paymentMethodType: string;
   ticketListStr: string;
+  promoCode?: string;
 }
 
 export interface StripeCreateBashEventDonationCheckoutSessionArgs {

package/src/utils/dateTimeUtils.ts

@@ -1,5 +1,5 @@
 import {DateType, DateValueType} from "react-tailwindcss-datepicker";
-import dayjs from "dayjs";
+import dayjs, {Dayjs} from "dayjs";
 import dayjsUtc from "dayjs/plugin/utc";
 import dayjsTimeZone from "dayjs/plugin/timezone";
 import {DateTimeArgType} from "../definitions";
@@ -141,14 +141,13 @@ export function setTimeOnDate(date: DateType | Date | undefined, parsedTime: ITi
   return correctTimeOnDate;
 }
 
-export function ensureDateTimeIsLocalDateTime(dateArg: DateType | undefined): Date {
+export function ensureDateTimeIsLocalDateTime(dateArg: DateType | Dayjs | undefined): Dayjs {
   if (dayjs(dateArg).isUTC()) {
     const dateLocalTimeZone = dayjs(dateArg);
-    const date = dateLocalTimeZone.toDate();
-    return date;
+    return dateLocalTimeZone;
   }
   else {
-    return new Date(dateArg ?? Date.now());
+    return dayjs(dateArg ?? Date.now());
   }
 }
 

package/src/utils/paymentUtils.ts

@@ -1,7 +1,27 @@
-import {TicketTier} from "@prisma/client";
+import {BashEventPromoCode, TicketTier} from "@prisma/client";
 import {BASH_FEE_PERCENTAGE, NumberOfTicketsForDate, PRICE_DOLLARS_AND_CENTS_RATIO} from "../definitions";
 
 
+/**
+ * Returns the amount of discount in dollars
+ * @param totalInDollars
+ * @param promoCode
+ */
+export function calculateDiscountFromPromoCode(totalInDollars: number, promoCode: BashEventPromoCode | undefined): number {
+  if (promoCode) {
+    if (promoCode.discountAmountInCents) {
+      const discountInDollars = convertCentsToDollars(promoCode.discountAmountInCents);
+      return Math.max(0, discountInDollars); // Ensure we don't discount more than 100%
+    }
+    if (promoCode.discountAmountPercentage) {
+      const discountInDollars = totalInDollars * promoCode.discountAmountPercentage;
+      return Math.min(totalInDollars, discountInDollars); // Ensure we don't discount more than 100%
+    }
+  }
+  return 0;
+}
+
+
 /**
  * Returns the total price based on a map where the keys are the ticketTierIds
  * @param ticketTiers
@@ -18,13 +38,13 @@ export function calculateTotalPriceWithoutTax(ticketTiers: TicketTier[], ticketL
   return total;
 }
 
-export function convertCentsToDollars(price: number | undefined): number {
+export function convertCentsToDollars(price: number | undefined | null): number {
   if (!price) {
     return 0;
   }
   return price / PRICE_DOLLARS_AND_CENTS_RATIO;
 }
-export function convertDollarsToCents(price: number | undefined): number {
+export function convertDollarsToCents(price: number | undefined | null): number {
   if (!price) {
     return 0;
   }