Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements in product page and its listing

Browse Source 
Login page rendered via a template
This commit is contained in:
Anand Doshi 2012-07-09 15:56:12 +05:30
parent 1731786a61
commit e47def842d
17 changed files with 540 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.json
View File

@ -23,7 +23,4 @@
"public/js/complete_setup.js": [ "public/js/complete_setup.js": [
"erpnext/startup/js/complete_setup.js", "erpnext/startup/js/complete_setup.js",
], ],
"public/js/product_category.js": [
"erpnext/website/js/product_category.js",
],
} }

6
erpnext/patches/june_2012/cms2.py
View File

@ -18,6 +18,12 @@ def cleanup():
delete from `tabPage` delete from `tabPage`
where module='Website' and ifnull(web_page, 'No') = 'Yes'""") where module='Website' and ifnull(web_page, 'No') = 'Yes'""")
# change show_in_website value in item table to 0 or 1
webnotes.conn.sql("""\
update `tabItem`
set show_in_website = if(show_in_website = 'Yes', 1, 0)
where show_in_website is not null""")
def save_pages(): def save_pages():
"""save all web pages, blogs to create content""" """save all web pages, blogs to create content"""
import webnotes import webnotes

15
erpnext/stock/doctype/item/item.js
View File

@ -29,8 +29,23 @@ cur_frm.cscript.refresh = function(doc) {
} }
$c_obj(make_doclist(doc.doctype, doc.name),'check_if_sle_exists','',callback); $c_obj(make_doclist(doc.doctype, doc.name),'check_if_sle_exists','',callback);
} }
cur_frm.cscript.hide_website_fields(doc);
} }
cur_frm.cscript.hide_website_fields = function(doc) {
var website_fields_list = ['page_name', 'website_image', 'web_short_description',
'web_long_description']
if (cint(doc.show_in_website)) {
unhide_field(website_fields_list);
} else {
hide_field(website_fields_list);
}
}
cur_frm.cscript.show_in_website = function(doc, dt, dn) {
cur_frm.cscript.hide_website_fields(doc);
}
cur_frm.fields_dict['default_bom'].get_query = function(doc) { cur_frm.fields_dict['default_bom'].get_query = function(doc) {
//var d = locals[this.doctype][this.docname]; //var d = locals[this.doctype][this.docname];

45
erpnext/stock/doctype/item/item.py
View File

@ -225,37 +225,6 @@ Total Available Qty: %s
def on_rename(self,newdn,olddn): def on_rename(self,newdn,olddn):
sql("update tabItem set item_code = %s where name = %s", (newdn, olddn)) sql("update tabItem set item_code = %s where name = %s", (newdn, olddn))
# def make_page(self):
# if self.doc.show_in_website=='Yes':
#
# import website.utils
#
# if self.doc.page_name:
# import webnotes.model
# webnotes.model.delete_doc('Page', self.doc.page_name)
#
# p = website.utils.add_page("Product " + self.doc.item_name)
# self.doc.page_name = p.name
#
# from jinja2 import Template
# import markdown2
# import os
#
#
# self.doc.long_description_html = markdown2.markdown(self.doc.description or '')
#
# with open(os.path.join(os.path.dirname(__file__), 'template.html'), 'r') as f:
# p.content = Template(f.read()).render(doc=self.doc)
#
# with open(os.path.join(os.path.dirname(__file__), 'product_page.js'), 'r') as f:
# p.script = Template(f.read()).render(doc=self.doc)
#
# p.save()
#
# website.utils.add_guest_access_to_page(p.name)
#
# del self.doc.fields['long_description_html']
#
def clear_web_cache(self): def clear_web_cache(self):
import website.web_cache import website.web_cache
@ -263,14 +232,22 @@ Total Available Qty: %s
self.doc.page_name != self.old_page_name: self.doc.page_name != self.old_page_name:
website.web_cache.delete_web_cache(self.old_page_name) website.web_cache.delete_web_cache(self.old_page_name)
if self.doc.show_in_website == 'Yes': if self.doc.show_in_website:
website.web_cache.clear_web_cache(self.doc.doctype, self.doc.name, self.doc.page_name) website.web_cache.clear_web_cache(self.doc.doctype, self.doc.name, self.doc.page_name)
else: else:
website.web_cache.delete_web_cache(self.doc.page_name) website.web_cache.delete_web_cache(self.doc.page_name)
def update_page_name(self): def update_page_name(self):
import website.utils import website.utils
self.doc.page_name = website.utils.page_name(self.doc.name + " " + self.doc.item_name)
# if same name, do not repeat twice
if self.doc.name == self.doc.item_name:
page_name = self.doc.name
else:
page_name = self.doc.name + " " + self.doc.item_name
self.doc.page_name = website.utils.page_name(page_name)
webnotes.conn.set_value('Item', self.doc.name, 'page_name', self.doc.page_name) webnotes.conn.set_value('Item', self.doc.name, 'page_name', self.doc.page_name)
# no need to check for uniqueness, as name is unique # no need to check for uniqueness, as name is unique
@ -279,5 +256,3 @@ Total Available Qty: %s
import markdown2 import markdown2
self.doc.web_description_html = markdown2.markdown(self.doc.description or '', self.doc.web_description_html = markdown2.markdown(self.doc.description or '',
extras=["wiki-tables"]) extras=["wiki-tables"])

227
erpnext/stock/doctype/item/item.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-04-30 18:33:53', 'creation': '2012-06-08 12:54:51',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-06-07 16:16:24', 'modified': '2012-07-04 11:10:29',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -57,73 +57,6 @@
'name': u'Item' 'name': u'Item'
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Material Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Material Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Material User',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Material User',
'submit': 0,
'write': 0
},
# DocPerm
{
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Material Master Manager',
'write': 1
},
# DocPerm
{
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Material Master Manager',
'write': 0
},
# DocPerm # DocPerm
{ {
'cancel': 1, 'cancel': 1,
@ -134,6 +67,25 @@
'write': 1 'write': 1
}, },
# DocPerm
{
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Material Master Manager',
'write': 0
},
# DocPerm
{
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Material Master Manager',
'write': 1
},
# DocPerm # DocPerm
{ {
'doctype': u'DocPerm', 'doctype': u'DocPerm',
@ -141,6 +93,54 @@
'role': u'System Manager' 'role': u'System Manager'
}, },
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Material Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Material Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Material User',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Material User',
'submit': 0,
'write': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -731,26 +731,6 @@
'reqd': 1 'reqd': 1
}, },
# DocField
{
'doctype': u'DocField',
'fieldname': u'show_in_website',
'fieldtype': u'Select',
'label': u'Show in Website',
'options': u'No\nYes',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'website_image',
'fieldtype': u'Select',
'label': u'website_image',
'options': u'attach_files:',
'permlevel': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -794,17 +774,6 @@
'permlevel': 0 'permlevel': 0
}, },
# DocField
{
'colour': u'White:FFF',
'description': u'website page link',
'doctype': u'DocField',
'fieldname': u'page_name',
'fieldtype': u'Data',
'label': u'Page Name',
'permlevel': 1
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -994,5 +963,63 @@
'no_copy': 1, 'no_copy': 1,
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'website_section',
'fieldtype': u'Section Break',
'label': u'Website',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'show_in_website',
'fieldtype': u'Check',
'label': u'Show in Website',
'permlevel': 0
},
# DocField
{
'colour': u'White:FFF',
'description': u'website page link',
'doctype': u'DocField',
'fieldname': u'page_name',
'fieldtype': u'Data',
'label': u'Page Name',
'permlevel': 1
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'website_image',
'fieldtype': u'Select',
'label': u'Image',
'options': u'attach_files:',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'web_short_description',
'fieldtype': u'Text',
'label': u'Short Description',
'permlevel': 0
},
# DocField
{
'doctype': u'DocField',
'fieldname': u'web_long_description',
'fieldtype': u'Code',
'label': u'Long Description',
'options': u'Markdown',
'permlevel': 0
} }
] ]

