muba-posting 4.1.21 → 4.1.23

package/Posting.js

@@ -22,6 +22,7 @@ import PublishProgressBar from './PublishProgressBar.js';
 import EditHead from './EditHead.js';
 import PictureSelector from 'muba-picture';
 import PopupPermissions from 'muba-popup-permissions';
+import PaymentOnlinePopup from 'muba-payment-online';
 import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
 const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
@@ -209,10 +210,14 @@ export default class Posting extends React.Component {
           this.popupNoListings.show();
         } else {
           const pendingAd = await this.props.request(this, LOAD_PENDING_CREATED);
-          await this.setState({
-            postingAd: { ...this.state.postingAd, ...pendingAd },
-            isLoading: false
-          });
+          if (pendingAd.httpStatus === 200) {
+            const languages = pendingAd?.languages.length > 0 ? pendingAd?.languages : this.state.postingAd.languages
+            const languageId = languages[0].language;
+            await this.setState({
+              postingAd: { ...this.state.postingAd, ...pendingAd, languageId: languageId, languages: languages },
+              isLoading: false
+            });
+          }
 
           this.setState({ view: this.state.originView });
           if (this.props.changeView) {
@@ -281,8 +286,12 @@ export default class Posting extends React.Component {
 
     prevViews.unshift(this.state.view);
 
-    if (this.state.postingAd.town) {
-      const response = await this.props.request(this, CREATE_AD, this.state.postingAd);
+    if (this.state.fullPosting && this.state.postingAd.town && Views.PUBLISH_6 !== this.state.view) {
+      const ad = { ...this.state.postingAd };
+      if (Views.PUBLISH_4 !== this.state.view) {
+        delete ad.images;
+      }
+      const response = await this.props.request(this, CREATE_AD, ad);
       if (response.httpStatus === 200) {
         await this.setState({
           postingAd: { ...this.state.postingAd, id: response.id }
@@ -330,14 +339,16 @@ export default class Posting extends React.Component {
         this.setState({ currentScreen: 6 });
         break;
       case Views.PREVIEW:
-        await this.previewScreen.refreshData(params);
+        if (params) {
+          await this.previewScreen.refreshData(params);
+        }
         break;
       case Views.EDIT_SELECTOR:
         await this.setState({ prevViews: [] })
     }
     this.scroll.scrollTop();
     this.setState({ view: view });
-    if (this.props.changeView) {
+    if (this.props.changeView && Views.PAYMENT_ONLINE !== view) {
       this.props.changeView(view)
     }
   }
@@ -370,6 +381,7 @@ export default class Posting extends React.Component {
   }
 
   async _saveEditAd() {
+    this._showLoading();
     const ad = { ...this.state.postingAd, id: { adId: this.state.postingAd.id } };
     if (this.state.originView === Views.EDIT_SELECTOR && Views.PUBLISH_4 !== this.state.view) {
       delete ad.images;
@@ -388,6 +400,7 @@ export default class Posting extends React.Component {
       await this.setState({ postingAd: { ...this.state.postingAd, adId: response.id } });
       this._goToPage(Views.PREVIEW, null, response);
     }
+    this._hideLoading();
 
     if (this.props.showRatingPopup) {
       this.props.showRatingPopup();
@@ -441,7 +454,7 @@ export default class Posting extends React.Component {
 
         <View style={commonStyles.flex1}>
           <View onLayout={(event) => this.setState({ headerHeight: event.nativeEvent.layout.height })}>
-            {!this.state.showImageBrowser ? this.props.topBar : null}
+            {!this.state.showImageBrowser && this.state.view !== Views.PAYMENT_ONLINE ? this.props.topBar : null}
           </View>
           {this.state.showImageBrowser ?
             <PictureSelector max={this.state.maxPictures - this.state.postingAd.images.length} callback={this.imageBrowserCallback} savePicture={this._savePicture} goBack={() => this.goBack(true)} />
@@ -453,7 +466,7 @@ export default class Posting extends React.Component {
           {this.state.fontLoaded ?
             <View style={[this.props.containerStyle, this.state.showImageBrowser ? commonStyles.displayNone : '']}>
               <CustomScrollView ref={(element) => this.scroll = element}>
-                {this.state.view !== Views.PREVIEW ?
+                {this.state.view !== Views.PREVIEW && this.state.view !== Views.PAYMENT_ONLINE ?
                   <View onLayout={(event) => this.setState({ progressBarHeight: event.nativeEvent.layout.height })}>
                     {
                       this.state.adId == null ?
@@ -582,7 +595,8 @@ export default class Posting extends React.Component {
                   showView={this.state.view === Views.PREVIEW}
                   progressBarHeight={this.state.progressBarHeight}
                   request={this.props.request}
-                  headerHeight={this.state.headerHeight} />
+                  headerHeight={this.state.headerHeight}
+                  highlight={() => this._goToPage(Views.PAYMENT_ONLINE)} />
 
                 <PostingEdit ref={(view) => this.editSelector = view}
                   postingAd={this.state.postingAd}
@@ -590,6 +604,21 @@ export default class Posting extends React.Component {
                   topBar={this.props.topBar}
                   goToPage={(view) => this._goToPage(view)} />
 
+                {this.state.view === Views.PAYMENT_ONLINE ?
+                  <PaymentOnlinePopup
+                    context={this.props.context}
+                    request={this.props.request}
+                    topBar={this.props.topBar}
+                    adId={this.state.postingAd.id}
+                    country={this.props.country}
+                    goToPrivacy={this.props.goToPrivacy}
+                    changeView={this.props.changeView}
+                    close={this.goBack}
+                    goBack={() => this.setState({ view: Views.PREVIEW }, () => this.goBack())} />
+                  :
+                  null
+                }
+
               </CustomScrollView>
               <PopupAdvice icon={<FontAwesomeIcon name='block' />} title={strings('setup.noPromoteTitle', { product: '' })} headerColor={commonStyles.red} ref={(popupAdvice) => { this.popupNoListings = popupAdvice; }}
                 onClose={async () => this.state.view !== Views.PREVIEW ? this.goBack() : null} hideButton={true}>

package/Preview.js

@@ -190,7 +190,18 @@ export default class Preview extends React.Component {
                   </View>
                 </View>
               }
+              {!this.props.businessId ?
+                <View style={commonStyles.previewHighlightContainer}>
+                  <TouchableOpacity style={[commonStyles.previewHighlightButton, commonStyles.alignCenter]} activeOpacity={0.5} onPress={() => this.props.highlight()}>
+                    <Image style={commonStyles.previewHighlightImage} source={require('./assets/images/sparks.png')} />
+                    <Text style={commonStyles.previewHighlightText}>Highlight</Text>
+                  </TouchableOpacity>
+                </View>
+                :
+                null
+              }
             </View>
+
             <View style={commonStyles.previewBackButton}>
               <TouchableOpacity activeOpacity={0.5} onPress={() => this.props.goBack()}>
                 <Text style={commonStyles.carteNote}>{strings('setup.returnHome')}</Text>

package/Publish6.js

@@ -62,7 +62,8 @@ export default class Publish6 extends React.Component {
       return false;
     }
     for (let index = 0; index < firstList?.length; ++index) {
-      if (firstList[index].value != secondList[index].value) {
+      if (firstList[index].title != secondList[index].title
+        || firstList[index].description != secondList[index].description) {
         return false;
       }
     }

package/commonStyles.js

@@ -1,6 +1,7 @@
 import { StyleSheet, Dimensions, Platform } from 'react-native';
 import { isRTL } from 'muba-i18n';
 import Constants from 'expo-constants';
+import { Fonts } from '../../app/utils/Common';
 
 const window = Dimensions.get('window');
 
@@ -1323,6 +1324,35 @@ export default StyleSheet.create({
     left: 0,
     right: 0,
     bottom: 0
+  },
+
+  previewHighlightContainer: {
+    marginTop: 30
+  },
+
+  previewHighlightButton: {
+    backgroundColor: 'rgb(241, 255, 254)',
+    fontSize: 16,
+    marginBottom: 10,
+    borderWidth: 1,
+    borderStyle: 'solid',
+    borderColor: 'rgb(15, 179, 166)',
+    borderRadius: 5,
+    paddingVertical: 10
+  },
+
+  previewHighlightImage: {
+    position: 'absolute',
+    top: -13,
+    left: 6,
+    width: 35,
+    height: 36
+  },
+
+  previewHighlightText: {
+    fontFamily: Fonts.Button,
+    textTransform: 'uppercase',
+    color: 'rgb(15, 179, 166)'
   }
 
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "4.1.21",
+  "version": "4.1.23",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {
@@ -29,6 +29,7 @@
     "muba-output-text": "4",
     "muba-phone-group": "4",
     "muba-picture": "4",
+    "muba-payment-online": "4",
     "muba-popup-advice": "4",
     "muba-popup-permissions": "4",
     "muba-radio-button-group": "4"