Update other to alternate_contact.

Fix styling on very long addresses.

Author: jjeffryes

css/obBase.css

@@ -4820,12 +4820,12 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 .buyAddressWrapper {
   padding: 15px;
-  overflow: hidden;
+    word-wrap: break-word;
 }
 
-.buyAddressWrapper > div {
-  overflow: hidden;
-  text-overflow: ellipsis;
+.payAddressWrapper {
+    padding: 20px 15px;
+    word-wrap: break-word;
 }
 
 /*========== utility classes ==========*/

js/templates/buyAddresses.html

@@ -25,7 +25,7 @@
               <%= address.state %> <%= address.postal_code %>
             </div>
             <div>
-              <%= address.other %>
+              <%= address.alternate_contact %>
             </div>
             <div>
               <%= address.displayCountry %>
@@ -78,7 +78,7 @@
               <%= address.state %> <%= address.postal_code %>
             </div>
             <div>
-              <%= address.other %>
+              <%= address.alternate_contact %>
             </div>
             <div>
               <%= address.displayCountry %>

js/templates/buyDetails.html

@@ -67,7 +67,7 @@
   <% if( ob.vendor_offer.listing.metadata.category === "physical good" ) { %>
   <div class="flexRow custCol-border borderBottom">
     <div class="flexCol-8">
-      <div class="rowItem padding2015">
+      <div class="payAddressWrapper">
         <div class="table">
           <div>
             <div class="thumbnail-large-slim">
@@ -80,8 +80,11 @@
               <% if(ob.selectedAddress) { %>
               <div class="marginBottom2"><%= ob.selectedAddress.name %></div>
               <div class="marginBottom2"><%= ob.selectedAddress.street %></div>
-              <div class="marginBottom2"><%= ob.selectedAddress.city %>, <%= ob.selectedAddress.state %> <%= ob.selectedAddress.postal_code %></div>
-              <div class="marginBottom2"><%= ob.selectedAddress.other %></div>
+              <div class="marginBottom2">
+                <%= ob.selectedAddress.city %><% if(ob.selectedAddress.state || ob.selectedAddress.postal_code && ob.selectedAddress.city){ %>,<% } %>
+                <%= ob.selectedAddress.state %> <%= ob.selectedAddress.postal_code %>
+              </div>
+              <div class="marginBottom2"><%= ob.selectedAddress.alternate_contact %></div>
               <div><%= ob.selectedAddress.displayCountry %></div>
               <% } %>
             </div>

js/templates/settings.html

@@ -846,7 +846,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('CurrentAddress') %><
                         <% if(address.city && address.state || address.city && address.postal_code) print(",") %>
                         <%= address.state %> <%= address.postal_code %>
                       </div>
-                      <div><%= address.other %></div>
+                      <div><%= address.alternate_contact %></div>
                       <div><%= address.displayCountry %></div>
                     </div>
 

js/templates/transactionModal.html

@@ -773,7 +773,7 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
             <div><%- ob.buyer_order.order.shipping.ship_to %></div>
             <div><%- ob.buyer_order.order.shipping.address %></div>
             <div><%- ob.buyer_order.order.shipping.city %> <%- ob.buyer_order.order.shipping.state %> <%- ob.buyer_order.order.shipping.postal_code %></div>
-            <div><%- ob.buyer_order.order.shipping.other %></div>
+            <div><%- ob.buyer_order.order.alternate_contact %></div>
             <div><%= polyglot.t('countries.' + ob.buyer_order.order.shipping.country) %></div>
           </div>
         </div>

js/views/buyWizardVw.js

@@ -340,7 +340,7 @@ module.exports = baseModal.extend({
     newAddress.city = this.$el.find('#buyWizardCityInput').val();
     newAddress.state = this.$el.find('#buyWizardStateInput').val();
     newAddress.postal_code = this.$el.find('#buyWizardPostalInput').val();
-    newAddress.other = this.$el.find('#buyWizardOther').val();
+    newAddress.alternate_contact = this.$el.find('#buyWizardOther').val();
     newAddress.country = this.$el.find('#buyWizardCountryInput').val();
     newAddress.displayCountry = this.$el.find('#buyWizardCountryInput option:selected').data('name');
 
@@ -509,7 +509,7 @@ module.exports = baseModal.extend({
       formData.append("city", selectedAddress.city);
       formData.append("state", selectedAddress.state);
       formData.append("postal_code", selectedAddress.postal_code);
-      formData.append("other", selectedAddress.other);
+      formData.append("alternate_contact", selectedAddress.alternate_contact);
       formData.append("country", selectedAddress.country);
     }
 

js/views/settingsVw.js

@@ -965,12 +965,12 @@ module.exports = pageVw.extend({
     newAddress.city = this.$('#settingsShipToCity').val();
     newAddress.state = this.$('#settingsShipToState').val();
     newAddress.postal_code = this.$('#settingsShipToPostalCode').val();
-    newAddress.other = this.$('#settingsShipToOther').val();
+    newAddress.alternate_contact = this.$('#settingsShipToOther').val();
     newAddress.country = this.$('#settingsShipToCountry').val();
     newAddress.displayCountry = this.$('#settingsShipToCountry option:selected').data('name');
 
     //if form is partially filled out throw error
-    if (newAddress.name || newAddress.street || newAddress.city || newAddress.state || newAddress.postal_code || newAddress.other) {
+    if (newAddress.name || newAddress.street || newAddress.city || newAddress.state || newAddress.postal_code || newAddress.alternate_contact) {
       if (!newAddress.name) {
         this.$('#settingsShipToName').addClass('invalid');
         app.simpleMessageModal.open({