diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py
index 5c38cc1a78..2cbd65e744 100644
--- a/support/doctype/support_ticket/support_ticket.py
+++ b/support/doctype/support_ticket/support_ticket.py
@@ -72,18 +72,4 @@ class DocType(TransactionBase):
def set_status(name, status):
st = webnotes.bean("Support Ticket", name)
st.doc.status = status
- st.save()
-
-def get_website_args():
- bean = webnotes.bean("Support Ticket", webnotes.form_dict.name)
- if bean.doc.raised_by != webnotes.session.user:
- return {
- "doc": {"name": "Not Allowed"}
- }
- else:
- return {
- "doc": bean.doc,
- "doclist": bean.doclist,
- "webnotes": webnotes,
- "utils": webnotes.utils
- }
+ st.save()
\ No newline at end of file
diff --git a/support/doctype/support_ticket/templates/__init__.py b/support/doctype/support_ticket/templates/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/support/doctype/support_ticket/templates/pages/__init__.py b/support/doctype/support_ticket/templates/pages/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/support/doctype/support_ticket/templates/ticket.html b/support/doctype/support_ticket/templates/pages/ticket.html
similarity index 97%
rename from support/doctype/support_ticket/templates/ticket.html
rename to support/doctype/support_ticket/templates/pages/ticket.html
index 6622ed1589..1cfab9b00f 100644
--- a/support/doctype/support_ticket/templates/ticket.html
+++ b/support/doctype/support_ticket/templates/pages/ticket.html
@@ -1,4 +1,4 @@
-{% extends "app/website/templates/html/page.html" %}
+{% extends base_template %}
{% set title=doc.name %}
diff --git a/support/doctype/support_ticket/templates/pages/ticket.py b/support/doctype/support_ticket/templates/pages/ticket.py
new file mode 100644
index 0000000000..2227a6a5cb
--- /dev/null
+++ b/support/doctype/support_ticket/templates/pages/ticket.py
@@ -0,0 +1,19 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import webnotes
+
+def get_context():
+ bean = webnotes.bean("Support Ticket", webnotes.form_dict.name)
+ if bean.doc.raised_by != webnotes.session.user:
+ return {
+ "doc": {"name": "Not Allowed"}
+ }
+ else:
+ return {
+ "doc": bean.doc,
+ "doclist": bean.doclist,
+ "webnotes": webnotes,
+ "utils": webnotes.utils
+ }
diff --git a/support/doctype/support_ticket/templates/pages/tickets.html b/support/doctype/support_ticket/templates/pages/tickets.html
new file mode 100644
index 0000000000..d3e316c5de
--- /dev/null
+++ b/support/doctype/support_ticket/templates/pages/tickets.html
@@ -0,0 +1,33 @@
+{% extends "app/portal/templates/includes/transactions.html" %}
+
+{% block javascript -%}
+{{ super() }}
+
+
+{%- endblock %}
\ No newline at end of file
diff --git a/support/doctype/support_ticket/templates/pages/tickets.py b/support/doctype/support_ticket/templates/pages/tickets.py
new file mode 100644
index 0000000000..21892a1cae
--- /dev/null
+++ b/support/doctype/support_ticket/templates/pages/tickets.py
@@ -0,0 +1,26 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint, formatdate
+
+def get_context():
+ return {
+ "title": "My Tickets",
+ "method": "support.doctype.support_ticket.templates.pages.tickets.get_tickets",
+ "icon": "icon-ticket",
+ "empty_list_message": "No Tickets Raised",
+ "page": "ticket"
+ }
+
+@webnotes.whitelist()
+def get_tickets(start=0):
+ tickets = webnotes.conn.sql("""select name, subject, status, creation
+ from `tabSupport Ticket` where raised_by=%s
+ order by modified desc
+ limit %s, 20""", (webnotes.session.user, cint(start)), as_dict=True)
+ for t in tickets:
+ t.creation = formatdate(t.creation)
+
+ return tickets
\ No newline at end of file
diff --git a/support/doctype/support_ticket/templates/tickets.html b/support/doctype/support_ticket/templates/tickets.html
deleted file mode 100644
index 166dbcd4d4..0000000000
--- a/support/doctype/support_ticket/templates/tickets.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "app/website/templates/html/transactions.html" %}
-
-{% block javascript -%}
-{{ super() }}
-
-var status_label = {
- "Open": "label-success",
- "Waiting for Customer": "label-danger",
- "Closed": "label-default"
-}
-
-var render = function(doc) {
- doc.status = doc.status.trim();
- doc.label_class = status_label[doc.status] || "label-default";
- if(doc.status==="Waiting for Customer") doc.status = "To Reply";
-
- $(repl('
\
- \
-
\
- %(status)s
\
-
\
-
%(name)s
\
-
%(subject)s
\
-
\
-
\
- %(creation)s\
-
\
-
', doc)).appendTo($list);
-};
-{%- endblock %}
\ No newline at end of file
diff --git a/utilities/doctype/address/address.py b/utilities/doctype/address/address.py
index 7ffb911417..69e81b8312 100644
--- a/utilities/doctype/address/address.py
+++ b/utilities/doctype/address/address.py
@@ -51,25 +51,3 @@ class DocType:
webnotes.conn.sql("""update `tabAddress` set `%s`=0 where `%s`=%s and name!=%s""" %
(is_address_type, fieldname, "%s", "%s"), (self.doc.fields[fieldname], self.doc.name))
break
-
-def get_website_args():
- def _get_fields(fieldnames):
- return [webnotes._dict(zip(["label", "fieldname", "fieldtype", "options"],
- [df.label, df.fieldname, df.fieldtype, df.options]))
- for df in webnotes.get_doctype("Address", processed=True).get({"fieldname": ["in", fieldnames]})]
-
- bean = None
- if webnotes.form_dict.name:
- bean = webnotes.bean("Address", webnotes.form_dict.name)
-
- return {
- "doc": bean.doc if bean else None,
- "meta": webnotes._dict({
- "left_fields": _get_fields(["address_title", "address_type", "address_line1", "address_line2",
- "city", "state", "pincode", "country"]),
- "right_fields": _get_fields(["email_id", "phone", "fax", "is_primary_address",
- "is_shipping_address"])
- }),
- "cint": cint
- }
-
diff --git a/utilities/doctype/address/templates/__init__.py b/utilities/doctype/address/templates/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/utilities/doctype/address/templates/pages/__init__.py b/utilities/doctype/address/templates/pages/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/utilities/doctype/address/templates/address.html b/utilities/doctype/address/templates/pages/address.html
similarity index 98%
rename from utilities/doctype/address/templates/address.html
rename to utilities/doctype/address/templates/pages/address.html
index 6d4273c3a5..63c3748f2a 100644
--- a/utilities/doctype/address/templates/address.html
+++ b/utilities/doctype/address/templates/pages/address.html
@@ -1,4 +1,4 @@
-{% extends "app/website/templates/html/page.html" %}
+{% extends base_template %}
{% set title=doc and doc.name or "New Address" %}
{% set docname=(doc and doc.name or "") %}
diff --git a/utilities/doctype/address/templates/pages/address.py b/utilities/doctype/address/templates/pages/address.py
new file mode 100644
index 0000000000..d87974d0d8
--- /dev/null
+++ b/utilities/doctype/address/templates/pages/address.py
@@ -0,0 +1,28 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import cint
+
+def get_context():
+ def _get_fields(fieldnames):
+ return [webnotes._dict(zip(["label", "fieldname", "fieldtype", "options"],
+ [df.label, df.fieldname, df.fieldtype, df.options]))
+ for df in webnotes.get_doctype("Address", processed=True).get({"fieldname": ["in", fieldnames]})]
+
+ bean = None
+ if webnotes.form_dict.name:
+ bean = webnotes.bean("Address", webnotes.form_dict.name)
+
+ return {
+ "doc": bean.doc if bean else None,
+ "meta": webnotes._dict({
+ "left_fields": _get_fields(["address_title", "address_type", "address_line1", "address_line2",
+ "city", "state", "pincode", "country"]),
+ "right_fields": _get_fields(["email_id", "phone", "fax", "is_primary_address",
+ "is_shipping_address"])
+ }),
+ "cint": cint
+ }
+
diff --git a/utilities/doctype/address/templates/addresses.html b/utilities/doctype/address/templates/pages/addresses.html
similarity index 96%
rename from utilities/doctype/address/templates/addresses.html
rename to utilities/doctype/address/templates/pages/addresses.html
index b19780ae38..e3a5b683d7 100644
--- a/utilities/doctype/address/templates/addresses.html
+++ b/utilities/doctype/address/templates/pages/addresses.html
@@ -1,4 +1,4 @@
-{% extends "app/website/templates/html/page.html" %}
+{% extends base_template %}
{% set title="My Addresses" %}
diff --git a/utilities/website_transactions.py b/utilities/website_transactions.py
deleted file mode 100644
index f8710968fb..0000000000
--- a/utilities/website_transactions.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd.
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import webnotes
-from webnotes.utils import cint, formatdate
-import json
-
-def get_transaction_list(doctype, start):
- # find customer id
- customer = webnotes.conn.get_value("Contact", {"email_id": webnotes.session.user},
- "customer")
-
- if customer:
- transactions = webnotes.conn.sql("""select name, creation, currency, grand_total_export
- from `tab%s` where customer=%s and docstatus=1
- order by creation desc
- limit %s, 20""" % (doctype, "%s", "%s"), (customer, cint(start)), as_dict=True)
- for doc in transactions:
- doc.items = ", ".join(webnotes.conn.sql_list("""select item_name
- from `tab%s Item` where parent=%s limit 5""" % (doctype, "%s"), doc.name))
- doc.creation = formatdate(doc.creation)
- return transactions
- else:
- return []
-
-def get_common_args():
- return {
- "global_number_format": webnotes.conn.get_default("number_format") or "#,###.##",
- "currency": webnotes.conn.get_default("currency"),
- "currency_symbols": json.dumps(dict(webnotes.conn.sql("""select name, symbol
- from tabCurrency where ifnull(enabled,0)=1""")))
- }
-
-@webnotes.whitelist()
-def get_orders(start=0):
- return get_transaction_list("Sales Order", start)
-
-def order_list_args():
- args = get_common_args()
- args.update({
- "title": "My Orders",
- "method": "utilities.website_transactions.get_orders",
- "icon": "icon-list",
- "empty_list_message": "No Orders Yet",
- "page": "order",
- })
- return args
-
-@webnotes.whitelist()
-def get_invoices(start=0):
- return get_transaction_list("Sales Invoice", start)
-
-def invoice_list_args():
- args = get_common_args()
- args.update({
- "title": "Invoices",
- "method": "utilities.website_transactions.get_invoices",
- "icon": "icon-file-text",
- "empty_list_message": "No Invoices Found",
- "page": "invoice"
- })
- return args
-
-@webnotes.whitelist()
-def get_shipments(start=0):
- return get_transaction_list("Delivery Note", start)
-
-def shipment_list_args():
- args = get_common_args()
- args.update({
- "title": "Shipments",
- "method": "utilities.website_transactions.get_shipments",
- "icon": "icon-truck",
- "empty_list_message": "No Shipments Found",
- "page": "shipment"
- })
- return args
-
-@webnotes.whitelist()
-def get_tickets(start=0):
- tickets = webnotes.conn.sql("""select name, subject, status, creation
- from `tabSupport Ticket` where raised_by=%s
- order by modified desc
- limit %s, 20""", (webnotes.session.user, cint(start)), as_dict=True)
- for t in tickets:
- t.creation = formatdate(t.creation)
-
- return tickets
-
-def ticket_list_args():
- return {
- "title": "My Tickets",
- "method": "utilities.website_transactions.get_tickets",
- "icon": "icon-ticket",
- "empty_list_message": "No Tickets Raised",
- "page": "ticket"
- }
-
-def get_transaction_args(doctype, name):
- customer = webnotes.conn.get_value("Contact", {"email_id": webnotes.session.user},
- "customer")
-
- bean = webnotes.bean(doctype, name)
- if bean.doc.customer != customer:
- return {
- "doc": {"name": "Not Allowed"}
- }
- else:
- return {
- "doc": bean.doc,
- "doclist": bean.doclist,
- "webnotes": webnotes,
- "utils": webnotes.utils
- }
-
-def get_order_args():
- args = get_transaction_args("Sales Order", webnotes.form_dict.name)
- args.update({
- "parent_link": "orders",
- "parent_title": "My Orders"
- })
- return args
-
-def get_invoice_args():
- args = get_transaction_args("Sales Invoice", webnotes.form_dict.name)
- args.update({
- "parent_link": "invoices",
- "parent_title": "Invoices"
- })
- return args
-
-def get_shipment_args():
- args = get_transaction_args("Delivery Note", webnotes.form_dict.name)
- args.update({
- "parent_link": "shipments",
- "parent_title": "Shipments"
- })
- return args