vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2017-10-26 20:52:30 +05:30
commit d88f3e2372
3 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '9.2.1'
__version__ = '9.2.2'
__title__ = "Frappe Framework"
local = Local()

2
frappe/core/page/usage_info/usage_info.html
View file

@ -1,7 +1,7 @@
<div>
{% if limits.expiry %}
<div class="upgrade-message padding" style="border-bottom: 1px solid #d0d8dc;">
<h4>{{ __("You have {0} days left in your trial", [days_to_expiry]) }}</h4>
<h4>{{ __("You have {0} days left in your subscription", [days_to_expiry]) }}</h4>
{% if limits.upgrade_url %}
<p>Upgrade to a premium plan with more users, storage and priority support.</p>

40
frappe/public/js/frappe/list/list_sidebar.js
View file

@ -349,24 +349,32 @@ frappe.views.ListSidebar = Class.extend({
},
setup_upgrade_box: function() {
let upgrade_list = $(`<ul class="list-unstyled sidebar-menu"></ul>`).appendTo(this.sidebar);
let upgrade_box = $(`<div class="border" style="
padding: 0px 10px;
border-radius: 3px;
">
<a><i class="octicon octicon-x pull-right close" style="margin-top: 10px;"></i></a>
<h5>Go Premium</h5>
<p>Upgrade to a premium plan with more users, storage and priority support.</p>
<button class="btn btn-sm btn-default" style="margin-bottom: 10px;">Upgrade</button>
</div>`).appendTo(upgrade_list);
upgrade_box.find('.btn-primary').on('click', () => {
window.open(frappe.boot.limits.upgrade_url);
});
// Show Renew/Upgrade button,
// if account is holding one user free plan or
// if account's expiry date within range of 30 days from today's date
upgrade_box.find('.close').on('click', () => {
upgrade_list.remove();
frappe.flags.upgrade_dismissed = 1;
});
let upgrade_date = frappe.datetime.add_days(get_today(), 30);
if (frappe.boot.limits.users === 1 || upgrade_date >= frappe.boot.limits.expiry) {
let upgrade_box = $(`<div class="border" style="
padding: 0px 10px;
border-radius: 3px;
">
<a><i class="octicon octicon-x pull-right close" style="margin-top: 10px;"></i></a>
<h5>Go Premium</h5>
<p>Upgrade to a premium plan with more users, storage and priority support.</p>
<button class="btn btn-sm btn-primary" style="margin-bottom: 10px;"> Renew / Upgrade </button>
</div>`).appendTo(upgrade_list);
upgrade_box.find('.btn-primary').on('click', () => {
frappe.set_route('usage-info');
});
upgrade_box.find('.close').on('click', () => {
upgrade_list.remove();
frappe.flags.upgrade_dismissed = 1;
});
}
},
get_cat_tags:function(){
return this.cat_tags;