63
erpnext/stock/doctype/item/product_page.js
View File

@ -1,63 +0,0 @@
// ERPNext - web based ERP (http://erpnext.com)
// Copyright (C) 2012 Web Notes Technologies Pvt Ltd
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
wn.require('erpnext/website/js/product_category.js');
pscript["onload_{{ doc.page_name }}"] = function(wrapper) {
wrapper.product_group = "{{ doc.item_group }}";
wrapper.product_name = "{{ doc.name }}";
erpnext.make_product_categories(wrapper);
$(wrapper).find('.product-inquiry').click(function() {
loadpage('contact', function() {
$('#content-contact-us [name="contact-message"]').val("Hello,\n\n\
Please send me more information on {{ doc.title }} (Item Code:{{ doc.item }})\n\n\
My contact details are:\n\nThank you!\
");
})
});
// similar products
wrapper.similar = new wn.ui.Listing({
parent: $(wrapper).find('.similar-products').get(0),
hide_refresh: true,
page_length: 5,
get_query: function() {
args = {
cat: wrapper.product_group,
name: wrapper.product_name
};
return repl('select t1.name, t1.title, t1.thumbnail_image, \
t1.page_name, t1.short_description \
from tabProduct t1, tabItem t2 \
where t1.item = t2.name \
and ifnull(t1.published,0)=1 \
and t1.name != "%(name)s" \
and t2.item_group="%(cat)s" order by t1.modified desc', args)
},
render_row: function(parent, data) {
if(data.short_description.length > 100) {
data.short_description = data.short_description.substr(0,100) + '...';
}
parent.innerHTML = repl('<div style="float:left; width: 60px;">\
<img src="files/%(thumbnail_image)s" style="width:55px;"></div>\
<div style="float:left; width: 180px">\
<b><a href="#!%(page_name)s">%(title)s</a></b>\
<p>%(short_description)s</p></div>\
<div style="clear: both; margin-bottom: 15px;"></div>', data);
}
});
wrapper.similar.run();
}

25
erpnext/stock/doctype/item/template.html
View File

@ -1,25 +0,0 @@
<div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="content-product-{{ doc.name }}">
<div class="layout-main-section">
<h1>{{ doc.item_name }}</h1>
<div style="float: left;">
<br><br>
<image src="files/{{ doc.website_image }}" style="width: 300px;
margin-left: 15px;" />
<br><br>
{{ doc.long_description_html }}
<button class="btn primary product-inquiry"
data-product="{{ doc.name }}"
data-description="{{ doc.short_description }}">Send Inquiry</button>
</div>
</div>
<div class="layout-side-section">
<h4>More Categories</h4>
<div class="more-categories"></div>
<br>
<h4>Similar Products</h4>
<div class="similar-products"></div>
</div>
<div style="clear: both"></div>
</div>
</div>

97
erpnext/website/product.py Normal file
View File

@ -0,0 +1,97 @@
import webnotes
@webnotes.whitelist(allow_guest=True)
def get_product_list(args=None):
"""
args = {
'limit_start': 0,
'limit_page_length': 20,
'search': '',
'product_group': '',
}
"""
import webnotes
from webnotes.utils import cstr, cint
if not args: args = webnotes.form_dict
# dict to be passed to sql function
query_args = {
'limit_start': cint(args.get('limit_start')),
'limit_page_length': cint(args.get('limit_page_length'))
}
# base query
query = """\
select name, item_name, page_name, website_image,
description, web_short_description
from `tabItem`
where is_sales_item = 'Yes'
and docstatus = 0
and show_in_website = 1"""
# search term condition
if args.get('search'):
query += """
and (
web_short_description like %(search)s or
web_long_description like %(search)s or
description like %(search)s or
item_name like %(search)s or
name like %(search)s
)"""
query_args['search'] = "%" + cstr(args.get('search')) + "%"
# product group condition
if args.get('product_group') and args.get('product_group') != 'All Products':
query += """
and item_group = %(product_group)s"""
query_args['product_group'] = args.get('product_group')
# order by
query += """
order by item_name asc, name asc"""
if args.get('limit_page_length'):
query += """
limit %(limit_start)s, %(limit_page_length)s"""
return webnotes.conn.sql(query, query_args, as_dict=1)
@webnotes.whitelist(allow_guest=True)
def get_product_category_list():
import webnotes
result = webnotes.conn.sql("""\
select count(name) as items, item_group
from `tabItem`
where is_sales_item = 'Yes'
and docstatus = 0
and show_in_website = 1
group by item_group
order by items desc""", as_dict=1)
# add All Products link
total_count = sum((r.get('items') or 0 for r in result))
result = [{'items': total_count, 'item_group': 'All Products'}] + (result or [])
return result
@webnotes.whitelist(allow_guest=True)
def get_similar_product_list(args=None):
import webnotes
if not args: args = webnotes.form_dict
result = webnotes.conn.sql("""\
select name, item_name, page_name, website_image,
description, web_short_description
from `tabItem`
where is_sales_item = 'Yes'
and docstatus = 0
and show_in_website = 1
and name != %(product_name)s
and item_group = %(product_group)s
order by item_name""", args, as_dict=1)
return result

