merchi_cart 0.0.3-a → 0.0.3-c

package/lib/Cart.js

@@ -31,7 +31,6 @@ function CartComponents() {
             if (includeTheme) {
                 actionFetchTheme(domainId);
             }
-            console.log(domainId, 'whjat os tjos');
             initMerchiCart(domainId);
         }
     }, [domainId, includeTheme, initialiseCart]);

package/lib/slices/sliceCart.js

@@ -174,7 +174,7 @@ export var sliceCart = createSlice({
             state.cart.client = action.payload;
         },
         setDomainId: function (state, action) {
-            state.domainId = action.payload.domainId;
+            state.domainId = action.payload;
         },
         toggleCartOpen: function (state) {
             state.modalCartOpen = !state.modalCartOpen;

package/lib/store.js

@@ -144,11 +144,10 @@ export function actionFetchTheme(id) {
         dispatch(fetchThemeError());
     });
 }
-function cartAndCookie() {
+function cartAndCookie(domainId) {
     return __awaiter(this, void 0, void 0, function () {
-        var domainId, cart;
+        var cart;
         return __generator(this, function (_a) {
-            domainId = getStore().stateCart.domainId;
             console.log(domainId, 'what is this thing in cartAndCookie');
             cart = makeCart({ domain: { id: domainId } }, true);
             return [2 /*return*/, cart.create({ embed: cartEmbed })
@@ -170,13 +169,13 @@ function cartAndCookie() {
         });
     });
 }
-export function createAndSetNewCartCookie() {
+export function createAndSetNewCartCookie(domainId) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     dispatch(fetchCart());
-                    return [4 /*yield*/, cartAndCookie()];
+                    return [4 /*yield*/, cartAndCookie(domainId)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -186,12 +185,14 @@ export function createAndSetNewCartCookie() {
 }
 export function doClearCart() {
     return __awaiter(this, void 0, void 0, function () {
+        var domainId;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    domainId = getStore().stateCart.domainId;
                     dispatch(setCart({}));
                     closeClearCart();
-                    return [4 /*yield*/, createAndSetNewCartCookie()];
+                    return [4 /*yield*/, createAndSetNewCartCookie(domainId)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -457,7 +458,7 @@ function updateCartValues(cartJson) {
     dispatch(sliceCart.actions.fetchCartSuccess(cartJson));
     dispatch(initCartShipmentSlice(cartJson));
 }
-function getCart(cartIdAndToken) {
+function getCart(domainId, cartIdAndToken) {
     var cartSettingsInvalid = sliceCart.actions.cartSettingsInvalid;
     var id = Number(cartIdAndToken[0]);
     if (cartIdAndToken[1]) {
@@ -479,7 +480,7 @@ function getCart(cartIdAndToken) {
         }
     })
         .catch(function (e) {
-        createAndSetNewCartCookie();
+        createAndSetNewCartCookie(domainId);
     });
 }
 export function getMerchiCart(domainId) {
@@ -491,10 +492,12 @@ export function getMerchiCart(domainId) {
                 case 1:
                     cartIdAndToken = _a.sent();
                     if (cartIdAndToken) {
-                        getCart(cartIdAndToken);
+                        console.log('try get', domainId);
+                        getCart(domainId, cartIdAndToken);
                     }
                     else {
-                        createAndSetNewCartCookie();
+                        console.log('try create', domainId);
+                        createAndSetNewCartCookie(domainId);
                     }
                     return [2 /*return*/];
             }
@@ -528,11 +531,13 @@ export function getMerchiCartValues() {
 }
 export function doCartComplete() {
     return __awaiter(this, void 0, void 0, function () {
+        var domainId;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    domainId = getStore().stateCart.domainId;
                     dispatch(sliceCartPayment.actions.doCardComplete());
-                    return [4 /*yield*/, cartAndCookie().then(function () { return location.reload(); })];
+                    return [4 /*yield*/, cartAndCookie(domainId).then(function () { return location.reload(); })];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];

package/package.json

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