muba-posting 9.0.16 → 9.0.18

package/Publish5.js

@@ -5,6 +5,8 @@ import commonStyles from './commonStyles';
 import InputSelect from 'muba-input-select';
 import AdFeatures from 'muba-ad-features';
 import { Views } from './utils/Views';
+import InputText from 'muba-input-text';
+import InputNumber from './shared/InputNumber.js';
 
 export default class Publish5 extends React.Component {
   constructor(props) {
@@ -75,6 +77,12 @@ export default class Publish5 extends React.Component {
         ],
         selectedItem: this.props.postingAd.landStatus
       },
+      showTerraceSurface: this.props.postingAd.terrace,
+      showGardenSurface: this.props.postingAd.garden,
+      showParkingPlaces: this.props.postingAd.garage,
+      terraceSurface: this.props.postingAd.terraceSurface,
+      gardenSurface: this.props.postingAd.gardenSurface,
+      parkingPlaces: this.props.postingAd.parkingPlaces
     }
   }
 
@@ -82,6 +90,41 @@ export default class Publish5 extends React.Component {
     this.refreshData();
   }
 
+  onChangeFeature(value, name) {
+    this.props.postingAd[name] = value
+    if (name == 'terrace') {
+      this.setState({ showTerraceSurface: value }, () => {
+        this.onChangeTerraceSurface(null);
+      });
+    } else if (name == 'garden') {
+      this.setState({ showGardenSurface: value }, () => {
+        this.onChangeGardenSurface(null);
+      })
+    } else if (name == 'garage') {
+      this.setState({ showParkingPlaces: value }, () => {
+        this.onChangeParkingPlaces(null);
+      })
+    }
+  }
+
+  onChangeTerraceSurface(text) {
+    this.setState({ terraceSurface: text }, () => {
+      this.props.postingAd.terraceSurface = text;
+    });
+  }
+
+  onChangeGardenSurface(text) {
+    this.setState({ gardenSurface: text }, () => {
+      this.props.postingAd.gardenSurface = text;
+    });
+  }
+
+  onChangeParkingPlaces(text) {
+    this.setState({ parkingPlaces: text }, () => {
+      this.props.postingAd.parkingPlaces = text;
+    });
+  }
+
   loadFeaturesOptions() {
     const labels = {}
     const options = {};
@@ -173,6 +216,18 @@ export default class Publish5 extends React.Component {
       validate = this.inputSelectOrientation.onSubmitValidate() && validate;
     }
 
+    if (this.state.showTerraceSurface) {
+      validate = this.inpuTerraceSurface.onSubmitValidate() && validate;
+    }
+
+    if (this.state.showGardenSurface) {
+      validate = this.inputGardenSurface.onSubmitValidate() && validate;
+    }
+
+    if (this.state.showParkingPlaces) {
+      validate = this.inputParkingPlaces.onSubmitValidate() && validate;
+    }
+
     return validate;
   }
 
@@ -310,13 +365,74 @@ export default class Publish5 extends React.Component {
 
                 <View style={[commonStyles.row, commonStyles.rowIcons]}>
                   {this.props.mainFeatures.map(feature =>
-                    <IconFeature
-                      key={feature.name}
+                    <IconFeature key={feature.name}
                       name={feature.name}
                       iconText={feature.label}
+                      postingAd={this.props.postingAd}
                       selected={this.props.postingAd[feature.name]}
                       disabled={!this.props.allowedToModify.features}
-                      onPress={(value) => this.props.postingAd[feature.name] = value} />
+                      onPress={(value) => this.onChangeFeature(value, feature.name)}
+                      extraField={<View>
+                        {feature.name == 'terrace' && this.state.showTerraceSurface &&
+                          <View style={[commonStyles.row, { padding: 5 }]} >
+                            <View style={commonStyles.col8}>
+                              <InputText
+                                value={this.state.terraceSurface}
+                                style={commonStyles.area}
+                                keyboardType='numeric'
+                                type='number'
+                                returnKeyType={"next"}
+                                onlyNumbers={true}
+                                required={true}
+                                maxValue={999999}
+                                onChangeText={(text) => this.onChangeTerraceSurface(text)}
+                                scroll={(ref) => this.props.scroll(ref)}
+                                ref={(element) => this.inpuTerraceSurface = element} />
+                            </View>
+                            <View style={commonStyles.col4}>
+                              <View style={[commonStyles.unit]}>
+                                <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                              </View>
+                            </View>
+                          </View>
+                        }
+
+                        {feature.name == 'garden' && this.state.showGardenSurface &&
+                          <View style={[commonStyles.row, { padding: 5 }]} >
+                            <View style={commonStyles.col8}>
+                              <InputText
+                                value={this.state.gardenSurface}
+                                style={commonStyles.area}
+                                keyboardType='numeric'
+                                type='number'
+                                returnKeyType={"next"}
+                                onlyNumbers={true}
+                                required={true}
+                                maxValue={999999}
+                                onChangeText={(text) => this.onChangeGardenSurface(text)}
+                                scroll={(ref) => this.props.scroll(ref)}
+                                ref={(element) => this.inputGardenSurface = element} />
+                            </View>
+                            <View style={commonStyles.col4}>
+                              <View style={[commonStyles.unit]}>
+                                <Text style={commonStyles.unitText}>{strings('setup.measureSurface')}</Text>
+                              </View>
+                            </View>
+                          </View>
+                        }
+
+                        {feature.name == 'garage' && this.state.showParkingPlaces &&
+                          <InputNumber
+                            value={this.props.postingAd.parkingPlaces}
+                            minValue={1}
+                            maxValue={99}
+                            required={true}
+                            scroll={(ref) => this.props.scroll(ref)}
+                            onChange={(value) => this.onChangeParkingPlaces(value)}
+                            ref={(element) => this.inputParkingPlaces = element} />
+                        }
+                      </View>}
+                    />
                   )}
                 </View>
               </View>
@@ -336,7 +452,7 @@ export default class Publish5 extends React.Component {
                       iconText={feature.label}
                       selected={this.props.postingAd[feature.name]}
                       disabled={!this.props.allowedToModify.features}
-                      onPress={(value) => this.props.postingAd[feature.name] = value} />
+                      onPress={(value) => this.onChangeFeature(value, feature.name)} />
                   )}
                 </View>
               </View>
