@springmicro/cart 0.7.22 → 0.7.24

package/src/checkout/index.tsx

@@ -28,6 +28,7 @@ export default function Checkout({
   disableFields = [],
   dev,
   invoiceId,
+  affiliateCode,
   order: _order,
 }: {
   apiBaseUrl: string;
@@ -41,22 +42,22 @@ export default function Checkout({
   disableFields?: string[];
   dev?: boolean;
   invoiceId?;
+  affiliateCode?;
   order?;
 }) {
   const store = useStore(cartStore);
   const localCart = useMemo(() => JSON.parse(store), [store]);
-
-  const cart = invoiceId ? { items: _order.basket } : localCart; // todo fix calculation
+  const [order, setOrder] = useState(_order); // starts undefined on a typical checkout. If an order is provided, it's likely an invoice.
+  console.log("CART", invoiceId, order, localCart);
+  const cart = invoiceId ? { items: order.basket } : localCart; // todo fix calculation
 
   const [products, setProducts] = useState({});
   const [prices, setPrices] = useState({});
   const [subtotal, setSubtotal] = useState("Loading prices...");
-  const taxState = useState<any>({ tax_amount: "TBD" });
   const shipping = 0;
   const discount = 0;
 
   const [status, setStatus] = useState(0);
-  const [order, setOrder] = useState(_order); // starts undefined on a typical checkout. If an order is provided, it's likely an invoice.
   const [successData, setSuccessData] = useState(null);
 
   useEffect(() => {
@@ -76,12 +77,12 @@ export default function Checkout({
                 order.charge_id ||
                   !["pending", "awaiting_payment"].includes(order.status)
                   ? 2
-                  : 0 // normally this should be set to 1 but we need to ensure it sends card data to the payment provider and that data is likely lost on refresh.
+                  : 0, // normally this should be set to 1 but we need to ensure it sends card data to the payment provider and that data is likely lost on refresh.
               );
             })
             .catch(() => {
               console.error("Failed to get order");
-            })
+            }),
       );
     }
   }, []);
@@ -92,22 +93,22 @@ export default function Checkout({
     const pricesToGet = cart.items
       .map((c) => c.price_id)
       .filter(
-        (pId) => Object.keys(products).findIndex((pKey) => pKey == pId) === -1
+        (pId) => Object.keys(products).findIndex((pKey) => pKey == pId) === -1,
       );
 
     // filter out products that have already been queried
     const productsToGet = cart.items
       .map((c) => c.product_id)
       .filter(
-        (pId) => Object.keys(products).findIndex((pKey) => pKey == pId) === -1
+        (pId) => Object.keys(products).findIndex((pKey) => pKey == pId) === -1,
       );
 
     const priceUrl = `${apiBaseUrl}/api/ecommerce/price?filter={'ids':[${pricesToGet.join(
-      ","
+      ",",
     )}]}`;
 
     const productUrl = `${apiBaseUrl}/api/ecommerce/products?filter={'ids':[${productsToGet.join(
-      ","
+      ",",
     )}]}`;
 
     const fetchSettings = {
@@ -137,7 +138,7 @@ export default function Checkout({
               ...o,
               [p.id]: p,
             }),
-            prices
+            prices,
           );
           setPrices(data);
         }
@@ -148,7 +149,7 @@ export default function Checkout({
               ...o,
               [p.id]: p,
             }),
-            products
+            products,
           );
           setProducts(data);
         }
@@ -160,22 +161,10 @@ export default function Checkout({
     setSubtotal(
       cart.items
         .map((product) => prices[product.price_id]?.unit_amount)
-        .reduce((p, c) => (c ? p + c : p), 0)
+        .reduce((p, c) => (c ? p + c : p), 0),
     );
   }, [cart, prices]);
 
-  useEffect(() => {
-    const taxable_items = cart.items.filter(
-      (i) =>
-        prices[i.price_id]?.unit_amount > 0 &&
-        products[i.product_id]?.type !== "DONATION"
-    );
-
-    if (taxable_items.length === 0) {
-      taxState[1]({ tax_amount: 0 });
-    }
-  }, [cart, prices, products]);
-
   if (status === 0 && cart.items.length === 0)
     return (
       <div
@@ -219,7 +208,6 @@ export default function Checkout({
             discount={discount}
             shipping={shipping}
             taxProvider={taxProvider}
-            taxState={taxState}
             statusState={[status, setStatus]}
             cart={cart}
             prices={prices}
@@ -239,6 +227,7 @@ export default function Checkout({
             hideFields={hideFields}
             disableFields={disableFields}
             invoiceId={invoiceId}
+            affiliateCode={affiliateCode}
           />
         )}
         {status === 2 && order !== undefined && (

package/src/utils/storage.ts

@@ -61,7 +61,6 @@ apiPathDetails.listen((pathDetails, oldPathDetails) => {
         });
 
         cartStore.set(cartStr);
-        console.log(cartStr);
       } else if (status === 404 && localCartData.items.length > 0) {
         fetchFromCartApi(
           "PUT",
@@ -115,7 +114,6 @@ export function logout(apiBaseUrl: string | undefined) {
 }
 
 export function addToCart(p: CartProduct) {
-  console.log("ADD TO CART", p);
   const cart: Cart = JSON.parse(cartStore.get());
   const newCart: Cart = {
     ...cart,