[fix] payment mechanism for memberships, membership listing

This commit is contained in:
Saurabh
2017-03-14 19:40:14 +05:30
parent 5dae6a8206
commit 5139f837c5
14 changed files with 232 additions and 34 deletions

View File

@@ -13,16 +13,16 @@
{% if not last_membership %}
<p>You have never been a member of ERPNext Foundation. Click on the button below to start a new membership</p>
<p><a href="/memberships?new=1" class='btn btn-primary'>Become A Member</a></p>
<p><a href="/members/setup_payment" class='btn btn-primary'>Become A Member</a></p>
{% elif frappe.utils.getdate(last_membership.to_date) < frappe.utils.getdate(frappe.utils.nowdate()) %}
<p>Your Membership has expired, Click the button below to start a new membership</p>
<p><a href="/memberships?new=1" class='btn btn-primary'>Renew</a></p>
<p><a href="/members/setup_payment" class='btn btn-primary'>Renew</a></p>
<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
{% elif frappe.utils.getdate(frappe.utils.add_days(last_membership.to_date, -30)) < frappe.utils.getdate(frappe.utils.nowdate())%}
<p>Your Membership is due to expire soon. Click on the button below to renew</p>
<p><a href="/memberships?new=1" class='btn btn-primary'>Renew</a></p>
<p><a href="/members/setup_payment" class='btn btn-primary'>Renew</a></p>
<p><a href="/memberships" class='text-muted'>View Membership History</a></p>
{% else %}

View File

@@ -0,0 +1,24 @@
{% extends "templates/web.html" %}
{% block title %}Setup Payment Method{% endblock %}
{% block page_content %}
<section>
<input type="radio" name="gender" value="USD" checked> USD <br>
<input type="radio" name="gender" value="INR" style="margin-top: 15px;"> INR <br>
</section>
<div class="section" style="margin-top:10px;"><a class="btn btn-primary next"> Next </a></div>
<script>
frappe.ready(function() {
$('.next').on('click', function() {
if($("input[type=radio]:checked").val() == 'INR'){
window.location = '/memberships?new=1'
}
else{
window.location = '/memberships-usd?new=1'
}
})
})
</script>
{% endblock %}

View File

@@ -0,0 +1,6 @@
import frappe
import foundation
def get_context(context):
if frappe.session.user != 'Guest':
context.show_sidebar = True

View File

@@ -1,5 +1,6 @@
import frappe
no_cache = 1
def get_context(context):
context.form_dict = frappe.form_dict
context.title = 'Service Providers'
@@ -60,7 +61,7 @@ def get_context(context):
introduction='Become an invidual member to list here',
route='/members'
)]
context.service_providers = [d for d in frappe.get_all('Service Provider', 'name, title, introduction, `image`, route',
dict(country=frappe.form_dict.country, show_in_website=1), order_by='name') if d.name not in individual_members]