muba-posting 7.0.0 → 7.0.2

package/PostingEdit.js

@@ -57,12 +57,16 @@ export default class PostingEdit extends React.Component {
               </View>
               <Text style={commonStyles.editIconText}>{strings('edit.transaction')}</Text>
             </TouchableOpacity>
-            <TouchableOpacity style={[commonStyles.col, commonStyles.col4, commonStyles.homeLinkBox]} activeOpacity={0.5} onPress={() => this.navigateToPublish2()}>
-              <View style={commonStyles.homeIcon} >
-                <Image source={require('./assets/images/location.png')} style={commonStyles.homeIconImage} />
-              </View>
-              <Text style={commonStyles.editIconText}>{strings('edit.location')}</Text>
-            </TouchableOpacity>
+            {this.props.postingAd.promotionId ? 
+              null
+            :
+              <TouchableOpacity style={[commonStyles.col, commonStyles.col4, commonStyles.homeLinkBox]} activeOpacity={0.5} onPress={() => this.navigateToPublish2()}>
+                <View style={commonStyles.homeIcon} >
+                  <Image source={require('./assets/images/location.png')} style={commonStyles.homeIconImage} />
+                </View>
+                <Text style={commonStyles.editIconText}>{strings('edit.location')}</Text>
+              </TouchableOpacity>              
+            }
             <TouchableOpacity style={[commonStyles.col, commonStyles.col4, commonStyles.homeLinkBox]} activeOpacity={0.5} onPress={() => this.props.goToPage(Views.PUBLISH_3)}>
               <View style={commonStyles.homeIcon} >
                 <Image source={require('./assets/images/caracter.png')} style={commonStyles.homeIconImage} />

package/Preview.js

@@ -25,7 +25,7 @@ export default class Preview extends React.Component {
   }
 
   componentDidMount = async () => {
-    const paymentOnlineActive = await this.props.request(this, PAYMENT_ONLINE_ACTIVE, { regionId: this.props.postingAd.region });
+    const paymentOnlineActive = await this.props.request(this, PAYMENT_ONLINE_ACTIVE, { regionId: this.props.postingAd.region, adId: this.props.postingAd.id });
     this.setState({ showPaymentOnline: paymentOnlineActive.value === 'true' });
     this.refreshData();
   }

package/Publish1.js

@@ -114,7 +114,7 @@ export default class Publish1 extends React.Component {
       }
 
       if (this.props.postingAd.id == null || this.props.fullPosting) {
-        if (this.props.postingAd.exactlyLocated) {
+        if (this.props.postingAd.exactlyLocated  && this.props.postingAd.promotionId == null) {
           this.props.goToPage(Views.PUBLISH_2);
         } else {
           this.props.goToPage(Views.PUBLISH_2_B);

package/Publish2b.js

@@ -212,6 +212,7 @@ export default class Publish2b extends React.Component {
               required={false}
               onChangeText={(text) => this.onChangeAddress(text)}
               textContainerStyle={commonStyles.inputContainer}
+              disabled={this.props.postingAd.promotionId != null}
               style={commonStyles.input} />
             <InputSelect
               label={strings('setup.region')}
@@ -222,6 +223,7 @@ export default class Publish2b extends React.Component {
               options={this.state.regionOptions}
               onChange={(value) => this.loadCities(value)}
               ref={(element) => this.inputSelectRegion = element}
+              disabled={this.props.postingAd.promotionId != null}
               selectStyle={commonStyles.inputSelect} />
             <InputSelect
               label={strings('setup.city')}
@@ -232,7 +234,7 @@ export default class Publish2b extends React.Component {
               options={this.state.cityOptions}
               onChange={(value) => this.loadDistricts(value)}
               ref={(element) => this.inputSelecCity = element}
-              disabled={this.state.cityOptions.elements.length === 1}
+              disabled={this.state.cityOptions.elements.length === 1 || this.props.postingAd.promotionId != null}
               selectStyle={commonStyles.inputSelect} />
             <InputSelect
               label={strings('setup.district')}
@@ -243,7 +245,7 @@ export default class Publish2b extends React.Component {
               options={this.state.districtOptions}
               onChange={(value) => this.loadTowns(value)}
               ref={(element) => this.inputSelectDistrict = element}
-              disabled={this.state.districtOptions.elements.length === 1}
+              disabled={this.state.districtOptions.elements.length === 1 || this.props.postingAd.promotionId != null}
               visible={this.state.districtOptions.elements.length !== 2}
               selectStyle={commonStyles.inputSelect} />
             <InputSelect
@@ -255,7 +257,7 @@ export default class Publish2b extends React.Component {
               options={this.state.townOptions}
               onChange={(value) => this.props.postingAd.town = value}
               ref={(element) => this.inputSelectTown = element}
-              disabled={this.state.townOptions.elements.length === 1}
+              disabled={this.state.townOptions.elements.length === 1 || this.props.postingAd.promotionId != null}
               visible={this.state.townOptions.elements.length !== 2}
               selectStyle={commonStyles.inputSelect} />
           </View>
@@ -264,9 +266,13 @@ export default class Publish2b extends React.Component {
           <TouchableHighlight style={commonStyles.actionButton} underlayColor="#ff5d00" onPress={() => this.nextStep()}>
             <Text style={commonStyles.actionButtonText}>{this.props.postingAd.id == null || this.props.fullPosting ? strings('setup.next').toUpperCase() : strings('setup.enregistrer').toUpperCase()}</Text>
           </TouchableHighlight>
-          <TouchableHighlight underlayColor="rgba(0,0,0,0)" onPress={() => { this.props.postingAd.exactlyLocated = true; this.props.replacePage(Views.PUBLISH_2) }}>
-            <Text style={[commonStyles.carteNote, commonStyles.carteNoteMap]}>{strings('setup.useMap')}</Text>
-          </TouchableHighlight>
+          {this.props.postingAd.promotionId ? 
+              null
+            :          
+              <TouchableHighlight underlayColor="rgba(0,0,0,0)" onPress={() => { this.props.postingAd.exactlyLocated = true; this.props.replacePage(Views.PUBLISH_2) }}>
+                <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' />}>

package/package.json

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