merchi_cart 0.0.2-i → 0.0.2-m

package/lib/Cart.js

@@ -37,5 +37,5 @@ function CartComponents() {
                         _jsxs(_Fragment, { children: [_jsx(CartFooter, { children: _jsx(CartTotals, {}) }), _jsxs(CartFooter, { children: [_jsx(ButtonClearCart, {}), _jsx(ButtonBack, {}), _jsx(ButtonNextDynamic, {})] })] })] }))] }));
 }
 export default function Cart(props) {
-    return (_jsx(CartProvider, __assign({}, props, { children: _jsxs(Provider, { store: store, children: [_jsx(CartComponents, {}), _jsx(CartHeader, {}), _jsx(CartAlert, {})] }) })));
+    return (_jsx(CartProvider, __assign({}, props, { children: _jsx(Provider, { store: store, children: _jsx(CartComponents, {}) }) })));
 }

package/lib/CartAlert.js

@@ -8,8 +8,8 @@ import { useCartContext } from './CartProvider';
 function CartAlert() {
     var classNameBtnClose = useCartContext().classNameBtnClose;
     var alert = useSelector(function (s) { return s.stateCartAlert; }).alert;
-    var icon = alert.icon, message = alert.message, show = alert.show, Title = alert.Title;
+    var icon = alert.icon, message = alert.message, show = alert.show, title = alert.title;
     return (_jsx(_Fragment, { children: show && (_jsxs(Alert, { alertType: alert.type, children: [icon &&
-                    _jsx(FontAwesomeIcon, { icon: icon }), " ", _jsx("strong", { children: Title }), " ", message, _jsx("button", { type: "button", className: classNameBtnClose, "data-bs-dismiss": "alert", "aria-label": "Close", onClick: closeAlert, children: _jsx(FontAwesomeIcon, { icon: faTimes }) })] })) }));
+                    _jsx(FontAwesomeIcon, { icon: icon }), " ", _jsx("strong", { children: title }), " ", message, _jsx("button", { type: "button", className: classNameBtnClose, "data-bs-dismiss": "alert", "aria-label": "Close", onClick: closeAlert, children: _jsx(FontAwesomeIcon, { icon: faTimes }) })] })) }));
 }
 export default CartAlert;

package/lib/components/CartTabPanel.js

@@ -3,9 +3,15 @@ import { useSelector } from 'react-redux';
 import { useCartContext } from '../CartProvider';
 export default function CartTabPanel(_a) {
     var children = _a.children, tabId = _a.tabId;
-    var _b = useSelector(function (s) { return s; }).stateCart, activeTab = _b.activeTab, tabs = _b.tabs;
+    var _b = useSelector(function (s) { return s.stateCart; }), activeTab = _b.activeTab, tabs = _b.tabs;
     var classNameCartTabPanel = useCartContext().classNameCartTabPanel;
     var activeTabValues = tabs[activeTab];
-    var display = tabId === activeTabValues.tabId ? 'block' : 'none';
+    var display = tabId === -1 && activeTab === -1
+        ? 'block'
+        : tabId === -2 && activeTab === -2
+            ? 'block'
+            : tabId === activeTabValues.tabId
+                ? 'block'
+                : 'none';
     return (_jsx("div", { className: classNameCartTabPanel, style: { display: display }, children: children }));
 }

package/lib/forms/FormShipmentAddressAndNotes.js

@@ -9,14 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useDispatch, useSelector } from 'react-redux';
 import { useForm } from 'react-hook-form';
 import InputsAddress from './InputsAddress';
 import { CheckoutContainer, InnerContainer, } from '../components/containers';
 import { Title } from '../components';
-import { updateCartShipmentAddress, } from '../store';
-import { sliceCartShipment } from '../slices/sliceCartShipment';
+import { updateCartShipmentAddress, saveCartShipmentAddressAndGoToNextTab, } from '../store';
+import { shipmentFormId, sliceCartShipment } from '../slices/sliceCartShipment';
 import { faMapMarkerAlt } from '@fortawesome/free-solid-svg-icons';
 import { useCartContext } from '../CartProvider';
 var AddressGeoSuggestInput = function (props) { return (_jsx(InputsAddress, __assign({}, props, { name: 'receiverAddress' }))); };
@@ -54,6 +54,6 @@ export function ActiveFormShipmentAddressAndNotes() {
             updateShipmentAddress(address));
         updateCartShipmentAddress();
     }
-    return (_jsx(_Fragment, {}));
+    return (_jsx(FormShipmentAddressAndNotes, { address: receiverAddress, addressFieldsOpen: addressFieldsOpen, formId: shipmentFormId, notes: receiverNotes, setCartShipmentAddress: saveCartShipmentAddressAndGoToNextTab, toggleAddressFields: toggleAddressFieldsOpen, updateCartShipmentAddress: actionUpdateCartShipmentAddress }));
 }
 export default FormShipmentAddressAndNotes;

