Merge branch 'sshin/3113' into staging

templates/auto-refund.html

@@ -8,7 +8,7 @@ <h2>Sorry to see you go, {{ name }}</h2>
 </svg>
 
   <p>
-    A ${{ amount }} auto refund has been processed and will be credited to your {% if card_type %}{{ card_type | capitalize }}{% else %}card{% endif %}{% if last_four %} ending in {{ last_four }}{% endif %} shortly.
+    A ${{ amount }} auto refund has been processed and will be credited to your {% if card_type %}{{ card_type }}{% elif is_credit_card %}card{% elif is_us_bank_account %}US Bank Account{% if bank_name %} from {{ bank_name }}{% endif %}{% endif %}{% if last_four %} ending in {{ last_four }}{% endif %} shortly.
   </p>
 </div>
 <p>

templates/auto-refund.txt

@@ -1,5 +1,5 @@
 Your subscription has been successfully canceled. Your account has been returned to our one-seat developer plan. We appreciate your business and welcome you back anytime.
 
-A ${{ amount }} auto refund has been processed and will be credited to your {% if card_type %}{{ card_type | capitalize }}{% else %}card{% endif %}{% if last_four %} ending in {{ last_four }}{% endif %} shortly.
+A ${{ amount }} auto refund has been processed and will be credited to your {% if card_type %}{{ card_type }}{% elif is_credit_card %}card{% elif is_us_bank_account %}US Bank Account{% if bank_name %} from {{ bank_name }}{% endif %}{% endif %}{% if last_four %} ending in {{ last_four }}{% endif %} shortly.
 
 If you have any questions or need help, please contact us at [email protected]

templates/failed-payment.html

@@ -46,11 +46,18 @@
     color: black;
   "
 >
-  We were unable to process your {% if card_type %}{{ card_type |
-  capitalize }}{% else %}card{% endif %}{% if last_four %} ending in
-  {{ last_four }}{% endif %}. Please take a moment to double check
-  your payment information to ensure your account continues to run
-  smoothly.
+  We were unable to process your 
+  {% if card_type %}
+    {{ card_type | capitalize }}
+  {% elif is_credit_card %}
+    card
+  {% elif is_us_bank_account %}
+    US Bank Account
+    {% if bank_name %} from {{ bank_name }}{% endif %}
+  {% endif %}
+  {% if last_four %} ending in {{ last_four }}{% endif %}. 
+  Please take a moment to double check your payment information 
+  to ensure your account continues to run smoothly.
 </p>
 <p style="width: 100%; padding: 35px 0px; text-align: center">
   <a

templates/failed-payment.txt

@@ -1,6 +1,6 @@
 Your ${{ amount }} payment to Functional Software, Inc, dba Sentry has failed.
 
-We were unable to process your {% if card_type %}{{ card_type | capitalize }}{% else %}card{% endif %}{% if last_four %} ending in {{ last_four }}{% endif %}. Please take a moment to double check your payment information to ensure your account continues to run smoothly.
+We were unable to process your {% if card_type %}{{ card_type }}{% elif is_credit_card %}card{% elif is_us_bank_account %}US Bank Account{% if bank_name %} from {{ bank_name }}{% endif %}{% endif %}{% if last_four %} ending in {{ last_four }}{% endif %}. Please take a moment to double check your payment information to ensure your account continues to run smoothly.
 
 In most cases, a payment might fail due to:
 - An expired card