muba-posting 4.1.8 → 4.1.11

package/PopupSpendProduct.js

@@ -37,8 +37,8 @@ export default class PopupSpendProduct extends React.Component {
     const PRODUCT_KEY = Product.PREMIUM;
     const responseJson = await this.props.request(this, PROMOTE_AD, {
       businessId: this.props.businessId,
-      adId: this.props.adId,
-      productKey: PRODUCT_KEY
+      productKey: PRODUCT_KEY,
+      id: { adId: this.props.adId }
     });
 
     this.props.hideLoading();
@@ -60,8 +60,8 @@ export default class PopupSpendProduct extends React.Component {
     const PRODUCT_KEY = Product.SUPER_PREMIUM;
     const responseJson = await this.props.request(this, PROMOTE_AD, {
       businessId: this.props.businessId,
-      adId: this.props.adId,
-      productKey: PRODUCT_KEY
+      productKey: PRODUCT_KEY,
+      id: { adId: this.props.adId }
     });
 
     this.props.hideLoading();

package/Posting.js

@@ -61,6 +61,7 @@ export default class Posting extends React.Component {
       adId: this.props.adId,
       maxPictures: 0,
       countryPhone: '',
+      businessId: this.props.businessId,
       picturesUploaded: 0,
       postingAd: {
         category: null,
@@ -120,8 +121,7 @@ export default class Posting extends React.Component {
         id: null,
         languageId: currentLocale().toUpperCase(),
         languages: [{ language: currentLocale().toUpperCase(), title: null, description: null, automatic: true }],
-        userId: this.props.userId,
-        userEmail: this.props.userEmail
+        userId: this.props.userId
       }
     };
   }
@@ -189,10 +189,15 @@ export default class Posting extends React.Component {
       }
 
       this.getMaxPictures();
-      this.readBusinessId();
+      if (this.state.businessId == null) {
+        this.readBusinessId();
+      }
       const hasListings = await this.checkListings();
       if (this.state.adId != null) {
         this.setState({ view: this.state.originView });
+        if (this.props.changeView) {
+          this.props.changeView(this.state.originView)
+        }
         await this.loadAd();
       } else {
         await this.setState({ isLoading: false });
@@ -200,6 +205,9 @@ export default class Posting extends React.Component {
           this.popupNoListings.show();
         } else {
           this.setState({ view: this.state.originView });
+          if (this.props.changeView) {
+            this.props.changeView(this.state.originView)
+          }
         }
       }
       BackHandler.addEventListener('hardwareBackPress', this.goBack);
@@ -319,6 +327,9 @@ export default class Posting extends React.Component {
     }
     this.scroll.scrollTop();
     this.setState({ view: view });
+    if (this.props.changeView) {
+      this.props.changeView(view)
+    }
   }
 
   goBack = async () => {
@@ -534,6 +545,7 @@ export default class Posting extends React.Component {
                 <Publish6 ref={(view) => this.publish6Screen = view}
                   postingAd={this.state.postingAd}
                   country={this.props.country}
+                  businessId={this.state.businessId}
                   scroll={(ref) => this.scroll.scrollIntoView(ref)}
                   saveEditAd={() => this._saveEditAd()}
                   goToPage={(view, params) => this._goToPage(view, null, params)}

package/Publish4.js

@@ -74,10 +74,10 @@ export default class Publish4 extends React.Component {
 
   async deleteImage(itemDeleted) {
     if (itemDeleted.id) {
-      if (!this.props.postingAd.deletedPictures) {
-        this.props.postingAd.deletedPictures = [];
+      if (!this.props.postingAd.deletedFiles) {
+        this.props.postingAd.deletedFiles = [];
       }
-      this.props.postingAd.deletedPictures.push(itemDeleted.id);
+      this.props.postingAd.deletedFiles.push(itemDeleted.id);
     }
 
     let filteredArray = this.props.postingAd.images.filter(item => item !== itemDeleted);

package/Publish6.js

@@ -122,10 +122,13 @@ export default class Publish6 extends React.Component {
 
       const body = {
         adId: this.props.postingAd.id,
-        userId: this.props.postingAd.userId,
         phones: phones
       };
-
+      if (this.props.postingAd.userId) {
+        body['userId'] = this.props.postingAd.userId;
+      } else if (this.props.businessId) {
+        body['businessId'] = this.props.businessId;
+      }
 
       this.setState({ loading: true });
 

package/package.json

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

package/utils/Views.js

@@ -1,11 +1,11 @@
 export const Views = {
-    PUBLISH_1: 'Publish1',
-    PUBLISH_2: 'Publish2',
-    PUBLISH_2_B: 'Publish2b',
-    PUBLISH_3: 'Publish3',
-    PUBLISH_4: 'Publish4',
-    PUBLISH_5: 'Publish5',
-    PUBLISH_6: 'Publish6',
-    PREVIEW: 'Preview',
-    EDIT_SELECTOR: 'PostingEdit'
+    PUBLISH_1: 'publish-1',
+    PUBLISH_2: 'publish-2',
+    PUBLISH_2_B: 'publish-2b',
+    PUBLISH_3: 'publish-3',
+    PUBLISH_4: 'publish-4',
+    PUBLISH_5: 'publish-5',
+    PUBLISH_6: 'publish-6',
+    PREVIEW: 'preview',
+    EDIT_SELECTOR: 'posting-edit'
 }