-
+
@@ -8,4 +8,5 @@
+
\ No newline at end of file
diff --git a/erpnext/website/page/products/products.js b/erpnext/website/page/products/products.js
index 993397dd387..0e7dec501b7 100644
--- a/erpnext/website/page/products/products.js
+++ b/erpnext/website/page/products/products.js
@@ -1,11 +1,84 @@
erpnext.products = {}
+wn.require('erpnext/website/js/product_category.js');
+
pscript.onload_products = function(wrapper) {
+ sys_defaults.default_product_category = JSON.parse(sys_defaults.default_product_category);
+ erpnext.products.wrapper = wrapper;
+
+ // make lists
+ erpnext.make_product_categories(wrapper);
+ erpnext.products.make_product_list(wrapper);
+
+ // button
+ $(wrapper).find('.products-search .btn').click(function() {
+ wrapper.mainlist.run();
+ });
+
+ $(wrapper).find('.products-search input').keypress(function(ev) {
+ if(ev.which==13) $(wrapper).find('.products-search .btn').click();
+ });
+}
+
+pscript.onshow_products = function(wrapper) {
+ // show default product category
+ erpnext.products.set_group();
+}
+
+erpnext.products.get_group = function() {
+ var route = window.location.hash.split('/');
+ if(route.length>1) {
+ // from url
+ var grp = erpnext.product_item_group[route[1]];
+ var label = route[1];
+ } else {
+ // default
+ var grp = sys_defaults.default_product_category.item_group;
+ var label = sys_defaults.default_product_category.label;
+ }
+ erpnext.products.cur_group = grp;
+ return {grp:grp, label:label};
+}
+
+erpnext.products.make_product_list = function(wrapper) {
+ wrapper.mainlist = new wn.widgets.Listing({
+ parent: $(wrapper).find('.web-main-section').get(0),
+ run_btn: $(wrapper).find('.products-search .btn').get(0),
+ hide_refresh: true,
+ get_query: function() {
+ args = {
+ searchstr: $('input[name="products-search"]').val() || '',
+ cat: erpnext.products.cur_group
+ };
+ 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 t2.item_group="%(cat)s" \
+ and t1.short_description like "%%(searchstr)s%"', args)
+ },
+ render_row: function(parent, data) {
+ parent.innerHTML = repl('ERPNext
-
Categories
\
+ s)
\
+ \
+ %(title)s\
+
\
+ ', data);
+ }
+ });
+
+}
+
+erpnext.products.set_group = function() {
+ var cat = erpnext.products.get_group();
+ if(!cat.grp) {
+ // still nothing
+ setTimeout('erpnext.products.set_group()', 1000);
+ return;
+ }
// get erpnext.products.default_category
+ var wrapper = erpnext.products.wrapper;
- // make search box
-
- // make main listing based on default category
-
- // make sidelisting of categories
+ $(wrapper).find('h1').html(cat.label);
+ wrapper.mainlist.run();
}
\ No newline at end of file
diff --git a/erpnext/website/utils.py b/erpnext/website/utils.py
index e1802cb64ff..330f7a39a47 100644
--- a/erpnext/website/utils.py
+++ b/erpnext/website/utils.py
@@ -1,14 +1,53 @@
+import webnotes
+from webnotes.model.doc import Document
+
def make_template(doc, path, convert_fields = ['main_section', 'side_section']):
"""make template"""
- import os, jinja2, markdown2
+ import os, jinja2
- # markdown
- for f in convert_fields:
- doc.fields[f + '_html'] = markdown2.markdown(doc.fields[f] or '', \
- extras=["wiki-tables"])
+ markdown(doc, convert_fields)
# write template
with open(path, 'r') as f:
temp = jinja2.Template(f.read())
- return temp.render(doc = doc.fields)
\ No newline at end of file
+ return temp.render(doc = doc.fields)
+
+def markdown(doc, fields):
+ """convert fields to markdown"""
+ import markdown2
+ # markdown
+ for f in fields:
+ doc.fields[f + '_html'] = markdown2.markdown(doc.fields[f] or '', \
+ extras=["wiki-tables"])
+
+
+def page_name(title):
+ """make page name from title, and check that there is no duplicate"""
+ import re
+ name = re.sub('[~!@#$%^&*()<>,."\']', '', title.lower())
+ return '-'.join(name.split()[:4])
+
+def add_page(title):
+ """add a custom page with title"""
+ name = page_name(title)
+ if webnotes.conn.sql("""select name from tabPage where name=%s""", name):
+ p = Document('Page', name)
+ else:
+ p = Document('Page')
+
+ p.title = title
+ p.name = p.page_name = name
+ p.module = 'Website'
+ p.standard = 'No'
+
+ return p
+
+def add_guest_access_to_page(page):
+ """add Guest in Page Role"""
+ if not webnotes.conn.sql("""select parent from `tabPage Role`
+ where role='Guest' and parent=%s""", page):
+ d = Document('Page Role')
+ d.parent = page
+ d.role = 'Guest'
+ d.save()
\ No newline at end of file
diff --git a/index.html b/index.html
index d758f2f602b..a75f24af93c 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
%(short_description)s