[design] pos
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index e9c790d..deb6a2c 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -7,14 +7,7 @@
$(document).bind('toolbar_setup', function() {
frappe.app.name = "ERPNext";
- $('.navbar-brand').html('<i class="icon-home"></i>')
- .attr("title", "Home")
- .addClass("navbar-icon-home")
- .css({
- "max-width": "200px",
- "text-overflow": "ellipsis",
- "white-space": "nowrap"
- });
+ $('.navbar-brand').html('ERPNext');
$('[data-link="docs"]').attr("href", "https://erpnext.com/user-guide")
});
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
new file mode 100644
index 0000000..dd323bc
--- /dev/null
+++ b/erpnext/public/js/pos/pos.html
@@ -0,0 +1,55 @@
+<div class="pos">
+ <div class="row">
+ <div class="col-sm-5 pos-bill-wrapper">
+ <div class="pos-bill-toolbar row">
+ <div class="party-area col-xs-6"></div>
+ <div class="col-xs-6">
+ <button class="btn btn-success make-payment">{%= __("Pay") %}</button>
+ </div>
+ </div>
+ <div class="pos-bill">
+ <div class="item-cart">
+ <div class="row pos-bill-row pos-bill-header">
+ <div class="col-xs-5"><h6>{%= __("Item") %}</h6></div>
+ <div class="col-xs-4"><h6 class="text-right">{%= __("Quantity") %}</h6></div>
+ <div class="col-xs-3"><h6 class="text-right">{%= __("Rate") %}</h6></div>
+ </div>
+ <div class="items"></div>
+ </div>
+ <div class="totals-area">
+ <div class="row pos-bill-row net-total-area">
+ <div class="col-xs-6"><h6 class="text-muted">{%= __("Net Total") %}</h6></div>
+ <div class="col-xs-6"><h6 class="net-total text-right"></h6></div>
+ </div>
+ <div class="tax-table hide">
+ <h6>{%= __("Taxes") %}</h6>
+ </div>
+ <div class="row pos-bill-row discount-amount-area">
+ <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount Amount") %}</h6></div>
+ <div class="col-xs-6"><input type="text" class="form-control discount-amount text-right"></div>
+ </div>
+ <div class="row pos-bill-row grand-total-area">
+ <div class="col-xs-6"><h6>{%= __("Grand Total") %}</h6></div>
+ <div class="col-xs-6"><h6 class="grand-total text-right"></h6></div>
+ </div>
+ <div class="row pos-bill-row paid-amount-area">
+ <div class="col-xs-6"><h6 class="text-muted">{%= __("Amount Paid") %}</h6></div>
+ <div class="col-xs-6"><input type="text" class="form-control paid-amount text-right"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-7 pos-item-area">
+ <div class="row pos-item-toolbar">
+ <div class="barcode-area col-xs-4"></div>
+ <div class="search-area col-xs-4"></div>
+ <div class="item-group-area col-xs-4"></div>
+ </div>
+ <div class="item-list-area row">
+ <div class="col-sm-12">
+ <div class="row item-list"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js
new file mode 100644
index 0000000..cfae515
--- /dev/null
+++ b/erpnext/public/js/pos/pos.js
@@ -0,0 +1,502 @@
+// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+erpnext.POS = Class.extend({
+ init: function(wrapper, frm) {
+ this.wrapper = wrapper;
+ this.frm = frm;
+ this.wrapper.html(frappe.render_template("pos", {}));
+
+ this.check_transaction_type();
+ this.make();
+
+ var me = this;
+ $(this.frm.wrapper).on("refresh-fields", function() {
+ me.refresh();
+ });
+
+ this.wrapper.find('input.discount-amount').on("change", function() {
+ frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", this.value);
+ });
+
+ this.call_function("remove-items", function() {me.remove_selected_items();});
+ this.call_function("make-payment", function() {me.make_payment();});
+ },
+ check_transaction_type: function() {
+ var me = this;
+
+ // Check whether the transaction is "Sales" or "Purchase"
+ if (frappe.meta.has_field(cur_frm.doc.doctype, "customer")) {
+ this.set_transaction_defaults("Customer", "export");
+ }
+ else if (frappe.meta.has_field(cur_frm.doc.doctype, "supplier")) {
+ this.set_transaction_defaults("Supplier", "import");
+ }
+ },
+ set_transaction_defaults: function(party, export_or_import) {
+ var me = this;
+ this.party = party;
+ this.price_list = (party == "Customer" ?
+ this.frm.doc.selling_price_list : this.frm.doc.buying_price_list);
+ this.price_list_field = (party == "Customer" ? "selling_price_list" : "buying_price_list");
+ this.sales_or_purchase = (party == "Customer" ? "Sales" : "Purchase");
+ this.net_total = "net_total_" + export_or_import;
+ this.grand_total = "grand_total_" + export_or_import;
+ // this.amount = export_or_import + "_amount";
+ // this.rate = export_or_import + "_rate";
+ },
+ call_function: function(class_name, fn, event_name) {
+ this.wrapper.find("." + class_name).on(event_name || "click", fn);
+ },
+ make: function() {
+ this.make_party();
+ this.make_barcode();
+ this.make_search();
+ this.make_item_group();
+ this.make_item_list();
+ },
+ make_party: function() {
+ var me = this;
+ this.party_field = frappe.ui.form.make_control({
+ df: {
+ "fieldtype": "Link",
+ "options": this.party,
+ "label": this.party,
+ "fieldname": "pos_party",
+ "placeholder": this.party
+ },
+ parent: this.wrapper.find(".party-area"),
+ only_input: true,
+ });
+ this.party_field.make_input();
+ this.party_field.$input.on("change", function() {
+ if(!me.party_field.autocomplete_open)
+ frappe.model.set_value(me.frm.doctype, me.frm.docname,
+ me.party.toLowerCase(), this.value);
+ });
+ },
+ make_barcode: function() {
+ var me = this;
+ this.barcode = frappe.ui.form.make_control({
+ df: {
+ "fieldtype": "Data",
+ "label": "Barcode",
+ "fieldname": "pos_barcode",
+ "placeholder": "Barcode / Serial No"
+ },
+ parent: this.wrapper.find(".barcode-area"),
+ only_input: true,
+ });
+ this.barcode.make_input();
+ this.barcode.$input.on("keypress", function() {
+ if(me.barcode_timeout)
+ clearTimeout(me.barcode_timeout);
+ me.barcode_timeout = setTimeout(function() { me.add_item_thru_barcode(); }, 1000);
+ });
+ },
+ make_search: function() {
+ var me = this;
+ this.search = frappe.ui.form.make_control({
+ df: {
+ "fieldtype": "Data",
+ "label": "Item",
+ "fieldname": "pos_item",
+ "placeholder": "Search Item"
+ },
+ parent: this.wrapper.find(".search-area"),
+ only_input: true,
+ });
+ this.search.make_input();
+ this.search.$input.on("keypress", function() {
+ if(!me.search.autocomplete_open)
+ if(me.item_timeout)
+ clearTimeout(me.item_timeout);
+ me.item_timeout = setTimeout(function() { me.make_item_list(); }, 1000);
+ });
+ },
+ make_item_group: function() {
+ var me = this;
+ this.item_group = frappe.ui.form.make_control({
+ df: {
+ "fieldtype": "Link",
+ "options": "Item Group",
+ "label": "Item Group",
+ "fieldname": "pos_item_group",
+ "placeholder": "Item Group"
+ },
+ parent: this.wrapper.find(".item-group-area"),
+ only_input: true,
+ });
+ this.item_group.make_input();
+ this.item_group.$input.on("change", function() {
+ if(!me.item_group.autocomplete_open)
+ me.make_item_list();
+ });
+ },
+ make_item_list: function() {
+ var me = this;
+ me.item_timeout = null;
+ frappe.call({
+ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_items',
+ args: {
+ sales_or_purchase: this.sales_or_purchase,
+ price_list: this.price_list,
+ item_group: this.item_group.$input.val(),
+ item: this.search.$input.val()
+ },
+ callback: function(r) {
+ var $wrap = me.wrapper.find(".item-list");
+ me.wrapper.find(".item-list").empty();
+ if (r.message) {
+ $.each(r.message, function(index, obj) {
+ if (obj.image)
+ image = '<img src="' + obj.image + '" class="img-responsive" \
+ style="border:1px solid #eee; max-height: 140px;">';
+ else
+ image = '<div class="missing-image"><i class="icon-camera"></i></div>';
+
+ $(repl('<div class="col-xs-3 pos-item" data-item_code="%(item_code)s">\
+ <div style="height: 140px; overflow: hidden;">%(item_image)s</div>\
+ <div class="small">%(item_code)s</div>\
+ <div class="small">%(item_name)s</div>\
+ <div class="small">%(item_price)s</div>\
+ </div>',
+ {
+ item_code: obj.name,
+ item_price: format_currency(obj.price_list_rate, obj.currency),
+ item_name: obj.name===obj.item_name ? "" : obj.item_name,
+ item_image: image
+ })).appendTo($wrap);
+ });
+ }
+
+ // if form is local then allow this function
+ $(me.wrapper).find("div.pos-item").on("click", function() {
+ if(me.frm.doc.docstatus==0) {
+ console.log($(this).attr("data-item_code"));
+ me.add_to_cart($(this).attr("data-item_code"));
+ }
+ });
+ }
+ });
+ },
+ add_to_cart: function(item_code, serial_no) {
+ var me = this;
+ var caught = false;
+
+ if(!me.frm.doc[me.party.toLowerCase()] && ((me.frm.doctype == "Quotation" &&
+ me.frm.doc.quotation_to == "Customer")
+ || me.frm.doctype != "Quotation")) {
+ msgprint(__("Please select {0} first.", [me.party]));
+ return;
+ }
+
+ // get no_of_items
+ var no_of_items = me.wrapper.find(".pos-bill-item").length;
+
+ // check whether the item is already added
+ if (no_of_items != 0) {
+ $.each(this.frm.doc[this.frm.cscript.fname] || [], function(i, d) {
+ if (d.item_code == item_code) {
+ caught = true;
+ if (serial_no)
+ frappe.model.set_value(d.doctype, d.name, "serial_no", d.serial_no + '\n' + serial_no);
+ else
+ frappe.model.set_value(d.doctype, d.name, "qty", d.qty + 1);
+ }
+ });
+ }
+
+ // if item not found then add new item
+ if (!caught)
+ this.add_new_item_to_grid(item_code, serial_no);
+
+ this.refresh();
+ this.refresh_search_box();
+ },
+ add_new_item_to_grid: function(item_code, serial_no) {
+ var me = this;
+
+ var child = frappe.model.add_child(me.frm.doc, this.frm.doctype + " Item",
+ this.frm.cscript.fname);
+ child.item_code = item_code;
+
+ if (serial_no)
+ child.serial_no = serial_no;
+
+ this.frm.script_manager.trigger("item_code", child.doctype, child.name);
+ },
+ refresh_search_box: function() {
+ var me = this;
+
+ // Clear Item Box and remake item list
+ if (this.search.$input.val()) {
+ this.search.set_input("");
+ this.make_item_list();
+ }
+ },
+ update_qty: function(item_code, qty) {
+ console.log([item_code, qty]);
+ var me = this;
+ $.each(this.frm.doc[this.frm.cscript.fname] || [], function(i, d) {
+ if (d.item_code == item_code) {
+ if (qty == 0) {
+ frappe.model.clear_doc(d.doctype, d.name);
+ me.refresh_grid();
+ } else {
+ frappe.model.set_value(d.doctype, d.name, "qty", qty);
+ }
+ }
+ });
+ this.refresh();
+ },
+ refresh: function() {
+ var me = this;
+
+ this.refresh_item_list();
+ this.party_field.set_input(this.frm.doc[this.party.toLowerCase()]);
+ this.wrapper.find('input.discount-amount').val(this.frm.doc.discount_amount);
+ this.barcode.set_input("");
+
+ this.show_items_in_item_cart();
+ this.show_taxes();
+ this.set_totals();
+
+ // if form is local then only run all these functions
+ if (this.frm.doc.docstatus===0) {
+ this.call_when_local();
+ }
+
+ this.disable_text_box_and_button();
+ this.hide_payment_button();
+
+ // If quotation to is not Customer then remove party
+ if (this.frm.doctype == "Quotation" && this.frm.doc.quotation_to!="Customer") {
+ this.party_field.$input.prop("disabled", true);
+ }
+ },
+ refresh_item_list: function() {
+ var me = this;
+ // refresh item list on change of price list
+ if (this.frm.doc[this.price_list_field] != this.price_list) {
+ this.price_list = this.frm.doc[this.price_list_field];
+ this.make_item_list();
+ }
+ },
+ show_items_in_item_cart: function() {
+ var me = this;
+ var $items = this.wrapper.find(".items").empty();
+
+ $.each(this.frm.doc[this.frm.cscript.fname] || [], function(i, d) {
+ $(frappe.render_template("pos_bill_item", {
+ item_code: d.item_code,
+ item_name: d.item_name===d.item_code ? "" : ("<br>" + d.item_name),
+ qty: d.qty,
+ actual_qty: d.actual_qty,
+ rate: format_currency(d.rate, me.frm.doc.currency),
+ amount: format_currency(d.amount, me.frm.doc.currency)
+ })).appendTo($items);
+ });
+
+ this.wrapper.find("input.pos-item-qty").on("focus", function() {
+ $(this).select();
+ });
+ },
+ show_taxes: function() {
+ var me = this;
+ var taxes = this.frm.doc[this.frm.cscript.other_fname] || [];
+ $(this.wrapper).find(".tax-table")
+ .toggle((taxes && taxes.length) ? true : false)
+ .find("tbody").empty();
+
+ $.each(taxes, function(i, d) {
+ if (d.tax_amount) {
+ $(repl('<tr>\
+ <td>%(description)s %(rate)s</td>\
+ <td style="text-align: right;">%(tax_amount)s</td>\
+ <tr>', {
+ description: d.description,
+ rate: ((d.charge_type == "Actual") ? '' : ("(" + d.rate + "%)")),
+ tax_amount: format_currency(flt(d.tax_amount)/flt(me.frm.doc.conversion_rate),
+ me.frm.doc.currency)
+ })).appendTo(".tax-table tbody");
+ }
+ });
+ },
+ set_totals: function() {
+ var me = this;
+ this.wrapper.find(".net-total").text(format_currency(this.frm.doc[this.net_total],
+ me.frm.doc.currency));
+ this.wrapper.find(".grand-total").text(format_currency(this.frm.doc[this.grand_total],
+ me.frm.doc.currency));
+
+ $(".paid-amount-area").toggle(!!this.frm.doc.paid_amount);
+ if(this.frm.doc.paid_amount) {
+ this.wrapper.find(".paid-amount").text(format_currency(this.frm.doc.paid_amount,
+ me.frm.doc.currency));
+ }
+ },
+ call_when_local: function() {
+ var me = this;
+
+ // append quantity to the respective item after change from input box
+ $(this.wrapper).find("input.pos-item-qty").on("change", function() {
+ var item_code = $(this).closest("tr").attr("id");
+ me.update_qty(item_code, $(this).val());
+ });
+
+ // increase/decrease qty on plus/minus button
+ $(this.wrapper).find(".pos-qty-btn").on("click", function() {
+ var $item = $(this).parents(".pos-bill-item:first");
+ me.increase_decrease_qty($item, $(this).attr("data-action"));
+ });
+
+ // on td click toggle the highlighting of row
+ $(this.wrapper).find("#cart tbody tr td").on("click", function() {
+ var row = $(this).closest("tr");
+ if (row.attr("data-selected") == "false") {
+ row.attr("class", "warning");
+ row.attr("data-selected", "true");
+ }
+ else {
+ row.prop("class", null);
+ row.attr("data-selected", "false");
+ }
+ me.refresh_delete_btn();
+ });
+
+ me.refresh_delete_btn();
+ //me.focus();
+ },
+ focus: function() {
+ if(me.frm.doc[this.party]) {
+ this.barcode.$input.focus();
+ } else {
+ if(!(this.frm.doctype == "Quotation" && this.frm.doc.quotation_to!="Customer"))
+ this.party_field.$input.focus();
+ }
+ },
+ increase_decrease_qty: function($item, operation) {
+ var item_code = $item.attr("data-item-code");
+ var item_qty = cint($item.find("input.pos-item-qty").val());
+
+ if (operation == "increase-qty")
+ this.update_qty(item_code, item_qty + 1);
+ else if (operation == "decrease-qty" && item_qty != 0)
+ this.update_qty(item_code, item_qty - 1);
+ },
+ disable_text_box_and_button: function() {
+ var me = this;
+ // if form is submitted & cancelled then disable all input box & buttons
+ $(this.wrapper)
+ .find(".remove-items, .make-payment, .pos-qty-btn")
+ .toggle(this.frm.doc.docstatus===0);
+
+ $(this.wrapper).find('input, button').prop("disabled", !(this.frm.doc.docstatus===0));
+ },
+ hide_payment_button: function() {
+ $(this.wrapper)
+ .find(".make-payment")
+ .toggle(this.frm.doctype == "Sales Invoice" && this.frm.doc.is_pos);
+ },
+ refresh_delete_btn: function() {
+ $(this.wrapper).find(".remove-items").toggle($(".item-cart .warning").length ? true : false);
+ },
+ add_item_thru_barcode: function() {
+ var me = this;
+ me.barcode_timeout = null;
+ frappe.call({
+ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_item_code',
+ args: {barcode_serial_no: this.barcode.$input.val()},
+ callback: function(r) {
+ if (r.message) {
+ if (r.message[1] == "serial_no")
+ me.add_to_cart(r.message[0][0].item_code, r.message[0][0].name);
+ else
+ me.add_to_cart(r.message[0][0].name);
+ }
+ else
+ msgprint(__("Invalid Barcode"));
+
+ me.refresh();
+ }
+ });
+ },
+ remove_selected_items: function() {
+ var me = this;
+ var selected_items = [];
+ var no_of_items = $(this.wrapper).find("#cart tbody tr").length;
+ for(var x=0; x<=no_of_items - 1; x++) {
+ var row = $(this.wrapper).find("#cart tbody tr:eq(" + x + ")");
+ if(row.attr("data-selected") == "true") {
+ selected_items.push(row.attr("id"));
+ }
+ }
+
+ var child = this.frm.doc[this.frm.cscript.fname] || [];
+
+ $.each(child, function(i, d) {
+ for (var i in selected_items) {
+ if (d.item_code == selected_items[i]) {
+ frappe.model.clear_doc(d.doctype, d.name);
+ }
+ }
+ });
+
+ this.refresh_grid();
+ },
+ refresh_grid: function() {
+ this.frm.dirty();
+ this.frm.fields_dict[this.frm.cscript.fname].grid.refresh();
+ this.frm.script_manager.trigger("calculate_taxes_and_totals");
+ this.refresh();
+ },
+ make_payment: function() {
+ var me = this;
+ var no_of_items = $(this.wrapper).find("#cart tbody tr").length;
+ var mode_of_payment = [];
+
+ if (no_of_items == 0)
+ msgprint(__("Payment cannot be made for empty cart"));
+ else {
+ frappe.call({
+ method: 'erpnext.accounts.doctype.sales_invoice.pos.get_mode_of_payment',
+ callback: function(r) {
+ if(!r.message) {
+ msgprint(__("Please add to Modes of Payment from Setup."))
+ return;
+ }
+ for (x=0; x<=r.message.length - 1; x++) {
+ mode_of_payment.push(r.message[x].name);
+ }
+
+ // show payment wizard
+ var dialog = new frappe.ui.Dialog({
+ width: 400,
+ title: 'Payment',
+ fields: [
+ {fieldtype:'Data', fieldname:'total_amount', label:'Total Amount', read_only:1},
+ {fieldtype:'Select', fieldname:'mode_of_payment', label:'Mode of Payment',
+ options:mode_of_payment.join('\n'), reqd: 1},
+ {fieldtype:'Button', fieldname:'pay', label:'Pay'}
+ ]
+ });
+ dialog.set_values({
+ "total_amount": $(".grand-total").text()
+ });
+ dialog.show();
+ dialog.get_input("total_amount").prop("disabled", true);
+
+ dialog.fields_dict.pay.input.onclick = function() {
+ me.frm.set_value("mode_of_payment", dialog.get_values().mode_of_payment);
+ me.frm.set_value("paid_amount", dialog.get_values().total_amount);
+ me.frm.cscript.mode_of_payment(me.frm.doc);
+ me.frm.save();
+ dialog.hide();
+ me.refresh();
+ };
+ }
+ });
+ }
+ },
+});
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
new file mode 100644
index 0000000..e45536f
--- /dev/null
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -0,0 +1,16 @@
+<div class="row pos-bill-row pos-bill-item" data-item-code="{%= item_code %}">
+ <div class="col-xs-5"><h6>{%= item_code %}{%= item_name %}</h6></div>
+ <div class="col-xs-4">
+ <div class="row pos-qty-row">
+ <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="icon-minus-sign text-muted"></i></div>
+ <div class="col-xs-8">
+ <input type="text" value="{%= qty %}" class="form-control input-sm pos-item-qty text-right">
+ <div class="actual-qty small text-muted text-right">{%= actual_qty %}</div>
+ </div>
+ <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="icon-plus-sign text-muted"></i></div>
+ </div>
+ </div>
+ <div class="col-xs-3 text-right">
+ <h6>{%= amount %}<div class="text-muted" style="margin-top: 5px;">{%= rate %}</div></h6>
+ </div>
+</div>
diff --git a/erpnext/public/js/transaction.js b/erpnext/public/js/transaction.js
index a261649..5bbfae4 100644
--- a/erpnext/public/js/transaction.js
+++ b/erpnext/public/js/transaction.js
@@ -105,12 +105,12 @@
// make pos
if(!this.frm.pos) {
- this.frm.layout.add_view("pos");
- this.frm.pos = new erpnext.POS(this.frm.layout.views.pos, this.frm);
+ var wrapper = this.frm.appframe.add_view("pos", "<div>");
+ this.frm.pos = new erpnext.POS(wrapper, this.frm);
}
// toggle view
- this.frm.layout.set_view(this.pos_active ? "" : "pos");
+ this.frm.appframe.set_view(this.pos_active ? "main" : "pos");
this.pos_active = !this.pos_active;
// refresh
@@ -224,9 +224,9 @@
me.frm.script_manager.trigger("currency");
me.apply_pricing_rule();
- }
+ }
}
-
+
if (this.frm.doc.posting_date) var date = this.frm.doc.posting_date;
else var date = this.frm.doc.transaction_date;
erpnext.get_fiscal_year(this.frm.doc.company, date, fn);