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

Merge pull request #2341 from neilLasrado/shopping-cart-fix

Browse Source 
shopping cart fix
This commit is contained in:
Nabin Hait 2014-10-27 11:42:02 +05:30
commit 60fbdecff4
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/templates/pages/address.html
View File

@ -92,7 +92,7 @@
frappe.call({ frappe.call({
btn: $(this), btn: $(this),
type: "POST", type: "POST",
method: "shopping_cart.templates.pages.address.save_address", method: "erpnext.templates.pages.address.save_address",
args: { fields: fields, address_fieldname: get_url_arg("address_fieldname") }, args: { fields: fields, address_fieldname: get_url_arg("address_fieldname") },
error_msg: "#address-error", error_msg: "#address-error",
callback: function(r) { callback: function(r) {

2
erpnext/templates/pages/addresses.html
View File

@ -19,7 +19,7 @@
;(function() { ;(function() {
var fetch_addresses = function() { var fetch_addresses = function() {
frappe.call({ frappe.call({
method: "shopping_cart.templates.pages.addresses.get_addresses", method: "erpnext.templates.pages.addresses.get_addresses",
callback: function(r) { callback: function(r) {
$("#address-list .progress").remove(); $("#address-list .progress").remove();
var $list = $("#address-list"); var $list = $("#address-list");

2
erpnext/templates/pages/invoice.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import flt, fmt_money from frappe.utils import flt, fmt_money
from shopping_cart.templates.utils import get_transaction_context from erpnext.templates.utils import get_transaction_context
no_cache = 1 no_cache = 1
no_sitemap = 1 no_sitemap = 1

8
erpnext/templates/pages/invoices.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from shopping_cart.templates.utils import get_currency_context from erpnext.templates.utils import get_currency_context
no_cache = 1 no_cache = 1
no_sitemap = 1 no_sitemap = 1
@ -12,7 +12,7 @@ def get_context(context):
invoices_context = get_currency_context() invoices_context = get_currency_context()
invoices_context.update({ invoices_context.update({
"title": "Invoices", "title": "Invoices",
"method": "shopping_cart.templates.pages.invoices.get_invoices", "method": "erpnext.templates.pages.invoices.get_invoices",
"icon": "icon-file-text", "icon": "icon-file-text",
"empty_list_message": "No Invoices Found", "empty_list_message": "No Invoices Found",
"page": "invoice" "page": "invoice"
@ -21,8 +21,8 @@ def get_context(context):
@frappe.whitelist() @frappe.whitelist()
def get_invoices(start=0): def get_invoices(start=0):
from shopping_cart.templates.utils import get_transaction_list from erpnext.templates.utils import get_transaction_list
from shopping_cart.templates.pages.invoice import modify_status from erpnext.templates.pages.invoice import modify_status
invoices = get_transaction_list("Sales Invoice", start, ["outstanding_amount"]) invoices = get_transaction_list("Sales Invoice", start, ["outstanding_amount"])
for d in invoices: for d in invoices:
modify_status(d) modify_status(d)

2
erpnext/templates/pages/order.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe import _ from frappe import _
from shopping_cart.templates.utils import get_transaction_context from erpnext.templates.utils import get_transaction_context
no_cache = 1 no_cache = 1
no_sitemap = 1 no_sitemap = 1

6
erpnext/templates/pages/orders.py
View File

@ -3,8 +3,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from shopping_cart.templates.utils import get_currency_context, get_transaction_list from erpnext.templates.utils import get_currency_context, get_transaction_list
from shopping_cart.templates.pages.order import modify_status from erpnext.templates.pages.order import modify_status
no_cache = 1 no_cache = 1
no_sitemap = 1 no_sitemap = 1
@ -13,7 +13,7 @@ def get_context(context):
orders_context = get_currency_context() orders_context = get_currency_context()
orders_context.update({ orders_context.update({
"title": "My Orders", "title": "My Orders",
"method": "shopping_cart.templates.pages.orders.get_orders", "method": "erpnext.templates.pages.orders.get_orders",
"icon": "icon-list", "icon": "icon-list",
"empty_list_message": "No Orders Yet", "empty_list_message": "No Orders Yet",
"page": "order", "page": "order",

2
erpnext/templates/pages/shipment.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from shopping_cart.templates.utils import get_transaction_context from erpnext.templates.utils import get_transaction_context
no_cache = 1 no_cache = 1
no_sitemap = 1 no_sitemap = 1

6
erpnext/templates/pages/shipments.py
View File

@ -3,7 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from shopping_cart.templates.utils import get_currency_context from erpnext.templates.utils import get_currency_context
no_cache = 1 no_cache = 1
no_sitemap = 1 no_sitemap = 1
@ -12,7 +12,7 @@ def get_context(context):
shipments_context = get_currency_context() shipments_context = get_currency_context()
shipments_context.update({ shipments_context.update({
"title": "Shipments", "title": "Shipments",
"method": "shopping_cart.templates.pages.shipments.get_shipments", "method": "erpnext.templates.pages.shipments.get_shipments",
"icon": "icon-truck", "icon": "icon-truck",
"empty_list_message": "No Shipments Found", "empty_list_message": "No Shipments Found",
"page": "shipment" "page": "shipment"
@ -21,5 +21,5 @@ def get_context(context):
@frappe.whitelist() @frappe.whitelist()
def get_shipments(start=0): def get_shipments(start=0):
from shopping_cart.templates.utils import get_transaction_list from erpnext.templates.utils import get_transaction_list
return get_transaction_list("Delivery Note", start) return get_transaction_list("Delivery Note", start)

2
erpnext/templates/pages/ticket.html
View File

@ -90,7 +90,7 @@ $(document).ready(function() {
} else { } else {
frappe.call({ frappe.call({
type: "POST", type: "POST",
method: "shopping_cart.templates.pages.ticket.add_reply", method: "erpnext.templates.pages.ticket.add_reply",
btn: this, btn: this,
args: { ticket: "{{ doc.name }}", message: reply }, args: { ticket: "{{ doc.name }}", message: reply },
callback: function(r) { callback: function(r) {

2
erpnext/templates/pages/tickets.html
View File

@ -65,7 +65,7 @@
} else { } else {
frappe.call({ frappe.call({
type: "POST", type: "POST",
method: "shopping_cart.templates.pages.tickets.make_new_ticket", method: "erpnext.templates.pages.tickets.make_new_ticket",
btn: this, btn: this,
args: { subject: subject, message: message }, args: { subject: subject, message: message },
callback: function(r) { callback: function(r) {

2
erpnext/templates/pages/tickets.py
View File

@ -11,7 +11,7 @@ no_sitemap = 1
def get_context(context): def get_context(context):
return { return {
"title": "My Tickets", "title": "My Tickets",
"method": "shopping_cart.templates.pages.tickets.get_tickets", "method": "erpnext.templates.pages.tickets.get_tickets",
"icon": "icon-ticket", "icon": "icon-ticket",
"empty_list_message": "No Tickets Raised", "empty_list_message": "No Tickets Raised",
"page": "ticket" "page": "ticket"

2
erpnext/templates/pages/user.html
View File

@ -34,7 +34,7 @@ $(document).ready(function() {
$("#fullname").val(getCookie("full_name") || ""); $("#fullname").val(getCookie("full_name") || "");
$("#update_user").click(function() { $("#update_user").click(function() {
frappe.call({ frappe.call({
method: "shopping_cart.templates.pages.user.update_user", method: "erpnext.templates.pages.user.update_user",
type: "POST", type: "POST",
args: { args: {
fullname: $("#fullname").val(), fullname: $("#fullname").val(),