Skip to content

Commit

Permalink
Merge pull request #10 from q-verse/develop
Browse files Browse the repository at this point in the history 
Release 2020-06-03
  • Loading branch information
@danialmalik
danialmalik authored Jun 3, 2020
2 parents c930fe9 + 9dc1a9c commit 02d8baf
Show file tree
Hide file tree
Showing 12 changed files with 1,536 additions and 8 deletions.
5 changes: 5 additions & 0 deletions q-verse/ecommerce/st-lutherx-ecommerce/static/sass/partials/views/_basket.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,11 @@
}
}

.payment-button-back {
background: white;
border-top: none;
}

.verification-note {
margin-top: 20px;
border: 5px solid $gray-lightest;
Expand Down
4 changes: 4 additions & 0 deletions q-verse/ecommerce/st-lutherx-ecommerce/templates/edx/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}{% endblock title %}</title>
<script type="text/javascript">
var currency = "{{ settings.OSCAR_DEFAULT_CURRENCY }}";
var currency_symbol = "{{ settings.OSCAR_DEFAULT_CURRENCY_SYMBOL }}";
</script>

{% compress css %}
{% if main_css %}
Expand Down
50 changes: 50 additions & 0 deletions q-verse/ecommerce/st-lutherx-ecommerce/templates/edx/credit/_provider_detail.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{% load i18n %}

<div class="row center-block provider" data-sku="{{ provider.sku }}" data-price="{{ provider.price }}" data-new-price="{{ provider.new_price }}" data-discount="{{ provider.discount}}">
<div class="row">
<div class="col-xs-2 text-center">
<label class="radio-button">
<input type="radio" name="provider"/>
<span>{% trans "Select" %}</span>
</label>
</div>

<div class="col-sm-8 col-xs-10">
<h3 class="title">{{ provider.display_name }}</h3>

<p>
<strong>{% trans "Credits: " %}</strong> {{ provider.credit_hours }}<br>
<strong>{% trans "Price: " %}</strong> {{ currency_symbol }}{{ provider.price }}
</p>

<p>
{{ provider.description }}
</p>

<button class="btn-link show-instructions" data-toggle="collapse"
data-target="#fulfillment-instructions-{{ provider.id|lower }}">
{% blocktrans with display_name=provider.display_name %}
Learn more about {{ display_name }} credit?
{% endblocktrans %}
</button>

<div class="collapse" id="fulfillment-instructions-{{ provider.id|lower }}">
{{ provider.fulfillment_instructions|safe }}
</div>
</div>
<div class="col-sm-2 col-xs-2 hidden-xs">
<img alt="{{ provider.display_name }}" class="img-responsive provider-image"
src="{{ provider.thumbnail_url }}">
</div>
</div>

<div class="row">
<div class="col-xs-8 col-xs-offset-2">
<small>
{% blocktrans with date=deadline|date %}
Credit available until {{ date }}
{% endblocktrans %}
</small>
</div>
</div>
</div>
128 changes: 128 additions & 0 deletions q-verse/ecommerce/st-lutherx-ecommerce/templates/edx/credit/checkout.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
{% extends 'edx/base.html' %}

{% load core_extras %}
{% load static %}
{% load i18n %}

{% block title %}
{% blocktrans with course_name=course.name %}Purchase Credit for {{ course_name }}{% endblocktrans %}
{% endblock title %}

{% block content %}
<div class="credit-checkout-page">
<div class="container credit-checkout">
<div class="row center-block course-details">
{% if error %}
<div class="alert alert-danger error-message" role="alert">
{{ error }}
</div>
{% else %}
<div class="col-sm-11">
<h3 class="title">
{% captureas course_name %}
<span class="course-title">{{ course.name }}</span>
{% endcaptureas %}
{% blocktrans %}
Purchase Credit for {{ course_name }}
{% endblocktrans %}
</h3>
<span>
{% blocktrans with date=deadline|date %}
Congratulations! You are eligible to purchase academic course credit for this course.
You must purchase your credit before {{ date }}.
Select one of the following institutions to purchase your credit.
{% endblocktrans %}
</span>
</div>
</div>
<div class="provider-container">
<div class="row center-block provider-details">
{% for provider in providers %}
{% include "edx/credit/_provider_detail.html" %}
{% endfor %}
<div class="row center-block text-right">
{% if code %}
<div class="col-sm-2 col-sm-offset-10 price text-left">
<span>{% trans "Price:" %}</span>
<span class="pull-right">{{ currency_symbol }}<span class="price"></span></span>
</div>
<div class="col-sm-2 col-sm-offset-10 discount text-left">
<span>{% trans "Discount:" %} </span>
<span class="pull-right"><span class="discount"></span></span>
</div>
{% endif %}
<div class="col-sm-2 col-sm-offset-10 total-price text-left">
<span>{% trans "Total:" %} <span>
<span class="pull-right">{{ currency_symbol }}<span class="total-price"></span></span>
</div>
</div>
</div>
<div id="payment-buttons" class="row checkout-controls center-block text-right">
<a data-track-type="click"
data-track-event="edx.bi.ecommerce.credit.payment_selected"
data-course-id="{{ course.id }}"
class="btn btn-primary payment-button"
href="/basket/add/?code={{code}}&sku=">
Checkout
</a>
</div>
</div>
{% endif %}

<div class="advatanges-panel well">
<div class="row center-block">
<div class="col-md-12">
<img class="cap-image" src="{% static "images/cap.png" %}" alt=""/>
<strong>Earn Academic Credit for Your Accomplishments</strong>
</div>
</div>

<div class="row center-block ">

<div class="col-md-4">
<div class="advantages">
<strong>{% trans "You deserve it." %}</strong>

<p>
{% trans "The hard work is over - you passed the course! Now get the credit you deserve to start or complete a degree." %}
</p>
</div>
</div>
<div class="col-md-4">
<div class="advantages">
<strong>{% trans "It's affordable." %}</strong>

<p>
{% trans "The credit offered through edX generally costs less than the same credit at most institutions." %}
</p>
</div>
</div>
<div class="col-md-4">
<div class="advantages">
<strong>{% trans "It opens doors." %}</strong>

<p>
{% trans "Many of today's most in-demand jobs require a college degree. Start your path to success!" %}
</p>
</div>
</div>
</div>
</div>

<div class="row center-block">
<strong>{% trans "Questions?" %}</strong>
</div>
<div class="row center-block">
{% blocktrans with link_start='<a href="https://www.edx.org/gfa">' link_end='</a>' %}
Please read {{ link_start }}our FAQs to view common questions about our certificates.{{ link_end }}
{% endblocktrans %}
</div>
</div>

<form id="payment-processor-form"></form>
</div>
{% endblock content %}

{% block javascript %}
<script src="{% static 'js/apps/credit_checkout.js' %}"></script>
{% endblock %}
5 changes: 4 additions & 1 deletion ...commerce/st-lutherx-ecommerce/templates/oscar/basket/partials/hosted_checkout_basket.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
</div>
{% endif %}

<div class="payment-buttons" data-basket-id="{{ basket.id }}">
<div class="payment-buttons payment-button-back" data-basket-id="{{ basket.id }}">
{% if free_basket %}
<a href="{% url 'checkout:free-checkout' %}"
data-track-type="click"
Expand Down Expand Up @@ -166,6 +166,9 @@
{% elif processor.NAME == 'authorizenet' %}
{# Translators: Do NOT translate the name Authorizenet. #}
{% trans "AuthorizeNet" %}
{% elif processor.NAME == 'paystack' %}
{# Translators: Do NOT translate the name Paystack. #}
{% trans "Checkout with Paystack" %}
{% endif %}
</button>
{% endfor %}
Expand Down
Loading

0 comments on commit 02d8baf

Please sign in to comment.