hey-pharmacist-ecommerce 1.1.28 → 1.1.30

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

@@ -11,9 +11,8 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { Category } from './category';
+import { CreateVariantDto } from './create-variant-dto';
 import { SingleProductMedia } from './single-product-media';
-import { SubCategory } from './sub-category';
 /**
  * 
  * @export
@@ -35,40 +34,52 @@ export interface UpdateProductDto {
     description?: string;
     /**
      * 
-     * @type {Array<string>}
+     * @type {string}
      * @memberof UpdateProductDto
      */
-    tags?: Array<string>;
+    brand?: string;
     /**
      * 
      * @type {string}
      * @memberof UpdateProductDto
      */
-    brand?: string;
+    sku?: string;
     /**
      * 
      * @type {string}
      * @memberof UpdateProductDto
      */
-    sku?: string;
+    upc?: string;
     /**
      * 
-     * @type {boolean}
+     * @type {Array<SingleProductMedia>}
      * @memberof UpdateProductDto
      */
-    showStock?: boolean;
+    media?: Array<SingleProductMedia>;
     /**
      * 
      * @type {Array<string>}
      * @memberof UpdateProductDto
      */
-    reviews?: Array<string>;
+    tags?: Array<string>;
+    /**
+     * Category IDs
+     * @type {Array<string>}
+     * @memberof UpdateProductDto
+     */
+    categoryIds?: Array<string>;
+    /**
+     * SubCategory IDs
+     * @type {Array<string>}
+     * @memberof UpdateProductDto
+     */
+    subCategoryIds?: Array<string>;
     /**
      * 
-     * @type {string}
+     * @type {boolean}
      * @memberof UpdateProductDto
      */
-    upc?: string;
+    showStock?: boolean;
     /**
      * 
      * @type {boolean}
@@ -76,27 +87,27 @@ export interface UpdateProductDto {
      */
     homeScreenFeatured?: boolean;
     /**
-     * 
-     * @type {Array<SingleProductMedia>}
+     * IDs of frequently bought together products
+     * @type {Array<string>}
      * @memberof UpdateProductDto
      */
-    productMedia?: Array<SingleProductMedia>;
+    frequentlyBoughtWith?: Array<string>;
     /**
-     * 
+     * IDs of frequently bought together products (alias)
      * @type {Array<string>}
      * @memberof UpdateProductDto
      */
     frequentlyBoughtProducts?: Array<string>;
     /**
      * 
-     * @type {Array<Category>}
+     * @type {boolean}
      * @memberof UpdateProductDto
      */
-    parentCategories: Array<Category>;
+    isActive?: boolean;
     /**
      * 
-     * @type {Array<SubCategory>}
+     * @type {Array<CreateVariantDto>}
      * @memberof UpdateProductDto
      */
-    parentSubCategories: Array<SubCategory>;
+    variants?: Array<CreateVariantDto>;
 }

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

@@ -11,6 +11,7 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { CreateStoreDtoSettings } from './create-store-dto-settings';
 /**
  * 
  * @export
@@ -102,4 +103,10 @@ export interface UpdateStoreDto {
      * @memberof UpdateStoreDto
      */
     storeBillingAddress?: string;
+    /**
+     * 
+     * @type {CreateStoreDtoSettings}
+     * @memberof UpdateStoreDto
+     */
+    settings?: CreateStoreDtoSettings;
 }

package/src/lib/Apis/models/update-sub-category-dto.ts

@@ -42,4 +42,10 @@ export interface UpdateSubCategoryDto {
      * @memberof UpdateSubCategoryDto
      */
     isActive?: boolean;
+    /**
+     * 
+     * @type {number}
+     * @memberof UpdateSubCategoryDto
+     */
+    order?: number;
 }

package/src/lib/Apis/models/{update-product-variant-dto.ts → update-variant-dto.ts}

@@ -15,92 +15,92 @@ import { SingleProductMedia } from './single-product-media';
 /**
  * 
  * @export
- * @interface UpdateProductVariantDto
+ * @interface UpdateVariantDto
  */
-export interface UpdateProductVariantDto {
+export interface UpdateVariantDto {
   _id?: string;
     /**
      * 
      * @type {string}
-     * @memberof UpdateProductVariantDto
+     * @memberof UpdateVariantDto
      */
     name?: string;
     /**
      * 
-     * @type {Array<SingleProductMedia>}
-     * @memberof UpdateProductVariantDto
+     * @type {string}
+     * @memberof UpdateVariantDto
      */
-    productMedia?: Array<SingleProductMedia>;
+    description?: string;
     /**
      * 
      * @type {string}
-     * @memberof UpdateProductVariantDto
+     * @memberof UpdateVariantDto
      */
-    description?: string;
+    sku?: string;
     /**
      * 
-     * @type {number}
-     * @memberof UpdateProductVariantDto
+     * @type {string}
+     * @memberof UpdateVariantDto
      */
-    inventory?: number;
+    brand?: string;
     /**
-     * The width of the product variant in cm
-     * @type {number}
-     * @memberof UpdateProductVariantDto
+     * 
+     * @type {Array<SingleProductMedia>}
+     * @memberof UpdateVariantDto
      */
-    width?: number;
+    media?: Array<SingleProductMedia>;
     /**
-     * The height of the product variant in cm
+     * 
      * @type {number}
-     * @memberof UpdateProductVariantDto
+     * @memberof UpdateVariantDto
      */
-    height?: number;
+    retailPrice?: number;
     /**
-     * The length of the product variant in cm
+     * Initial inventory count
      * @type {number}
-     * @memberof UpdateProductVariantDto
+     * @memberof UpdateVariantDto
      */
-    length?: number;
+    inventoryCount?: number;
     /**
-     * The weight of the product variant in g
+     * Width in cm
      * @type {number}
-     * @memberof UpdateProductVariantDto
+     * @memberof UpdateVariantDto
      */
-    weight?: number;
+    width?: number;
     /**
-     * 
-     * @type {string}
-     * @memberof UpdateProductVariantDto
+     * Height in cm
+     * @type {number}
+     * @memberof UpdateVariantDto
      */
-    brand?: string;
+    height?: number;
     /**
-     * 
-     * @type {string}
-     * @memberof UpdateProductVariantDto
+     * Length in cm
+     * @type {number}
+     * @memberof UpdateVariantDto
      */
-    sku?: string;
+    length?: number;
     /**
-     * 
+     * Weight in grams
      * @type {number}
-     * @memberof UpdateProductVariantDto
+     * @memberof UpdateVariantDto
      */
-    retailPrice?: number;
+    weight?: number;
     /**
      * 
-     * @type {number}
-     * @memberof UpdateProductVariantDto
+     * @type {boolean}
+     * @memberof UpdateVariantDto
      */
-    costPrice?: number;
+    isActive?: boolean;
     /**
-     * 
-     * @type {number}
-     * @memberof UpdateProductVariantDto
+     * Custom attributes like color, size, etc.
+     * @type {any}
+     * @memberof UpdateVariantDto
      */
-    totalSold?: number;
+    attributes?: any;
     /**
-     * 
-     * @type {number}
-     * @memberof UpdateProductVariantDto
+     * Variant ID to update
+     * @type {string}
+     * @memberof UpdateVariantDto
      */
-    inventoryCount?: number;
+    id: string;
 }

package/src/lib/Apis/models/variant-id-inventory-body.ts

@@ -0,0 +1,27 @@
+/* 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.
+ */
+/**
+ * 
+ * @export
+ * @interface VariantIdInventoryBody
+ */
+export interface VariantIdInventoryBody {
+  _id?: string;
+    /**
+     * 
+     * @type {number}
+     * @memberof VariantIdInventoryBody
+     */
+    quantityChange?: number;
+}

package/src/lib/api-adapter/config.ts

@@ -83,3 +83,56 @@ export function clearAuthToken(): void {
   }
 }
 
+/**
+ * Change user password
+ * Custom implementation to fix the auto-generated API which incorrectly sends passwords as headers
+ */
+export async function changePassword(oldPassword: string, newPassword: string): Promise<void> {
+  if (!currentConfig) {
+    throw new Error('API adapter not initialized.');
+  }
+
+  const token = getAuthToken();
+  if (!token) {
+    throw new Error('User is not authenticated');
+  }
+
+  const url = `${currentConfig.apiBaseUrl}/auth/change-password`;
+
+  console.log('Change Password Request:', {
+    url,
+    storeId: currentConfig.storeId,
+    hasToken: !!token,
+    tokenPrefix: token.substring(0, 20) + '...',
+  });
+
+  const response = await fetch(url, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Store-Key': currentConfig.storeId,
+      'Authorization': `Bearer ${token}`,
+    },
+    body: JSON.stringify({
+      oldPassword,
+      newPassword,
+    }),
+  });
+
+  console.log('Change Password Response:', {
+    status: response.status,
+    statusText: response.statusText,
+  });
+
+  if (!response.ok) {
+    const errorData = await response.json().catch(() => ({}));
+    console.error('Change Password Error:', errorData);
+    throw {
+      response: {
+        data: errorData,
+        status: response.status,
+      },
+    };
+  }
+}
+

package/src/lib/validations/address.ts

