@osimatic/helpers-js 1.0.84 → 1.0.86

package/form_helper.js

@@ -15,7 +15,8 @@ class FormHelper {
 
 	static reset(form, submitButton) {
 		submitButton = typeof submitButton != 'undefined' && null != submitButton ? submitButton : form.find('button[name="validate"]');
-		form.find('input[name]:not([type="checkbox"], [type="radio"]), select, textarea').each((idx, el) => $(el).val('')).off('change');
+		form.find('input[name]:not([type="checkbox"], [type="radio"]), select:not(.selectpicker), textarea').each((idx, el) => $(el).val('')).off('change');
+		form.find('select.selectpicker').each((idx, el) => $(el).val(''));
 		FormHelper.buttonLoader(submitButton, 'reset');
 		FormHelper.hideFormErrors(form);
 		return form;

package/location.js

@@ -310,6 +310,10 @@ class PostalAddress {
 			separator = '<br/>';
 		}
 
+		function empty(value) {
+			return typeof value == 'undefined' || value == null || value === '';
+		}
+
 		/*
 		var address = new Address({
 			country: "USA",
@@ -324,23 +328,25 @@ class PostalAddress {
 		console.log(formatted);
 		 */
 
-		var addressDataForPluging = {
-			streetAddress: addressData.streetAddress+(addressData.additionalAddress!=null&&addressData.additionalAddress!==''?"\n"+addressData.additionalAddress:''),
-			postalCode: addressData.postalCode,
-			locality: addressData.locality,
-			region: addressData.state,
-			countryCode: addressData.countryCode,
-			country: Country.getCountryName(addressData.countryCode),
+		addressData['countryCode'] = !empty(addressData['countryCode'])?addressData['countryCode']:null;
+
+		let addressDataForPluging = {
+			streetAddress: (!empty(addressData['streetAddress'])?addressData['streetAddress']:'')+(!empty(addressData['additionalAddress'])?"\n"+addressData['additionalAddress']:''),
+			postalCode: !empty(addressData['postalCode'])?addressData['postalCode']:null,
+			locality: !empty(addressData['locality'])?addressData['locality']:null,
+			region: !empty(addressData['state'])?addressData['state']:null,
+			countryCode: addressData['countryCode'],
+			country: Country.getCountryName(addressData['countryCode']),
 		};
-		if (addressDataForPluging.locality == null) {
-			addressDataForPluging.locality = addressData.suburb;
+		if (addressDataForPluging['locality'] == null && !empty(addressData['suburb'])) {
+			addressDataForPluging['locality'] = addressData['suburb'];
 		}
-		if (addressDataForPluging.locality == null) {
-			addressDataForPluging.locality = addressData.stateDistrict;
+		if (addressDataForPluging['locality'] == null && !empty(addressData['stateDistrict'])) {
+			addressDataForPluging['locality'] = addressData['stateDistrict'];
 		}
 
-		var af = new AddressFmt();
-		var formattedAddress = af.format(new Address(addressDataForPluging));
+		let af = new AddressFmt();
+		let formattedAddress = af.format(new Address(addressDataForPluging));
 		return formattedAddress.replace(/\n+/g, separator);
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"