@open-tender/cloud 0.1.91 → 0.1.93

package/dist/cjs/slices/customer/groupOrders.d.ts

@@ -1,5 +1,5 @@
 import { AppState } from '../../app';
-import { GroupOrder, GroupOrderExpanded, GroupOrders, GroupOrdersExpanded, RequestError, RequestStatus } from '@open-tender/types';
+import { GroupOrder, GroupOrderExpanded, GroupOrdersExpanded, RequestError, RequestStatus } from '@open-tender/types';
 import { OrderState } from '../order';
 export interface CustomerGroupOrdersState {
     entities: GroupOrdersExpanded;
@@ -64,7 +64,7 @@ export declare const makeCartData: (order: OrderState, spendingLimit?: string) =
         notes: string;
     }[];
 } | null;
-export declare const updateCustomerGroupOrder: import("@reduxjs/toolkit").AsyncThunk<GroupOrders, {
+export declare const updateCustomerGroupOrder: import("@reduxjs/toolkit").AsyncThunk<void, {
     cartId: number;
     callback?: (() => void) | undefined;
 }, {

package/dist/cjs/slices/customer/groupOrders.js

@@ -71,7 +71,6 @@ const makeCartData = (order, spendingLimit) => {
 };
 exports.makeCartData = makeCartData;
 exports.updateCustomerGroupOrder = (0, toolkit_1.createAsyncThunk)(CustomerGroupOrdersActionType.UpdateCustomerGroupOrder, ({ cartId, callback }, { dispatch, getState, rejectWithValue }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _b;
     try {
         const api = getState().config.api;
         const token = (0, account_1.selectToken)(getState());
@@ -83,14 +82,16 @@ exports.updateCustomerGroupOrder = (0, toolkit_1.createAsyncThunk)(CustomerGroup
         const { requestedAt, revenueCenter } = getState().order;
         if (response.requested_at !== requestedAt) {
             dispatch((0, order_1.setRequestedAt)(response.requested_at));
-            const tz = utils_1.timezoneMap[(_b = revenueCenter === null || revenueCenter === void 0 ? void 0 : revenueCenter.timezone) !== null && _b !== void 0 ? _b : 'US/Central'];
-            const requestedAtText = (0, utils_1.makeRequestedAtStr)(response.requested_at, tz);
-            dispatch((0, order_1.addMessage)(`Requested time updated to ${requestedAtText}`));
+            if (revenueCenter) {
+                const tz = utils_1.timezoneMap[revenueCenter.timezone];
+                const requestedAtText = (0, utils_1.makeRequestedAtStr)(response.requested_at, tz);
+                dispatch((0, order_1.addMessage)(`Requested time updated to ${requestedAtText}`));
+            }
         }
         const payload = Object.assign(Object.assign({}, (0, groupOrder_1.makeCartPayload)(response)), { isCartOwner: true });
+        dispatch((0, groupOrder_1.adjustGroupOrder)(payload));
         if (callback)
             callback();
-        return payload;
     }
     catch (err) {
         const error = err;
@@ -231,8 +232,9 @@ const customerGroupOrdersSlice = (0, toolkit_1.createSlice)({
             state.error = action.payload;
             state.loading = 'idle';
         })
-            .addCase(exports.updateCustomerGroupOrder.fulfilled, (state, action) => {
-            return Object.assign(Object.assign(Object.assign({}, state), action.payload), { loading: 'idle', error: null });
+            .addCase(exports.updateCustomerGroupOrder.fulfilled, state => {
+            state.error = null;
+            state.loading = 'idle';
         })
             .addCase(exports.updateCustomerGroupOrder.pending, state => {
             state.loading = 'pending';

package/dist/cjs/slices/groupOrder.js

@@ -71,11 +71,8 @@ exports.joinGroupOrder = (0, toolkit_1.createAsyncThunk)(GroupOrderActionType.Jo
         const response = yield api.postCartGuest(data);
         const { cart_guest_id: cartGuestId, first_name: firstName, last_name: lastName } = response;
         const { revenueCenter } = getState().order;
-        console.log('revenueCenter', revenueCenter);
         dispatch((0, order_1.resetOrder)());
         const { serviceType, requestedAt } = getState().groupOrder;
-        console.log('serviceType', serviceType);
-        console.log('requestedAt', requestedAt);
         dispatch((0, order_1.setMenuVars)({ revenueCenter, serviceType, requestedAt }));
         dispatch((0, order_1.setCart)([]));
         const payload = { cartGuestId, firstName, lastName };
@@ -163,7 +160,7 @@ const groupOrderSlice = (0, toolkit_1.createSlice)({
     reducers: {
         resetGroupOrder: () => initialState,
         adjustGroupOrder: (state, action) => {
-            state = Object.assign(Object.assign({}, state), action.payload);
+            return Object.assign(Object.assign({}, state), action.payload);
         }
     },
     extraReducers: builder => {

package/dist/cjs/slices/order.js

@@ -243,7 +243,7 @@ const orderSlice = (0, toolkit_1.createSlice)({
             state.alert = null;
         },
         updateOrder: (state, action) => {
-            state = Object.assign(Object.assign({}, state), action.payload);
+            return Object.assign(Object.assign({}, state), action.payload);
         },
         checkout: state => state,
         setAlert: (state, action) => {
@@ -271,9 +271,8 @@ const orderSlice = (0, toolkit_1.createSlice)({
             state.currentVendor = action.payload;
         },
         setMenuVars: (state, action) => {
-            console.log('action.payload', action.payload);
             const { revenueCenter } = action.payload;
-            state = Object.assign(Object.assign(Object.assign({}, state), action.payload), { orderType: revenueCenter.revenue_center_type, isOutpost: revenueCenter.is_outpost });
+            return Object.assign(Object.assign(Object.assign({}, state), action.payload), { orderType: revenueCenter.revenue_center_type, isOutpost: revenueCenter.is_outpost });
         },
         setAddress: (state, action) => {
             state.address = action.payload;

package/dist/esm/slices/customer/groupOrders.d.ts

@@ -1,5 +1,5 @@
 import { AppState } from '../../app';
-import { GroupOrder, GroupOrderExpanded, GroupOrders, GroupOrdersExpanded, RequestError, RequestStatus } from '@open-tender/types';
+import { GroupOrder, GroupOrderExpanded, GroupOrdersExpanded, RequestError, RequestStatus } from '@open-tender/types';
 import { OrderState } from '../order';
 export interface CustomerGroupOrdersState {
     entities: GroupOrdersExpanded;
@@ -64,7 +64,7 @@ export declare const makeCartData: (order: OrderState, spendingLimit?: string) =
         notes: string;
     }[];
 } | null;
-export declare const updateCustomerGroupOrder: import("@reduxjs/toolkit").AsyncThunk<GroupOrders, {
+export declare const updateCustomerGroupOrder: import("@reduxjs/toolkit").AsyncThunk<void, {
     cartId: number;
     callback?: (() => void) | undefined;
 }, {

package/dist/esm/slices/customer/groupOrders.js

@@ -3,7 +3,7 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { ReducerType } from '../types';
 import { MISSING_CUSTOMER } from '@open-tender/types';
 import { checkAuth, selectToken } from './account';
-import { makeCartPayload, resetGroupOrder } from '../groupOrder';
+import { adjustGroupOrder, makeCartPayload, resetGroupOrder } from '../groupOrder';
 import { addMessage, resetAlert, setAlert, setCart, setRequestedAt, setRevenueCenter } from '../order';
 import { makeRequestedAtStr, makeSimpleCart, rehydrateCart, timezoneMap } from '@open-tender/utils';
 import { showNotification } from '../notifications';
@@ -66,7 +66,6 @@ export const makeCartData = (order, spendingLimit) => {
         ? Object.assign(Object.assign({}, orderData), { spending_limit: spendingLimit }) : orderData;
 };
 export const updateCustomerGroupOrder = createAsyncThunk(CustomerGroupOrdersActionType.UpdateCustomerGroupOrder, ({ cartId, callback }, { dispatch, getState, rejectWithValue }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     try {
         const api = getState().config.api;
         const token = selectToken(getState());
@@ -78,14 +77,16 @@ export const updateCustomerGroupOrder = createAsyncThunk(CustomerGroupOrdersActi
         const { requestedAt, revenueCenter } = getState().order;
         if (response.requested_at !== requestedAt) {
             dispatch(setRequestedAt(response.requested_at));
-            const tz = timezoneMap[(_a = revenueCenter === null || revenueCenter === void 0 ? void 0 : revenueCenter.timezone) !== null && _a !== void 0 ? _a : 'US/Central'];
-            const requestedAtText = makeRequestedAtStr(response.requested_at, tz);
-            dispatch(addMessage(`Requested time updated to ${requestedAtText}`));
+            if (revenueCenter) {
+                const tz = timezoneMap[revenueCenter.timezone];
+                const requestedAtText = makeRequestedAtStr(response.requested_at, tz);
+                dispatch(addMessage(`Requested time updated to ${requestedAtText}`));
+            }
         }
         const payload = Object.assign(Object.assign({}, makeCartPayload(response)), { isCartOwner: true });
+        dispatch(adjustGroupOrder(payload));
         if (callback)
             callback();
-        return payload;
     }
     catch (err) {
         const error = err;
@@ -226,8 +227,9 @@ const customerGroupOrdersSlice = createSlice({
             state.error = action.payload;
             state.loading = 'idle';
         })
-            .addCase(updateCustomerGroupOrder.fulfilled, (state, action) => {
-            return Object.assign(Object.assign(Object.assign({}, state), action.payload), { loading: 'idle', error: null });
+            .addCase(updateCustomerGroupOrder.fulfilled, state => {
+            state.error = null;
+            state.loading = 'idle';
         })
             .addCase(updateCustomerGroupOrder.pending, state => {
             state.loading = 'pending';

package/dist/esm/slices/groupOrder.js

@@ -66,11 +66,8 @@ export const joinGroupOrder = createAsyncThunk(GroupOrderActionType.JoinGroupOrd
         const response = yield api.postCartGuest(data);
         const { cart_guest_id: cartGuestId, first_name: firstName, last_name: lastName } = response;
         const { revenueCenter } = getState().order;
-        console.log('revenueCenter', revenueCenter);
         dispatch(resetOrder());
         const { serviceType, requestedAt } = getState().groupOrder;
-        console.log('serviceType', serviceType);
-        console.log('requestedAt', requestedAt);
         dispatch(setMenuVars({ revenueCenter, serviceType, requestedAt }));
         dispatch(setCart([]));
         const payload = { cartGuestId, firstName, lastName };
@@ -158,7 +155,7 @@ const groupOrderSlice = createSlice({
     reducers: {
         resetGroupOrder: () => initialState,
         adjustGroupOrder: (state, action) => {
-            state = Object.assign(Object.assign({}, state), action.payload);
+            return Object.assign(Object.assign({}, state), action.payload);
         }
     },
     extraReducers: builder => {

package/dist/esm/slices/order.js

@@ -238,7 +238,7 @@ const orderSlice = createSlice({
             state.alert = null;
         },
         updateOrder: (state, action) => {
-            state = Object.assign(Object.assign({}, state), action.payload);
+            return Object.assign(Object.assign({}, state), action.payload);
         },
         checkout: state => state,
         setAlert: (state, action) => {
@@ -266,9 +266,8 @@ const orderSlice = createSlice({
             state.currentVendor = action.payload;
         },
         setMenuVars: (state, action) => {
-            console.log('action.payload', action.payload);
             const { revenueCenter } = action.payload;
-            state = Object.assign(Object.assign(Object.assign({}, state), action.payload), { orderType: revenueCenter.revenue_center_type, isOutpost: revenueCenter.is_outpost });
+            return Object.assign(Object.assign(Object.assign({}, state), action.payload), { orderType: revenueCenter.revenue_center_type, isOutpost: revenueCenter.is_outpost });
         },
         setAddress: (state, action) => {
             state.address = action.payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-tender/cloud",
-  "version": "0.1.91",
+  "version": "0.1.93",
   "description": "A library of hooks, reducers, utility functions, and types for use with Open Tender applications that utilize our cloud-based Order API.",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",