fix: Shopping cart issue v13 (#22868)
* 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.
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
index 14500ba..21fa4c3 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
@@ -12,5 +12,11 @@
if (frm.doc.enabled === 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', '');
+ }
}
});
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index c574afa..32004ef 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -95,15 +95,16 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Company",
+ "mandatory_depends_on": "eval: doc.enabled === 1",
"options": "Company",
- "remember_last_selected_value": 1,
- "reqd": 1
+ "remember_last_selected_value": 1
},
{
"description": "Prices will not be shown if Price List is not set",
"fieldname": "price_list",
"fieldtype": "Link",
"label": "Price List",
+ "mandatory_depends_on": "eval: doc.enabled === 1",
"options": "Price List"
},
{
@@ -115,14 +116,14 @@
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Default Customer Group",
- "options": "Customer Group",
- "reqd": 1
+ "mandatory_depends_on": "eval: doc.enabled === 1",
+ "options": "Customer Group"
},
{
"fieldname": "quotation_series",
"fieldtype": "Select",
"label": "Quotation Series",
- "reqd": 1
+ "mandatory_depends_on": "eval: doc.enabled === 1"
},
{
"collapsible": 1,
@@ -171,7 +172,7 @@
"idx": 1,
"issingle": 1,
"links": [],
- "modified": "2020-07-17 17:53:22.667228",
+ "modified": "2020-08-02 18:21:43.873303",
"modified_by": "Administrator",
"module": "Shopping Cart",
"name": "Shopping Cart Settings",