muba-posting 4.2.2 → 4.2.4

package/Posting.js

@@ -35,6 +35,7 @@ const BUSINESS_PRODUCTS = { method: 'GET', url: '/controller/products/{key}/rema
 const MAX_PICTURES = { method: 'GET', url: '/controller/posting/max-pictures' };
 const COUNTRY_PHONE = { method: 'GET', url: '/controller/countries/{countryCode}/phones' };
 const LOAD_PENDING_CREATED = { method: 'GET', url: '/controller/ads/pending-created/posting' };
+const PAYMENT_ONLINE_ACTIVE = { method: 'GET', url: '/controller/payments-online/{countryCode}/active' };
 
 export default class Posting extends React.Component {
   constructor(props) {
@@ -65,7 +66,6 @@ export default class Posting extends React.Component {
       countryPhone: '',
       businessId: this.props.businessId,
       picturesUploaded: 0,
-      images: [],
       params: null,
       postingAd: {
         transaction: null,
@@ -400,6 +400,11 @@ export default class Posting extends React.Component {
     } else {
       await this.setState({ postingAd: { ...this.state.postingAd, adId: response.id } });
       this._goToPage(Views.PREVIEW, null, response);
+
+      const paymentOnlineActive = await this.props.request(this, PAYMENT_ONLINE_ACTIVE, { regionId: this.state.postingAd.region });
+      if (!this.businessId && paymentOnlineActive.value === 'true') {
+        this._goToPage(Views.PAYMENT_ONLINE);
+      }
     }
     this._hideLoading();
 
@@ -427,8 +432,11 @@ export default class Posting extends React.Component {
 
   imageBrowserCallback = async (photos) => {
     this.setState({
-      showImageBrowser: false,
-      images: photos
+      showImageBrowser: false
+    }, () => {
+      for (let photo of photos) {
+        this.publish4?.loadUri(photo)
+      }
     });
   }
 
@@ -442,9 +450,8 @@ export default class Posting extends React.Component {
 
   _savePicture = async (picture) => {
     this.setState({
-      showImageBrowser: false,
-      images: [picture]
-    });
+      showImageBrowser: false
+    }, () => this.publish4?.loadUri(picture));
   }
 
   render() {
@@ -552,6 +559,7 @@ export default class Posting extends React.Component {
 
                 {this.state.view === Views.PUBLISH_4 ?
                   <Publish4 postingAd={this.state.postingAd}
+                    ref={publish4 => this.publish4 = publish4}
                     saveEditAd={() => this._saveEditAd()}
                     goToPage={(view) => this._goToPage(view)}
                     request={this.props.request}
@@ -562,8 +570,7 @@ export default class Posting extends React.Component {
                     progressBarHeight={this.state.progressBarHeight}
                     headerHeight={this.state.headerHeight}
                     openPictureSelector={() => this._openPictureSelector()}
-                    maxPictures={this.state.maxPictures}
-                    images={this.state.images} />
+                    maxPictures={this.state.maxPictures} />
                   :
                   null
                 }
@@ -642,7 +649,7 @@ export default class Posting extends React.Component {
                 }
 
               </CustomScrollView>
-              <PopupAdvice icon={<FontAwesomeIcon name='block' />} title={strings('setup.noPromoteTitle', { product: '' })} headerColor={commonStyles.red} ref={(popupAdvice) => { this.popupNoListings = popupAdvice; }}
+              <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}>
                 <OutputText style={commonStyles.popupText}>{strings('setup.noPromoteSubtitle', { countryPhone: this.state.countryPhone })}</OutputText>
                 <TouchableOpacity style={[commonStyles.okBtnBoxPopup, commonStyles.okBtnPopup]} onPress={() => this.popupNoListings.hide()} >

package/Publish4.js

@@ -25,7 +25,7 @@ export default class Publish4 extends React.Component {
   }
 
   componentDidMount() {
-    for (let photo of this.props.images) {
+    for (let photo of this.props.postingAd.images) {
       this.loadImage(photo);
     }
 
@@ -37,9 +37,9 @@ export default class Publish4 extends React.Component {
   }
 
   componentDidUpdate = async (prevProps) => {
-    if (!this.isSameList(prevProps.images, this.props.images)) {
+    if (!this.isSameList(prevProps.postingAd.images, this.props.postingAd.images)) {
       this.setState({ images: [] }, () => {
-        for (let photo of this.props.images) {
+        for (let photo of this.props.postingAd.images) {
           this.loadImage(photo);
         }
       });
@@ -58,7 +58,7 @@ export default class Publish4 extends React.Component {
     return true;
   }
 
-  async loadImage(imgUri) {
+  async loadUri(imgUri) {
     if (imgUri) {
       let fileType = imgUri.substring(imgUri.lastIndexOf('.') + 1).toLowerCase();
 
@@ -72,20 +72,24 @@ export default class Publish4 extends React.Component {
         extraInfo: this.state.images.length
       }
 
-      let imagesArray = this.state.images;
-      imagesArray.push(image);
+      this.loadImage(image);
+    }
+  }
 
-      await this.setState({
-        showErrorNoSelectedImages: false,
-        images: imagesArray
-      });
+  loadImage(image) {
+    let imagesArray = this.state.images;
+    imagesArray.push(image);
 
+    this.setState({
+      showErrorNoSelectedImages: false,
+      images: imagesArray
+    }, () => {
       if (this.state.images.length == this.props.maxPictures) {
         this.setState({ allPhotosSelected: true });
       } else if (this.state.images.length == 1) {
         this.selectMainPhoto(this.state.images[0]);
       }
-    }
+    });
   }
 
   async deleteImage(itemId, index) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {
@@ -18,20 +18,20 @@
   "homepage": "https://github.com/Mubawab/muba-posting#readme",
   "dependencies": {
     "@react-native-async-storage/async-storage": "~1.17.3",
-    "muba-custom-scroll-view": "4",
-    "muba-display-price": "4",
-    "muba-font": "4",
-    "muba-i18n": "4",
-    "muba-input-select": "4",
-    "muba-input-text": "4",
-    "muba-loading-cursor": "4",
-    "muba-map": "4",
-    "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"
+    "muba-custom-scroll-view": "5",
+    "muba-display-price": "5",
+    "muba-font": "5",
+    "muba-i18n": "5",
+    "muba-input-select": "5",
+    "muba-input-text": "5",
+    "muba-loading-cursor": "5",
+    "muba-map": "5",
+    "muba-output-text": "5",
+    "muba-phone-group": "5",
+    "muba-picture": "5",
+    "muba-payment-online": "5",
+    "muba-popup-advice": "5",
+    "muba-popup-permissions": "5",
+    "muba-radio-button-group": "5"
   }
 }