muba-posting 5.0.9 → 5.0.11

package/Publish1.js

@@ -3,9 +3,12 @@ import { Text, View, TouchableHighlight, Dimensions } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import RadioButtonGroup from 'muba-radio-button-group';
+import InputSelect from 'muba-input-select';
 import { Views } from './utils/Views';
 const window = Dimensions.get('window');
 
+const GET_PROMOTIONS = { method: 'GET', url: '/controller/posting/promotions' };
+const PROMOTION_LOCATION = { method: 'GET', url: '/controller/promotions/{promotionId}/location' };
 const GET_TRANSACTIONS = { method: 'GET', url: '/controller/transactions' };
 
 export default class Publish1 extends React.Component {
@@ -18,6 +21,10 @@ export default class Publish1 extends React.Component {
     this.state = {
       isLoading: false,
       showTypeBienError: false,
+      promotionOptions: {
+        elements: [{ section: true, value: null, label: strings('setup.selectPromotion') }],
+        selectedItem: this.props.postingAd.promotionId
+      },
       transactionOptions: { elements: [], selectedItem: this.props.postingAd.transaction },
       typeBienOptions: { elements: [], selectedItem: this.props.postingAd.adType }
     };
@@ -47,6 +54,24 @@ export default class Publish1 extends React.Component {
     if (this.state.minHeight != minHeight) {
       this.setState({ minHeight: minHeight })
     }
+
+    this.loadPromotions();
+  }
+
+  async loadPromotions() {
+    const responseJson = await this.props.request(this.props.context, GET_PROMOTIONS);
+    if (responseJson.httpStatus === 200) {
+      const promotionOptions = {
+        elements: [this.state.promotionOptions.elements[0]],
+        selectedItem: this.props.postingAd.promotionId
+      };
+
+      responseJson.list.map((item) => {
+        promotionOptions.elements.push(item);
+      });
+
+      this.setState({ promotionOptions: promotionOptions });
+    }
   }
 
   getAdTypes(transaction) {
@@ -88,6 +113,23 @@ export default class Publish1 extends React.Component {
     this.props.postingAd.adType = value;
   }
 
+  async changePromotion(value) {
+    const responseJson = await this.props.request(this.props.context, PROMOTION_LOCATION, {
+      promotionId: value
+    });
+    if (responseJson.httpStatus === 200) {
+      this.props.postingAd.latitude = responseJson.latitude;
+      this.props.postingAd.longitude = responseJson.longitude;
+      this.props.postingAd.region = responseJson.regionId;
+      this.props.postingAd.province = responseJson.provinceId;
+      this.props.postingAd.city = responseJson.cityId;
+      this.props.postingAd.district = responseJson.districtId;
+      this.props.postingAd.town = responseJson.townId;
+      this.props.postingAd.exactlyLocated = true;
+    }
+    this.props.postingAd.promotionId = value;
+  }
+
   async nextStep() {
     if (this.validateForm()) {
       for (var i = 0; i < this.state.typeBienOptions.elements.length; i++) {
@@ -99,8 +141,10 @@ export default class Publish1 extends React.Component {
 
       if (this.props.postingAd.id == null || this.props.fullPosting) {
         if (this.props.postingAd.exactlyLocated) {
+          console.log('2')
           this.props.goToPage(Views.PUBLISH_2);
         } else {
+          console.log('2-b')
           this.props.goToPage(Views.PUBLISH_2_B);
         }
       } else {
@@ -114,7 +158,11 @@ export default class Publish1 extends React.Component {
   }
 
   validateForm() {
-    return this.radioButtonAdType.onSubmitValidate();
+    let validPromotions = this.state.promotionOptions.elements.length <= 1;
+    if (!validPromotions) {
+      validPromotions = this.inputSelectPromotions.onSubmitValidate();
+    }
+    return validPromotions && this.radioButtonAdType.onSubmitValidate();
   }
 
   render() {
@@ -124,6 +172,18 @@ export default class Publish1 extends React.Component {
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.typeTransaction')}</Text>
 
+            <InputSelect
+              label={strings('setup.selectPromotion')}
+              placeholder={strings('setup.select')}
+              labelStyle={commonStyles.progressbarField}
+              ref={(element) => this.inputSelectPromotions = element}
+              visible={this.state.promotionOptions.elements.length > 1}
+              required={true}
+              scroll={(ref) => this.props.scroll(ref)}
+              options={this.state.promotionOptions}
+              onChange={(value) => this.changePromotion(value)}
+              selectStyle={commonStyles.inputSelect} />
+
             <RadioButtonGroup
               style={commonStyles.progressbarFieldContainer}
               required={true}

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/locales/ar.json

@@ -117,7 +117,9 @@
 		"south": "جنوب",
 		"west": "الغرب",
 		"est": "شرق",
-		"highlight": "رفع قيمة"
+		"highlight": "رفع قيمة",
+		"ad_cant_post_zone": "لا يمكنك النشر في هذه المدينة",
+		"selectPromotion": "إلى أي ترويج وتخفيض تنتمي الممتلكات الخاصة بك؟*"
 	},
 	"product": {
 		"LISTING": "قوائم",

package/locales/en.json

@@ -117,7 +117,9 @@
     "south": "South",
     "west": "West",
     "est": "Est",
-    "highlight": "Highlight"
+    "highlight": "Highlight",
+    "ad_cant_post_zone": "You can't post in this city",
+    "selectPromotion": "What promotion does your property belong to? *"
   },
   "product": {
     "LISTING": "Listing",

package/locales/es.json

@@ -117,7 +117,9 @@
     "south": "Sur",
     "west": "Oeste",
     "est": "Este",
-    "highlight": "Destacar"
+    "highlight": "Destacar",
+    "ad_cant_post_zone": "No puedes publicar en esta ciudad",
+    "selectPromotion": "¿A qué promoción pertenece tu bien? *"
   },
   "product": {
     "LISTING": "Listing",

package/locales/fr.json

@@ -117,7 +117,9 @@
     "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",
+    "selectPromotion": "A quelle promotion appartient votre bien? *"
   },
   "product": {
     "LISTING": "Liste",

package/locales/it.json

@@ -117,7 +117,9 @@
     "south": "Sud",
     "west": "Ovest",
     "est": "Est",
-    "highlight": "Evidenziare"
+    "highlight": "Evidenziare",
+    "ad_cant_post_zone": "Non puoi postare in questa città",
+    "selectPromotion": "A quale promozione appartiene il tuo immobile? *"
   },
   "product": {
     "LISTING": "Inserzioni",

package/locales/nl.json

@@ -117,7 +117,9 @@
     "south": "Zuid",
     "west": "Oost",
     "est": "North",
-    "highlight": "Highlighting"
+    "highlight": "Highlighting",
+    "ad_cant_post_zone": "In deze stad mag je niet posten",
+    "selectPromotion": "Bij welke promotie hoort uw accommodatie? *"
   },
   "product": {
     "LISTING": "Advertenties",

package/package.json

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