Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
1c20324e
Commit
1c20324e
authored
May 17, 2016
by
Malik Shahzad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL-470: Checkout buttons center alligned
parent
37990047
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
38 deletions
+35
-38
ecommerce/static/sass/partials/views/_basket.scss
+1
-6
ecommerce/templates/oscar/basket/partials/basket_content.html
+33
-31
ecommerce/templates/oscar/basket/partials/basket_totals.html
+1
-1
No files found.
ecommerce/static/sass/partials/views/_basket.scss
View file @
1c20324e
...
@@ -14,8 +14,7 @@
...
@@ -14,8 +14,7 @@
}
}
#basket_totals
,
#basket_totals
,
.price
,
.price
{
.payment-buttons
{
@include
float
(
right
);
@include
float
(
right
);
}
}
...
@@ -148,10 +147,6 @@
...
@@ -148,10 +147,6 @@
}
}
.payment-buttons
{
.payment-buttons
{
@include
margin-right
(
30px
);
text-align
:
right
;
.payment-button
{
.payment-button
{
border-color
:
#1E8142
;
border-color
:
#1E8142
;
padding
:
spacing-vertical
(
small
)
spacing-horizontal
(
mid-large
);
padding
:
spacing-vertical
(
small
)
spacing-horizontal
(
mid-large
);
...
...
ecommerce/templates/oscar/basket/partials/basket_content.html
View file @
1c20324e
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
{% if not line_data.enrollment_code %}
{% if not line_data.enrollment_code %}
{% block vouchers %}
{% block vouchers %}
{% if basket.contains_a_voucher %}
{% if basket.contains_a_voucher %}
<div
class=
"vouchers col-
sm-
6"
>
<div
class=
"vouchers col-6"
>
{% for voucher in basket.vouchers.all %}
{% for voucher in basket.vouchers.all %}
<p
class=
"voucher"
>
<p
class=
"voucher"
>
{% blocktrans with voucher_code=voucher.code %}
{% blocktrans with voucher_code=voucher.code %}
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
{% else %}
{% else %}
{# Hide the entire section if a custom BasketView doesn't pass in a voucher form #}
{# Hide the entire section if a custom BasketView doesn't pass in a voucher form #}
{% if voucher_form %}
{% if voucher_form %}
<div
class=
"use-voucher col-
sm-
6"
>
<div
class=
"use-voucher col-6"
>
<p
id=
"voucher_form_link"
><a
href=
"#voucher"
>
{% trans "Apply a coupon code" %}
</a></p>
<p
id=
"voucher_form_link"
><a
href=
"#voucher"
>
{% trans "Apply a coupon code" %}
</a></p>
<div
id=
"voucher_form_container"
>
<div
id=
"voucher_form_container"
>
<form
id=
"voucher_form"
action=
"{% url 'basket:vouchers-add' %}"
method=
"post"
>
<form
id=
"voucher_form"
action=
"{% url 'basket:vouchers-add' %}"
method=
"post"
>
...
@@ -116,35 +116,37 @@
...
@@ -116,35 +116,37 @@
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"payment-buttons"
data-basket-id=
"{{ basket.id }}"
>
<div
class=
"col-lg-6 col-lg-offset-6 col-md-8 col-md-offset-4 col-sm-10 col-sm-offset-2"
>
{% if free_basket %}
<div
class=
"pull-right payment-buttons"
data-basket-id=
"{{ basket.id }}"
>
<a
href=
"{% url 'checkout:free-checkout' %}"
{% if free_basket %}
data-track-type=
"click"
<a
href=
"{% url 'checkout:free-checkout' %}"
data-track-event=
"edx.bi.ecommerce.basket.free_checkout"
data-track-type=
"click"
data-track-category=
"checkout"
data-track-event=
"edx.bi.ecommerce.basket.free_checkout"
data-course-id=
"{{ course.id }}"
data-track-category=
"checkout"
class=
"btn btn-success checkout-button"
>
data-course-id=
"{{ course.id }}"
{% trans "Place Order" %}
class=
"btn btn-success checkout-button"
>
</a>
{% trans "Place Order" %}
{% else %}
</a>
{% for processor in payment_processors %}
{% else %}
<button
data-track-type=
"click"
{% for processor in payment_processors %}
data-track-event=
"edx.bi.ecommerce.basket.payment_selected"
<button
data-track-type=
"click"
data-track-category=
"checkout"
data-track-event=
"edx.bi.ecommerce.basket.payment_selected"
data-processor-name=
"{{ processor.NAME }}"
data-track-category=
"checkout"
data-course-id=
"{{ course.id }}"
data-processor-name=
"{{ processor.NAME }}"
class=
"btn payment-button"
data-course-id=
"{{ course.id }}"
value=
"{{ processor.NAME|lower }}"
class=
"btn payment-button"
id=
"{{ processor.NAME|lower }}"
>
value=
"{{ processor.NAME|lower }}"
{% if processor.NAME == 'cybersource' %}
id=
"{{ processor.NAME|lower }}"
>
{% trans "Checkout" %}
{% if processor.NAME == 'cybersource' %}
{% elif processor.NAME == 'paypal' %}
{% trans "Checkout" %}
{# Translators: Do NOT translate the name PayPal. #}
{% elif processor.NAME == 'paypal' %}
{% trans "Checkout with PayPal" %}
{# Translators: Do NOT translate the name PayPal. #}
{% endif %}
{% trans "Checkout with PayPal" %}
</button>
{% endif %}
{% endfor %}
</button>
{% endif %}
{% endfor %}
{% endif %}
</div>
</div>
</div>
</div>
</div>
...
...
ecommerce/templates/oscar/basket/partials/basket_totals.html
View file @
1c20324e
{% load i18n %}
{% load i18n %}
{% load currency_filters %}
{% load currency_filters %}
<div
id=
"basket_totals"
class=
"col-
sm-
2"
>
<div
id=
"basket_totals"
class=
"col-2"
>
{% block order_total %}
{% block order_total %}
{% trans "Total:" %}
{% trans "Total:" %}
{{ order_total.incl_tax|currency:basket.currency }}
{{ order_total.incl_tax|currency:basket.currency }}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment