From ce544a5997467b470903fb71560ffcb6bdaf1719 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Sat, 15 Oct 2016 16:34:13 -0500
Subject: [PATCH 1/4] Fixed #2624: view invoice button redirection

---
 .../templates/digitalglarus/membership_orders_detail.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalglarus/templates/digitalglarus/membership_orders_detail.html b/digitalglarus/templates/digitalglarus/membership_orders_detail.html
index 2f1ef140..c8c5018c 100644
--- a/digitalglarus/templates/digitalglarus/membership_orders_detail.html
+++ b/digitalglarus/templates/digitalglarus/membership_orders_detail.html
@@ -17,7 +17,7 @@
      <div class="signup-container">
         <div class="col-xs-12 col-sm-6 col-lg-8 text-center wow fadeInDown"> 
           <div class="payment-box">
-            <h2 class="section-heading payment-head">Your membership invoice for {{order.created_at|date:"F"}}</h2>
+            <h2 class="section-heading payment-head">Your membership invoice for {{order.created_at|date:"Y-m"}}</h2>
             <hr class="greyline-long">
             <h2 class="billing-head">Invoice<btn class="btn btn-primary btn-grey btn-edit print hidden-print" data-print="price">Get PDF</btn></h2>                              
                                

From 102aec9c16cf40a4673aeb84a9518a9050c65c0a Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Sat, 15 Oct 2016 16:58:40 -0500
Subject: [PATCH 2/4] Fixed #2650: Add 'Go back' button to
 registration/unregistration steps

---
 .../templates/digitalglarus/booking_payment.html      | 11 ++++++++---
 .../digitalglarus/membership_deactivated.html         |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html
index 43137b46..294e64c3 100644
--- a/digitalglarus/templates/digitalglarus/booking_payment.html
+++ b/digitalglarus/templates/digitalglarus/booking_payment.html
@@ -18,6 +18,10 @@
     padding: .5em;
     padding-right: 1.5em
   }
+
+  .order-bottom-text a{
+    margin-left: 0px;
+  }
 </style>
 
   <section id="price">
@@ -140,9 +144,10 @@
                   <h2 class="order-name">Booking Summary</h2>
               </div>
                 <div class="order-box">
-                  <h3 class="col-xs-6 order-item">Dates {{start_date}} - {{end_date}}</h3>                  
-                  <br/>
-
+                  <h3 class="col-xs-6 order-item">Dates {{start_date}} - {{end_date}}</h3>
+                  <p class="order-bottom-text">
+                      <a href="{{request.META.HTTP_REFERER}}">Change dates</a>       
+                  </p>
                   <hr class="greyline">
                   <h2 class="col-xs-6 payment-total">Total days: {{booking_days}} </h2>
                   <h2 class="order-sum">{{original_price|floatformat}}CHF</h2>
diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html
index 7ce1137f..acc92078 100644
--- a/digitalglarus/templates/digitalglarus/membership_deactivated.html
+++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html
@@ -25,6 +25,7 @@
                             <button type="button" class="btn btn-primary btn-blue" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button>
 
 
+
                             <div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog">
                               <div class="modal-dialog" role="document">
                                 <div class="modal-content">
@@ -49,7 +50,7 @@
                         </div>
                           <div class="notice-box text-left">
                             <p class="order-bottom-text">
-                              Your membership wouldn't be automatically renewed each month.
+                              Your membership wouldn't be automatically renewed each month. <a href="{{request.META.HTTP_REFERER}}">Go back</a>
                             </p>
                          </div>
                       </div>

From 042fa547e36e25399937ba85724a327224a162fd Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Sat, 15 Oct 2016 17:00:10 -0500
Subject: [PATCH 3/4] Fixed #2651: Reduce book button size

---
 digitalglarus/templates/digitalglarus/booking_payment.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html
index 294e64c3..07a7739f 100644
--- a/digitalglarus/templates/digitalglarus/booking_payment.html
+++ b/digitalglarus/templates/digitalglarus/booking_payment.html
@@ -173,7 +173,7 @@
                     <div class="button-box">
                         <div class="row">
                           <div class="col-xs-12">
-                              <button id="payment_button" class="btn btn-primary btn-lg btn-blck " type="submit">Book</button>
+                              <button id="payment_button" class="btn btn-primary btn-md btn-blck " type="submit">Book</button>
                           </div>
                         </div> 
                     </div>

From 35bd78a78b0d43963a1398ad9ea09ec4a72545bc Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Tue, 18 Oct 2016 23:29:07 -0500
Subject: [PATCH 4/4] =?UTF-8?q?Fixed=20#2652:=20Order=20confirmation=20pag?=
 =?UTF-8?q?e=20needs=20buttons=20for=20next=20action.=20Fixed=C2=A0#2653:?=
 =?UTF-8?q?=20cancel=20subscription=20modal=20position=20adjustment.=20Fix?=
 =?UTF-8?q?ed=20#2658:=20Billing=20address=20info=20change=20page.=20Fixed?=
 =?UTF-8?q?=20#2659:=20order=20history=20page=20booking=20history=20list.?=
 =?UTF-8?q?=20Issue=20#2659=20Added=20start=20date=20and=20end=20=5Fdate?=
 =?UTF-8?q?=20to=20membership=20model=20attributes.=20Fixed=20membership?=
 =?UTF-8?q?=20creating=20process=20in=20order=20to=20set=20start=20and=20e?=
 =?UTF-8?q?nd=20membership=20dates.=20Fixed=20start=20date=20and=20end=20d?=
 =?UTF-8?q?ate=20in=20membership=20detail=20view=20and=20orders=20list=20i?=
 =?UTF-8?q?n=20order=20to=20use=20new=20membership=20attributes=20model.?=
 =?UTF-8?q?=20Adding=20membership=20order=20after=20booking.=20Fixed=20Mem?=
 =?UTF-8?q?bership=20creation=20when=20an=20booking=20is=20placed.Fixed=20?=
 =?UTF-8?q?#2661=20=20:=20move=20DG=20terms=20and=20condition=20text+=20ch?=
 =?UTF-8?q?eckbox=20in=20order=20page.Fixed=20=202663:=20DG=20pricing=20pa?=
 =?UTF-8?q?ge=20column=20width=20fix.Fixed=20#2660:=20DG=20footer=20style?=
 =?UTF-8?q?=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0021_auto_20161017_1958.py     |  41 +++++
 digitalglarus/models.py                       |  28 +++-
 .../static/digitalglarus/css/agency.css       |   4 +-
 .../static/digitalglarus/js/utils.js          |   2 +
 .../digitalglarus/booking_orders_detail.html  |   7 +-
 .../digitalglarus/booking_orders_list.html    |   2 +
 .../digitalglarus/membership_deactivated.html |  11 +-
 .../digitalglarus/membership_orders_list.html |   2 +-
 .../digitalglarus/membership_payment.html     |  13 +-
 .../digitalglarus/membership_pricing.html     |   6 +-
 .../digitalglarus/user_billing_address.html   |   5 +-
 digitalglarus/views.py                        | 149 +++++++++++-------
 12 files changed, 189 insertions(+), 81 deletions(-)
 create mode 100644 digitalglarus/migrations/0021_auto_20161017_1958.py

diff --git a/digitalglarus/migrations/0021_auto_20161017_1958.py b/digitalglarus/migrations/0021_auto_20161017_1958.py
new file mode 100644
index 00000000..69b44dde
--- /dev/null
+++ b/digitalglarus/migrations/0021_auto_20161017_1958.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-10-17 19:58
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('digitalglarus', '0020_auto_20161013_0253'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='membership',
+            name='end_date',
+            field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 0, 209303, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='membership',
+            name='start_date',
+            field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 7, 361473, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='membershiporder',
+            name='end_date',
+            field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 15, 657240, tzinfo=utc)),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='membershiporder',
+            name='start_date',
+            field=models.DateField(default=datetime.datetime(2016, 10, 17, 19, 58, 16, 897120, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index 7ed0f53a..c809a8b5 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -62,6 +62,13 @@ class MembershipType(models.Model):
 class Membership(models.Model):
     type = models.ForeignKey(MembershipType)
     active = models.BooleanField(default=True)
+    start_date = models.DateField()
+    end_date = models.DateField()
+
+    @classmethod
+    def get_by_user(cls, user):
+        return cls.objects.\
+            filter(membershiporder__customer__user=user).last()
 
     @classmethod
     def create(cls, data):
@@ -79,6 +86,11 @@ class Membership(models.Model):
         return cls.objects.filter(has_order_past_month | has_order_current_month).\
             filter(active_membership).exists()
 
+    def update_dates(self, start_date, end_date):
+        self.start_date = start_date
+        self.end_date = end_date
+        self.save()
+
     def deactivate(self):
         self.active = False
         self.save()
@@ -86,17 +98,19 @@ class Membership(models.Model):
 
 class MembershipOrder(Ordereable, models.Model):
     membership = models.ForeignKey(Membership)
+    start_date = models.DateField()
+    end_date = models.DateField()
 
     @classmethod
     def current_membership(cls, user):
-        last_payment = cls.objects.\
+        last_membership_payment = cls.objects.\
             filter(customer__user=user).last()
-        start_date = last_payment.created_at
-        _, days_in_month = calendar.monthrange(start_date.year,
-                                               start_date.month)
-        start_date.replace(day=1)
-        end_date = start_date + timedelta(days=days_in_month)
-        return start_date, end_date
+        # start_date = last_payment.created_at
+        # _, days_in_month = calendar.monthrange(start_date.year,
+        #                                        start_date.month)
+        # start_date.replace(day=1)
+        # end_date = start_date + timedelta(days=days_in_month)
+        return last_membership_payment.start_date, last_membership_payment.end_date
 
     def first_membership_range_date(self):
         start_date = self.created_at
diff --git a/digitalglarus/static/digitalglarus/css/agency.css b/digitalglarus/static/digitalglarus/css/agency.css
index 39289c6e..67154295 100755
--- a/digitalglarus/static/digitalglarus/css/agency.css
+++ b/digitalglarus/static/digitalglarus/css/agency.css
@@ -1172,11 +1172,11 @@ footer {
 }
 
 .map-caption{
-	text-transform: none;
+    text-transform:uppercase;
+    font-size: 13px;
 	font-family:"Montserrat","Helvetica Neue",Helvetica, Arial,sans-serif;
 	font-weight: 400;
 	color: #ffffff;
-	font-size: 14px;
 	letter-spacing: 1px;
 	text-align:center;
 }
diff --git a/digitalglarus/static/digitalglarus/js/utils.js b/digitalglarus/static/digitalglarus/js/utils.js
index d780fc25..e824dafc 100644
--- a/digitalglarus/static/digitalglarus/js/utils.js
+++ b/digitalglarus/static/digitalglarus/js/utils.js
@@ -18,4 +18,6 @@ $( document ).ready(function() {
 
   });
 
+
+
 });
\ No newline at end of file
diff --git a/digitalglarus/templates/digitalglarus/booking_orders_detail.html b/digitalglarus/templates/digitalglarus/booking_orders_detail.html
index f3d7b049..006c6568 100644
--- a/digitalglarus/templates/digitalglarus/booking_orders_detail.html
+++ b/digitalglarus/templates/digitalglarus/booking_orders_detail.html
@@ -55,8 +55,13 @@
             <hr class="greyline-long">
             <h2 class="col-xs-6 payment-total text-left"> Total</h2>
             <h2 class="order-result">{{final_price|floatformat}}CHF</h2>
-            <br>            
+            <br>   
+
+            <p class="order-bottom-text">
+              View my bookings <a href="{% url 'digitalglarus:booking_orders_list' %}">Go to my page</a>            
+            </p>         
           </div>
+
     </div>              
      
     <div class="col-xs-12 col-sm-4 col-lg-4 wow fadeInDown hidden-print"> 
diff --git a/digitalglarus/templates/digitalglarus/booking_orders_list.html b/digitalglarus/templates/digitalglarus/booking_orders_list.html
index 9fa3d793..426fcea1 100644
--- a/digitalglarus/templates/digitalglarus/booking_orders_list.html
+++ b/digitalglarus/templates/digitalglarus/booking_orders_list.html
@@ -24,6 +24,7 @@
                   <th>#</th>
                   <th>Booking dates</th>
                   <th>Days</th>
+                  <th>Membership Required Months</th>
                   <th>Invoice</th>
                 </tr>
               </thead>
@@ -33,6 +34,7 @@
                   <th scope="row">{{order.id}}</th>
                   <td>{{order.booking.start_date}}-{{order.booking.end_date}}</td>
                   <td>{{order.booking_days}}</td>
+                  <td>{{order.membership_required_months}}</td>
                   <td><a class="btn btn-xs btn-primary btn-darkgrey" href="{% url 'digitalglarus:booking_orders_detail' order.id %}">View</a></td>
                 </tr>
                 {% endfor %}
diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html
index acc92078..0f30a1ba 100644
--- a/digitalglarus/templates/digitalglarus/membership_deactivated.html
+++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html
@@ -3,6 +3,15 @@
 {% block title %}crowdfunding{% endblock %}
 
 {% block content %}
+
+<style type="text/css">
+
+  #cancel-subscription-modal{
+    margin-top:10%;    
+  }
+
+</style>
+
   <section id="price">
     <div class="signup-container">
 	  <div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
@@ -37,7 +46,7 @@
                                     <p>Do you want to cancel your subscription?</p>
                                   </div>
                                   <div class="modal-footer">
-                                    <button type="button" class="btn btn-default" data-dismiss="modal">No</button>
+                                    <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
                                     <button type="submit" class="btn btn-primary">Yes</button>
                                   </div>
                                 </div><!-- /.modal-content -->
diff --git a/digitalglarus/templates/digitalglarus/membership_orders_list.html b/digitalglarus/templates/digitalglarus/membership_orders_list.html
index 8247835a..5fc92329 100644
--- a/digitalglarus/templates/digitalglarus/membership_orders_list.html
+++ b/digitalglarus/templates/digitalglarus/membership_orders_list.html
@@ -14,7 +14,7 @@
             <h2 class="order-head">Member Name</h2>
             <h2 class="member-name">{{request.user.name}}</h2>
             <hr class="greyline-long">
-            <h2 class="order-head">Active Membership</h2>
+            <h2 class="order-head">Current Membership</h2>
             <h2 class="member-name">{{membership_start_date|date}}-{{membership_end_date|date}}</h2>
             <hr class="greyline-long">
             <h2 class="order-head">Orders history</h2>
diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html
index 824d46a9..0aa1c7ee 100644
--- a/digitalglarus/templates/digitalglarus/membership_payment.html
+++ b/digitalglarus/templates/digitalglarus/membership_payment.html
@@ -91,6 +91,13 @@
                                     </div>
                                 </div>
                                 <div class="row">
+                                    <label class="custom-control custom-checkbox">
+                                     <br/>
+                                     <input type="checkbox" class="custom-control-input">
+                                     <span class="custom-control-indicator"></span>
+                                     <span class="custom-control-description">I accept the Digital Glarus <a href=#>Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
+                                     </label>
+
                                     <div class="col-xs-12">
                                         <button class="btn btn-primary btn-md btn-blck " type="submit">Purchase membership</button>
                                     </div>
@@ -132,12 +139,6 @@
                   <h2 class="col-xs-6 payment-total">Total</h2>
                   <h2 class="order-result">{{membership_type.first_month_price|floatformat}}CHF</h2>
                   <div class="text-center">
-                  <label class="custom-control custom-checkbox">
-                           <br/>
-                           <input type="checkbox" class="custom-control-input">
-                           <span class="custom-control-indicator"></span>
-                           <span class="custom-control-description">I accept the Digital Glarus <a href=#>Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
-                           </label>
                     <div class="button-box">
                           </div>
                          
diff --git a/digitalglarus/templates/digitalglarus/membership_pricing.html b/digitalglarus/templates/digitalglarus/membership_pricing.html
index fec32399..13349b22 100644
--- a/digitalglarus/templates/digitalglarus/membership_pricing.html
+++ b/digitalglarus/templates/digitalglarus/membership_pricing.html
@@ -5,8 +5,8 @@
 {% block content %}
   <section id="price">
     <div class="container">
-    <div class="row col-md-3 text-center wow fadeInDown"></div>
-    <div class="row col-md-6 text-center wow fadeInDown"> 
+    <div class="row col-md-2 text-center wow fadeInDown"></div>
+    <div class="row col-md-8 text-center wow fadeInDown"> 
        <div class="price-box">
        <span class="glyphicon glyphicon-star"></span>
         <h2 class="section-heading">Digital Glarus Membership</h2>
@@ -39,7 +39,7 @@
               
        </div>        
       </div>
-      <div class="row col-md-3 text-center wow fadeInDown"></div>
+      <div class="row col-md-2 text-center wow fadeInDown"></div>
     </div> 
   </section> 
       <!--membership includes-->