@@ -356,7 +472,7 @@ export default class Publish5 extends React.Component {
                       iconText={feature.label}
                       selected={this.props.postingAd[feature.name]}
                       disabled={!this.props.allowedToModify.features}
-                      onPress={(value) => this.props.postingAd[feature.name] = value} />
+                      onPress={(value) => this.onChangeFeature(value, feature.name)} />
                   )}
                 </View>
               </View>
@@ -396,12 +512,14 @@ class IconFeature extends React.Component {
 
   render() {
     return (
-      <View style={[commonStyles.characLinkBox, commonStyles.col, commonStyles.col3]}>
+      <View style={[commonStyles.characLinkBox, commonStyles.col, commonStyles.col4]}>
         <TouchableOpacity activeOpacity={1} style={[commonStyles.characIcon, this.state.selected ? commonStyles.characBoxSelected : null, this.props.disabled ? commonStyles.disabled : null]} onPress={() => this.onPressIcon()}
           disabled={this.props.disabled}>
           <AdFeatures style={[commonStyles.characImage, this.state.selected ? commonStyles.characImageSelected : null]} name={this.props.name} />
         </TouchableOpacity>
         <Text style={[commonStyles.characIconText, this.state.selected ? commonStyles.characIconTextSelected : null]}>{this.props.iconText}</Text>
+
+        {this.props.extraField}
       </View>
     );
   }

package/Publish6.js

@@ -15,6 +15,7 @@ const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
 
 const GENERATE_TITLE_DESCRIPTION = { method: 'GET', url: '/controller/posting/generate-title-description' };
 const PHONE_REGISTERED = { method: 'GET', url: '/controller/posting/phone-registered' };
+const CHECK_VIRTUAL_VISIT = { method: 'GET', url: '/controller/posting/check-virtual-visit' };
 const PHONE_SEPARATOR = '###';
 
 let submitClicked;
@@ -30,10 +31,12 @@ export default class Publish6 extends React.Component {
     this.state = {
       hideSave: false,
       requiredPhoneError: false,
+      virtualVisitError: false,
       titleDescriptionLoaded: false,
       languages: this.props.postingAd.languages,
       picturesUploaded: 0,
       reference: this.props.postingAd.reference,
+      virtualVisit: this.props.postingAd.virtualVisit,
       showResetPassword: false,
       showLogin: false,
       accessUsers: {
@@ -171,10 +174,16 @@ export default class Publish6 extends React.Component {
 
       this.languageItem.forEach(element => validate = element.validateLanguageItem() && validate);
     }
+    this.setState({
+      requiredPhoneError: !validate,
+      loading: false
+    });
 
-    this.setState({ loading: false });
-
-    this.setState({ requiredPhoneError: !validate });
+    if (this.state.virtualVisit != null && this.state.virtualVisit !== '') {
+      const virtualVisitResponse = await this.props.request(this.props.context, CHECK_VIRTUAL_VISIT, { virtualVisitUrl: this.state.virtualVisit });
+      validate = virtualVisitResponse.valid && validate;
+      this.setState({ virtualVisitError: !virtualVisitResponse.valid });
+    }
 
     if (this.reference) {
       validate = this.reference.onSubmitValidate() && validate;
@@ -196,6 +205,11 @@ export default class Publish6 extends React.Component {
     this.setState({ reference: text });
   }
 
+  onChangeVirtualVisit(text) {
+    this.props.postingAd.virtualVisit = text;
+    this.setState({ virtualVisit: text });
+  }
+
   login() {
     this.popupPhoneRegistered.hide();
     navigate(this.props.context, Views.LOGIN, { RedirectTo: 'back', disableRegister: true, loadLeadData: false, lu: this.state.lu })
@@ -236,6 +250,26 @@ export default class Publish6 extends React.Component {
                   returnKeyType={"next"}
                   maxLength={50}
                   disabled={!this.props.allowedToModify.clientRef}
+                  onSubmitEditing={(event) => { this.virtualVisit.current.focus(); }} />
+              </View>
+              :
+              null
+            }
+
+            {this.props.businessId ?
+              <View style={this.state.virtualVisitError ? [commonStyles.progressbarFieldContainer, commonStyles.fieldError] : commonStyles.progressbarFieldContainer}>
+                <View style={commonStyles.row}>
+                  <Text style={commonStyles.progressbarField}>{strings('setup.virtualVisit')}</Text>
+                  <Text style={commonStyles.subNote}> {strings('setup.virtualVisitHttps')}</Text>
+                </View>
+                <InputText value={this.state.virtualVisit} ref={(element) => this.virtualVisit = element}
+                  placeholder={strings('setup.virtualVisit')}
+                  required={false} onChangeText={(text) => this.onChangeVirtualVisit(text)}
+                  style={commonStyles.input}
+                  textContainerStyle={{ marginTop: 10 }}
+                  returnKeyType={"next"}
+                  maxLength={512}
+                  disabled={!this.props.allowedToModify.virtualVisit}
                   onSubmitEditing={(event) => { this.phoneGroupRef.current.focus(); }} />
               </View>
               :

package/locales/ar.json

@@ -46,6 +46,8 @@
     "phone": "الهواتف",
     "reference": "المرجع",
     "uniqueReference": "استخدم مرجعًا وحيدا للإعلان",
+    "virtualVisit": "زيارة افتراضية",
+    "virtualVisitHttps": "(//:https)",
     "maxPhones": "الحد الأقصى 3 هواتف",
     "existingPhone": "تم تخصيص هذا الرقم الهاتفي لمستخدم آخر‎",
     "legalNote": "من خلال خلق هذا الإعلان ، فإنك توافق على شروط الاستخدام و سياسة الخصوصية الخاصة بشركة مبوب. نحن نحتفظ بالحق في حذف و / أو تعديل الإعلانات غير اللائقة.",

package/locales/en.json

@@ -46,6 +46,8 @@
     "phone": "Phones",
     "reference": "Reference",
     "uniqueReference": "Use a unique reference for the ad",
+    "virtualVisit": "Virtual tour",
+    "virtualVisitHttps": "(https://)",
     "maxPhones": "Maximum 3 phones",
     "existingPhone": "This phone number is already used by another user",
     "legalNote": "By creating this ad, you agree to Mubawab's Terms of Use and Privacy Policy. We reserve the right to delete and / or modify inappropriate ads.",

package/locales/es.json

@@ -46,6 +46,8 @@
     "phone": "Teléfonos",
     "reference": "Referencia",
     "uniqueReference": "Utiliza una referencia única por anuncio",
+    "virtualVisit": "Tour virtual",
+    "virtualVisitHttps": "(https://)",
     "maxPhones": "Máximo 3 teléfonos",
     "existingPhone": "Este teléfono ya lo ha utilizado otro usuario",
     "legalNote": "Al crear este anuncio, aceptas los Términos de uso y la Política de privacidad de Mubawab. Nos reservamos el derecho de eliminar y/o modificar anuncios inapropiados.",

package/locales/fr.json

@@ -46,6 +46,8 @@
     "phone": "Téléphones",
     "reference": "Référence",
     "uniqueReference": "Utiliser une référence unique pour l'annonce",
+    "virtualVisit": "Visite virtuelle",
+    "virtualVisitHttps": "(https://)",
     "maxPhones": "Maximum 3 téléphones",
     "existingPhone": "Ce numéro de téléphone est déjà attribué à un autre utilisateur",
     "legalNote": "En créant cette annonce, vous acceptez les conditions d'utilisation et la politique de confidentialité de Mubawab. Nous nous réservons le droit de supprimer et/ou de modifier des annonces inappropriées.",

package/locales/it.json

@@ -46,6 +46,8 @@
     "phone": "Numero/i di telefono",
     "reference": "Riferimento",
     "uniqueReference": "Usa un unico riferimento per l'annuncio",
+    "virtualVisit": "Tour virtuale",
+    "virtualVisitHttps": "(https://)",
     "maxPhones": "Massimo 3 telefoni",
     "existingPhone": "Il numero di telefono è già usato da un altro utente",
     "legalNote": "Creando questo annuncio accetti i termini di utilizzo e la politica sulla privacy di Mubawab. Ci riserviamo il diritto di eliminare e/o modificare annunci inappropriati.",

package/locales/nl.json

@@ -46,6 +46,8 @@
     "phone": "Telefoonnummer(s)",
     "reference": "Referentie",
     "uniqueReference": "Gebruik een uniek referentienummer voor de advertentie",
+    "virtualVisit": "Virtuele tour",
+    "virtualVisitHttps": "(https://)",
     "maxPhones": "Maximaal 3 telefoons",
     "existingPhone": "Dit telefoonnummer wordt al gebruikt door een andere gebruiker",
     "legalNote": "Door deze advertentie te maken, gaat u akkoord met de Gebruiksvoorwaarden en het Privacybeleid van Mubawab. We behouden ons het recht voor om ongepaste advertenties te verwijderen en/of te wijzigen.",

package/package.json

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