@@ -8,7 +8,7 @@ export const addressSchema = z.object({
   state: z.string().min(2, 'State is required'),
   zip: z.string().min(4, 'ZIP code is required'),
   country: z.string().min(2, 'Country is required'),
-  phone: z.string().min(10, 'Phone number is required'),
+  phone: z.string().min(10, 'Phone number must be at least 10 characters').optional().or(z.literal('')),
 });
 
 export type AddressFormData = z.infer<typeof addressSchema>;

package/src/providers/FavoritesProvider.tsx

@@ -1,14 +1,14 @@
 'use client';
 
-import { ExtendedProductDTO } from '@/lib/Apis';
+import { Product } from '@/lib/Apis';
 import React, { createContext, useContext, useState, useEffect, ReactNode } from 'react';
 import { useNotification } from './NotificationProvider';
 
 interface FavoritesContextType {
   favorites: string[];
   isFavorite: (productId: string) => boolean;
-  toggleFavorite: (product: ExtendedProductDTO) => void;
-  addToFavorites: (product: ExtendedProductDTO) => void;
+  toggleFavorite: (product: Product) => void;
+  addToFavorites: (product: Product) => void;
   removeFromFavorites: (productId: string) => void;
 }
 
@@ -53,7 +53,7 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
     return favorites.includes(productId);
   };
 
-  const addToFavorites = (product: ExtendedProductDTO) => {
+  const addToFavorites = (product: Product) => {
     if (!favorites.includes(product.id)) {
       setFavorites(prev => [...prev, product.id]);
       notification.success(
@@ -71,7 +71,7 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
     );
   };
 
-  const toggleFavorite = (product: ExtendedProductDTO) => {
+  const toggleFavorite = (product: Product) => {
     if (isFavorite(product.id)) {
       removeFromFavorites(product.id);
     } else {

package/src/providers/WishlistProvider.tsx

@@ -5,12 +5,12 @@ import { WishlistApi } from '@/lib/Apis/apis/wishlist-api';
 import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
 import { useAuth } from './AuthProvider';
 import { useMemo } from 'react';
-import { ExtendedProductDTO, Wishlist } from '@/lib/Apis';
+import { ProductsApi, Wishlist, Product } from '@/lib/Apis';
 import { useNotification } from './NotificationProvider';
 
 
 interface WishlistContextType extends Wishlist {
-  addToWishlist: (product: ExtendedProductDTO) => Promise<void>;
+  addToWishlist: (product: Product) => Promise<void>;
   removeFromWishlist: (productId: string) => Promise<void>;
   isInWishlist: (productId: string) => boolean;
   getWishlistCount: () => number;
@@ -64,7 +64,7 @@ export function WishlistProvider({ children }: { children: ReactNode }) {
         error: error instanceof Error ? error.message : 'Failed to load wishlist',
       }));
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isAuthenticated]);
 
 
@@ -72,7 +72,7 @@ export function WishlistProvider({ children }: { children: ReactNode }) {
     fetchWishlist();
   }, [fetchWishlist]);
 
-  const addToWishlist = async (product: any) => {
+  const addToWishlist = async (product: Product) => {
     if (!isAuthenticated) {
       notification.error(
         'Sign-in required',

package/src/screens/CartScreen.tsx

@@ -88,7 +88,7 @@ export function CartScreen() {
     );
   }
 
-  const subtotal = cart.total;
+  const subtotal = cart.cartBody.items.reduce((total, item) => total + item.productVariantData.finalPrice * item.quantity, 0);
   const shipping = 0;
   const tax = 0;
   const total = subtotal + shipping + tax;

package/src/screens/ChangePasswordScreen.tsx

@@ -9,8 +9,7 @@ import { useRouter } from 'next/navigation';
 import { Lock, ShieldCheck } from 'lucide-react';
 import { Input } from '@/components/ui/Input';
 import { Button } from '@/components/ui/Button';
-import { AuthApi } from '@/lib/Apis/apis/auth-api';
-import { getApiConfiguration } from '@/lib/api-adapter/config';
+import { changePassword } from '@/lib/api-adapter/config';
 import { useAuth } from '@/providers/AuthProvider';
 import { useBasePath } from '@/providers/BasePathProvider';
 
@@ -53,10 +52,7 @@ export function ChangePasswordScreen() {
     setIsSubmitting(true);
     setStatus(null);
     try {
-      await new AuthApi(getApiConfiguration()).changePassword(
-        data.currentPassword,
-        data.newPassword
-      );
+      await changePassword(data.currentPassword, data.newPassword);
       setStatus({ type: 'success', message: 'Password updated successfully' });
       setTimeout(() => router.push(buildPath('/account')), 600);
     } catch (error: any) {