ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

fixed scroll navbar issue, fixed supportus, fixed billing addres

Browse source
This commit is contained in:
Levi 2017-01-16 11:03:23 -05:00
parent 896c07930b
commit 8a4a2ff941
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
digitalglarus/static/digitalglarus/css/price.css
View file

@ -71,7 +71,7 @@
padding-right: 15px; padding-right: 15px;
padding-top: 15px; padding-top: 15px;
padding-bottom: 30px; padding-bottom: 30px;
margin-top: 10px; margin-top: 80px;
margin-bottom: 30px; margin-bottom: 30px;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;

2
digitalglarus/templates/digitalglarus/booking_orders_detail.html
View file

@ -113,7 +113,7 @@
</form> </form>
{% else %} {% else %}
<p class="inner"> <p class="inner">
<a class="btn btn-primary btn-blue" href="{% url 'digitalglarus:booking_orders_list' %}">Go to my page</a> <a class="btn btn-primary btn-blue hidden-print" href="{% url 'digitalglarus:booking_orders_list' %}">Go to my page</a>
</p> </p>
{% endif %} {% endif %}

2
digitalglarus/templates/digitalglarus/membership_orders_detail.html
View file

@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<div class="col-xs-12 col-sm-4 col-lg-4 wow fadeInDown"> <div class="col-xs-12 col-sm-4 col-lg-4 wow fadeInDown hidden-print">
<div class="order-summary"> <div class="order-summary">
<div class="header text-center"> <div class="header text-center">
<h2 class="order-name">Order Summary</h2> <h2 class="order-name">Order Summary</h2>

8
digitalglarus/templates/digitalglarus/supportus.html
View file

@ -1,7 +1,9 @@
{% extends "new_base_glarus.html" %} {% extends "new_base_glarus.html" %}
{% load staticfiles cms_tags %} {% load staticfiles cms_tags %}
{% block extra_css %}
{% block content %}
<style type="text/css"> <style type="text/css">
.supportus-posts .post-preview { .supportus-posts .post-preview {
@ -43,10 +45,6 @@
} }
</style> </style>
{% endblock %}
{% block content %}
<!-- Header --> <!-- Header -->
<section> <section>

9
digitalglarus/views.py
View file

@ -328,7 +328,7 @@ class BookingPaymentView(LoginRequiredMixin, MembershipRequiredMixin, FormView):
#credit_card_data = #credit_card_data =
#### ESTOY POR AQUI CAMBIANDO ESTO UN POCO PARA VER SI FUNCIONA #### ESTOY POR AQUI CAMBIANDO ESTO UN POCO PARA VER SI FUNCIONA
########################################################################################## ##########################################################################################
cus = StripeCustomer.get_or_create(email=user ) cus = StripeCustomer.get_or_create(email=user)
s= str(cus) s= str(cus)
s= s.split(" ") s= s.split(" ")
customer = stripe.Customer.retrieve(s[0]) customer = stripe.Customer.retrieve(s[0])
@ -647,11 +647,11 @@ class UserBillingAddressView(LoginRequiredMixin, UpdateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(UserBillingAddressView, self).get_context_data(**kwargs) context = super(UserBillingAddressView, self).get_context_data(**kwargs)
current_billing_address = self.request.user.billing_addresses.first() current_billing_address = self.request.user.billing_addresses.all().first()
context.update({ context.update({
'current_billing_address': current_billing_address 'current_billing_address': current_billing_address
}) })
return current_billing_address return context
def form_valid(self, form): def form_valid(self, form):
""" """
@ -679,7 +679,8 @@ class UserBillingAddressView(LoginRequiredMixin, UpdateView):
return form_kwargs return form_kwargs
def get_object(self): def get_object(self):
current_billing_address = self.request.user.billing_addresses.filter(current=True).last() current_billing_address = self.request.user.\
billing_addresses.filter(current=True).last()
# if not current_billing_address: # if not current_billing_address:
# raise AttributeError("Billing Address does not exists") # raise AttributeError("Billing Address does not exists")
return current_billing_address return current_billing_address