Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
978e8aa
feat: E-commerce Refactor
marination Feb 10, 2021
675e2af
chore: Drive E-commerce via Website Item
marination Feb 16, 2021
862a924
chore: Removing Item's Website section & references
marination Feb 19, 2021
2a3f5da
fix: Sider and indexing (minor)
marination Feb 19, 2021
333d08f
fix: Hide Attribute filters if 'Hide Variants' is enabled in E Commer…
marination Feb 19, 2021
d93e3a3
chore: Patches for Website Item
marination Feb 23, 2021
31d97b4
chore: Removed Shopping Cart Module
marination Feb 25, 2021
aa989a9
feat: Shop by Category
marination Mar 2, 2021
e13f762
feat: Card Actions and Wishlist
marination Mar 11, 2021
fc40b57
feat: Animate Add to Cart List interactions (UX)
marination Mar 11, 2021
1c8ee16
Merge branch 'develop' into e-commerce-refactor
marination Mar 11, 2021
0783e3d
feat: Wishlist from card actions
marination Mar 14, 2021
0b3921e
feat: Wishlist Page
marination Mar 15, 2021
075ce7f
fix: Sider
marination Mar 16, 2021
cf3f2ea
Merge branch 'develop' into e-commerce-refactor
marination Mar 16, 2021
f42716f
feat: Product Details Tabbed Section and Add to Wishlist in Item Full…
marination Mar 22, 2021
fe6e777
fix: Remove unnecessary css variable and hover state
marination Mar 22, 2021
470ec14
feat: (wip) Ratings and Reviews
marination Mar 25, 2021
be68f75
feat: Customer Ratings & Reviews Full Page
marination Apr 7, 2021
aff53b7
Merge branch 'develop' of https://github.com/frappe/erpnext into e-co…
marination Apr 7, 2021
6d85e82
fix: Sider and Tests
marination Apr 8, 2021
f10a08a
feat: Slashed Prices and Discount display
marination Apr 12, 2021
c2bd7e5
fix: Item schema modified date update
marination Apr 13, 2021
94d0149
Merge branch 'develop' of https://github.com/frappe/erpnext into e-co…
marination Apr 19, 2021
8bc90a6
feat: Discount Filters
marination Apr 20, 2021
ed0aabb
Merge branch 'develop' of https://github.com/frappe/erpnext into e-co…
marination Apr 21, 2021
b2e607b
chore: Sider and Semgrep
marination Apr 21, 2021
cc402a5
feat: Add basic autocomplete using redisearch
NagariaHussain Apr 21, 2021
4a0136b
feat: Basic Query + Autocomplete
NagariaHussain Apr 22, 2021
fdcfa41
feat: Add search fields field
NagariaHussain Apr 23, 2021
c376b67
feat: Make search index fields configurable
NagariaHussain Apr 26, 2021
d22951b
feat: Add Category autocomplete with config in settings
NagariaHussain Apr 26, 2021
58d08ee
chore: Make it a little beautiful
NagariaHussain Apr 29, 2021
a6deace
refactor: Use global redis connection
NagariaHussain Apr 29, 2021
28c2f5d
chore: Add query clean-up
NagariaHussain May 3, 2021
eb955c7
chore: Add placeholder image
NagariaHussain May 4, 2021
4356ffb
feat: Add brand line display setting
NagariaHussain May 5, 2021
b52d283
feat: Show brand line in search results
NagariaHussain May 5, 2021
1ebb1b8
feat: Show Recent Searches
NagariaHussain May 5, 2021
7a27820
chores: Add function params and remove unused imports
NagariaHussain May 11, 2021
acb6ce8
feat: Offer Display
marination May 8, 2021
163a624
fix: Show Offers section only if offers exist
marination May 10, 2021
a975f99
feat: (wip) Toggle Views
marination May 12, 2021
321b8af
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination May 13, 2021
6a802f3
feat: Product View toggling
marination May 17, 2021
a0bbe7f
fix: Sider and Patches
marination May 17, 2021
681ada9
fix: Patch fix for fresh installs
marination May 18, 2021
2bc68f3
fix: Empty states and miscellanous fixes
marination May 19, 2021
fe47761
fix: Move get_product_filtrs_data to website item file
marination May 19, 2021
82cc7f1
fix: Items Query, Sub categories, Review Button
marination May 19, 2021
bba0bc8
fix: Discount Filters and Web templates
marination May 24, 2021
9499db8
feat: Add decorator for redisearch
NagariaHussain May 26, 2021
50d7989
chore: Redisearch module load tracking
NagariaHussain May 26, 2021
0712caf
chore: Shopping Cart styles and cleanup shallow
marination May 27, 2021
ea4ec3b
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination May 27, 2021
6799eb9
feat: Add fallback when redisearch not loaded
NagariaHussain May 28, 2021
8a25523
chore: Redisearch warning in search settings
NagariaHussain May 28, 2021
fd3ce1b
fix: Documentation link and open in new tab
NagariaHussain May 28, 2021
4f73dee
Merge branch 'search-with-redisearch' into e-commerce-refactor
NagariaHussain May 28, 2021
acfdc6f
feat: Search UI
marination Jun 1, 2021
e000be5
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Jun 1, 2021
62faa5b
fix: Sider and Patch tests
marination Jun 2, 2021
5f3e4f0
fix: Search UI open/close and Empty product search results
marination Jun 2, 2021
bc3ab09
fix: Mixin import issue, search error handling, shop-by-category slid…
marination Jun 8, 2021
791e244
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Jun 8, 2021
cdcb18b
fix: Font size, empty image styles, and minor cleanup
marination Jun 8, 2021
4ba78e7
fix: Checkbox sizes and paging buttons
marination Jun 8, 2021
d6a32ea
fix: Missing Image in Item Page and Variants in Cart
marination Jun 8, 2021
db792c3
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Jun 28, 2021
1701125
chore: Cleanup Query Engine and Product query API
marination Jun 29, 2021
bcaea49
fix: Filters state, Search input clearing, Paging buttons
marination Jul 7, 2021
66a7924
feat: Guest Display Settings
marination Jul 8, 2021
2107883
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Jul 8, 2021
c844f3a
fix: Sync Website Items on Item Change, Short Website Description
marination Jul 8, 2021
f39c6db
fix: Rename Wishlist Item, Use Website Item Name in Wishlist Cards
marination Jul 8, 2021
9920747
fix: Discount Filtes & Filter behaviour
marination Jul 8, 2021
cf88b51
chore: UI refresh for grid/list view and search
marination Jul 11, 2021
f14596a
feat: Recommended Items and Item full page refresh
marination Jul 13, 2021
fed3b57
chore: Wishlist UI (minor)
marination Jul 13, 2021
bb60523
feat: Cart minor UI/UX Refresh
marination Jul 15, 2021
401cbc0
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Jul 15, 2021
ea96afc
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Jul 16, 2021
ece4f39
fix: Remove Website Item from Item Dashboard
marination Jul 16, 2021
7ef2af2
test: Website Item basic test & removed product configurator tests
marination Jul 19, 2021
20bc65c
test: Website Item (Item full page)
marination Aug 9, 2021
d477b99
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Aug 9, 2021
480dd8b
test: Recommendations, Reviews and Wishlist
marination Aug 9, 2021
1854581
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Aug 10, 2021
e3422f4
chore: debug travis
marination Aug 10, 2021
1fec5bb
chore: Re-organise files,remove T&C modal in cart
marination Aug 12, 2021
2416634
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Aug 12, 2021
34df274
fix: Error state and passing args for product listing
marination Aug 13, 2021
71b0e0a
test: Product Query & Filter Engine, Item Group Page
marination Aug 16, 2021
280f615
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Aug 24, 2021
341d9b4
chore: Remove `Home Page is Products` and Sider fixes
marination Aug 24, 2021
c1f6898
refactor: Cache Item Reviews and other review feedback
marination Aug 25, 2021
dc6a886
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Aug 25, 2021
06a6fd5
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Aug 26, 2021
d370294
fix: Sider and CI
marination Aug 26, 2021
fd44b6b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext…
marination Aug 30, 2021
7ab858a
Chore: Miscellaneous UI review changes
marination Sep 1, 2021
7c09a79
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Sep 2, 2021
c5efb6d
feat: (minor) Backorder indicator and fixed inconsistencies
marination Sep 2, 2021
10a450c
fix: Failing search util import and patch
marination Sep 2, 2021
9d05b2e
test: Set Price list and company in data engine test setup
marination Sep 3, 2021
853f479
Merge branch 'version-13-hotfix' into e-commerce-refactor
marination Sep 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions erpnext/accounts/doctype/coupon_code/test_coupon_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ def test_create_test_data():
"selling_cost_center": "Main - _TC",
"income_account": "Sales - _TC"
}],
"show_in_website": 1,
"route":"-test-tesla-car",
"website_warehouse": "Stores - _TC"
})
item.insert()
# create test item price
Expand Down
4 changes: 2 additions & 2 deletions erpnext/accounts/doctype/payment_request/payment_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def on_payment_authorized(self, status=None):
if not status:
return