53
erpnext/website/templates/login/login.html Normal file
View File

@ -0,0 +1,53 @@
{% extends "login/login.js" %}
{% block css %}
<style>
#login_wrapper {
width: 300px !important;
margin: 20px auto;
}
.login-banner {
margin-bottom: 20px;
}
</style>
{% endblock %}
{% block content %}
<div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'>
<div class="appframe-area"></div>
<div class="layout-main" style="padding: 15px;">
<form autocomplete="on">
<table border="0" cellspacing="8">
<tbody>
<tr>
<td>Login Id</td>
<td><input id="login_id" type="text" style="width: 180px"/></td>
</tr>
<tr>
<td>Password</td>
<td><input id="password" type="password" style="width: 180px" /></td>
</tr>
<tr>
<td style="text-align:right"><input id="remember_me" type="checkbox" /></td>
<td>Remember Me</td>
</tr>
<tr>
<td>&nbsp;</td>
<td id="login_message">&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<button type="submit" id="login_btn" class="btn btn-small btn-primary">Login</button>
</td>
</tr>
</tbody>
</table>
</form>
<p style="margin-left: 72px;"><span class="link_type"
onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
</div>
</div>
{% endblock %}

103
erpnext/website/templates/login/login.js Normal file
View File

@ -0,0 +1,103 @@
{% extends "page.html" %}
{% block javascript %}
{{ super() }}
// Copyright (c) 2012 Web Notes Technologies Pvt Ltd (http://erpnext.com)
//
// MIT License (MIT)
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
wn.provide('erpnext.login');
wn.pages["{{ name }}"].onload = function(wrapper) {
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area'));
wrapper.appframe.title('Login');
wrapper.appframe.$w.find('.close').toggle(false);
var lw = $i('login_wrapper');
$bs(lw, '1px 1px 3px #888');
$('#login_btn').click(erpnext.login.doLogin)
$('#password').keypress(function(ev){
if(ev.which==13 && $('#password').val()) {
$('form').submit(function() {
erpnext.login.doLogin();
return false;
});
}
});
$(document).trigger('login_rendered');
}
// Login Callback
erpnext.login.onLoginReply = function(r, rtext) {
$('#login_btn').done_working();
if(r.message=="Logged In"){
window.location.href='app.html' + (get_url_arg('page') ? ('?page='+get_url_arg('page')) : '');
} else {
$i('login_message').innerHTML = '<span style="color: RED;">'+(r.message)+'</span>';
//if(r.exc)alert(r.exc);
}
}
// Login
erpnext.login.doLogin = function(){
var args = {};
args['usr']=$i("login_id").value;
args['pwd']=$i("password").value;
if($i('remember_me').checked)
args['remember_me'] = 1;
$('#login_btn').set_working();
$c("login", args, erpnext.login.onLoginReply);
return false;
}
erpnext.login.show_forgot_password = function(){
// create dialog
var d = new wn.ui.Dialog({
title:"Forgot Password",
fields: [
{'label':'Email Id', 'fieldname':'email_id', 'fieldtype':'Data', 'reqd':true},
{'label':'Email Me A New Password', 'fieldname':'run', 'fieldtype':'Button'}
]
});
$(d.fields_dict.run.input).click(function() {
var values = d.get_values();
if(!values) return;
wn.call({
method:'reset_password',
args: { user: values.email_id },
callback: function() {
d.hide();
}
})
})
d.show();
}
{% endblock %}

60
erpnext/website/templates/product/product.html
View File

@ -1,23 +1,30 @@
{% extends "product/product.js" %} {% extends "product/product.js" %}
{% block title %}{{ item_name }} [{{ name }}]{% endblock %} {% block title %}
{% if item_name != name %}
{{ item_name }} [{{ name }}]
{% else %}
{{ item_name }}
{% endif %}
{% endblock %}
{% block content %} {% block content %}
<div class="layout-wrapper layout-wrapper-background"> <div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="content-product-{{ name }}"> <div class="web-content" id="content-product-{{ name }}">
<div class="layout-main-section"> <div class="layout-main-section">
<h1>{{ item_name }}</h1> <h1>{{ item_name }}</h1>
<div style="float: left;"> <div class="product-page-content">
<br><br> <br><br>
{% if website_image %} {% if website_image %}
<image src="files/{{ website_image }}" style="width: 300px; <image src="files/{{ website_image }}" />
margin-left: 15px;" /> {% else %}
<br><br> <div class="img-area"></div>
<span style="font-size: 11px">This is an auto-generated Image</span>
{% endif %} {% endif %}
<br><br>
<div class="web-long-description">
{{ web_description_html }} {{ web_description_html }}
<button class="btn primary product-inquiry" </div>
data-product="{{ name }}"
data-description="{{ description }}">Send Inquiry</button>
</div> </div>
</div> </div>
<div class="layout-side-section"> <div class="layout-side-section">
@ -31,3 +38,40 @@
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block css %}
<style>
.web-long-description {
font-size: 18px;
line-height: 200%;
}
.product-page-content {
float: left;
}
/* product page image css */
.product-page-content img {
max-width: 100%;
}
/* similar products listing */
.similar-products .img-area img {
max-width: 55px;
max-height: 55px;
}
.similar-products .img-area {
float: left;
width: 30%;
margin-top: 0.3em;
}
.similar-product-description {
float: left;
width: 70%;
}
.similar-product-description span {
font-size: 12px;
}
</style>
{% endblock %}

70
erpnext/website/templates/product/product.js
View File

