hey-pharmacist-ecommerce 1.1.30 → 1.1.31

package/src/lib/Apis/models/update-discount-dto.ts

@@ -19,155 +19,112 @@
 export interface UpdateDiscountDto {
   _id?: string;
     /**
-     * 
+     * Display name for the discount
      * @type {string}
      * @memberof UpdateDiscountDto
      */
-    discountName?: string;
+    name?: string;
     /**
-     * 
+     * Optional description for internal use
      * @type {string}
      * @memberof UpdateDiscountDto
      */
     description?: string;
     /**
-     * 
+     * ITEM_DISCOUNT: Shows on products automatically. COUPON_CODE: Requires code at checkout
      * @type {string}
      * @memberof UpdateDiscountDto
      */
-    discountType?: UpdateDiscountDtoDiscountTypeEnum;
+    type?: UpdateDiscountDtoTypeEnum;
     /**
-     * 
+     * PERCENTAGE or FIXED_AMOUNT
      * @type {string}
      * @memberof UpdateDiscountDto
      */
-    decreasePriceBy?: UpdateDiscountDtoDecreasePriceByEnum;
+    valueType?: UpdateDiscountDtoValueTypeEnum;
     /**
-     * 
-     * @type {string}
-     * @memberof UpdateDiscountDto
-     */
-    code?: string;
-    /**
-     * 
-     * @type {boolean}
+     * The discount value (percentage 1-100 or fixed dollar amount)
+     * @type {number}
      * @memberof UpdateDiscountDto
      */
-    automatic?: boolean;
+    value?: number;
     /**
-     * 
+     * Maximum discount amount for percentage discounts (optional, mainly for COUPON_CODE)
      * @type {number}
      * @memberof UpdateDiscountDto
      */
     cappedAt?: number;
     /**
-     * 
-     * @type {number}
+     * Coupon code (required for COUPON_CODE type)
+     * @type {string}
      * @memberof UpdateDiscountDto
      */
-    amount?: number;
+    code?: string;
     /**
-     * 
+     * When the discount becomes active
      * @type {Date}
      * @memberof UpdateDiscountDto
      */
     startsAt?: Date;
     /**
-     * 
+     * When the discount expires
      * @type {Date}
      * @memberof UpdateDiscountDto
      */
     expiresAt?: Date;
     /**
-     * 
-     * @type {number}
-     * @memberof UpdateDiscountDto
-     */
-    maxUses?: number;
-    /**
-     * 
+     * Current lifecycle state
      * @type {string}
      * @memberof UpdateDiscountDto
      */
     state?: UpdateDiscountDtoStateEnum;
     /**
-     * 
-     * @type {Array<string>}
+     * Quick toggle to enable/disable the discount
+     * @type {boolean}
      * @memberof UpdateDiscountDto
      */
-    categoriesEligible?: Array<string>;
+    isActive?: boolean;
     /**
-     * 
+     * Products to apply discount to (all their variants will be discounted)
      * @type {Array<string>}
      * @memberof UpdateDiscountDto
      */
     productsEligible?: Array<string>;
     /**
-     * 
+     * Specific variants to apply discount to
      * @type {Array<string>}
      * @memberof UpdateDiscountDto
      */
     variantsEligible?: Array<string>;
     /**
-     * 
-     * @type {number}
-     * @memberof UpdateDiscountDto
-     */
-    maxUsesPerUser?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof UpdateDiscountDto
-     */
-    minPurchaseRequired?: UpdateDiscountDtoMinPurchaseRequiredEnum;
-    /**
-     * 
+     * Maximum total times this discount can be used (optional)
      * @type {number}
      * @memberof UpdateDiscountDto
      */
-    minPurchaseAmount?: number;
+    maxUses?: number;
     /**
-     * 
+     * Maximum times a single user can use this discount (optional)
      * @type {number}
      * @memberof UpdateDiscountDto
      */
-    minPurchaseQuantity?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof UpdateDiscountDto
-     */
-    customerEligibility?: UpdateDiscountDtoCustomerEligibilityEnum;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof UpdateDiscountDto
-     */
-    usersEligible?: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof UpdateDiscountDto
-     */
-    groupsEligible?: Array<string>;
+    maxUsesPerUser?: number;
 }
 
 /**
     * @export
     * @enum {string}
     */
-export enum UpdateDiscountDtoDiscountTypeEnum {
-    PRODUCT = 'PRODUCT',
-    CATEGORY = 'CATEGORY',
-    VARIANT = 'VARIANT'
+export enum UpdateDiscountDtoTypeEnum {
+    ITEMDISCOUNT = 'ITEM_DISCOUNT',
+    COUPONCODE = 'COUPON_CODE'
 }
 /**
     * @export
     * @enum {string}
     */
-export enum UpdateDiscountDtoDecreasePriceByEnum {
+export enum UpdateDiscountDtoValueTypeEnum {
     PERCENTAGE = 'PERCENTAGE',
-    AMOUNT = 'AMOUNT'
+    FIXEDAMOUNT = 'FIXED_AMOUNT'
 }
 /**
     * @export
@@ -179,22 +136,4 @@ export enum UpdateDiscountDtoStateEnum {
     EXPIRED = 'EXPIRED',
     SCHEDULED = 'SCHEDULED'
 }
-/**
-    * @export
-    * @enum {string}
-    */
-export enum UpdateDiscountDtoMinPurchaseRequiredEnum {
-    NOREQUIREMENT = 'NO_REQUIREMENT',
-    MINIMUMAMOUNT = 'MINIMUM_AMOUNT',
-    MINIMUMQUANTITY = 'MINIMUM_QUANTITY'
-}
-/**
-    * @export
-    * @enum {string}
-    */
-export enum UpdateDiscountDtoCustomerEligibilityEnum {
-    ALL = 'ALL',
-    SPECIFICUSERS = 'SPECIFIC_USERS',
-    SPECIFICGROUPS = 'SPECIFIC_GROUPS'
-}
 

package/src/lib/Apis/models/update-notification-settings-dto.ts

@@ -0,0 +1,28 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Hey Pharamcist API
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { PreferenceUpdateItem } from './preference-update-item';
+/**
+ * 
+ * @export
+ * @interface UpdateNotificationSettingsDto
+ */
+export interface UpdateNotificationSettingsDto {
+  _id?: string;
+    /**
+     * Array of preference updates to apply
+     * @type {Array<PreferenceUpdateItem>}
+     * @memberof UpdateNotificationSettingsDto
+     */
+    preferences: Array<PreferenceUpdateItem>;
+}

package/src/lib/Apis/models/update-review-dto.ts

@@ -23,13 +23,13 @@ export interface UpdateReviewDto {
      * @type {string}
      * @memberof UpdateReviewDto
      */
-    userId?: string;
+    productId?: string;
     /**
      * 
      * @type {string}
      * @memberof UpdateReviewDto
      */
-    productId?: string;
+    productVariantId?: string;
     /**
      * 
      * @type {string}
@@ -56,8 +56,8 @@ export interface UpdateReviewDto {
     reply?: string;
     /**
      * 
-     * @type {string}
+     * @type {Date}
      * @memberof UpdateReviewDto
      */
-    replyDate?: string;
+    replyDate?: Date;
 }

package/src/lib/Apis/models/update-store-dto.ts

@@ -49,6 +49,12 @@ export interface UpdateStoreDto {
      * @memberof UpdateStoreDto
      */
     adminUrl?: string;
+    /**
+     * Shippo Platform managed account ID
+     * @type {string}
+     * @memberof UpdateStoreDto
+     */
+    shippoAccountId?: string;
     /**
      * 
      * @type {string}

package/src/lib/Apis/models/{pick-type-class.ts → variant-light-dto.ts}

@@ -14,38 +14,44 @@
 /**
  * 
  * @export
- * @interface PickTypeClass
+ * @interface VariantLightDto
  */
-export interface PickTypeClass {
+export interface VariantLightDto {
   _id?: string;
     /**
      * 
      * @type {string}
-     * @memberof PickTypeClass
+     * @memberof VariantLightDto
      */
-    id?: string;
+    id: string;
     /**
      * 
      * @type {string}
-     * @memberof PickTypeClass
+     * @memberof VariantLightDto
      */
-    firstname?: string;
+    name: string;
     /**
      * 
-     * @type {string}
-     * @memberof PickTypeClass
+     * @type {number}
+     * @memberof VariantLightDto
      */
-    lastname?: string;
+    retailPrice: number;
     /**
      * 
-     * @type {string}
-     * @memberof PickTypeClass
+     * @type {number}
+     * @memberof VariantLightDto
+     */
+    finalPrice: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof VariantLightDto
      */
-    avatar?: string;
+    inventoryCount: number;
     /**
      * 
      * @type {string}
-     * @memberof PickTypeClass
+     * @memberof VariantLightDto
      */
-    phoneNumber?: string;
+    sku: string;
 }

package/src/lib/utils/discount.ts

@@ -0,0 +1,155 @@
+/**
+ * Discount Utility Functions
+ * Handles calculation and validation of discounts based on the V2 refactor
+ */
+
+import { Discount } from '@/lib/Apis/models/discount';
+import { 
+  DiscountTypeEnum, 
+  DiscountValueTypeEnum, 
+  DiscountStateEnum 
+} from '@/lib/Apis/models/discount';
+
+export { DiscountTypeEnum, DiscountValueTypeEnum, DiscountStateEnum };
+
+export interface DiscountsInsightsDto {
+  totalDiscounts: number;
+  totalActive: number;
+  totalInactive: number;
+  totalExpired: number;
+  totalScheduled: number;
+  totalItemDiscounts: number;
+  totalCouponCodes: number;
+}
+
+/**
+ * Calculate discount amount for a given price
+ * @param price - Original price
+ * @param discount - Discount object
+ * @returns Calculated discount amount
+ */
+export function calculateDiscountAmount(price: number, discount: Discount): number {
+  // Skip state validation - trust that backend already validated the discount
+  // Just check if we have the required fields to calculate
+  if (!discount || !discount.value) {
+    return 0;
+  }
+
+  let amount = 0;
+  const valueType = String(discount.valueType).toUpperCase();
+
+  if (valueType === 'PERCENTAGE') {
+    amount = (price * discount.value) / 100;
+    // Apply cap if specified (mainly for coupon codes)
+    if (discount.cappedAt && amount > discount.cappedAt) {
+      amount = discount.cappedAt;
+    }
+  } else if (valueType === 'FIXED_AMOUNT' || valueType === 'FIXEDAMOUNT') {
+    amount = discount.value;
+  }
+
+  const finalAmount = Math.min(amount, price);
+  return Math.round(finalAmount * 100) / 100; // Round to 2 decimal places
+}
+
+/**
+ * Calculate final price after discount
+ * @param price - Original price
+ * @param discount - Discount object
+ * @returns Final discounted price
+ */
+export function calculateFinalPrice(price: number, discount: Discount): number {
+  const discountAmount = calculateDiscountAmount(price, discount);
+  return Math.max(0, price - discountAmount);
+}
+
+/**
+ * Check if a discount is currently valid (active and not expired/scheduled)
+ * @param discount - Discount object
+ * @returns True if discount is valid and can be applied
+ */
+export function isDiscountValid(discount: Discount): boolean {
+  if (!discount.isActive) {
+    return false;
+  }
+
+  const now = new Date();
+
+  // Check if scheduled
+  if (discount.startsAt && new Date(discount.startsAt) > now) {
+    return false; // Not yet started
+  }
+
+  // Check if expired
+  if (discount.expiresAt && new Date(discount.expiresAt) < now) {
+    return false; // Already expired
+  }
+
+  // Check state
+  const activeStates = [
+    DiscountStateEnum.ACTIVE,
+    'ACTIVE',
+  ];
+  
+  if (!activeStates.includes(discount.state as any)) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Check if a product is eligible for an item discount
+ * @param productId - Product ID
+ * @param variantId - Variant ID (optional)
+ * @param discount - Discount object
+ * @returns True if product/variant is eligible
+ */
+export function isProductEligibleForDiscount(
+  productId: string,
+  variantId: string | undefined,
+  discount: Discount
+): boolean {
+  // Check variant eligibility first (most specific)
+  if (variantId && discount.variantsEligible?.includes(variantId)) {
+    return true;
+  }
+
+  // Check product eligibility
+  if (discount.productsEligible?.includes(productId)) {
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * Format discount display text
+ * @param discount - Discount object
+ * @returns Formatted string like "20% OFF" or "$10 OFF"
+ */
+export function formatDiscountDisplay(discount: Discount): string {
+  const valueType = String(discount.valueType).toUpperCase();
+  
+  if (valueType === 'PERCENTAGE') {
+    return `${discount.value}% OFF`;
+  } else {
+    return `$${discount.value.toFixed(2)} OFF`;
+  }
+}
+
+/**
+ * Get discount state label
+ * @param state - Discount state
+ * @returns Human-readable state label
+ */
+export function getDiscountStateLabel(state: DiscountStateEnum | string): string {
+  const stateStr = String(state).toUpperCase();
+  const stateMap: Record<string, string> = {
+    'ACTIVE': 'Active',
+    'INACTIVE': 'Inactive',
+    'EXPIRED': 'Expired',
+    'SCHEDULED': 'Scheduled',
+  };
+  return stateMap[stateStr] || 'Unknown';
+}

package/src/lib/validations/discount.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export const couponCodeSchema = z.object({
+  code: z
+    .string()
+    .min(2, 'Coupon code must be at least 2 characters')
+    .max(50, 'Coupon code must not exceed 50 characters')
+    .toUpperCase(),
+});
+
+export type CouponCodeFormData = z.infer<typeof couponCodeSchema>;

package/src/providers/CartProvider.tsx

@@ -128,7 +128,7 @@ export function CartProvider({ children }: CartProviderProps) {
         }
         return item;
       });
-      const newSubtotal = newItems.reduce((acc, item) => acc + (item.productVariantData.finalPrice || 0) * item.quantity, 0);
+      const newSubtotal = Math.round(newItems.reduce((acc, item) => acc + (item.productVariantData.finalPrice || 0) * item.quantity, 0) * 100) / 100;
       return {
         ...prev,
         subTotal: newSubtotal,
@@ -174,7 +174,7 @@ export function CartProvider({ children }: CartProviderProps) {
     setCart(prev => {
       if (!prev) return null;
       const newItems = prev.cartBody.items.filter(item => String(item.productVariantId) !== String(productId));
-      const newSubtotal = newItems.reduce((acc, item) => acc + (item.productVariantData.finalPrice || 0) * item.quantity, 0);
+      const newSubtotal = Math.round(newItems.reduce((acc, item) => acc + (item.productVariantData.finalPrice || 0) * item.quantity, 0) * 100) / 100;
       return {
         ...prev,
         subTotal: newSubtotal,

package/src/providers/DiscountProvider.tsx

@@ -0,0 +1,97 @@
+'use client';
+
+import React, { createContext, useContext, useState, useCallback } from 'react';
+import { Discount } from '@/lib/Apis/models/discount';
+import { DiscountsApi } from '@/lib/Apis/apis/discounts-api';
+import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
+import { calculateDiscountAmount } from '@/lib/utils/discount';
+
+interface DiscountContextType {
+  appliedCoupon: Discount | null;
+  couponError: string | null;
+  isValidatingCoupon: boolean;
+  validateAndApplyCoupon: (code: string, userId?: string) => Promise<{ success: boolean; error?: string; discount?: Discount }>;
+  removeCoupon: () => void;
+  calculateCouponDiscount: (subtotal: number) => number;
+}
+
+const DiscountContext = createContext<DiscountContextType | undefined>(undefined);
+
+export function DiscountProvider({ children }: { children: React.ReactNode }) {
+  const [appliedCoupon, setAppliedCoupon] = useState<Discount | null>(null);
+  const [couponError, setCouponError] = useState<string | null>(null);
+  const [isValidatingCoupon, setIsValidatingCoupon] = useState(false);
+
+  const validateAndApplyCoupon = useCallback(
+    async (code: string, userId?: string) => {
+      setIsValidatingCoupon(true);
+      setCouponError(null);
+
+      try {
+        const api = new DiscountsApi(AXIOS_CONFIG);
+        const response = await api.validateCoupon(code, userId);
+        const discount = response.data;
+
+        if (!discount) {
+          setCouponError('Coupon code not found');
+          setAppliedCoupon(null);
+          return { success: false, error: 'Coupon code not found' };
+        }
+
+        setAppliedCoupon(discount);
+        setCouponError(null);
+        return { success: true, discount };
+      } catch (error: any) {
+        const errorMessage =
+          error.response?.data?.message || 'Failed to validate coupon code';
+        setCouponError(errorMessage);
+        setAppliedCoupon(null);
+        return { success: false, error: errorMessage };
+      } finally {
+        setIsValidatingCoupon(false);
+      }
+    },
+    []
+  );
+
+  const removeCoupon = useCallback(() => {
+    setAppliedCoupon(null);
+    setCouponError(null);
+  }, []);
+
+  const calculateCouponDiscount = useCallback(
+    (subtotal: number): number => {
+      if (!appliedCoupon) {
+        return 0;
+      }
+      const discount = calculateDiscountAmount(subtotal, appliedCoupon);
+      return discount;
+    },
+    [appliedCoupon]
+  );
+
+  const value: DiscountContextType = {
+    appliedCoupon,
+    couponError,
+    isValidatingCoupon,
+    validateAndApplyCoupon,
+    removeCoupon,
+    calculateCouponDiscount,
+  };
+
+  return (
+    <DiscountContext.Provider value={value}>
+      {children}
+    </DiscountContext.Provider>
+  );
+}
+
+export function useDiscountsContext() {
+  const context = useContext(DiscountContext);
+  if (!context) {
+    throw new Error('useDiscountsContext must be used within DiscountProvider');
+  }
+  return context;
+}
+
+export type { DiscountContextType };

package/src/providers/EcommerceProvider.tsx

@@ -7,10 +7,13 @@ import { AuthProvider } from './AuthProvider';
 import { CartProvider } from './CartProvider';
 import { WishlistProvider } from './WishlistProvider';
 import { BasePathProvider } from './BasePathProvider';
+import { DiscountProvider } from './DiscountProvider';
 import { initializeApiAdapter } from '@/lib/api-adapter';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { QueryClient } from '@tanstack/react-query';
 import { NotificationProvider } from './NotificationProvider';
+import { NotificationCenterProvider } from './NotificationCenterProvider';
+import { NotificationDrawer } from '@/components/NotificationDrawer';
 
 interface EcommerceProviderProps {
   config: EcommerceConfig;
@@ -35,11 +38,16 @@ export function EcommerceProvider({ config, children, withToaster = true, basePa
         <BasePathProvider basePath={basePath}>
           <AuthProvider>
             <NotificationProvider>
-              <CartProvider>
-                <WishlistProvider>
-                  {children}
-                </WishlistProvider>
-              </CartProvider>
+              <NotificationCenterProvider>
+                <CartProvider>
+                  <DiscountProvider>
+                    <WishlistProvider>
+                      {children}
+                      <NotificationDrawer />
+                    </WishlistProvider>
+                  </DiscountProvider>
+                </CartProvider>
+              </NotificationCenterProvider>
             </NotificationProvider>
           </AuthProvider>
         </BasePathProvider>