Skip to content

Commit

Permalink
fix: Sider and Linter
Browse files Browse the repository at this point in the history
  • Loading branch information
marination committed Jan 21, 2022
1 parent c1dd3d7 commit 33b5e1d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
12 changes: 8 additions & 4 deletions erpnext/e_commerce/shopping_cart/test_shopping_cart.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@

from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule
from erpnext.e_commerce.doctype.website_item.website_item import make_website_item
from erpnext.e_commerce.shopping_cart.cart import _get_cart_quotation, get_cart_quotation, get_party, update_cart
from erpnext.tests.utils import create_test_contact_and_address, change_settings
from erpnext.e_commerce.shopping_cart.cart import (
_get_cart_quotation,
get_cart_quotation,
get_party,
update_cart,
)
from erpnext.tests.utils import change_settings, create_test_contact_and_address


class TestShoppingCart(unittest.TestCase):
Expand Down Expand Up @@ -135,8 +140,7 @@ def test_tax_rule(self):
"default_customer_group": "_Test Customer Group",
"price_list": "_Test Price List India",
"show_price": 1
}
)
})
def test_add_item_variant_without_web_item_to_cart(self):
"Test adding Variants having no Website Items in cart via Template Web Item."
from erpnext.controllers.item_variant import create_variant
Expand Down
7 changes: 2 additions & 5 deletions erpnext/e_commerce/variant_selector/test_variant_selector.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,12 @@ def test_next_item_variant_values(self):
"default_customer_group": "_Test Customer Group",
"price_list": "_Test Price List India",
"show_price": 1
}
)
})
def test_exact_match_with_price(self):
"""
Test price fetching and matching of variant without Website Item
"""
from erpnext.e_commerce.doctype.website_item.test_website_item import (
make_web_item_price,
)
from erpnext.e_commerce.doctype.website_item.test_website_item import make_web_item_price

make_web_item_price(item_code="Test-Tshirt-Temp-S-R", price_list_rate=100)
next_values = get_next_attribute_and_values(
Expand Down
2 changes: 1 addition & 1 deletion erpnext/e_commerce/variant_selector/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from frappe.utils import cint

from erpnext.e_commerce.doctype.e_commerce_settings.e_commerce_settings import (
get_shopping_cart_settings
get_shopping_cart_settings,
)
from erpnext.e_commerce.shopping_cart.cart import _set_price_list
from erpnext.e_commerce.variant_selector.item_variants_cache import ItemVariantsCacheManager
Expand Down

0 comments on commit 33b5e1d

Please sign in to comment.