@ -22,52 +22,60 @@ wn.pages['{{ name }}'].onload = function(wrapper) {
wrapper.product_group = "{{ item_group }}"; wrapper.product_group = "{{ item_group }}";
wrapper.product_name = "{{ name }}"; wrapper.product_name = "{{ name }}";
erpnext.products.make_product_categories(wrapper); erpnext.products.make_product_categories(wrapper);
erpnext.products.make_similar_products(wrapper);
// if website image missing, autogenerate one
var $img = $('.product-page-content').find('.img-area');
if ($img && $img.length > 0) {
$img.append(wn.dom.placeholder(160, "{{ item_name }}"));
}
// TODO make this working // adjust page height based on sidebar height
$(wrapper).find('.product-inquiry').click(function() { var $main_page = $('.layout-main-section');
loadpage('contact', function() { var $sidebar = $('.layout-side-section');
$('#content-contact-us [name="contact-message"]').val("Hello,\n\n\ if ($sidebar.height() > $main_page.height()) {
Please send me more information on {{ item_name }} (Item Code:{{ name }})\n\n\ $main_page.height($sidebar.height());
My contact details are:\n\nThank you!\ }
");
}) }
});
erpnext.products.make_similar_products = function(wrapper) {
if (!wrapper) { wrapper = erpnext.products.wrapper; }
if (!wrapper) { return; }
// similar products // similar products
wrapper.similar = new wn.ui.Listing({ wrapper.similar = new wn.ui.Listing({
parent: $(wrapper).find('.similar-products').get(0), parent: $(wrapper).find('.similar-products').get(0),
hide_refresh: true, hide_refresh: true,
page_length: 5, page_length: 5,
get_query: function() { method: 'website.product.get_similar_product_list',
args = { get_args: function() {
cat: wrapper.product_group, return {
name: wrapper.product_name product_group: wrapper.product_group,
}; product_name: wrapper.product_name
var query = repl('select name, item_name, website_image, \ }
page_name, description \
from tabItem \
where is_sales_item="Yes" \
and ifnull(show_in_website, "No")="Yes" \
and name != "%(name)s" and docstatus = 0 \
and item_group="%(cat)s" order by modified desc', args)
return query
}, },
render_row: function(parent, data) { render_row: function(parent, data) {
if(data.description.length > 100) { if (!data.web_short_description) {
data.description = data.description.substr(0,100) + '...'; data.web_short_description = data.description;
}
if(data.web_short_description.length > 100) {
data.web_short_description =
data.web_short_description.substr(0,100) + '...';
} }
parent.innerHTML = repl('\ parent.innerHTML = repl('\
<div style="float:left; width: 60px; padding-bottom: 5px" class="img-area"></div>\ <a href="%(page_name)s.html"><div class="img-area"></div></a>\
<div style="float:left; width: 180px">\ <div class="similar-product-description">\
<b><a href="%(page_name)s.html">%(item_name)s</a></b>\ <h5><a href="%(page_name)s.html">%(item_name)s</a></h5>\
<p>%(description)s</p></div>\ <span>%(web_short_description)s</span>\
<div style="clear: both; margin-bottom: 15px;"></div>', data); </div>\
<div style="clear:both"></div>', data);
if(data.website_image) { if(data.website_image) {
$(parent).find('.img-area').append(repl( $(parent).find('.img-area').append(repl(
'<img src="files/%(website_image)s" style="width:55px;">', data)) '<img src="files/%(website_image)s" />', data))
} else { } else {
$(parent).find('.img-area').append(wn.dom.placeholder(50, $(parent).find('.img-area').append(wn.dom.placeholder(55,
data.item_name)); data.item_name));
} }
} }

7
erpnext/website/templates/product/product_category.js
View File

@ -8,12 +8,7 @@ erpnext.products.make_product_categories = function(wrapper) {
wrapper.category_list = new wn.ui.Listing({ wrapper.category_list = new wn.ui.Listing({
parent: $(wrapper).find('.more-categories').get(0), parent: $(wrapper).find('.more-categories').get(0),
query: 'select count(name) as items, item_group \ method: 'website.product.get_product_category_list',
from tabItem \
where is_sales_item="Yes" and \
ifnull(show_in_website, "No")="Yes" and \
docstatus = 0 \
group by item_group order by items desc',
hide_refresh: true, hide_refresh: true,
render_row: function(parent, data) { render_row: function(parent, data) {
parent.innerHTML = repl( parent.innerHTML = repl(

27
erpnext/website/templates/product/product_list.html
View File

@ -2,17 +2,6 @@
{% block title %}Products{% endblock %} {% block title %}Products{% endblock %}
{% block css %}
<style>
h3 > a, h3 > a:link, h3 > a:visited, h3 > a:active,
h3 > a:hover, h3 > a:focus {
text-decoration: none;
color: inherit;
}
</style>
{% endblock %}
{% block content %} {% block content %}
<div class="layout-wrapper layout-wrapper-background"> <div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="content-products"> <div class="web-content" id="content-products">
@ -29,10 +18,24 @@
</div> </div>
<div class="layout-side-section"> <div class="layout-side-section">
<h3><a href="products.html">Categories</a></h3> <h3>Categories</h3>
<div class="more-categories"></div> <div class="more-categories"></div>
</div> </div>
<div style="clear: both"></div> <div style="clear: both"></div>
</div> </div>
</div> </div>
{% endblock %}
{% block css %}
<style>
.img-area {
float:left;
width: 115px;
}
.product-list-description {
float:left;
width: 400px;
}
</style>
{% endblock %} {% endblock %}

34
erpnext/website/templates/product/product_list.js
View File

@ -31,8 +31,6 @@ wn.pages['{{ name }}'].onload = function(wrapper) {
// make lists // make lists
erpnext.products.make_product_list(wrapper); erpnext.products.make_product_list(wrapper);
// erpnext.products.product_list.run();
// bind search button or enter key // bind search button or enter key
$(wrapper).find('.products-search .btn').click(function() { $(wrapper).find('.products-search .btn').click(function() {
erpnext.products.product_list.run(); erpnext.products.product_list.run();
@ -51,30 +49,22 @@ erpnext.products.make_product_list = function(wrapper) {
parent: $(wrapper).find('#products-list').get(0), parent: $(wrapper).find('#products-list').get(0),
run_btn: $(wrapper).find('.products-search .btn').get(0), run_btn: $(wrapper).find('.products-search .btn').get(0),
no_toolbar: true, no_toolbar: true,
get_query: function() { method: 'website.product.get_product_list',
var srch = $('input[name="products-search"]').val() get_args: function() {
var search_cond = 'and (description like "%%(srch)s%"\ return {
or item_name like "%%(srch)s%")'; search: $('input[name="products-search"]').val() || '',
var product_group_cond = 'and item_group="%(group)s"'; product_group: erpnext.products.cur_group || '',
var cur_group = erpnext.products.cur_group
args = {
search_cond: srch ? repl(search_cond, {srch:srch}) : '',
cat: cur_group ? repl(product_group_cond, {group: cur_group}) : '',
}; };
return repl('select name, item_name, website_image, \
description, page_name \
from tabItem \
where is_sales_item="Yes" \
%(cat)s \
and docstatus = 0 and ifnull(show_in_website, "No")="Yes"\
%(search_cond)s', args)
}, },
render_row: function(parent, data) { render_row: function(parent, data) {
if (!data.web_short_description) {
data.web_short_description = data.description;
}
parent.innerHTML = repl('\ parent.innerHTML = repl('\
<div style="float:left; width: 115px;" class="img-area"></div>\ <a href="%(page_name)s.html"><div class="img-area"></div></a>\
<div style="float:left; width: 400px">\ <div class="product-list-description">\
<p><b><a href="%(page_name)s.html">%(item_name)s</a></b></p>\ <h4><a href="%(page_name)s.html">%(item_name)s</a></h4>\
<p>%(description)s</p></div>\ <p>%(web_short_description)s</p></div>\
<div style="clear: both;"></div>', data); <div style="clear: both;"></div>', data);
if(data.website_image) { if(data.website_image) {

17
erpnext/website/web_cache.py
View File

@ -32,7 +32,8 @@ def load_from_web_cache(page_name, comments, template): #, script=None):
where name = %s""", page_name) where name = %s""", page_name)
# if page doesn't exist, raise exception # if page doesn't exist, raise exception
if not res and page_name not in ['404', 'index', 'blog', 'products']: page_exception_list = ['404', 'index', 'blog', 'products', 'login-page']
if not res and page_name not in page_exception_list:
raise Exception, "Page %s not found" % page_name raise Exception, "Page %s not found" % page_name
html, doc_type, doc_name = res and res[0] or (None, None, None) html, doc_type, doc_name = res and res[0] or (None, None, None)
@ -55,7 +56,7 @@ def load_into_web_cache(page_name, template, doc_type, doc_name):
import webnotes import webnotes
outer_env_dict = get_outer_env() outer_env_dict = get_outer_env()
if page_name in ['404', 'blog', 'products']: if page_name in ['404', 'blog', 'products', 'login-page']:
args = outer_env_dict args = outer_env_dict
args.update({ args.update({
'name': page_name, 'name': page_name,
@ -80,12 +81,14 @@ def load_into_web_cache(page_name, template, doc_type, doc_name):
args.update({ 'insert_code': 1 }) args.update({ 'insert_code': 1 })
elif doc_type == 'Web Page': elif doc_type == 'Web Page':
template = 'web_page.html' template = 'web_page.html'
elif page_name == 'blog': else:
template = 'blog/blog_list.html'
args.update({ 'insert_code': 1 })
elif page_name == 'products':
template = 'product/product_list.html'
args.update({ 'insert_code': 1 }) args.update({ 'insert_code': 1 })
if page_name == 'blog':
template = 'blog/blog_list.html'
elif page_name == 'products':
template = 'product/product_list.html'
elif page_name == 'login-page':
template = 'login/login.html'
html = build_html(args, template) html = build_html(args, template)

10
public/js/product_category.js
View File

@ -1,10 +0,0 @@
/*
* erpnext/website/js/product_category.js
*/
erpnext.make_product_categories=function(wrapper){wrapper.category_list=new wn.ui.Listing({parent:$(wrapper).find('.more-categories').get(0),query:'select count(name) as items, item_group \
from tabItem \
where is_sales_item="Yes" and \
ifnull(show_in_website, "No")="Yes" and \
docstatus = 0 \
group by item_group order by items desc',hide_refresh:true,render_row:function(parent,data){parent.innerHTML=repl('<a href="#!products/%(item_group)s">%(item_group)s</a> (%(items)s)',data);}});wrapper.category_list.run();console.log('product categories made');}