@springmicro/cart 0.7.11 → 0.7.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@springmicro/cart",
   "private": false,
-  "version": "0.7.11",
+  "version": "0.7.13",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     "@nanostores/persistent": "^0.10.1",
     "@nanostores/query": "^0.3.3",
     "@nanostores/react": "^0.7.2",
-    "@springmicro/utils": "^0.7.11",
+    "@springmicro/utils": "^0.7.13",
     "dotenv": "^16.4.5",
     "nanostores": "^0.10.3",
     "react": "^18.2.0",
@@ -49,5 +49,5 @@
     "vite-plugin-css-injected-by-js": "^3.5.1",
     "yup": "^1.4.0"
   },
-  "gitHead": "83e40d99497f8016d112147e64bf69f9ae852d6d"
+  "gitHead": "0f3da8c5a1c587c6457114172bb297adefdf3e08"
 }

package/src/checkout/ReviewCartAndCalculateTaxes.tsx

@@ -215,18 +215,23 @@ export default function ReviewAndCalculateTaxes({
       invoiceId
     )
       .then(async (data) => {
-        dev && console.log("Checkout submitted");
+        dev && console.log("Checkout submitted.", data);
+
         if (data instanceof Response) {
           setFormError(true);
           const { detail: errorData } = await data.json();
-          // dev && alert(data.statusText);
-          // console.log(errorData);
-          // TODO display issues
-          if (!errorData.valid) setPrecheckErrors(errorData.errors);
+
+          if (!errorData.valid) {
+            dev && console.log("Precheck invalid", errorData);
+            setPrecheckErrors(errorData.errors);
+          }
         } else {
+          dev && console.log("Checkout returned status code 200");
+
           // success
           setSuccessData(data);
           onPlacement && onPlacement();
+
           // Get the current URL
           const currentUrl = new URL(window.location.href);
           // Set the query parameter 'showReceipt' to '1'
@@ -349,7 +354,9 @@ export default function ReviewAndCalculateTaxes({
 
         // const res = await submitFunc(values);
         submitFunc(values)
-          .then((v) => {})
+          .then((v) => {
+            dev && console.log("Submit success", v);
+          })
           .catch((e) => {
             dev && console.log("Submit errors", e);
           });

package/src/checkout/index.tsx

@@ -27,6 +27,8 @@ export default function Checkout({
   hideFields = [],
   disableFields = [],
   dev,
+  invoiceId,
+  order: _order,
 }: {
   apiBaseUrl: string;
   taxProvider: string;
@@ -38,10 +40,13 @@ export default function Checkout({
   hideFields?: string[];
   disableFields?: string[];
   dev?: boolean;
+  invoiceId?;
+  order?;
 }) {
   const store = useStore(cartStore);
-  const cart = useMemo(() => JSON.parse(store), [store]);
-  // const cart = JSON.parse(useStore(cartStore));
+  const localCart = useMemo(() => JSON.parse(store), [store]);
+
+  const cart = invoiceId ? { items: _order.basket } : localCart; // todo fix calculation
 
   const [products, setProducts] = useState({});
   const [prices, setPrices] = useState({});
@@ -51,7 +56,7 @@ export default function Checkout({
   const discount = 0;
 
   const [status, setStatus] = useState(0);
-  const [order, setOrder] = useState(undefined);
+  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(() => {
@@ -204,7 +209,7 @@ export default function Checkout({
          * Review taxes and shipping
          *
          * status === 2
-         * Order has been place. Invoice for printing.
+         * Order has been placed. Invoice for printing.
          *
          */}
 
@@ -233,10 +238,15 @@ export default function Checkout({
             dev={dev}
             hideFields={hideFields}
             disableFields={disableFields}
+            invoiceId={invoiceId}
           />
         )}
         {status === 2 && order !== undefined && (
-          <Invoice order={order} successData={successData} />
+          <Invoice
+            order={order}
+            successData={successData}
+            invoiceId={invoiceId}
+          />
         )}
       </div>
     </div>