package/lib/panels/PanelCartShipment.js

@@ -1,17 +1,20 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useSelector } from 'react-redux';
 import { faTruck } from '@fortawesome/free-solid-svg-icons';
+import { ActiveFormShipmentAddressAndNotes } from '../forms/FormShipmentAddressAndNotes';
 import { CheckoutContainer, InnerContainer, } from '../components/containers';
-import { Alert, CartBody, CartTabPanel, LoadingTemplateSm, Title, } from '../components';
+import { Alert, CartBody, CartTabPanel, LoadingTemplateSm, ShipmentGroupCard, Title, } from '../components';
 import { tabIdShipment } from '../slices/sliceCart';
 import CartNav from '../tabs/CartNav';
 function PanelCartShipment() {
-    var _a = useSelector(function (s) { return s; }).stateCartShipment, fetchingShipmentGroups = _a.fetchingShipmentGroups, shipmentGroups = _a.shipmentGroups;
-    return (_jsxs(CartTabPanel, { tabId: tabIdShipment, children: [_jsx(CartNav, {}), _jsx(CartBody, { style: { paddingTop: '2rem' }, children: _jsxs("div", { className: 'merchi-cart-tab-content', children: [_jsx(CheckoutContainer, { textAlign: 'left', children: _jsx(InnerContainer, { width: 700, paddingBottom: '3rem', children: _jsx(_Fragment, {}) }) }), fetchingShipmentGroups ? (_jsx(CheckoutContainer, { children: _jsxs(InnerContainer, { width: 700, children: [_jsx(LoadingTemplateSm, {}), _jsx("p", { children: "Fetching shipping options." })] }) })) : (_jsxs(_Fragment, { children: [_jsx(CheckoutContainer, { textAlign: 'left', children: _jsx(InnerContainer, { paddingBottom: '1rem', width: 700, children: _jsx(Title, { icon: faTruck, title: shipmentGroups.length > 1 ?
+    var _a = useSelector(function (s) { return s.stateCartShipment; }), fetchingShipmentGroups = _a.fetchingShipmentGroups, shipmentGroups = _a.shipmentGroups;
+    return (_jsxs(CartTabPanel, { tabId: tabIdShipment, children: [_jsx(CartNav, {}), _jsx(CartBody, { style: { paddingTop: '2rem' }, children: _jsxs("div", { className: 'merchi-cart-tab-content', children: [_jsx(CheckoutContainer, { textAlign: 'left', children: _jsx(InnerContainer, { width: 700, paddingBottom: '3rem', children: _jsx(ActiveFormShipmentAddressAndNotes, {}) }) }), fetchingShipmentGroups ? (_jsx(CheckoutContainer, { children: _jsxs(InnerContainer, { width: 700, children: [_jsx(LoadingTemplateSm, {}), _jsx("p", { children: "Fetching shipping options." })] }) })) : (_jsxs(_Fragment, { children: [_jsx(CheckoutContainer, { textAlign: 'left', children: _jsx(InnerContainer, { paddingBottom: '1rem', width: 700, children: _jsx(Title, { icon: faTruck, title: shipmentGroups.length > 1 ?
                                                 'Select shipment methods'
                                                 : shipmentGroups.length ?
                                                     'Select a shipment method'
                                                     : '' }) }) }), _jsx(CheckoutContainer, { textAlign: 'left', children: _jsxs(InnerContainer, { paddingBottom: '1rem', width: 700, children: [shipmentGroups.length > 1 &&
-                                                _jsx(Alert, { alertType: 'warning', children: "Items within this cart are warehoused in different locations and will be shipped separately. Please select how you would like your items to be shipped." }), _jsx(_Fragment, {})] }) })] }))] }) })] }));
+                                                _jsx(Alert, { alertType: 'warning', children: "Items within this cart are warehoused in different locations and will be shipped separately. Please select how you would like your items to be shipped." }), shipmentGroups.map(function (group, index) {
+                                                return _jsx(ShipmentGroupCard, { group: group, groupIndex: index }, "".concat(index, "-shipment-group"));
+                                            })] }) })] }))] }) })] }));
 }
 export default PanelCartShipment;

package/lib/slices/sliceCartAlert.js

@@ -6,7 +6,7 @@ export var sliceCartAlert = createSlice({
             icon: faInfoCircle,
             message: '',
             show: false,
-            Title: '',
+            title: '',
             type: 'info',
         },
     },

package/package.json

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