hey-pharmacist-ecommerce 1.1.24 → 1.1.26

package/src/lib/Apis/models/index.ts

@@ -1,5 +1,4 @@
 export * from './add-contact-to-list-dto';
-export * from './add-message-dto';
 export * from './address';
 export * from './address-created-request';
 export * from './allow-user-credit-dto';
@@ -29,7 +28,6 @@ export * from './category-populated';
 export * from './category-sub-category-populated';
 export * from './categorys-headlines-response-dto';
 export * from './change-user-email-dto';
-export * from './chat';
 export * from './check-notifications-response-dto';
 export * from './contact-aggregated-stats-response-dto';
 export * from './contact-full-dto';
@@ -41,20 +39,16 @@ export * from './country-stats-response-dto';
 export * from './create-address-dto';
 export * from './create-blog-dto';
 export * from './create-category-dto';
-export * from './create-chat-dto';
 export * from './create-contact-dto';
 export * from './create-contact-list-dto';
 export * from './create-discount-dto';
-export * from './create-draft-dto';
 export * from './create-email-template-dto';
 export * from './create-event-dto';
 export * from './create-marketing-campaign-dto';
 export * from './create-message-dto';
 export * from './create-notification-dto';
-export * from './create-product-attribute-dto';
 export * from './create-product-dto';
 export * from './create-review-dto';
-export * from './create-role-dto';
 export * from './create-single-variant-product-dto';
 export * from './create-store-address-dto';
 export * from './create-store-dto';
@@ -62,15 +56,12 @@ export * from './create-sub-category-dto';
 export * from './create-user-dto';
 export * from './create-user-group-dto';
 export * from './create-variant-dto';
-export * from './create-zone-dto';
 export * from './custom-product-dto';
-export * from './default-payment-method-request-dto';
 export * from './delete-file-dto';
 export * from './delete-many-files-dto';
 export * from './discount';
 export * from './discount-paginated-response';
 export * from './discounts-insights-dto';
-export * from './draft';
 export * from './email-invoice-dto';
 export * from './email-template-response-dto';
 export * from './event';
@@ -82,8 +73,6 @@ export * from './general-stats-response-dto';
 export * from './generate-day-slots-dto';
 export * from './generate-month-slots-dto';
 export * from './generate-week-slots-dto';
-export * from './google-analytics-request-dto';
-export * from './google-analytics-response-dto';
 export * from './group-with-no-users-dto';
 export * from './group-with-users-dto';
 export * from './images-upload-body';
@@ -95,30 +84,23 @@ export * from './manual-shipping-dto';
 export * from './marketing-campaign-content-dto';
 export * from './marketing-list-contact-dto';
 export * from './move-subcategory-dto';
-export * from './my-favorite-list-dto';
 export * from './new-client-email-dto';
 export * from './notification';
 export * from './object-id';
-export * from './open-api';
 export * from './order';
 export * from './order-paginated-response';
 export * from './order-time-line-dto';
 export * from './orders-insights-dto';
 export * from './paginated-products-dto';
 export * from './payment';
-export * from './payment-method';
-export * from './payment-method-data';
 export * from './payment-time-line-dto';
 export * from './payments-insights-dto';
 export * from './payments-paginated-response';
 export * from './pick-type-class';
-export * from './populated-chat-dto';
 export * from './populated-discount';
 export * from './populated-order';
 export * from './prefered-pick-or-delivery-time-dto';
 export * from './price-range';
-export * from './product';
-export * from './product-attribute';
 export * from './product-variant';
 export * from './products-insights-dto';
 export * from './rate-dto';
@@ -127,7 +109,6 @@ export * from './refill-request-dto';
 export * from './register-or-login-with-gmail';
 export * from './reserve-appointment';
 export * from './review';
-export * from './role';
 export * from './schedule-campaign-draft-dto';
 export * from './schedule-tour-email-dto';
 export * from './send-test-email-dto';
@@ -143,17 +124,13 @@ export * from './single-contact-list-stats-dto';
 export * from './single-country-stats-dto';
 export * from './single-general-stats';
 export * from './single-link-stats-dto';
-export * from './single-message-populated';
 export * from './single-notification-dto';
 export * from './single-product-media';
 export * from './single-recipient-dto';
