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

[Mod] Allows print only when the check value exists and the cart isn't empty

Browse Source
This commit is contained in:
Saurabh 2018-01-12 14:26:44 +05:30
parent 3a609108ae
commit c5a6cf3a0e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -51,7 +51,6 @@ erpnext.pos.PointOfSale = class PointOfSale {
}, },
() => this.setup_company(), () => this.setup_company(),
() => this.make_new_invoice(), () => this.make_new_invoice(),
() => this.set_form_action(),
() => { () => {
frappe.dom.unfreeze(); frappe.dom.unfreeze();
}, },
@ -111,6 +110,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
}, },
on_select_change: () => { on_select_change: () => {
this.cart.numpad.set_inactive(); this.cart.numpad.set_inactive();
this.set_form_action();
}, },
get_item_details: (item_code) => { get_item_details: (item_code) => {
return this.items.get(item_code); return this.items.get(item_code);
@ -180,6 +180,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
.then(() => { .then(() => {
// update cart // update cart
this.update_cart_data(item); this.update_cart_data(item);
this.set_form_action();
}); });
} }
return; return;
@ -503,8 +504,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
} }
set_form_action() { set_form_action() {
if(this.frm.doc.docstatus == 1 || this.frm.doc.allow_print_before_pay == 1){ if(this.frm.doc.docstatus == 1 || (this.frm.doc.allow_print_before_pay == 1&&this.frm.doc.items.length>0)){
this.page.set_secondary_action(__("Print"), () => { this.page.set_secondary_action(__("Print"), () => {
if(this.frm.doc.docstatus != 1 ){ if(this.frm.doc.docstatus != 1 ){
this.frm.save(); this.frm.save();
@ -514,6 +514,9 @@ erpnext.pos.PointOfSale = class PointOfSale {
} }
}); });
} }
if(this.frm.doc.items.length == 0){
this.page.clear_secondary_action();
}
if (this.frm.doc.docstatus == 1) { if (this.frm.doc.docstatus == 1) {
this.page.set_primary_action(__("New"), () => { this.page.set_primary_action(__("New"), () => {

6
erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js
View File

@ -13,9 +13,9 @@ QUnit.test("test:Point of Sales", function(assert) {
() => frappe.timeout(0.2), () => frappe.timeout(0.2),
() => frappe.click_element(`.cart-items [data-item-code="Test Product 2"]`), () => frappe.click_element(`.cart-items [data-item-code="Test Product 2"]`),
() => frappe.timeout(0.2), () => frappe.timeout(0.2),
() => frappe.click_element(`.btn-secondary`), // () => frappe.click_element(`.btn-secondary`),
() => frappe.timeout(0.4), // () => frappe.timeout(0.4),
() => assert.ok(!cur_frm.doc.__islocal, "Sales invoice saved"), // () => assert.ok(!cur_frm.doc.__islocal, "Sales invoice saved"),
() => frappe.click_element(`.number-pad [data-value="Rate"]`), () => frappe.click_element(`.number-pad [data-value="Rate"]`),
() => frappe.timeout(0.2), () => frappe.timeout(0.2),
() => frappe.click_element(`.number-pad [data-value="2"]`), () => frappe.click_element(`.number-pad [data-value="2"]`),