shopping_cart_settings = frappe.get_doc("Shopping Cart Settings")
shopping_cart_settings = frappe.get_doc("E Commerce Settings")

if status in ["Authorized", "Completed"]:
redirect_to = None
Expand Down Expand Up @@ -436,7 +436,7 @@ def get_gateway_details(args):
return get_payment_gateway_account(args.get("payment_gateway_account"))

if args.order_type == "Shopping Cart":
payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account
payment_gateway_account = frappe.get_doc("E Commerce Settings").payment_gateway_account
return get_payment_gateway_account(payment_gateway_account)

gateway_account = get_payment_gateway_account({"is_default": 1})
Expand Down
2 changes: 1 addition & 1 deletion erpnext/accounts/doctype/tax_rule/tax_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def validate_filters(self):
def validate_use_for_shopping_cart(self):
'''If shopping cart is enabled and no tax rule exists for shopping cart, enable this one'''
if (not self.use_for_shopping_cart
and cint(frappe.db.get_single_value('Shopping Cart Settings', 'enabled'))
and cint(frappe.db.get_single_value('E Commerce Settings', 'enabled'))
and not frappe.db.get_value('Tax Rule', {'use_for_shopping_cart': 1, 'name': ['!=', self.name]})):

self.use_for_shopping_cart = 1
Expand Down

This file was deleted.

7 changes: 3 additions & 4 deletions erpnext/controllers/item_variant.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def find_variant(template, args, variant_item_code=None):

conditions = " or ".join(conditions)

from erpnext.portal.product_configurator.utils import get_item_codes_by_attributes
from erpnext.e_commerce.variant_selector.utils import get_item_codes_by_attributes
possible_variants = [i for i in get_item_codes_by_attributes(args, template) if i != variant_item_code]

for variant in possible_variants:
Expand Down Expand Up @@ -261,9 +261,8 @@ def generate_keyed_value_combinations(args):
def copy_attributes_to_variant(item, variant):
# copy non no-copy fields

exclude_fields = ["naming_series", "item_code", "item_name", "show_in_website",
"show_variant_in_website", "opening_stock", "variant_of", "valuation_rate",
"has_variants", "attributes"]
exclude_fields = ["naming_series", "item_code", "item_name", "published_in_website",
"opening_stock", "variant_of", "valuation_rate", "has_variants", "attributes"]

if item.variant_based_on=='Manufacturer':
# don't copy manufacturer values if based on part no
Expand Down
Loading