muba-posting 5.0.7 → 5.0.10

package/Publish2.js

@@ -11,6 +11,7 @@ const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
 const window = Dimensions.get('window');
 
 const GET_LOCATION_FROM_COORDINATES = { method: 'GET', url: '/controller/location' };
+const GET_CHECK_ZONE = { method: 'GET', url: '/controller/posting/check-zone' };
 
 export default class Publish2 extends React.Component {
   constructor(props) {
@@ -26,10 +27,19 @@ export default class Publish2 extends React.Component {
 
   async nextStep() {
     if (await this.validateLocation()) {
-      if (this.props.postingAd.id == null || this.props.fullPosting) {
-        this.props.goToPage(Views.PUBLISH_3);
+      const responseCheckZone = await this.props.request(this.props.context, GET_CHECK_ZONE, {
+        businessId: this.props.postingAd.businessId,
+        townId: this.props.postingAd.town
+      });
+
+      if (responseCheckZone.value === 'true') {
+        if (this.props.postingAd.id == null || this.props.fullPosting) {
+          this.props.goToPage(Views.PUBLISH_3);
+        } else {
+          this.props.saveEditAd()
+        }
       } else {
-        this.props.saveEditAd()
+        this.popupNoZone.show();
       }
     } else {
       this.popupNoLocation.show();
@@ -123,6 +133,10 @@ export default class Publish2 extends React.Component {
           onClose={() => this.props.replacePage(Views.PUBLISH_2_B)} title={strings('setup.titleLocationNotFound')} onSubmit={() => { this.props.replacePage(Views.PUBLISH_2_B); return true; }} icon={<FontAwesomeIcon name='block' />}>
           <Text style={commonStyles.popupText}>{strings('setup.locationNotFound')}</Text>
         </PopupAdvice>
+        <PopupAdvice dialogStyle={commonStyles.popupBox} ref={(popupNoZone) => { this.popupNoZone = popupNoZone; }}
+          title={strings('setup.ad_cant_post_zone')} icon={<FontAwesomeIcon name='block' />}>
+            <Text style={commonStyles.popupText}></Text>
+        </PopupAdvice>        
       </View>
     );
   }

package/Publish2b.js

@@ -4,13 +4,18 @@ import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import InputSelect from 'muba-input-select';
 import InputText from 'muba-input-text';
+import PopupAdvice from 'muba-popup-advice';
 import { Views } from './utils/Views';
+import { createIconSetFromFontello } from 'react-native-vector-icons';
+import fontelloConfig from './fonts/config.json';
+const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
 const window = Dimensions.get('window');
 
 const GET_REGIONS = { method: 'GET', url: '/controller/countries/{countryCode}/regions' };
 const GET_CITIES_FROM_REGION = { method: 'GET', url: '/controller/regions/{regionId}/cities' };
 const GET_DISTRICTS_FROM_CITY = { method: 'GET', url: '/controller/cities/{cityId}/districts' };
 const GET_TOWNS_FROM_DISTRICT = { method: 'GET', url: '/controller/districts/{districtId}/towns' };
+const GET_CHECK_ZONE = { method: 'GET', url: '/controller/posting/check-zone' };
 
 export default class Publish2b extends React.Component {
   constructor(props) {
@@ -213,10 +218,19 @@ export default class Publish2b extends React.Component {
 
   async nextStep() {
     if (this.validateForm()) {
-      if (this.props.postingAd.id == null || this.props.fullPosting) {
-        this.props.goToPage(Views.PUBLISH_3);
+      const responseCheckZone = await this.props.request(this.props.context, GET_CHECK_ZONE, {
+        businessId: this.props.postingAd.businessId,
+        townId: this.props.postingAd.town
+      });
+
+      if (responseCheckZone.value === 'true') {      
+        if (this.props.postingAd.id == null || this.props.fullPosting) {
+          this.props.goToPage(Views.PUBLISH_3);
+        } else {
+          this.props.saveEditAd();
+        }
       } else {
-        this.props.saveEditAd();
+        this.popupNoZone.show();
       }
     }
   }
@@ -305,6 +319,10 @@ export default class Publish2b extends React.Component {
             <Text style={[commonStyles.carteNote, commonStyles.carteNoteMap]}>{strings('setup.useMap')}</Text>
           </TouchableHighlight>
         </View>
+        <PopupAdvice dialogStyle={commonStyles.popupBox} ref={(popupNoZone) => { this.popupNoZone = popupNoZone; }}
+          title={strings('setup.ad_cant_post_zone')} icon={<FontAwesomeIcon name='block' />}>
+          <Text style={commonStyles.popupText}></Text>
+        </PopupAdvice>           
       </View>
     );
   }

package/Publish4.js

@@ -63,7 +63,8 @@ export default class Publish4 extends React.Component {
 
   async loadUri(photo) {
     if (photo) {
-      let fileType = photo.uri.substring(photo.uri.lastIndexOf('.') + 1).toLowerCase();
+      const photoStr = photo.uri.lastIndexOf('.') > 0 && photo.uri.lastIndexOf('.') > photo.uri.length - 5 ? photo.uri : photo.filename;
+      const fileType = photoStr.substring(photoStr.lastIndexOf('.') + 1).toLowerCase();
 
       const image = {
         uri: photo.uri,
@@ -129,14 +130,19 @@ export default class Publish4 extends React.Component {
 
   selectMainPhoto(itemSelected) {
     let imagesArray = this.state.images.slice();
+    let imageSize = this.state.imageSize.slice();
 
     for (let imageObject of imagesArray) {
       imageObject.mainPicture = false;
 
       if (imageObject.uri === itemSelected.uri) {
         imageObject.mainPicture = true;
-        imagesArray.splice(imagesArray.indexOf(imageObject), 1);
+        const imageIndex = imagesArray.indexOf(imageObject);
+        imagesArray.splice(imageIndex, 1);
         imagesArray.splice(0, 0, imageObject);
+
+        const size = imageSize.splice(imageIndex, 1);
+        imageSize.splice(0, 0, ...size);
       }
     }
     let index = 0;
@@ -148,7 +154,8 @@ export default class Publish4 extends React.Component {
 
     this.setState({
       updateMainPhoto: true,
-      images: imagesArray
+      images: imagesArray,
+      imageSize: imageSize
     });
   }
 
@@ -296,8 +303,8 @@ export default class Publish4 extends React.Component {
                   return (
                     <View style={[commonStyles.photoBox]} onLayout={this.setContainerWidth} key={index}>
                       <Image style={{ width: this.state.imageSize[index]?.width, height: this.state.imageSize[index]?.height, marginVertical: this.state.imageSize[index]?.marginVertical, marginHorizontal: this.state.imageSize[index]?.marginHorizontal }}
-                        resizeMode='center' source={{ uri: item.uri }} borderRadius={10} onError={() => this.rerenderImage(index)} />
-                      <ImageBackground style={[commonStyles.photoControls, commonStyles.row]} source={require('./assets/images/bg-shadow.png')} resizeMode='center' borderRadius={1.5}>
+                        resizeMode='cover' source={{ uri: item.uri }} borderRadius={10} onError={() => this.rerenderImage(index)} />
+                      <ImageBackground style={[commonStyles.photoControls, commonStyles.row]} source={require('./assets/images/bg-shadow.png')} resizeMode='stretch' borderRadius={1.5}>
 
                         <TouchableHighlight style={commonStyles.leftIcon} onPress={() => this.deleteImage(item.id, index)}>
                           <FontAwesomeIcon style={commonStyles.whiteIcon} name="cancel-circled" />

package/locales/ar.json

@@ -117,7 +117,8 @@
 		"south": "جنوب",
 		"west": "الغرب",
 		"est": "شرق",
-		"highlight": "رفع قيمة"
+		"highlight": "رفع قيمة",
+		"ad_cant_post_zone":"لا يمكنك النشر في هذه المدينة"
 	},
 	"product": {
 		"LISTING": "قوائم",

package/locales/en.json

@@ -117,7 +117,8 @@
     "south": "South",
     "west": "West",
     "est": "Est",
-    "highlight": "Highlight"
+    "highlight": "Highlight",
+    "ad_cant_post_zone":"You can't post in this city"
   },
   "product": {
     "LISTING": "Listing",

package/locales/es.json

@@ -117,7 +117,8 @@
     "south": "Sur",
     "west": "Oeste",
     "est": "Este",
-    "highlight": "Destacar"
+    "highlight": "Destacar",
+    "ad_cant_post_zone":"No puedes publicar en esta ciudad"
   },
   "product": {
     "LISTING": "Listing",

package/locales/fr.json

@@ -117,7 +117,8 @@
     "south": "South",
     "west": "Ouest",
     "est": "Est",
-    "highlight": "Mettre en valeur"
+    "highlight": "Mettre en valeur",
+    "ad_cant_post_zone":"Vous ne pouvez pas poster dans cette ville"
   },
   "product": {
     "LISTING": "Liste",

package/locales/it.json

@@ -117,7 +117,8 @@
     "south": "Sud",
     "west": "Ovest",
     "est": "Est",
-    "highlight": "Evidenziare"
+    "highlight": "Evidenziare",
+    "ad_cant_post_zone":"Non puoi postare in questa città"
   },
   "product": {
     "LISTING": "Inserzioni",

package/locales/nl.json

@@ -117,7 +117,8 @@
     "south": "Zuid",
     "west": "Oost",
     "est": "North",
-    "highlight": "Highlighting"
+    "highlight": "Highlighting",
+    "ad_cant_post_zone":"In deze stad mag je niet posten"
   },
   "product": {
     "LISTING": "Advertenties",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "5.0.7",
+  "version": "5.0.10",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {