From 59c45492a935048c942f588afa424e4aed0457ee Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Tue, 9 Jul 2019 18:40:41 +0530
Subject: [PATCH] Add expiry year and month in the settings and order payment
 pages

---
 datacenterlight/templates/datacenterlight/order_detail.html | 1 +
 datacenterlight/views.py                                    | 4 ++++
 hosting/templates/hosting/order_detail.html                 | 1 +
 hosting/templates/hosting/settings.html                     | 1 +
 hosting/views.py                                            | 4 ++++
 5 files changed, 11 insertions(+)

diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index 31933e12..8a444bef 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -41,6 +41,7 @@
                 <h4>{% trans "Payment method" %}:</h4>
                 <p>
                     {{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
+                    {% trans "Expiry" %} {{cc_exp_year}}/{{cc_exp_month}}<br/>
                     {{request.user.email}}
                 </p>
             </div>
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 3763d465..60938ac8 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -568,11 +568,15 @@ class OrderConfirmationView(DetailView, FormView):
             card_details_response = card_details['response_object']
             context['cc_last4'] = card_details_response['last4']
             context['cc_brand'] = card_details_response['brand']
+            context['cc_exp_year'] = card_details_response['exp_year']
+            context['cc_exp_month'] = card_details_response['exp_month']
         else:
             card_id = self.request.session.get('card_id')
             card_detail = UserCardDetail.objects.get(id=card_id)
             context['cc_last4'] = card_detail.last4
             context['cc_brand'] = card_detail.brand
+            context['cc_exp_year'] = card_detail.exp_year
+            context['cc_exp_month'] = card_detail.exp_month
 
         if ('generic_payment_type' in request.session and
                 self.request.session['generic_payment_type'] == 'generic'):
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 4a62e9fa..a84e4e4f 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -82,6 +82,7 @@
                         {{user.email}}
                     {% else %}
                         {{cc_brand|default:_('Credit Card')}} {% trans "ending in" %} ****{{cc_last4}}<br>
+                        {% trans "Expiry" %} {{cc_exp_year}}/{{cc_exp_month}}<br/>
                         {% if request.user.is_authenticated %}
                             {{request.user.email}}
                         {% else %}
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index 56818cbf..5cdd830c 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -37,6 +37,7 @@
                                 <h5 class="billing-head">{% trans "Credit Card" %}</h5>
                                 <h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
                                 <h5 class="membership-lead">{% trans "Type" %}: {{card.brand}}</h5>
+                                <h5 class="membership-lead">{% trans "Expiry" %}: {{card.exp_month}}/{{card.exp_year}}</h5>
                                 <div class="credit-card-details-opt">
                                     <div class="row">
                                         {% if card_list_len > 1 %}
diff --git a/hosting/views.py b/hosting/views.py
index 201d58e7..9a2e5b19 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -906,11 +906,15 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView):
                 card_details_response = card_details['response_object']
                 context['cc_last4'] = card_details_response['last4']
                 context['cc_brand'] = card_details_response['brand']
+                context['cc_exp_year'] = card_details_response['exp_year']
+                context['cc_exp_month'] = card_details_response['exp_month']
             else:
                 card_id = self.request.session.get('card_id')
                 card_detail = UserCardDetail.objects.get(id=card_id)
                 context['cc_last4'] = card_detail.last4
                 context['cc_brand'] = card_detail.brand
+                context['cc_exp_year'] = card_detail.exp_year
+                context['cc_exp_month'] = card_detail.exp_month
             context['site_url'] = reverse('hosting:create_virtual_machine')
             context['vm'] = self.request.session.get('specs')
         return context