merchi_cart 0.0.3-c → 0.0.3-d

package/lib/Cart.js

@@ -15,6 +15,7 @@ import { Provider, useSelector } from 'react-redux';
 import { store } from './store';
 import CartAlert from './CartAlert';
 import CartHeader from './CartHeader';
+import CartNav from './tabs/CartNav';
 import CartTotals from './CartTotals';
 import CartProvider, { useCartContext } from './CartProvider';
 import { ButtonBack, ButtonClearCart, ButtonNextDynamic, } from './buttons';
@@ -34,7 +35,7 @@ function CartComponents() {
             initMerchiCart(domainId);
         }
     }, [domainId, includeTheme, initialiseCart]);
-    return (_jsxs(_Fragment, { children: [_jsx(CartHeader, {}), _jsx(CartAlert, {}), fetchingCart ? (_jsx(LoadingTemplate, {})) : cartSettingsInvalid ? (_jsx(CartPaymentSettingsInvalid, {})) : (_jsxs("div", { className: 'merchi-tab-pane', children: [_jsx(PanelClearCart, {}), _jsx(PanelEditCartItem, {}), _jsx(PanelCartItems, {}), _jsx(PanelCartShipment, {}), _jsx(PanelClientCheckout, {}), _jsx(PanelPaymentSuccess, {}), ![tabIdItem, tabIdClearCart, tabIdPaymentSuccess].includes(activeTab) &&
+    return (_jsxs(_Fragment, { children: [_jsx(CartHeader, {}), _jsx(CartAlert, {}), _jsx(CartNav, {}), fetchingCart ? (_jsx(LoadingTemplate, {})) : cartSettingsInvalid ? (_jsx(CartPaymentSettingsInvalid, {})) : (_jsxs("div", { className: 'merchi-tab-pane', children: [_jsx(PanelClearCart, {}), _jsx(PanelEditCartItem, {}), _jsx(PanelCartItems, {}), _jsx(PanelCartShipment, {}), _jsx(PanelClientCheckout, {}), _jsx(PanelPaymentSuccess, {}), ![tabIdItem, tabIdClearCart, tabIdPaymentSuccess].includes(activeTab) &&
                         _jsxs(_Fragment, { children: [_jsx(CartFooter, { children: _jsx(CartTotals, {}) }), _jsxs(CartFooter, { children: [_jsx(ButtonClearCart, {}), _jsx(ButtonBack, {}), _jsx(ButtonNextDynamic, {})] })] })] }))] }));
 }
 export default function Cart(props) {

package/lib/index.js

@@ -1,4 +1,4 @@
 import Cart from './Cart';
-import { getMerchiCart, getMerchiCartValues, isMerchiCartFetching, } from './store';
+import { actionGetMerchiCart as getMerchiCart, getMerchiCartValues, isMerchiCartFetching, } from './store';
 export { getMerchiCart, getMerchiCartValues, isMerchiCartFetching, };
 export default Cart;

package/lib/panels/PanelClientCheckout.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useSelector } from 'react-redux';
 import { tabIdCheckout } from '../slices/sliceCart';
-import CartNav from '../tabs/CartNav';
 import { CheckoutContainer, InnerContainer, } from '../components/containers';
 import CartClient from '../components/CartClient';
 import CartShipment from '../components/CartShipment';
@@ -15,11 +14,11 @@ function PanelClientCheckout() {
     var _a = useSelector(function (s) { return s.stateCart; }), cart = _a.cart, needsShipping = _a.needsShipping;
     var client = cart.client, domain = cart.domain;
     var company = domain && domain.company;
-    return (_jsxs(CartTabPanel, { tabId: tabIdCheckout, children: [_jsx(CartNav, {}), _jsx(CartBody, { style: { paddingTop: '2rem' }, children: client && client.id > -1 ?
-                    _jsxs(_Fragment, { children: [_jsx(CheckoutContainer, { children: _jsx(InnerContainer, { paddingBottom: '3rem', children: _jsx(CartClient, { client: client }) }) }), needsShipping &&
-                                _jsx(CheckoutContainer, { children: _jsx(InnerContainer, { paddingBottom: '3rem', children: _jsx(CartShipment, { cart: cart }) }) }), Boolean(company) && company.acceptSquare &&
-                                _jsx(CheckoutContainer, { children: _jsx(InnerContainer, { paddingBottom: '3rem', children: _jsx(FormSquarePayment, {}) }) }), _jsx(CheckoutContainer, { children: _jsx(InnerContainer, { children: _jsx(FormStripePayment, {}) }) })] })
-                    :
-                        _jsxs(_Fragment, { children: [_jsx(CheckoutContainer, { children: _jsxs(InnerContainer, { paddingBottom: '3rem', children: [_jsx(Title, { icon: faUserPlus, Title: 'Checkout as new customer' }), _jsx(FormNewCustomer, {})] }) }), _jsx(CheckoutContainer, { children: _jsxs(InnerContainer, { paddingBottom: '3rem', children: [_jsx(Title, { icon: faUserTag, Title: 'Checkout as returning customer' }), _jsx(FormReturningCustomer, {})] }) })] }) })] }));
+    return (_jsx(CartTabPanel, { tabId: tabIdCheckout, children: _jsx(CartBody, { style: { paddingTop: '2rem' }, children: client && client.id > -1 ?
+                _jsxs(_Fragment, { children: [_jsx(CheckoutContainer, { children: _jsx(InnerContainer, { paddingBottom: '3rem', children: _jsx(CartClient, { client: client }) }) }), needsShipping &&
+                            _jsx(CheckoutContainer, { children: _jsx(InnerContainer, { paddingBottom: '3rem', children: _jsx(CartShipment, { cart: cart }) }) }), Boolean(company) && company.acceptSquare &&
+                            _jsx(CheckoutContainer, { children: _jsx(InnerContainer, { paddingBottom: '3rem', children: _jsx(FormSquarePayment, {}) }) }), _jsx(CheckoutContainer, { children: _jsx(InnerContainer, { children: _jsx(FormStripePayment, {}) }) })] })
+                :
+                    _jsxs(_Fragment, { children: [_jsx(CheckoutContainer, { children: _jsxs(InnerContainer, { paddingBottom: '3rem', children: [_jsx(Title, { icon: faUserPlus, Title: 'Checkout as new customer' }), _jsx(FormNewCustomer, {})] }) }), _jsx(CheckoutContainer, { children: _jsxs(InnerContainer, { paddingBottom: '3rem', children: [_jsx(Title, { icon: faUserTag, Title: 'Checkout as returning customer' }), _jsx(FormReturningCustomer, {})] }) })] }) }) }));
 }
 export default PanelClientCheckout;

package/lib/store.js

@@ -148,7 +148,6 @@ function cartAndCookie(domainId) {
     return __awaiter(this, void 0, void 0, function () {
         var cart;
         return __generator(this, function (_a) {
-            console.log(domainId, 'what is this thing in cartAndCookie');
             cart = makeCart({ domain: { id: domainId } }, true);
             return [2 /*return*/, cart.create({ embed: cartEmbed })
                     .then(function (c) {
@@ -483,7 +482,7 @@ function getCart(domainId, cartIdAndToken) {
         createAndSetNewCartCookie(domainId);
     });
 }
-export function getMerchiCart(domainId) {
+export function actionGetMerchiCart(domainId) {
     return __awaiter(this, void 0, void 0, function () {
         var cartIdAndToken;
         return __generator(this, function (_a) {
@@ -492,11 +491,9 @@ export function getMerchiCart(domainId) {
                 case 1:
                     cartIdAndToken = _a.sent();
                     if (cartIdAndToken) {
-                        console.log('try get', domainId);
                         getCart(domainId, cartIdAndToken);
                     }
                     else {
-                        console.log('try create', domainId);
                         createAndSetNewCartCookie(domainId);
                     }
                     return [2 /*return*/];
@@ -547,9 +544,9 @@ export function doCartComplete() {
 }
 export function initMerchiCart(domainId) {
     dispatch(setDomainId(domainId));
-    getMerchiCart(domainId);
+    actionGetMerchiCart(domainId);
     if (window && window !== undefined) {
-        window.getCart = function () { return getMerchiCart(domainId); };
+        window.getCart = function () { return actionGetMerchiCart(domainId); };
         window.isMerchiCartFetching = isMerchiCartFetching;
         window.getMerchiCartValues = getMerchiCartValues;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merchi_cart",
-  "version": "0.0.3-c",
+  "version": "0.0.3-d",
   "description": "Merchi's cart",
   "main": "lib/index.js",
   "module": "src/index.tsx",