Skip to content

Commit 02d8baf

Browse files
danialmalikdanialmalik
authored
Merge pull request #10 from q-verse/develop
Release 2020-06-03
2 parents c930fe9 + 9dc1a9c commit 02d8baf

File tree

12 files changed

+1536
-8
lines changed

12 files changed

+1536
-8
lines changed

‎q-verse/ecommerce/st-lutherx-ecommerce/static/sass/partials/views/_basket.scss

+5
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,11 @@
406406
}
407407
}
408408

409+
.payment-button-back {
410+
background: white;
411+
border-top: none;
412+
}
413+
409414
.verification-note {
410415
margin-top: 20px;
411416
border: 5px solid $gray-lightest;

‎q-verse/ecommerce/st-lutherx-ecommerce/templates/edx/base.html

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<meta charset="UTF-8">
1616
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1717
<title>{% block title %}{% endblock title %}</title>
18+
<script type="text/javascript">
19+
var currency = "{{ settings.OSCAR_DEFAULT_CURRENCY }}";
20+
var currency_symbol = "{{ settings.OSCAR_DEFAULT_CURRENCY_SYMBOL }}";
21+
</script>
1822

1923
{% compress css %}
2024
{% if main_css %}

‎q-verse/ecommerce/st-lutherx-ecommerce/templates/edx/credit/_provider_detail.html

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{% load i18n %}
2+
3+
<div class="row center-block provider" data-sku="{{ provider.sku }}" data-price="{{ provider.price }}" data-new-price="{{ provider.new_price }}" data-discount="{{ provider.discount}}">
4+
<div class="row">
5+
<div class="col-xs-2 text-center">
6+
<label class="radio-button">
7+
<input type="radio" name="provider"/>
8+
<span>{% trans "Select" %}</span>
9+
</label>
10+
</div>
11+
12+
<div class="col-sm-8 col-xs-10">
13+
<h3 class="title">{{ provider.display_name }}</h3>
14+
15+
<p>
16+
<strong>{% trans "Credits: " %}</strong> {{ provider.credit_hours }}<br>
17+
<strong>{% trans "Price: " %}</strong> {{ currency_symbol }}{{ provider.price }}
18+
</p>
19+
20+
<p>
21+
{{ provider.description }}
22+
</p>
23+
24+
<button class="btn-link show-instructions" data-toggle="collapse"
25+
data-target="#fulfillment-instructions-{{ provider.id|lower }}">
26+
{% blocktrans with display_name=provider.display_name %}
27+
Learn more about {{ display_name }} credit?
28+
{% endblocktrans %}
29+
</button>
30+
31+
<div class="collapse" id="fulfillment-instructions-{{ provider.id|lower }}">
32+
{{ provider.fulfillment_instructions|safe }}
33+
</div>
34+
</div>
35+
<div class="col-sm-2 col-xs-2 hidden-xs">
36+
<img alt="{{ provider.display_name }}" class="img-responsive provider-image"
37+
src="{{ provider.thumbnail_url }}">
38+
</div>
39+
</div>
40+
41+
<div class="row">
42+
<div class="col-xs-8 col-xs-offset-2">
43+
<small>
44+
{% blocktrans with date=deadline|date %}
45+
Credit available until {{ date }}
46+
{% endblocktrans %}
47+
</small>
48+
</div>
49+
</div>
50+
</div>

‎q-verse/ecommerce/st-lutherx-ecommerce/templates/edx/credit/checkout.html

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
{% extends 'edx/base.html' %}
2+
3+
{% load core_extras %}
4+
{% load static %}
5+
{% load i18n %}
6+
7+
{% block title %}
8+
{% blocktrans with course_name=course.name %}Purchase Credit for {{ course_name }}{% endblocktrans %}
9+
{% endblock title %}
10+
11+
{% block content %}
12+
<div class="credit-checkout-page">
13+
<div class="container credit-checkout">
14+
<div class="row center-block course-details">
15+
{% if error %}
16+
<div class="alert alert-danger error-message" role="alert">
17+
{{ error }}
18+
</div>
19+
{% else %}
20+
<div class="col-sm-11">
21+
<h3 class="title">
22+
{% captureas course_name %}
23+
<span class="course-title">{{ course.name }}</span>
24+
{% endcaptureas %}
25+
{% blocktrans %}
26+
Purchase Credit for {{ course_name }}
27+
{% endblocktrans %}
28+
</h3>
29+
<span>
30+
{% blocktrans with date=deadline|date %}
31+
Congratulations! You are eligible to purchase academic course credit for this course.
32+
You must purchase your credit before {{ date }}.
33+
Select one of the following institutions to purchase your credit.
34+
{% endblocktrans %}
35+
</span>
36+
</div>
37+
</div>
38+
<div class="provider-container">
39+
<div class="row center-block provider-details">
40+
{% for provider in providers %}
41+
{% include "edx/credit/_provider_detail.html" %}
42+
{% endfor %}
43+
<div class="row center-block text-right">
44+
{% if code %}
45+
<div class="col-sm-2 col-sm-offset-10 price text-left">
46+
<span>{% trans "Price:" %}</span>
47+
<span class="pull-right">{{ currency_symbol }}<span class="price"></span></span>
48+
</div>
49+
<div class="col-sm-2 col-sm-offset-10 discount text-left">
50+
<span>{% trans "Discount:" %} </span>
51+
<span class="pull-right"><span class="discount"></span></span>
52+
</div>
53+
{% endif %}
54+
<div class="col-sm-2 col-sm-offset-10 total-price text-left">
55+
<span>{% trans "Total:" %} <span>
56+
<span class="pull-right">{{ currency_symbol }}<span class="total-price"></span></span>
57+
</div>
58+
</div>
59+
</div>
60+
<div id="payment-buttons" class="row checkout-controls center-block text-right">
61+
<a data-track-type="click"
62+
data-track-event="edx.bi.ecommerce.credit.payment_selected"
63+
data-course-id="{{ course.id }}"
64+
class="btn btn-primary payment-button"
65+
href="/basket/add/?code={{code}}&sku=">
66+
Checkout
67+
</a>
68+
</div>
69+
</div>
70+
{% endif %}
71+
72+
<div class="advatanges-panel well">
73+
<div class="row center-block">
74+
<div class="col-md-12">
75+
<img class="cap-image" src="{% static "images/cap.png" %}" alt=""/>
76+
<strong>Earn Academic Credit for Your Accomplishments</strong>
77+
</div>
78+
</div>
79+
80+
<div class="row center-block ">
81+
82+
<div class="col-md-4">
83+
<div class="advantages">
84+
<strong>{% trans "You deserve it." %}</strong>
85+
86+
<p>
87+
{% trans "The hard work is over - you passed the course! Now get the credit you deserve to start or complete a degree." %}
88+
</p>
89+
</div>
90+
</div>
91+
<div class="col-md-4">
92+
<div class="advantages">
93+
<strong>{% trans "It's affordable." %}</strong>
94+
95+
<p>
96+
{% trans "The credit offered through edX generally costs less than the same credit at most institutions." %}
97+
</p>
98+
</div>
99+
</div>
100+
<div class="col-md-4">
101+
<div class="advantages">
102+
<strong>{% trans "It opens doors." %}</strong>
103+
104+
<p>
105+
{% trans "Many of today's most in-demand jobs require a college degree. Start your path to success!" %}
106+
</p>
107+
</div>
108+
</div>
109+
</div>
110+
</div>
111+
112+
<div class="row center-block">
113+
<strong>{% trans "Questions?" %}</strong>
114+
</div>
115+
<div class="row center-block">
116+
{% blocktrans with link_start='<a href="https://www.edx.org/gfa">' link_end='</a>' %}
117+
Please read {{ link_start }}our FAQs to view common questions about our certificates.{{ link_end }}
118+
{% endblocktrans %}
119+
</div>
120+
</div>
121+
122+
<form id="payment-processor-form"></form>
123+
</div>
124+
{% endblock content %}
125+
126+
{% block javascript %}
127+
<script src="{% static 'js/apps/credit_checkout.js' %}"></script>
128+
{% endblock %}

‎q-verse/ecommerce/st-lutherx-ecommerce/templates/oscar/basket/partials/hosted_checkout_basket.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
</div>
138138
{% endif %}
139139

140-
<div class="payment-buttons" data-basket-id="{{ basket.id }}">
140+
<div class="payment-buttons payment-button-back" data-basket-id="{{ basket.id }}">
141141
{% if free_basket %}
142142
<a href="{% url 'checkout:free-checkout' %}"
143143
data-track-type="click"
@@ -166,6 +166,9 @@
166166
{% elif processor.NAME == 'authorizenet' %}
167167
{# Translators: Do NOT translate the name Authorizenet. #}
168168
{% trans "AuthorizeNet" %}
169+
{% elif processor.NAME == 'paystack' %}
170+
{# Translators: Do NOT translate the name Paystack. #}
171+
{% trans "Checkout with Paystack" %}
169172
{% endif %}
170173
</button>
171174
{% endfor %}

0 commit comments

Comments
 (0)