diff --git a/digitalglarus/templates/digitalglarus/user_billing_address.html b/digitalglarus/templates/digitalglarus/user_billing_address.html
index 138dc8ab..691ad57f 100644
--- a/digitalglarus/templates/digitalglarus/user_billing_address.html
+++ b/digitalglarus/templates/digitalglarus/user_billing_address.html
@@ -24,7 +24,7 @@
     <div class="signup-container">
       <div class="col-xs-12 col-sm-6 col-lg-8 text-center wow fadeInDown"> 
         <div class="payment-box">
-               <h2 class="section-heading payment-head">Billing Address Info</h2>
+               <h2 class="section-heading payment-head">Billing Address</h2>
              <!--  <h2 class="membership-amount">35CHF</h2> -->
                  <hr class="greyline-long">
                   <h2 class="billing-head">Billing Adress</h2>
@@ -35,6 +35,7 @@
                         {% bootstrap_field field show_label=False type='fields'%}
                       {% endfor %}
                       {% bootstrap_form_errors form type='non_fields'%}
+                      <input type="hidden" name="next" value="{{request.META.HTTP_REFERER}}">
                       <br>
 
                       <div class="row">
@@ -44,7 +45,7 @@
                                   <h2 class="signup-lead text-center">{{ message }}</h2>
                               {% endfor %}
                           {% endif %}
-                          <button id="payment_button" class="btn btn-primary btn-lg btn-blck " type="submit">Save</button>
+                          <button id="payment_button" class="btn btn-primary btn-md btn-blck " type="submit">Save</button>
                         </div>
                       </div> 
                       </form>
diff --git a/digitalglarus/views.py b/digitalglarus/views.py
index 192e4fc0..08f0daf5 100644
--- a/digitalglarus/views.py
+++ b/digitalglarus/views.py
@@ -209,63 +209,83 @@ class BookingPaymentView(LoginRequiredMixin, MembershipRequiredMixin, FormView):
             form.add_error("__all__", "Invalid credit card")
             return self.render_to_response(self.get_context_data(form=form))
 
-        if is_free:
-            billing_address = form.save()
+        # if is_free:
+        #     billing_address = form.save()
 
-            # Create Billing Address for User if he does not have one
-            if not customer.user.billing_addresses.count():
-                data.update({
-                    'user': customer.user.id
+        #     # Create Billing Address for User if he does not have one
+        #     if not customer.user.billing_addresses.count():
+        #         data.update({
+        #             'user': customer.user.id
+        #         })
+        #         billing_address_user_form = UserBillingAddressForm(data)
+        #         billing_address_user_form.is_valid()
+        #         billing_address_user_form.save()
+
+        #     # Create membership plan
+        #     booking_data = {
+        #         'start_date': start_date,
+        #         'end_date': end_date,
+        #         'start_date': start_date,
+        #         'free_days': free_days,
+        #         'price': normal_price,
+        #         'final_price': final_price,
+        #     }
+        #     booking = Booking.create(booking_data)
+
+        #     # Create membership order
+        #     order_data = {
+        #         'booking': booking,
+        #         'customer': customer,
+        #         'billing_address': billing_address,
+        #         'amount': final_price,
+        #         'original_price': normal_price,
+        #         'special_month_price': BookingPrice.objects.last().special_month_price,
+        #         'membership_required_months': membership_required_months,
+        #         'membership_required_months_price': membership_required_months_price,
+        #     }
+        #     order = BookingOrder.create(order_data)
+
+        #     return HttpResponseRedirect(self.get_success_url(order.id))
+
+        # If booking is not free, make the stripe charge
+        if not is_free:
+            # Make stripe charge to a customer
+            stripe_utils = StripeUtils()
+            charge_response = stripe_utils.make_charge(amount=final_price,
+                                                       customer=customer.stripe_id)
+            charge = charge_response.get('response_object')
+
+            # Check if the payment was approved
+            if not charge:
+                context.update({
+                    'paymentError': charge_response.get('error'),
+                    'form': form
                 })
-                billing_address_user_form = UserBillingAddressForm(data)
-                billing_address_user_form.is_valid()
-                billing_address_user_form.save()
+                return render(self.request, self.template_name, context)
 
-            # Create membership plan
-            booking_data = {
-                'start_date': start_date,
-                'end_date': end_date,
-                'start_date': start_date,
-                'free_days': free_days,
-                'price': normal_price,
-                'final_price': final_price,
-            }
-            booking = Booking.create(booking_data)
-
-            # Create membership order
-            order_data = {
-                'booking': booking,
-                'customer': customer,
-                'billing_address': billing_address,
-                'amount': final_price,
-                'original_price': normal_price,
-                'special_month_price': BookingPrice.objects.last().special_month_price,
-                'membership_required_months': membership_required_months,
-                'membership_required_months_price': membership_required_months_price,
-            }
-            order = BookingOrder.create(order_data)
-
-            return HttpResponseRedirect(self.get_success_url(order.id))
-
-        # Make stripe charge to a customer
-        stripe_utils = StripeUtils()
-        charge_response = stripe_utils.make_charge(amount=final_price,
-                                                   customer=customer.stripe_id)
-        charge = charge_response.get('response_object')
-
-        # Check if the payment was approved
-        if not charge:
-            context.update({
-                'paymentError': charge_response.get('error'),
-                'form': form
-            })
-            return render(self.request, self.template_name, context)
-
-        charge = charge_response.get('response_object')
+            charge = charge_response.get('response_object')
 
         # Create Billing Address for Membership Order
         billing_address = form.save()
 
+        # Check if user had to pay membership months in advaced
+        # if membership_required_months:
+
+        #     # Get current user membership
+        #     membership = Membership.get_by_user(self.request.user)
+
+        #     # Create membership order
+        #     order_data = {
+        #         'membership': membership,
+        #         'customer': customer,
+        #         'billing_address': billing_address,
+        #         'amount': membership_required_months_price,
+        #         'start_date': start_date,
+        #         'end_date': end_date
+        #     }
+
+        #     MembershipOrder.create(order_data)
+
         # Create Billing Address for User if he does not have one
         if not customer.user.billing_addresses.count():
             data.update({
@@ -275,7 +295,7 @@ class BookingPaymentView(LoginRequiredMixin, MembershipRequiredMixin, FormView):
             billing_address_user_form.is_valid()
             billing_address_user_form.save()
 
-        # Create membership plan
+        # Create Booking
         booking_data = {
             'start_date': start_date,
             'end_date': end_date,
@@ -286,7 +306,7 @@ class BookingPaymentView(LoginRequiredMixin, MembershipRequiredMixin, FormView):
         }
         booking = Booking.create(booking_data)
 
-        # Create membership order
+        # Create Booking order
         order_data = {
             'booking': booking,
             'customer': customer,
@@ -383,8 +403,15 @@ class MembershipPaymentView(LoginRequiredMixin, IsNotMemberMixin, FormView):
                 billing_address_user_form.is_valid()
                 billing_address_user_form.save()
 
+            # Get membership dates
+            membership_start_date, membership_end_date = membership_type.first_month_range
+
             # Create membership plan
-            membership_data = {'type': membership_type}
+            membership_data = {
+                'type': membership_type,
+                'start_date': membership_start_date,
+                'end_date': membership_end_date
+            }
             membership = Membership.create(membership_data)
 
             # Create membership order
@@ -393,7 +420,9 @@ class MembershipPaymentView(LoginRequiredMixin, IsNotMemberMixin, FormView):
                 'customer': customer,
                 'billing_address': billing_address,
                 'stripe_charge': charge,
-                'amount': membership_type.first_month_price
+                'amount': membership_type.first_month_price,
+                'start_date': membership_start_date,
+                'end_date': membership_end_date
             }
 
             membership_order = MembershipOrder.create(order_data)
@@ -403,13 +432,11 @@ class MembershipPaymentView(LoginRequiredMixin, IsNotMemberMixin, FormView):
                 'membership_dates': membership.type.first_month_formated_range
             })
 
-            start_m_date, end_m_date = membership_order.first_membership_range_date()
-
             context = {
                 'membership': membership,
                 'order': membership_order,
-                'membership_start_date': start_m_date,
-                'membership_end_date': end_m_date,
+                'membership_start_date': membership_start_date,
+                'membership_end_date': membership_end_date,
                 'base_url': "{0}://{1}".format(request.scheme, request.get_host())
 
             }
@@ -475,6 +502,12 @@ class UserBillingAddressView(LoginRequiredMixin, UpdateView):
     success_url = reverse_lazy('digitalglarus:user_billing_address')
     success_message = "Billing Address Updated"
 
+    def get_success_url(self):
+        next_url = self.request.POST.get('next') if self.request.POST.get('next')\
+            else self.success_url
+
+        return next_url
+
     def form_valid(self, form):
         """
         If the form is valid, save the associated model.