ordering-components-external 13.2.21 → 13.2.23

package/_modules/components/AddressForm/index.js

@@ -193,7 +193,7 @@ var AddressForm = exports.AddressForm = function AddressForm(props) {
   var saveAddress = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values, userCustomerSetup) {
       var _userByToken$session;
-      var _values$country_code, _formState$changes, _addressState$address, _userByToken$session2, _yield$ordering$users2, content, _content$result;
+      var _values$country_code, _formState$changes, _addressState$address, _userByToken$session2, data, _yield$ordering$users2, content, _content$result;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -218,57 +218,71 @@ var AddressForm = exports.AddressForm = function AddressForm(props) {
               loading: true
             }));
             _context2.prev = 8;
-            _context2.next = 11;
-            return ordering.users((userByToken === null || userByToken === void 0 ? void 0 : userByToken.id) || userId).addresses((_addressState$address = addressState.address) === null || _addressState$address === void 0 ? void 0 : _addressState$address.id).save(_objectSpread(_objectSpread({}, values), formState.changes), {
+            data = _objectSpread(_objectSpread({}, values), formState.changes);
+            Object.keys(data).forEach(function (key) {
+              if (data[key] === null) {
+                delete data[key];
+              }
+            });
+            _context2.next = 13;
+            return ordering.users((userByToken === null || userByToken === void 0 ? void 0 : userByToken.id) || userId).addresses((_addressState$address = addressState.address) === null || _addressState$address === void 0 ? void 0 : _addressState$address.id).save(data, {
               accessToken: (userByToken === null || userByToken === void 0 || (_userByToken$session2 = userByToken.session) === null || _userByToken$session2 === void 0 ? void 0 : _userByToken$session2.token) || accessToken
             });
-          case 11:
+          case 13:
             _yield$ordering$users2 = _context2.sent;
             content = _yield$ordering$users2.content;
             setFormState(_objectSpread(_objectSpread({}, formState), {}, {
               loading: false,
               error: content.error ? content.result : null,
+              result: content.result,
               changes: content.error ? formState.changes : {}
             }));
-            if (!content.error) {
-              setAddressState(_objectSpread(_objectSpread({}, addressState), {}, {
-                address: content.result
-              }));
-              onSaveAddress && onSaveAddress(content.result);
-              if (isSelectedAfterAdd) {
-                changeAddress(content.result.id, {
-                  address: isEdit ? null : content.result,
-                  country_code: (_content$result = content.result) === null || _content$result === void 0 ? void 0 : _content$result.country_code,
-                  type: options === null || options === void 0 ? void 0 : options.type,
-                  isEdit: isEdit
-                });
-              }
+            if (content.error) {
+              _context2.next = 22;
+              break;
             }
+            setAddressState(_objectSpread(_objectSpread({}, addressState), {}, {
+              address: content.result
+            }));
+            if (!isSelectedAfterAdd) {
+              _context2.next = 21;
+              break;
+            }
+            _context2.next = 21;
+            return changeAddress(content.result.id, {
+              address: isEdit ? null : content.result,
+              country_code: (_content$result = content.result) === null || _content$result === void 0 ? void 0 : _content$result.country_code,
+              type: options === null || options === void 0 ? void 0 : options.type,
+              isEdit: isEdit
+            });
+          case 21:
+            onSaveAddress && onSaveAddress(content.result);
+          case 22:
             if (!userCustomerSetup) {
-              _context2.next = 18;
+              _context2.next = 25;
               break;
             }
-            _context2.next = 18;
+            _context2.next = 25;
             return setUserCustomer(userCustomerSetup, true);
-          case 18:
+          case 25:
             if (!avoidRefreshUserInfo) {
               refreshUserInfo();
             }
-            _context2.next = 24;
+            _context2.next = 31;
             break;
-          case 21:
-            _context2.prev = 21;
+          case 28:
+            _context2.prev = 28;
             _context2.t0 = _context2["catch"](8);
             setFormState(_objectSpread(_objectSpread({}, formState), {}, {
               loading: false,
               error: [_context2.t0.message],
               address: {}
             }));
-          case 24:
+          case 31:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[8, 21]]);
+      }, _callee2, null, [[8, 28]]);
     }));
     return function saveAddress(_x3, _x4) {
       return _ref2.apply(this, arguments);

package/_modules/components/GoogleAutocompleteInput/index.js

@@ -59,6 +59,9 @@ var AutocompleteInput = function AutocompleteInput(props) {
       autocomplete.addListener('place_changed', function () {
         var place = autocomplete.getPlace();
         var addressObj = {};
+        var cityFallback = place === null || place === void 0 ? void 0 : place.address_components.find(function (component) {
+          return component.types.includes('administrative_area_level_2');
+        });
         if (place !== null && place !== void 0 && place.address_components) {
           var _iterator = _createForOfIteratorHelper(place.address_components),
             _step;
@@ -77,9 +80,10 @@ var AutocompleteInput = function AutocompleteInput(props) {
                 addressObj.neighborhood = component.long_name;
               }
               if (addressType === 'route') {
-                addressObj.route = component.short_name;
+                addressObj.route = component.long_name;
               }
               if (addressType === 'locality') {
+                addressObj.city = component.long_name || cityFallback.long_name;
                 addressObj.locality = component.long_name;
               }
               if ((_component$types = component.types) !== null && _component$types !== void 0 && _component$types.includes('sublocality')) {
@@ -91,9 +95,7 @@ var AutocompleteInput = function AutocompleteInput(props) {
               }
               if (addressType === 'administrative_area_level_1') {
                 addressObj.state = component.long_name;
-              }
-              if (addressType === 'administrative_area_level_2') {
-                addressObj.city = component.long_name;
+                addressObj.state_code = component.short_name;
               }
             }
           } catch (err) {

package/_modules/components/GoogleMaps/index.js

@@ -192,6 +192,9 @@ var GoogleMaps = exports.GoogleMaps = function GoogleMaps(props) {
         if (results && results.length > 0 && results !== null && results !== void 0 && (_results$ = results[0]) !== null && _results$ !== void 0 && _results$.address_components) {
           var _address$location, _address$location2;
           var addressObj = {};
+          var cityFallback = results[0].address_components.find(function (component) {
+            return component.types.includes('administrative_area_level_2');
+          });
           var _iterator2 = _createForOfIteratorHelper(results[0].address_components),
             _step2;
           try {
@@ -209,9 +212,10 @@ var GoogleMaps = exports.GoogleMaps = function GoogleMaps(props) {
                 addressObj.neighborhood = component.long_name;
               }
               if (addressType === 'route') {
-                addressObj.route = component.short_name;
+                addressObj.route = component.long_name;
               }
               if (addressType === 'locality') {
+                addressObj.city = component.long_name || cityFallback.long_name;
                 addressObj.locality = component.long_name;
               }
               if ((_component$types = component.types) !== null && _component$types !== void 0 && _component$types.includes('sublocality')) {
@@ -223,9 +227,7 @@ var GoogleMaps = exports.GoogleMaps = function GoogleMaps(props) {
               }
               if (addressType === 'administrative_area_level_1') {
                 addressObj.state = component.long_name;
-              }
-              if (addressType === 'administrative_area_level_2') {
-                addressObj.city = component.long_name;
+                addressObj.state_code = component.short_name;
               }
             }
           } catch (err) {

package/_modules/components/GpsButton/index.js

@@ -66,6 +66,9 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
           setIsLoading(false);
           var postalCode = null;
           var addressObj = {};
+          var cityFallback = results[0].address_components.find(function (component) {
+            return component.types.includes('administrative_area_level_2');
+          });
           if (results !== null && results !== void 0 && (_results$ = results[0]) !== null && _results$ !== void 0 && _results$.address_components) {
             var _iterator = _createForOfIteratorHelper(results[0].address_components),
               _step;
@@ -75,6 +78,7 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
                 var component = _step.value;
                 var addressType = component.types[0];
                 if (addressType === 'postal_code') {
+                  addressObj.zipcode = component.short_name;
                   postalCode = component.short_name;
                 }
                 if (addressType === 'street_number') {
@@ -84,9 +88,10 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
                   addressObj.neighborhood = component.long_name;
                 }
                 if (addressType === 'route') {
-                  addressObj.route = component.short_name;
+                  addressObj.route = component.long_name;
                 }
                 if (addressType === 'locality') {
+                  addressObj.city = component.long_name || cityFallback.long_name;
                   addressObj.locality = component.long_name;
                 }
                 if ((_component$types = component.types) !== null && _component$types !== void 0 && _component$types.includes('sublocality')) {
@@ -98,9 +103,7 @@ var GpsButton = exports.GpsButton = function GpsButton(props) {
                 }
                 if (addressType === 'administrative_area_level_1') {
                   addressObj.state = component.long_name;
-                }
-                if (addressType === 'administrative_area_level_2') {
-                  addressObj.city = component.long_name;
+                  addressObj.state_code = component.short_name;
                 }
               }
             } catch (err) {

package/_modules/components/OrderDetails/index.js

@@ -569,7 +569,7 @@ var OrderDetails = exports.OrderDetails = function OrderDetails(props) {
    */
   var getOrder = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var source, options, _result, result, error, response, res, _yield$ordering$setAc7, content, order, err, businessData, _err, _yield$ordering$setAc8, _content, _e$message, _order$id, _e$message2;
+      var source, options, _result, result, error, response, res, _yield$ordering$setAc7, content, order, err, businessData, _yield$ordering$setAc8, _content, _e$message, _order$id, _e$message2;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -631,7 +631,7 @@ var OrderDetails = exports.OrderDetails = function OrderDetails(props) {
             }
             setOrderState(_objectSpread(_objectSpread({}, orderState), {}, {
               loading: false,
-              error: [(_err = err) !== null && _err !== void 0 ? _err : 'ERROR']
+              error: [err !== null && err !== void 0 ? err : 'ERROR']
             }));
             return _context7.abrupt("return");
           case 30:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.2.21",
+  "version": "13.2.23",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/AddressForm/index.js

@@ -127,14 +127,22 @@ export const AddressForm = (props) => {
 
     setFormState({ ...formState, loading: true })
     try {
+      const data = { ...values, ...formState.changes }
+      Object.keys(data).forEach(key => {
+        if (data[key] === null) {
+          delete data[key]
+        }
+      })
+
       const { content } = await ordering
         .users(userByToken?.id || userId)
         .addresses(addressState.address?.id)
-        .save({ ...values, ...formState.changes }, { accessToken: userByToken?.session?.token || accessToken })
+        .save(data, { accessToken: userByToken?.session?.token || accessToken })
       setFormState({
         ...formState,
         loading: false,
         error: content.error ? content.result : null,
+        result: content.result,
         changes: content.error ? formState.changes : {}
       })
       if (!content.error) {
@@ -142,15 +150,15 @@ export const AddressForm = (props) => {
           ...addressState,
           address: content.result
         })
-        onSaveAddress && onSaveAddress(content.result)
         if (isSelectedAfterAdd) {
-          changeAddress(content.result.id, {
+          await changeAddress(content.result.id, {
             address: isEdit ? null : content.result,
             country_code: content.result?.country_code,
             type: options?.type,
             isEdit
           })
         }
+        onSaveAddress && onSaveAddress(content.result)
       }
       if (userCustomerSetup) {
         await setUserCustomer(userCustomerSetup, true)

package/src/components/GoogleAutocompleteInput/index.js

@@ -43,6 +43,7 @@ const AutocompleteInput = (props) => {
       autocomplete.addListener('place_changed', () => {
         const place = autocomplete.getPlace()
         const addressObj = {}
+        const cityFallback = place?.address_components.find(component => component.types.includes('administrative_area_level_2'))
         if (place?.address_components) {
           for (const component of place.address_components) {
             const addressType = component.types[0]
@@ -56,9 +57,10 @@ const AutocompleteInput = (props) => {
               addressObj.neighborhood = component.long_name
             }
             if (addressType === 'route') {
-              addressObj.route = component.short_name
+              addressObj.route = component.long_name
             }
             if (addressType === 'locality') {
+              addressObj.city = component.long_name || cityFallback.long_name
               addressObj.locality = component.long_name
             }
             if (component.types?.includes('sublocality')) {
@@ -70,9 +72,7 @@ const AutocompleteInput = (props) => {
             }
             if (addressType === 'administrative_area_level_1') {
               addressObj.state = component.long_name
-            }
-            if (addressType === 'administrative_area_level_2') {
-              addressObj.city = component.long_name
+              addressObj.state_code = component.short_name
             }
           }
           const address = {

package/src/components/GoogleMaps/index.js

@@ -132,6 +132,7 @@ export const GoogleMaps = (props) => {
       geocoder.geocode({ latLng: pos }, (results) => {
         if (results && results.length > 0 && results?.[0]?.address_components) {
           const addressObj = {}
+          const cityFallback = results[0].address_components.find(component => component.types.includes('administrative_area_level_2'))
           for (const component of results[0].address_components) {
             const addressType = component.types[0]
             if (addressType === 'postal_code') {
@@ -144,9 +145,10 @@ export const GoogleMaps = (props) => {
               addressObj.neighborhood = component.long_name
             }
             if (addressType === 'route') {
-              addressObj.route = component.short_name
+              addressObj.route = component.long_name
             }
             if (addressType === 'locality') {
+              addressObj.city = component.long_name || cityFallback.long_name
               addressObj.locality = component.long_name
             }
             if (component.types?.includes('sublocality')) {
@@ -158,9 +160,7 @@ export const GoogleMaps = (props) => {
             }
             if (addressType === 'administrative_area_level_1') {
               addressObj.state = component.long_name
-            }
-            if (addressType === 'administrative_area_level_2') {
-              addressObj.city = component.long_name
+              addressObj.state_code = component.short_name
             }
           }
           const address = {

package/src/components/GpsButton/index.js

@@ -39,10 +39,12 @@ export const GpsButton = (props) => {
           setIsLoading(false)
           let postalCode = null
           const addressObj = {}
+          const cityFallback = results[0].address_components.find(component => component.types.includes('administrative_area_level_2'))
           if (results?.[0]?.address_components) {
             for (const component of results[0].address_components) {
               const addressType = component.types[0]
               if (addressType === 'postal_code') {
+                addressObj.zipcode = component.short_name
                 postalCode = component.short_name
               }
               if (addressType === 'street_number') {
@@ -52,9 +54,10 @@ export const GpsButton = (props) => {
                 addressObj.neighborhood = component.long_name
               }
               if (addressType === 'route') {
-                addressObj.route = component.short_name
+                addressObj.route = component.long_name
               }
               if (addressType === 'locality') {
+                addressObj.city = component.long_name || cityFallback.long_name
                 addressObj.locality = component.long_name
               }
               if (component.types?.includes('sublocality')) {
@@ -66,9 +69,7 @@ export const GpsButton = (props) => {
               }
               if (addressType === 'administrative_area_level_1') {
                 addressObj.state = component.long_name
-              }
-              if (addressType === 'administrative_area_level_2') {
-                addressObj.city = component.long_name
+                addressObj.state_code = component.short_name
               }
             }
             if (status === 'OK') {