Add other to transaction modal.

Author: jjeffryes

js/templates/buyWizard.html

@@ -490,7 +490,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
               <div class="flexCol-7 custCol-border">
                 <input type="text"
                        name="new_ship_to_other"
-                       class="fieldItem custCol-text js-buyWizardPostalInput"
+                       class="fieldItem custCol-text"
                        placeholder="<%= polyglot.t('ShipToOtherPlaceholderShort') %>"
                        id="buyWizardOther"/>
               </div>

js/templates/transactionModal.html

@@ -770,10 +770,11 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
         </div>
         <div class="txt-unleaded pull-left">
           <div class="fontSize13 lineHeight16">
-            <%- ob.buyer_order.order.shipping.ship_to %>, <br />
-            <%- ob.buyer_order.order.shipping.address %><br />
-            <%- ob.buyer_order.order.shipping.city %>, <%- ob.buyer_order.order.shipping.state %> <%- ob.buyer_order.order.shipping.postal_code %><br />
-            <%= polyglot.t('countries.' + ob.buyer_order.order.shipping.country) %>
+            <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><%= polyglot.t('countries.' + ob.buyer_order.order.shipping.country) %></div>
           </div>
         </div>
       </div>

js/views/settingsVw.js

@@ -970,7 +970,7 @@ module.exports = pageVw.extend({
     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) {
+    if (newAddress.name || newAddress.street || newAddress.city || newAddress.state || newAddress.postal_code || newAddress.other) {
       if (!newAddress.name) {
         this.$('#settingsShipToName').addClass('invalid');
         app.simpleMessageModal.open({

js/views/transactionsVw.js

@@ -429,7 +429,7 @@ module.exports = pageVw.extend({
           } else {
             app.simpleMessageModal.open({
               title: window.polyglot.t('errorMessages.noData')
-            });           
+            });
           }
         });
   },
@@ -459,7 +459,7 @@ module.exports = pageVw.extend({
         dataObject.quantity = data.buyer_order.order.quantity;
         if (data.buyer_order.order.shipping){
           var dShipping = data.buyer_order.order.shipping;
-          dataObject.shipping_address = dShipping.ship_to + " " + dShipping.address +", " + dShipping.city + ", " + dShipping.state + ", " + dShipping.postal_code + ", " + dShipping.country;
+          dataObject.shipping_address = dShipping.ship_to + " " + dShipping.address +", " + dShipping.city + ", " + dShipping.state + ", " + dShipping.postal_code + ", " + dShipping.order + ", " + dShipping.country;
         }
         dataObject.payment_amount = dPayment.amount;
         dataObject.payment_address = dPayment.address;
@@ -482,7 +482,7 @@ module.exports = pageVw.extend({
       if (data.vendor_offer.policy){
         dataObject.return_policy = data.vendor_offer.policy.returns;
       }
-      
+
       this.currentExportData.push(dataObject);
     });
 
@@ -491,11 +491,11 @@ module.exports = pageVw.extend({
 
   openOrderModal: function(options){
     app.loadingModal.open({ insideApp: true });
-    
+
     if (options.status == "open"){
       options.status = 4;
     }
-    
+
     this.orderModalView && this.orderModalView.remove();
     this.orderModalView = new transactionModalVw({
       orderID: options.orderID,
@@ -522,4 +522,4 @@ module.exports = pageVw.extend({
 
     this.registerChild(this.orderModalView);
   }
-});
+});