Merge pull request #1896 from OpenBazaar/brian.originLocation

Only show shipping from on physical goods sales
OpenBazaar · Jun 3, 2020 · fa98ecb · fa98ecb
2 parents 34d2783 + be3cf5a
commit fa98ecb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/js/models/listing/Listing.js b/js/models/listing/Listing.js
@@ -875,7 +875,9 @@ export default class extends BaseModel {
         if (parsedResponse.metadata.shippingFromCountryCode !== '') {
           const countries = getIndexedCountries();
           const countryCode = parsedResponse.metadata.shippingFromCountryCode;
-          parsedResponse.metadata.shippingFromCountryName = countries[countryCode].name;
+          if (countryCode !== undefined) {
+            parsedResponse.metadata.shippingFromCountryName = countries[countryCode].name;
+          }
         }
       }
 

diff --git a/js/templates/modals/editListing/editListing.html b/js/templates/modals/editListing/editListing.html
@@ -235,7 +235,7 @@ <h2 class="h4 clrT"><%= ob.polyT('editListing.sectionNames.tagsDetailed') %></h2
         <div class="clrT2 txSm helper"><%= ob.polyT('editListing.helperTags') %></div>
       </section>
 
-      <section class="js-scrollToSection categorySection contentBox padMd clrP clrBr clrSh3 tx3">
+      <section class="js-scrollToSection contentBox padMd clrP clrBr clrSh3 tx3 js-sectionShippingFrom shippingFromSection">
         <h2 class="h4 clrT"><%= ob.polyT('editListing.sectionNames.sendLocation') %></h2>
         <hr class="clrBr rowMd" />
         <% if (ob.errors['item.sendLocation']) print(ob.formErrorTmpl({ errors: ob.errors['item.sendLocation'] })) %>

diff --git a/js/templates/modals/listingDetail/listing.html b/js/templates/modals/listingDetail/listing.html
@@ -202,7 +202,8 @@ <h2 class="flexExpand js-cryptoTitle cryptoTitle"></h2>
           <% } %>
         </div>
         <hr class="rowLg">
-        <% if(ob.metadata.shippingFromCountryCode !== '' || ob.metadata.shippingFromPostalCode !== '') { %>
+        <% if (ob.metadata.contractType === 'PHYSICAL_GOOD') { %>
+        <% if (ob.metadata.shippingFromCountryCode !== '' || ob.metadata.shippingFromPostalCode !== '') { %>
         <h5><%= ob.polyT('editListing.sendLocation.shippingFromLabel') %></h5>
         <div class="rowLg">
           <% if(ob.metadata.shippingFromCountryCode !== '') { %>
@@ -212,7 +213,7 @@ <h5><%= ob.polyT('editListing.sendLocation.shippingFromLabel') %></h5>
             <%= ob.polyT('editListing.sendLocation.shippingFromPostalCodeLabel') %>: <%= ob.metadata.shippingFromPostalCode %>
           <% } %>
         </div>
-        <% } %>
+        <% } } %>
         <h5><%= ob.polyT('listingDetail.tags') %></h5>
         <div class="tagWrapper rowLg">
           <% ob.item.tags.forEach(function(tag){

diff --git a/js/views/modals/editListing/EditListing.js b/js/views/modals/editListing/EditListing.js
@@ -977,6 +977,9 @@ export default class extends BaseModal {
     // If the type is not 'PHYSICAL_GOOD', we'll clear out any shipping options.
     if (metadata.get('contractType') !== 'PHYSICAL_GOOD') {
       this.model.get('shippingOptions').reset();
+      const m = this.model.get('metadata');
+      m.set('shippingFromCountryCode', 'NA');
+      m.set('shippingFromPostalCode', '');
     } else {
       // If any shipping options have a type of 'LOCAL_PICKUP', we'll
       // clear out any services that may be there.

diff --git a/styles/modules/modals/_editListing.scss b/styles/modules/modals/_editListing.scss
@@ -325,6 +325,7 @@
 
   .tab-shipping,
   .shippingSection,
+  .shippingFromSection,
   .conditionWrap {
     display: none;
   }
@@ -341,6 +342,14 @@
     }
   }
 
+  &.TYPE_PHYSICAL_GOOD {
+    .tab-shippingFrom,
+    .conditionWrap,
+    .shippingFromSection {
+      display: block;
+    }
+  }
+
   &.TYPE_CRYPTOCURRENCY {
     .tab-variants,
     .tab-coupons {