@hanzo/commerce 1.1.0 → 1.1.1

package/components/cart.tsx

@@ -1,5 +1,5 @@
 'use client'
-import React, { type PropsWithChildren, useState } from 'react'
+import React, { type PropsWithChildren } from 'react'
 import { useRouter } from 'next/navigation'
 import { observer } from 'mobx-react-lite'
 
@@ -23,18 +23,9 @@ const Cart: React.FC<PropsWithChildren & {
   isMobile=false,
   hideCheckout=false
 }) => {
-  const [loadingCheckout, setLoadingCheckout] = useState(false)
   const cmmc = useCommerce()
   const router = useRouter()
   const auth = useAuth()
-
-  const checkout = async () => {
-    setLoadingCheckout(true)
-    if (auth.user) {
-      await cmmc.createOrder(auth.user.email)
-    }
-    router.push('/checkout')
-  }
   
   return (
     <div className={cn('border p-6 rounded-lg', className)}>
@@ -50,10 +41,10 @@ const Cart: React.FC<PropsWithChildren & {
       </div>
       {cmmc.cartItems.length > 0 && !hideCheckout && (
         <>
-          {!auth.loggedIn ? (
+          {!(auth && auth.loggedIn) ? (
             <Button size='sm' variant='secondary' rounded='lg' className='mt-12 mx-auto' onClick={() => router.push('/login?redirectUrl=checkout')}>Login to checkout</Button>
           ) : (
-            <Button size='lg' variant='secondary' rounded='lg' className='mt-12 mx-auto' onClick={checkout} disabled={loadingCheckout}>Checkout</Button>
+            <Button size='lg' variant='secondary' rounded='lg' className='mt-12 mx-auto' onClick={() => router.push('/checkout')}>Checkout</Button>
           )}
         </>
       )}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/commerce",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Library with shopping cart components.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/service/impls/standalone/orders/index.ts

@@ -23,12 +23,52 @@ const getDBInstance = (name: string): Firestore => {
  
 interface SavedOrder {
   email: string
+  paymentMethod: string
+  status: string
   timestamp: FieldValue
   items: ActualLineItemSnapshot[]
 }
 
 const createOrder = async (
   email: string,
+  paymentMethod: string,
+  items: ActualLineItemSnapshot[],
+  options: {
+    dbName: string
+    ordersTable: string
+  }
+): Promise<{
+  success: boolean,
+  error: any,
+  id?: string
+}> => {  
+
+  let error: any | null = null
+  const ordersRef = collection(getDBInstance(options.dbName), options.ordersTable)
+  const orderId = `${email}-${new Date().toISOString()}`
+
+  try {
+    await setDoc(doc(ordersRef, orderId), {
+      email,
+      paymentMethod,
+      status: 'open',
+      timestamp: serverTimestamp(),
+      items,
+    } satisfies SavedOrder)
+    return { success: !error, error, id: orderId }
+  }
+  catch (e) {  
+    console.error('Error writing item document: ', e)
+    error = e  
+  }  
+  
+  return { success: !error, error }  
+}
+
+const updateOrder = async (
+  orderId: string,
+  email: string,
+  paymentMethod: string,
   items: ActualLineItemSnapshot[],
   options: {
     dbName: string
@@ -43,8 +83,10 @@ const createOrder = async (
   const ordersRef = collection(getDBInstance(options.dbName), options.ordersTable)
 
   try {
-    await setDoc(doc(ordersRef, `${email}-${new Date().toISOString()}`), {
+    await setDoc(doc(ordersRef, orderId), {
       email,
+      paymentMethod,
+      status: 'open',
       timestamp: serverTimestamp(),
       items,
     } satisfies SavedOrder)
@@ -57,4 +99,4 @@ const createOrder = async (
   return { success: !error, error }  
 }
 
-export { createOrder }
+export { createOrder, updateOrder }

package/service/impls/standalone/standalone-service.ts

@@ -15,7 +15,10 @@ import type {
   FacetsDesc
 } from '../../../types'
 
-import { createOrder as createOrderHelper } from './orders'
+import {
+  createOrder as createOrderHelper,
+  updateOrder as updateOrderHelper
+} from './orders'
 
 import ActualLineItem, { type ActualLineItemSnapshot } from './actual-line-item'
 
@@ -84,9 +87,15 @@ class StandaloneService
     })
   }
 
-  async createOrder(email: string): Promise<void> {
+  async createOrder(email: string, paymentMethod: string): Promise<string | undefined> {
     const snapshot = this.takeSnapshot()
-    createOrderHelper(email, snapshot.items, this._options) // didn't want to have two levels of 'items'
+    const order = await createOrderHelper(email, paymentMethod, snapshot.items, this._options) // didn't want to have two levels of 'items'
+    return order.id
+  }
+
+  async updateOrder(orderId: string, email: string, paymentMethod: string): Promise<void> {
+    const snapshot = this.takeSnapshot()
+    updateOrderHelper(orderId, email, paymentMethod, snapshot.items, this._options) // didn't want to have two levels of 'items'
   }
 
   takeSnapshot = (): StandaloneServiceSnapshot => ({
@@ -127,13 +136,14 @@ class StandaloneService
           }
         }
       }
-      
-      let foundItem: ActualLineItem | undefined = undefined
-      this._categoryMap.forEach((category, categoryId) => {
-        if (foundItem) return
-        if (categoriesTried.includes(categoryId)) return
-        foundItem = category.products.find((p) => (p.sku === skuToFind)) as ActualLineItem | undefined
-      }) 
+      for( const [categoryId, category] of this._categoryMap.entries()) {
+        if (categoriesTried.includes(categoryId)) continue
+        const foundItem = category.products.find((p) => (p.sku === skuToFind)) as ActualLineItem | undefined
+        if (foundItem) {
+          return foundItem as ActualLineItem
+        }
+      }
+      return undefined
     })();
 
     return !!this._currentItem

package/types/commerce-service.ts

@@ -8,7 +8,8 @@ interface CommerceService extends ObsLineItemRef {
   get cartTotal(): number
   getCartCategorySubtotal(categoryId: string): number
 
-  createOrder(email: string): Promise<void>
+  createOrder(email: string, paymentMethod: string): Promise<string | undefined>
+  updateOrder(orderId: string, email: string, paymentMethod: string): Promise<void>
 
     /** 
      * Sets the tokens at each level supplied.
@@ -29,7 +30,7 @@ interface CommerceService extends ObsLineItemRef {
      * "current" is unrelated to what is "specified",
      * ie, facets' values 
      *  */ 
-  setCurrentItem(sku: string | undefined): boolean // was valid sku and was set.
+  setCurrentItem(sku: string | undefined): boolean // valid sku and was set.
     /**
      * For convenience, so widgets can share state.
      * "current" is unrelated to what is "specified",

package/util/use-sku-and-facet-params.ts

@@ -22,6 +22,7 @@ interface GetMutator {
 }
 
 const useSkuAndFacetParams = (
+  setMessage: (m: string | undefined) => void,
   setLoading?: (l: boolean) => void
 ) => {
 
@@ -50,8 +51,6 @@ const useSkuAndFacetParams = (
     parseAsBoolean.withDefault(false).withOptions({ clearOnDefault: true })
   )
 
-  const [message, setMessage] = useState<string | undefined>(undefined)
-
   const directMutator: GetMutator = (level: 1 | 2): StringMutator => {
 
     const setLevel = (value: string, level: 1 | 2 ): void  => {
@@ -84,6 +83,8 @@ const useSkuAndFacetParams = (
     }
   }
 
+  let message: string | undefined = undefined
+
   useEffect(() => {
     
     const setCurrentCategoryFromSku = (sku: string) => {
@@ -111,14 +112,14 @@ const useSkuAndFacetParams = (
             }
           })
         }
-        setMessage(undefined)
         encRef.current.usingSkuMode = true
       }
       else {
+
         setSkuParam('')
           // if sent here w an invalid sku, 
           // it will effectively put us in facet params mode
-        setMessage('Invalid sku. ' + PLEASE_SELECT_FACETS)
+        message = 'Invalid sku. ' + PLEASE_SELECT_FACETS
       }
     }
 
@@ -148,7 +149,6 @@ const useSkuAndFacetParams = (
       const categories = cmmc.setFacets(facets)
       if (categories && categories.length > 0) {
         cmmc.setCurrentItem(categories[0].products[0].sku)
-        setMessage(undefined)
       }
       else {
         cmmc.setCurrentItem(undefined)
@@ -156,17 +156,15 @@ const useSkuAndFacetParams = (
       }
     }
     else {
-      setMessage(PLEASE_SELECT_FACETS)
+      setMessage(message ?? PLEASE_SELECT_FACETS)
     }
     setLoading && setLoading(false)
   }, [level1 , level2])
 
   return {
-    message,
     getMutator: encRef.current.usingSkuMode ?
       directMutator : paramsMutator
   }
-
 }
 
 export default useSkuAndFacetParams