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

[pos][minor]

Browse Source
This commit is contained in:
Akhilesh Darjee 2013-08-23 18:22:32 +05:30
parent 4d47b007aa
commit 1f0b8606d6
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
accounts/doctype/sales_invoice/pos.js
View File

@ -160,10 +160,13 @@ erpnext.POS = Class.extend({
parent: this.wrapper.find(".barcode-area") parent: this.wrapper.find(".barcode-area")
}); });
this.barcode.make_input(); this.barcode.make_input();
this.barcode.$input.on("change", function() { this.barcode.$input.on("keypress", function() {
me.add_item_thru_barcode(); setTimeout(function() { me.barcode_timeout(); }, 1000);
}); });
}, },
barcode_timeout: function() {
me.add_item_thru_barcode();
},
make_item_list: function() { make_item_list: function() {
var me = this; var me = this;
wn.call({ wn.call({
@ -178,7 +181,7 @@ erpnext.POS = Class.extend({
me.wrapper.find(".item-list").empty(); me.wrapper.find(".item-list").empty();
$.each(r.message, function(index, obj) { $.each(r.message, function(index, obj) {
if (obj.image) if (obj.image)
image = "<img src='" + obj.image + "' class='img-responsive'>"; image = '<img src="' + obj.image + '" class="img-responsive" style="border: 1px solid #eee;">';
else else
image = '<div class="missing-image"><i class="icon-camera"></i></div>'; image = '<div class="missing-image"><i class="icon-camera"></i></div>';
@ -230,7 +233,6 @@ erpnext.POS = Class.extend({
var child = wn.model.add_child(me.frm.doc, "Sales Invoice Item", "entries"); var child = wn.model.add_child(me.frm.doc, "Sales Invoice Item", "entries");
child.item_code = item_code; child.item_code = item_code;
me.frm.cscript.item_code(me.frm.doc, child.doctype, child.name); me.frm.cscript.item_code(me.frm.doc, child.doctype, child.name);
//me.refresh();
} }
}, },
update_qty: function(item_code, qty) { update_qty: function(item_code, qty) {
@ -262,7 +264,7 @@ erpnext.POS = Class.extend({
<td>%(item_code)s%(item_name)s</td>\ <td>%(item_code)s%(item_name)s</td>\
<td><input type="text" value="%(qty)s" \ <td><input type="text" value="%(qty)s" \
class="form-control qty" style="text-align: right;"></td>\ class="form-control qty" style="text-align: right;"></td>\
<td style="text-align: right;">%(rate)s<br><b>%(amount)s</b></td>\ <td style="text-align: right;"><b>%(amount)s</b><br>%(rate)s</td>\
</tr>', </tr>',
{ {
item_code: d.item_code, item_code: d.item_code,
@ -297,14 +299,18 @@ erpnext.POS = Class.extend({
this.wrapper.find(".grand-total").text(format_currency(this.frm.doc.grand_total_export, this.wrapper.find(".grand-total").text(format_currency(this.frm.doc.grand_total_export,
cur_frm.doc.price_list_currency)); cur_frm.doc.price_list_currency));
$("input.qty").on("focus", function() {
$(this).select();
});
// append quantity to the respective item after change from input box // append quantity to the respective item after change from input box
$("input.qty").on("change", function() { $("input.qty").on("change", function() {
var item_code = $(this).closest("tr")[0].id; var item_code = $(this).closest("tr")[0].id;
me.update_qty(item_code, $(this).val()); me.update_qty(item_code, $(this).val());
}); });
// on td click highlight the respective row // on td click toggle the highlighting of row
$("td").on("click", function() { $("#cart tbody tr td").on("click", function() {
var row = $(this).closest("tr"); var row = $(this).closest("tr");
if (row.attr("data-selected") == "false") { if (row.attr("data-selected") == "false") {
row.attr("class", "warning"); row.attr("class", "warning");
@ -319,22 +325,25 @@ erpnext.POS = Class.extend({
}); });
me.refresh_delete_btn(); me.refresh_delete_btn();
cur_frm.pos.barcode.$input.focus();
}, },
refresh_delete_btn: function() { refresh_delete_btn: function() {
$(".delete-items").toggle($(".item-cart .warning").length ? true : false); $(".delete-items").toggle($(".item-cart .warning").length ? true : false);
}, },
add_item_thru_barcode: function() { add_item_thru_barcode: function() {
var me = this; var me = this;
clearTimeout();
wn.call({ wn.call({
method: 'accounts.doctype.sales_invoice.pos.get_item_from_barcode', method: 'accounts.doctype.sales_invoice.pos.get_item_from_barcode',
args: {barcode: this.barcode.$input.val()}, args: {barcode: this.barcode.$input.val()},
callback: function(r) { callback: function(r) {
if (r.message) { if (r.message) {
me.add_to_cart(r.message[0].name); me.add_to_cart(r.message[0].name);
me.refresh();
} }
else else
msgprint(wn._("Invalid Barcode")); msgprint(wn._("Invalid Barcode"));
me.refresh();
} }
}); });
}, },
@ -348,9 +357,6 @@ erpnext.POS = Class.extend({
selected_items.push(row.attr("id")); selected_items.push(row.attr("id"));
} }
} }
if (!selected_items[0])
msgprint(wn._("Please select any item to remove it"));
var child = wn.model.get_children("Sales Invoice Item", this.frm.doc.name, "entries", var child = wn.model.get_children("Sales Invoice Item", this.frm.doc.name, "entries",
"Sales Invoice"); "Sales Invoice");
@ -362,6 +368,7 @@ erpnext.POS = Class.extend({
} }
}); });
cur_frm.fields_dict["entries"].grid.refresh(); cur_frm.fields_dict["entries"].grid.refresh();
cur_frm.script_manager.trigger("calculate_taxes_and_totals");
me.refresh(); me.refresh();
}, },
make_payment: function() { make_payment: function() {

2
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -97,8 +97,6 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
if (cint(sys_defaults.fs_pos_view)===1) if (cint(sys_defaults.fs_pos_view)===1)
cur_frm.cscript.pos_btn(); cur_frm.cscript.pos_btn();
setTimeout(function() { cur_frm.$pos_btn.click(); }, 1000);
} else { } else {
// hide shown pos for submitted records // hide shown pos for submitted records
if(cur_frm.pos_active) cur_frm.cscript.toggle_pos(false); if(cur_frm.pos_active) cur_frm.cscript.toggle_pos(false);