Merge branch 'website-wip' of github.com:webnotes/erpnext into website-wip

setup/doctype/item_group/item_group.py

@@ -18,7 +18,7 @@ class DocType(DocTypeNestedSet):
 		
 		self.validate_name_with_item()
 		
-		from website.helpers.product import invalidate_cache_for
+		from selling.utils.product import invalidate_cache_for
 		
 		if self.doc.show_in_website:
 			from webnotes.webutils import update_page_name
@@ -44,8 +44,8 @@ class DocType(DocTypeNestedSet):
 			webnotes.msgprint("An item exists with same name (%s), please change the \
 				item group name or rename the item" % self.doc.name, raise_exception=1)
 	
-	def prepare_template_args(self):
-		from website.helpers.product import get_product_list_for_group, \
+	def get_context(self):
+		from selling.utils.product import get_product_list_for_group, \
 			get_parent_item_groups, get_group_item_count
 
 		self.doc.sub_groups = webnotes.conn.sql("""select name, page_name
@@ -60,6 +60,6 @@ class DocType(DocTypeNestedSet):
 		self.doc.title = self.doc.name
 
 		if self.doc.slideshow:
-			from website.helpers.slideshow import get_slideshow
+			from website.doctype.website_slideshow.website_slideshow import get_slideshow
 			get_slideshow(self)
 		

setup/doctype/item_group/templates/generators/item_group.html

@@ -0,0 +1,42 @@
+{% extends base_template %}
+
+{% block content %}
+{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
+{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
+<div class="col-md-12">
+	{% if slideshow %}<!-- slideshow -->
+	{% include "lib/website/templates/includes/slideshow.html" %}
+	{% endif %}
+	{% if description %}<!-- description -->
+	<div>{{ description or ""}}</div>
+	{% else %}
+	<h3>{{ name }}</h3>
+	{% endif %}
+</div>
+<div class="col-md-12">
+	{% if sub_groups %}
+	<hr />
+	<div class="row">
+	{% for d in sub_groups %}
+		<div class="col-md-4">
+			<a href="{{ d.page_name }}">{{ d.name }} ({{ d.count }})</a>
+		</div>
+	{% endfor %}
+	</div>
+	<hr />
+	{% endif %}
+	{% if items %}
+	<div id="search-list" class="row">
+		{% for item in items %}
+			{{ item }}
+		{% endfor %}
+	</div>
+		{% if (items|length)==100 %}
+			<div class="alert info">Showing top 100 items.</div>
+		{% endif %}
+	{% else %}
+		<div class="alert">No items listed.</div>
+	{% endif %}
+</div>
+
+{% endblock %}

setup/doctype/item_group/templates/generators/item_group.py

@@ -0,0 +1,2 @@
+doctype = "Item Group"
+condition_field = "show_in_website"

setup/doctype/sales_partner/sales_partner.py

@@ -29,7 +29,7 @@ class DocType:
 		else:
 			return ''
 			
-	def prepare_template_args(self):
+	def get_context(self):
 		address = webnotes.conn.get_value("Address", 
 			{"sales_partner": self.doc.name, "is_primary_address": 1}, 
 			"*", as_dict=True)
@@ -42,4 +42,4 @@ class DocType:
 				"email": address.email_id,
 				"partner_address": filter_strip_join(address_rows, "\n<br>"),
 				"phone": filter_strip_join(cstr(address.phone).split(","), "\n<br>")
-			})
+			})

setup/doctype/sales_partner/templates/generators/partner.html

@@ -0,0 +1,26 @@
+{% extends base_template %}
+
+{% block content %}
+	<div class="col-md-12" itemscope itemtype="http://schema.org/Organization">
+		<div class="row">
+			<div class="col-md-4">
+				{% if logo -%}
+				<img itemprop="brand" src="{{ logo }}" class="partner-logo" 
+					alt="{{ partner_name }}" title="{{ partner_name }}" />
+				<br><br>
+				{%- endif %}
+				<address>
+					{% if partner_website -%}<p><a href="{{ partner_website }}" 
+						target="_blank">{{ partner_website }}</a></p>{%- endif %}
+					{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %}
+					{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %}
+					{% if email -%}<p itemprop="email"><span class="icon-envelope"></span> {{ email }}</p>{%- endif %}
+				</address>
+			</div>
+			<div class="col-md-8">
+				<h3 itemprop="name" style="margin-top: 0px;">{{ partner_name }}</h3>
+				<p>{{ description }}</p>
+			</div>
+		</div>
+	</div>
+{% endblock %}

setup/doctype/sales_partner/templates/generators/partner.py

@@ -0,0 +1,2 @@
+doctype = "Sales Partner"
+condition_field = "show_in_website"

setup/doctype/sales_partner/templates/pages/partners.html

@@ -0,0 +1,30 @@
+{% extends base_template %}
+
+{% set title="Partners" %}
+
+{% block content %}
+	<div class="col-md-12">
+		<h2 id="blog-title">{{ title }}</h2>
+		<hr>
+		{% for partner_info in partners %}
+		<div class="row">
+			<div class="col-md-3">
+				{% if partner_info.logo -%}
+				<a href="{{ partner_info.page_name }}">
+					<img itemprop="brand" src="{{ partner_info.logo }}" class="partner-logo" 
+						alt="{{ partner_info.partner_name }}" title="{{ partner_info.partner_name }}" />
+				</a>
+				{%- endif %}
+			</div>
+			<div class="col-md-9">
+				<a href="{{ partner_info.page_name }}">
+					<h4>{{ partner_info.partner_name }}</h4>
+				</a>
+				<p style="color: #999">{{ partner_info.territory }} - {{ partner_info.partner_type }}</p>
+				<p>{{ partner_info.introduction }}</p>
+			</div>
+		</div>
+		<hr>
+		{% endfor %}
+	</div>
+{% endblock %}

setup/doctype/sales_partner/templates/pages/partners.py

@@ -0,0 +1,7 @@
+import webnotes
+
+def get_context():
+	return {
+		"partners": webnotes.conn.sql("""select * from `tabSales Partner`
+			where show_in_website=1 order by name asc""", as_dict=True),
+	}