-export * from './single-suggest-attribute';
-export * from './statistic-dto';
 export * from './store';
 export * from './store-entity';
 export * from './sub-category';
 export * from './sub-category-headlines-only-response-dto';
-export * from './suggest-attributes';
 export * from './suggested-slot';
 export * from './tadmin-session-data';
 export * from './tuser-session-data';
@@ -174,21 +151,17 @@ export * from './update-event-dto';
 export * from './update-items-order-dto';
 export * from './update-marketing-camp-draft-dto';
 export * from './update-message-dto';
-export * from './update-product-attribute-dto';
 export * from './update-product-dto';
 export * from './update-product-variant-dto';
 export * from './update-refill-request-dto';
 export * from './update-review-dto';
-export * from './update-role-dto';
 export * from './update-store-dto';
 export * from './update-sub-category-dto';
 export * from './update-transfere-patients-request-dto';
 export * from './update-user-dto';
 export * from './update-user-group-dto';
-export * from './update-zone-dto';
 export * from './upload-pdf-body';
 export * from './used-by';
-export * from './user';
 export * from './user-entity';
 export * from './user-group';
 export * from './user-insights-dto';
@@ -196,5 +169,3 @@ export * from './user-with-no-id';
 export * from './users-paginated-response';
 export * from './verify-email-dto';
 export * from './wishlist';
-export * from './zone';
-export * from './zone-single-size';

package/src/lib/Apis/models/orders-insights-dto.ts

@@ -60,10 +60,4 @@ export interface OrdersInsightsDto {
      * @memberof OrdersInsightsDto
      */
     totalOutForDeliveryOrders: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof OrdersInsightsDto
-     */
-    draftsCount: number;
 }

package/src/lib/Apis/models/payment.ts

@@ -11,7 +11,6 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { PaymentMethod } from './payment-method';
 import { PaymentTimeLineDTO } from './payment-time-line-dto';
 import { UserWithNoId } from './user-with-no-id';
 /**
@@ -63,12 +62,6 @@ export interface Payment {
      * @memberof Payment
      */
     orderId: string;
-    /**
-     * 
-     * @type {PaymentMethod}
-     * @memberof Payment
-     */
-    paymentCardDetails: PaymentMethod;
     /**
      * 
      * @type {UserWithNoId}

package/src/lib/Apis/models/product-variant.ts

@@ -116,12 +116,6 @@ export interface ProductVariant {
      * @memberof ProductVariant
      */
     sku: string;
-    /**
-     * 
-     * @type {{ [key: string]: string; }}
-     * @memberof ProductVariant
-     */
-    attribute: { [key: string]: string; };
     /**
      * 
      * @type {boolean}

package/src/lib/Apis/models/products-insights-dto.ts

@@ -36,10 +36,4 @@ export interface ProductsInsightsDto {
      * @memberof ProductsInsightsDto
      */
     totalInactiveProducts: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof ProductsInsightsDto
-     */
-    totalDrafts: number;
 }

package/src/lib/Apis/models/rate-dto.ts

