diff --git a/erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py b/erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py index 1f8cd4ea3f0..20a96f94191 100644 --- a/erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py +++ b/erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py @@ -18,18 +18,26 @@ class TestECommerceSettings(unittest.TestCase): return frappe.get_doc({"doctype": "E Commerce Settings", "company": "_Test Company"}) - def test_exchange_rate_exists(self): - frappe.db.sql("""delete from `tabCurrency Exchange`""") + # NOTE: Exchangrate API has all enabled currencies that ERPNext supports. + # We aren't checking just currency exchange record anymore + # while validating price list currency exchange rate to that of company. + # The API is being used to fetch the rate which again almost always + # gives back a valid value (for valid currencies). + # This makes the test obsolete. + # Commenting because im not sure if there's a better test we can write - cart_settings = self.get_cart_settings() - cart_settings.price_list = "_Test Price List Rest of the World" - self.assertRaises(ShoppingCartSetupError, cart_settings.validate_exchange_rates_exist) + # def test_exchange_rate_exists(self): + # frappe.db.sql("""delete from `tabCurrency Exchange`""") - from erpnext.setup.doctype.currency_exchange.test_currency_exchange import ( - test_records as currency_exchange_records, - ) - frappe.get_doc(currency_exchange_records[0]).insert() - cart_settings.validate_exchange_rates_exist() + # cart_settings = self.get_cart_settings() + # cart_settings.price_list = "_Test Price List Rest of the World" + # self.assertRaises(ShoppingCartSetupError, cart_settings.validate_exchange_rates_exist) + + # from erpnext.setup.doctype.currency_exchange.test_currency_exchange import ( + # test_records as currency_exchange_records, + # ) + # frappe.get_doc(currency_exchange_records[0]).insert() + # cart_settings.validate_exchange_rates_exist() def test_tax_rule_validation(self): frappe.db.sql("update `tabTax Rule` set use_for_shopping_cart = 0") diff --git a/erpnext/e_commerce/doctype/item_review/test_item_review.py b/erpnext/e_commerce/doctype/item_review/test_item_review.py index d02d137fe51..8a4befc800a 100644 --- a/erpnext/e_commerce/doctype/item_review/test_item_review.py +++ b/erpnext/e_commerce/doctype/item_review/test_item_review.py @@ -18,6 +18,7 @@ from erpnext.e_commerce.doctype.website_item.website_item import make_website_it from erpnext.e_commerce.shopping_cart.cart import get_party from erpnext.stock.doctype.item.test_item import make_item + class TestItemReview(unittest.TestCase): def setUp(self): item = make_item("Test Mobile Phone") diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 102e1ccc5e2..0e290384b4c 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -236,7 +236,7 @@ doc_events = { "erpnext.support.doctype.issue.issue.set_first_response_time" ] }, - ("Sales Taxes and Charges Template", "Price List"): { + "Sales Taxes and Charges Template": { "on_update": "erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings.validate_cart_settings" }, "Tax Category": { diff --git a/erpnext/templates/pages/customer_reviews.js b/erpnext/public/js/customer_reviews.js similarity index 100% rename from erpnext/templates/pages/customer_reviews.js rename to erpnext/public/js/customer_reviews.js diff --git a/erpnext/public/js/erpnext-web.bundle.js b/erpnext/public/js/erpnext-web.bundle.js index a40a70cfb59..194ac06aaa6 100644 --- a/erpnext/public/js/erpnext-web.bundle.js +++ b/erpnext/public/js/erpnext-web.bundle.js @@ -1,6 +1,7 @@ import "./website_utils"; import "./shopping_cart"; import "./wishlist"; +import "./customer_reviews"; import "../../e_commerce/product_ui/list"; import "../../e_commerce/product_ui/views"; import "../../e_commerce/product_ui/grid"; diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 0957ce06159..fc45ba99c43 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -536,7 +536,7 @@ class TestItem(ERPNextTestCase): "check if index is getting created in db" indices = frappe.db.sql("show index from tabItem", as_dict=1) - expected_columns = {"item_code", "item_name", "item_group", "route"} + expected_columns = {"item_code", "item_name", "item_group"} for index in indices: expected_columns.discard(index.get("Column_name"))