Merge remote-tracking branch '32511/bug/failed-payment-email' into comm_prs_248beta1

Author: Indraniks

app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html

@@ -23,43 +23,45 @@ <h1>{{trans "Payment Transaction Failed"}}</h1>
 
 <ul>
     <li>
-        <strong>{{trans "Reason"}}</strong><br />
+        <strong>{{trans "Reason"}}</strong><br>
         {{var reason}}
     </li>
     <li>
-        <strong>{{trans "Checkout Type"}}</strong><br />
+        <strong>{{trans "Checkout Type"}}</strong><br>
         {{var checkoutType}}
     </li>
     <li>
-        <strong>{{trans "Customer:"}}</strong><br />
+        <strong>{{trans "Customer:"}}</strong><br>
         <a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
     </li>
     <li>
-        <strong>{{trans "Items"}}</strong><br />
+        <strong>{{trans "Items"}}</strong><br>
         {{var items|raw}}
     </li>
     <li>
-        <strong>{{trans "Total:"}}</strong><br />
+        <strong>{{trans "Total:"}}</strong><br>
         {{var total}}
     </li>
     <li>
-        <strong>{{trans "Billing Address:"}}</strong><br />
+        <strong>{{trans "Billing Address:"}}</strong><br>
         {{var billingAddressHtml|raw}}
     </li>
+    {{depend shippingMethod}}
     <li>
-        <strong>{{trans "Shipping Address:"}}</strong><br />
+        <strong>{{trans "Shipping Address:"}}</strong><br>
         {{var shippingAddressHtml|raw}}
     </li>
     <li>
-        <strong>{{trans "Shipping Method:"}}</strong><br />
+        <strong>{{trans "Shipping Method:"}}</strong><br>
         {{var shippingMethod}}
     </li>
+    {{/depend}}
     <li>
-        <strong>{{trans "Payment Method:"}}</strong><br />
+        <strong>{{trans "Payment Method:"}}</strong><br>
         {{var paymentMethod}}
     </li>
     <li>
-        <strong>{{trans "Date & Time:"}}</strong><br />
+        <strong>{{trans "Date & Time:"}}</strong><br>
         {{var dateAndTime}}
     </li>
 </ul>