@@ -42,12 +42,6 @@ export interface RateDto {
      * @memberof RateDto
      */
     currencyLocal: string;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof RateDto
-     */
-    attributes: Array<string>;
     /**
      * 
      * @type {string}

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

@@ -37,12 +37,6 @@ export interface UpdateProductVariantDto {
      * @memberof UpdateProductVariantDto
      */
     description?: string;
-    /**
-     * 
-     * @type {{ [key: string]: string; }}
-     * @memberof UpdateProductVariantDto
-     */
-    attribute?: { [key: string]: string; };
     /**
      * 
      * @type {number}

package/src/providers/WishlistProvider.tsx

@@ -6,12 +6,11 @@ import { AXIOS_CONFIG } from '@/lib/Apis/wrapper';
 import { useAuth } from './AuthProvider';
 import { useMemo } from 'react';
 import { Wishlist } from '@/lib/Apis';
-import { Product } from '@/lib/Apis/models';
 import { useNotification } from './NotificationProvider';
 
 
 interface WishlistContextType extends Wishlist {
-  addToWishlist: (product: Product) => Promise<void>;
+  addToWishlist: (product: any) => Promise<void>;
   removeFromWishlist: (productId: string) => Promise<void>;
   isInWishlist: (productId: string) => boolean;
   getWishlistCount: () => number;
@@ -73,7 +72,7 @@ export function WishlistProvider({ children }: { children: ReactNode }) {
     fetchWishlist();
   }, [fetchWishlist]);
 
-  const addToWishlist = async (product: Product) => {
+  const addToWishlist = async (product: any) => {
     if (!isAuthenticated) {
       notification.error(
         'Sign-in required',

package/src/screens/CheckoutScreen.tsx

@@ -66,14 +66,14 @@ const PAYMENT_METHODS = [
     className: 'border-amber-500 hover:bg-amber-50',
     activeClass: 'bg-amber-50 border-amber-500 text-amber-700',
   },
-  {
-    label: 'Credit',
-    value: 'Credit',
-    icon: <ShieldCheck className="w-5 h-5" />,
-    description: 'Use your account credit',
-    className: 'border-emerald-500 hover:bg-emerald-50',
-    activeClass: 'bg-emerald-50 border-emerald-500 text-emerald-700',
-  },
+  // {
+  //   label: 'Credit',
+  //   value: 'Credit',
+  //   icon: <ShieldCheck className="w-5 h-5" />,
+  //   description: 'Use your account credit',
+  //   className: 'border-emerald-500 hover:bg-emerald-50',
+  //   activeClass: 'bg-emerald-50 border-emerald-500 text-emerald-700',
+  // },
 ];
 
 export function CheckoutScreen() {
@@ -86,7 +86,6 @@ export function CheckoutScreen() {
   const [paymentMethod, setPaymentMethod] = useState('Card');
   const [error, setError] = useState<string | null>(null);
   const [selectedAddressId, setSelectedAddressId] = useState<string | null>(null);
-  const [selectedStoreAddressId, setSelectedStoreAddressId] = useState<string | null>(null);
   const [storeAddresses, setStoreAddresses] = useState<any[]>([]); // For pickup selection
   const [isAddressModalOpen, setIsAddressModalOpen] = useState(false);
   const [editingAddress, setEditingAddress] = useState<any | null>(null);
@@ -220,19 +219,9 @@ export function CheckoutScreen() {
     durationTerms?: string;
     estimatedDays?: number;
     providerImage75?: string;
-    attributes?: string[];
     test?: boolean;
   }
 
-  interface ShippingResponse {
-    data?: {
-      messages: ShippingMessage[];
-      rates: ShippingRate[];
-      status: string;
-    };
-  }
-
-
   useEffect(() => {
     if (!isDelivery || !selectedAddressId || !cart || cart?.cartBody?.items?.length === 0 || !cart?.cartBody?.items) {
       setShippingRates([]);
@@ -256,7 +245,7 @@ export function CheckoutScreen() {
       } catch (e: any) {
         setShippingRates([]);
         setSelectedShippingRateId(null);
-        setShippingRatesError(e?.message || 'Failed to fetch shipping rates');
+        setShippingRatesError(e?.response?.data?.message || 'Failed to fetch shipping rates');
       } finally {
         setShippingRatesLoading(false);
       }
@@ -265,24 +254,18 @@ export function CheckoutScreen() {
 
   useEffect(() => {
     if (!isDelivery) {
-      const stores = [
-        { id: 'store1', name: 'Main Pharmacy', street1: '123 Main St', city: 'Seattle' },
-        { id: 'store2', name: 'Eastside Pickup', street1: '456 East Ave', city: 'Bellevue' },
-      ];
-      setStoreAddresses(stores);
-      setSelectedStoreAddressId(stores[0].id);
-      setShippingPrice(0);
-    } else {
-      setStoreAddresses([]);
-      setSelectedStoreAddressId(null);
+      (async () => {
+        const api = new ShippingApi(AXIOS_CONFIG);
+        const res = await api.getStoreAddress();
+        if (res.data) {
+          setStoreAddresses([res.data]);
+          setShippingPrice(0);
+        }
+      })();
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isDelivery]);
 
-  const checkoutSteps = [
-    { id: 1, label: 'Cart', status: 'complete' as const },
-    { id: 2, label: 'Details', status: 'current' as const },
-    { id: 3, label: 'Payment', status: 'upcoming' as const },
-  ];
 
   const onSubmit = async (data: CheckoutFormData) => {
     setError(null);
@@ -319,10 +302,6 @@ export function CheckoutScreen() {
         }
       }
     } else {
-      if (!selectedStoreAddressId) {
-        setError('Please select a pickup location.');
-        return;
-      }
       if (storeAddresses.length === 0) {
         setError('Store pickup location is not available.');
         return;
@@ -367,7 +346,6 @@ export function CheckoutScreen() {
         orderRemindingDates: [],
         shippingAddress: data.shipping,
         billingAddress: sameAsShipping ? data.shipping : data.billing,
-        pickupStoreId: !isDelivery ? selectedStoreAddressId : undefined,
       };
 
       const api = new OrdersApi(AXIOS_CONFIG);
@@ -594,15 +572,13 @@ export function CheckoutScreen() {
                 {!isDelivery && storeAddresses.length > 0 && (
                   <div className="md:col-span-2">
                     <label className="block mb-2 font-semibold">Select Pickup Location</label>
-                    <select
-                      className="w-full border rounded-sm p-2"
-                      value={selectedStoreAddressId || ''}
-                      onChange={e => setSelectedStoreAddressId(e.target.value)}
-                    >
+                    <div className="flex items-center gap-2">
                       {storeAddresses.map(addr => (
-                        <option key={addr.id} value={addr.id}>{addr.name} - {addr.street1}, {addr.city}</option>
+                        <div key={addr.id} className="w-full border rounded-sm p-2">
+                          <p>{addr.name} - {addr.street1}, {addr.city}, {addr.state} {addr.zip}</p>
+                        </div>
                       ))}
-                    </select>
+                    </div>
                   </div>
                 )}
               </div>
@@ -612,7 +588,7 @@ export function CheckoutScreen() {
             {isDelivery && selectedAddressId && (
               <div className="bg-white border-2 border-gray-100 rounded-[24px] p-8 text-[#2B4B7C]">
                 <div className="flex items-center gap-3 text-xl font-semibold text-gray-900 pb-4 mb-8 border-b">
-                  <Truck className="text-accent w-8 h-8 flex items-center justify-center text-[#2B4B7C]" />
+                  <Truck className="w-8 h-8 flex items-center justify-center text-[#2B4B7C]" />
                   <h2 className="font-['Poppins',sans-serif] font-semibold text-[#2B4B7C] text-2xl">Shipping Options</h2>
                 </div>
 
@@ -638,8 +614,6 @@ export function CheckoutScreen() {
                     {shippingRates.map((rate) => {
                       const isSelected = !!selectedShippingRateId && selectedShippingRateId === rate.objectId;
                       const isTest = rate.test;
-                      const hasAttributes = rate.attributes && rate.attributes.length > 0;
-
                       return (
                         <div
                           key={rate.objectId}
@@ -681,28 +655,6 @@ export function CheckoutScreen() {
                                     </span>
                                   )}
                                 </div>
-
-                                {/* Attributes */}
-                                {hasAttributes && (
-                                  <div className="flex flex-wrap gap-2 mb-3">
-                                    {rate.attributes.map((attr: string) => (
-                                      <span
-                                        key={attr}
-                                        className={`px-2 py-1 text-xs font-medium rounded-full ${attr === 'FASTEST'
-                                          ? 'bg-green-100 text-green-800'
-                                          : attr === 'BESTVALUE'
-                                            ? 'bg-blue-100 text-blue-800'
-                                            : attr === 'CHEAPEST'
-                                              ? 'bg-purple-100 text-purple-800'
-                                              : 'bg-gray-100 text-gray-800'
-                                          }`}
-                                      >
-                                        {attr}
-                                      </span>
-                                    ))}
-                                  </div>
-                                )}
-
                                 {/* Delivery Info */}
                                 <div className="space-y-1 text-sm text-gray-600">
                                   {rate.durationTerms && (
@@ -906,8 +858,8 @@ export function CheckoutScreen() {
                     'You will be redirected to a secure payment page.'}
                   {paymentMethod === 'Cash' &&
                     'Pay with cash at the time of delivery or pickup.'}
-                  {paymentMethod === 'Credit' &&
-                    'Use your available account credit for this order.'}
+                  {/* {paymentMethod === 'Credit' &&
+                    'Use your available account credit for this order.'} */}
                 </p>
               </div>
             </div>