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

fix: Shopping cart issue v13 (#22868)

Browse Source 
* refactoring shopping cart settings

* adding column_break in shopping cart settings

* fix: mandatory depend on fix company

* fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.
This commit is contained in:
Anupam Kumar 2020-08-03 18:50:11 +05:30 committed by GitHub
parent b50b20458e
commit 1895e9b89a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
View File

@ -12,5 +12,11 @@ frappe.ui.form.on("Shopping Cart Settings", {
if (frm.doc.enabled === 1) { if (frm.doc.enabled === 1) {
frm.set_value('enable_variants', 1); frm.set_value('enable_variants', 1);
} }
else {
frm.set_value('company', '');
frm.set_value('price_list', '');
frm.set_value('default_customer_group', '');
frm.set_value('quotation_series', '');
}
} }
}); });

13
erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
View File

@ -95,15 +95,16 @@
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"mandatory_depends_on": "eval: doc.enabled === 1",
"options": "Company", "options": "Company",
"remember_last_selected_value": 1, "remember_last_selected_value": 1
"reqd": 1
}, },
{ {
"description": "Prices will not be shown if Price List is not set", "description": "Prices will not be shown if Price List is not set",
"fieldname": "price_list", "fieldname": "price_list",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Price List", "label": "Price List",
"mandatory_depends_on": "eval: doc.enabled === 1",
"options": "Price List" "options": "Price List"
}, },
{ {
@ -115,14 +116,14 @@
"fieldtype": "Link", "fieldtype": "Link",
"ignore_user_permissions": 1, "ignore_user_permissions": 1,
"label": "Default Customer Group", "label": "Default Customer Group",
"options": "Customer Group", "mandatory_depends_on": "eval: doc.enabled === 1",
"reqd": 1 "options": "Customer Group"
}, },
{ {
"fieldname": "quotation_series", "fieldname": "quotation_series",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Quotation Series", "label": "Quotation Series",
"reqd": 1 "mandatory_depends_on": "eval: doc.enabled === 1"
}, },
{ {
"collapsible": 1, "collapsible": 1,
@ -171,7 +172,7 @@
"idx": 1, "idx": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2020-07-17 17:53:22.667228", "modified": "2020-08-02 18:21:43.873303",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Shopping Cart", "module": "Shopping Cart",
"name": "Shopping Cart Settings", "name": "Shopping Cart Settings",