Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
38a6fb4
feat: E-commerce Refactor
marination Feb 10, 2021
fe5977c
chore: Drive E-commerce via Website Item
marination Feb 16, 2021
4218975
chore: Removing Item's Website section & references
marination Feb 19, 2021
3c1b022
fix: Sider and indexing (minor)
marination Feb 19, 2021
eb4c46d
fix: Hide Attribute filters if 'Hide Variants' is enabled in E Commer…
marination Feb 19, 2021
5e0869a
chore: Patches for Website Item
marination Feb 23, 2021
bc98bb7
chore: Removed Shopping Cart Module
marination Feb 25, 2021
b47a5ba
feat: Shop by Category
marination Mar 2, 2021
fb83a1b
feat: Card Actions and Wishlist
marination Mar 11, 2021
b2be6ef
feat: Animate Add to Cart List interactions (UX)
marination Mar 11, 2021
c0de1fa
feat: Wishlist from card actions
marination Mar 14, 2021
9797d00
feat: Wishlist Page
marination Mar 15, 2021
36ae599
fix: Sider
marination Mar 16, 2021
c494fcf
feat: Product Details Tabbed Section and Add to Wishlist in Item Full…
marination Mar 22, 2021
512cf57
fix: Remove unnecessary css variable and hover state
marination Mar 22, 2021
1793ab5
feat: (wip) Ratings and Reviews
marination Mar 25, 2021
9a686d0
feat: Customer Ratings & Reviews Full Page
marination Apr 7, 2021
38fe632
fix: Sider and Tests
marination Apr 8, 2021
09ee0d1
feat: Slashed Prices and Discount display
marination Apr 12, 2021
ded1e7d
fix: Item schema modified date update
marination Apr 13, 2021
581de19
feat: Discount Filters
marination Apr 20, 2021
6026449
chore: Sider and Semgrep
marination Apr 21, 2021
08228cc
feat: Add basic autocomplete using redisearch
NagariaHussain Apr 21, 2021
7a89fe3
feat: Basic Query + Autocomplete
NagariaHussain Apr 22, 2021
6cb0c22
feat: Add search fields field
NagariaHussain Apr 23, 2021
835a4ec
feat: Make search index fields configurable
NagariaHussain Apr 26, 2021
e34cb8e
feat: Add Category autocomplete with config in settings
NagariaHussain Apr 26, 2021
69e1469
chore: Make it a little beautiful
NagariaHussain Apr 29, 2021
f273cf0
refactor: Use global redis connection
NagariaHussain Apr 29, 2021
427fdea
chore: Add query clean-up
NagariaHussain May 3, 2021
09e4ed8
chore: Add placeholder image
NagariaHussain May 4, 2021
79e6499
feat: Add brand line display setting
NagariaHussain May 5, 2021
5c40ee3
feat: Show brand line in search results
NagariaHussain May 5, 2021
b675d0c
feat: Show Recent Searches
NagariaHussain May 5, 2021
0821ed1
chores: Add function params and remove unused imports
NagariaHussain May 11, 2021
c0babbd
feat: Offer Display
marination May 8, 2021
7afe942
fix: Show Offers section only if offers exist
marination May 10, 2021
c5c8735
feat: (wip) Toggle Views
marination May 12, 2021
5fd33da
feat: Product View toggling
marination May 17, 2021
faa962c
fix: Sider and Patches
marination May 17, 2021
d946d82
fix: Patch fix for fresh installs
marination May 18, 2021
67fe372
fix: Empty states and miscellanous fixes
marination May 19, 2021
6e803ab
fix: Move get_product_filtrs_data to website item file
marination May 19, 2021
dab78a8
fix: Items Query, Sub categories, Review Button
marination May 19, 2021
4288245
fix: Discount Filters and Web templates
marination May 24, 2021
c661068
feat: Add decorator for redisearch
NagariaHussain May 26, 2021
5d37c83
chore: Redisearch module load tracking
NagariaHussain May 26, 2021
7fbc95f
chore: Shopping Cart styles and cleanup shallow
marination May 27, 2021
67255e0
feat: Add fallback when redisearch not loaded
NagariaHussain May 28, 2021
4aeed6c
chore: Redisearch warning in search settings
NagariaHussain May 28, 2021
604895d
fix: Documentation link and open in new tab
NagariaHussain May 28, 2021
fccd759
feat: Search UI
marination Jun 1, 2021
b357edd
fix: Sider and Patch tests
marination Jun 2, 2021
d4a6ffa
fix: Search UI open/close and Empty product search results
marination Jun 2, 2021
d3e6f46
fix: Mixin import issue, search error handling, shop-by-category slid…
marination Jun 8, 2021
92ffbea
fix: Font size, empty image styles, and minor cleanup
marination Jun 8, 2021
7a8b0ab
fix: Checkbox sizes and paging buttons
marination Jun 8, 2021
34ab2c1
fix: Missing Image in Item Page and Variants in Cart
marination Jun 8, 2021
6b5c7d1
chore: Cleanup Query Engine and Product query API
marination Jun 29, 2021
6f20035
fix: Filters state, Search input clearing, Paging buttons
marination Jul 7, 2021
ccd3dd1
feat: Guest Display Settings
marination Jul 8, 2021
be6de4f
fix: Sync Website Items on Item Change, Short Website Description
marination Jul 8, 2021
6e00520
fix: Rename Wishlist Item, Use Website Item Name in Wishlist Cards
marination Jul 8, 2021
5905949
fix: Discount Filtes & Filter behaviour
marination Jul 8, 2021
2b10673
chore: UI refresh for grid/list view and search
marination Jul 11, 2021
55f653d
feat: Recommended Items and Item full page refresh
marination Jul 13, 2021
6a8b0b9
chore: Wishlist UI (minor)
marination Jul 13, 2021
7e67e8b
feat: Cart minor UI/UX Refresh
marination Jul 15, 2021
34bbdc0
fix: Remove Website Item from Item Dashboard
marination Jul 16, 2021
3a61dc0
test: Website Item basic test & removed product configurator tests
marination Jul 19, 2021
fdcf2be
test: Website Item (Item full page)
marination Aug 9, 2021
5e99514
test: Recommendations, Reviews and Wishlist
marination Aug 9, 2021
0001335
chore: debug travis
marination Aug 10, 2021
2ac8b1f
chore: Re-organise files,remove T&C modal in cart
marination Aug 12, 2021
924eca5
fix: Error state and passing args for product listing
marination Aug 13, 2021
a10c1ba
test: Product Query & Filter Engine, Item Group Page
marination Aug 16, 2021
b156dd3
chore: Remove `Home Page is Products` and Sider fixes
marination Aug 24, 2021
4e76791
refactor: Cache Item Reviews and other review feedback
marination Aug 25, 2021
6e0c558
fix: Sider and CI
marination Aug 26, 2021
e12a301
Chore: Miscellaneous UI review changes
marination Sep 1, 2021
f986361
feat: (minor) Backorder indicator and fixed inconsistencies
marination Sep 2, 2021
7b76fc7
fix: Failing search util import and patch
marination Sep 2, 2021
0f132fe
test: Set Price list and company in data engine test setup
marination Sep 3, 2021
0d0bfbc
fix: Paging and Discount filter
marination Sep 3, 2021
84c6db8
test: Product Discounts
marination Sep 3, 2021
8760ad0
fix: Website item patch fixes
deepeshgarg007 Sep 9, 2021
d1579a0
fix: Shopping Cart and Variant Selection (Hotfix PR #27508)
marination Sep 15, 2021
354d6d2
fix: Handle `is_search_module_loaded` for redis version < 4.0.0 (#27574)
marination Sep 18, 2021
3e4373f
fix: Website Items with same Item name unhandled, thumbnails missing
marination Sep 30, 2021
dcfc874
fix: Pre-commit formatting
marination Sep 30, 2021
754a4f6
fix: Item Variant selection empty popup on website
marination Oct 12, 2021
62f208d
fix: Fetch thumbnail from Item master instead of regenerating
marination Oct 19, 2021
9550786
fix: re-run patch
marination Oct 19, 2021
f2b4cfa
fix: Get db values as dict when checking for thumbnail in existing we…
marination Oct 19, 2021
23cb58d
fix: Check if thumbnail column exists in case of table trimming
marination Oct 19, 2021
2ae6bac
fix: Move thumbnail updation to different patch
marination Oct 20, 2021
f8b09b2
fix: SO Portal fixes
marination Oct 21, 2021
e9a902d
style: Fixed indentation for visible heirarchy
marination Oct 27, 2021
255fb88
fix: missing validate_item_group_defaults function
ankush Jan 31, 2022
306abb9
chore: Adjust to ESbuild and missing imports
marination Jan 31, 2022
4bbd7fd
chore: Fix imports and formatting (linter) & Sider (unused import)
marination Jan 31, 2022
35caee5
fix: Merge conflicts, Linter and Server Test
marination Feb 1, 2022
38c5a18
feat: Allow addition of custom search box
marination Nov 29, 2021
f8d54e3
fix: Sider (missing semicolon)
marination Nov 29, 2021
5829672
fix: search_box_id instead of search_box_class
marination Nov 29, 2021
3cd60c9
fix: no module named 'redisearch' (#28818)
rtdany10 Dec 10, 2021
efaee8e
fix: fetch correct selling price.
dj12djdjs Dec 18, 2021
a401ae8
test: e-commerce customer pricing rule
dj12djdjs Dec 22, 2021
c56c50e
fix(test): e-commerce fetch logged-in user item price.
dj12djdjs Dec 23, 2021
83117cc
fix: Convert Item links to Website Item links in Item Card Group temp…
marination Dec 21, 2021
9cdcf8e
fix: Sider
marination Dec 22, 2021
392f2db
fix: Code cleanup
marination Dec 22, 2021
34b8ada
fix: Faulty 'continue' not setting value in db
marination Dec 22, 2021
b92ec8f
fix(e-commerce): shopping cart total quantity (#29076)
dj12djdjs Dec 31, 2021
949d7e2
fix(ux): tripple digit cart qty
dj12djdjs Dec 30, 2021
61d834b
fix: Exclude unpublished items while fetching items from other item g…
marination Jan 10, 2022
54cd4ba
fix: Behaviour if Item Variants Cache generation
marination Jan 10, 2022
f3ef67c
test: Variant Selector - Attribute Value fetching
marination Jan 11, 2022
3823c61
test: Variant Selector - Fetch next valid Attribute values fetching a…
marination Jan 11, 2022
b064e66
fix: Server Side test - teardown correctly
marination Jan 11, 2022
2e92bfe
fix: Cart Logic of Item variant without Website Item
marination Jan 20, 2022
d7ca488
tests: Variant without web item price fetch and add to cart
marination Jan 21, 2022
95873d6
fix: Sider and Linter
marination Jan 21, 2022
8a5f83e
fix: (test) set user for price test
marination Jan 21, 2022
fae4bc2
fix: Wrong variable name breaks Cart Items rendering
marination Jan 21, 2022
3b07d90
debug: CI
marination Jan 21, 2022
527b50a
fix: Failing test, sider and linter
marination Feb 1, 2022
a651a86
fix: Merge conflict inconsistency due to https://github.com/frappe/er…
marination Feb 1, 2022
f2c7927
fix: (minor) build issues on cart and item page
marination Feb 2, 2022
dd3bc1f
fix: (Linter) Write queries using QB/ORM and other minor lines for se…
marination Feb 2, 2022
95ff914
fix: Cart buttons not working
marination Feb 3, 2022
42b82b6
fix: Qb query, use `isin` instead of in and access fields without dot…
marination Feb 3, 2022
d27c115
fix: remove stale doctypes and add msg for ecommerce refactor (#27700)
ankush Sep 30, 2021
d065560
fix: Ignore mandatory fields if exist (#27871)
gavindsouza Oct 8, 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 @@ -39,9 +39,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
6 changes: 3 additions & 3 deletions erpnext/accounts/doctype/payment_request/payment_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,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 @@ -435,13 +435,13 @@ def get_existing_payment_request_amount(ref_dt, ref_dn):
""", (ref_dt, ref_dn))
return flt(existing_payment_request_amount[0][0]) if existing_payment_request_amount else 0

def get_gateway_details(args):
def get_gateway_details(args): # nosemgrep
"""return gateway and payment account of default payment gateway"""
if args.get("payment_gateway_account"):
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 @@ -98,7 +98,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
22 changes: 0 additions & 22 deletions erpnext/buying/doctype/supplier/supplier.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,28 +131,6 @@ def after_rename(self, olddn, newdn, merge=False):
if frappe.defaults.get_global_default('supp_master_name') == 'Supplier Name':
frappe.db.set(self, "supplier_name", newdn)

def create_onboarding_docs(self, args):
company = frappe.defaults.get_defaults().get('company') or \
frappe.db.get_single_value('Global Defaults', 'default_company')

for i in range(1, args.get('max_count')):
supplier = args.get('supplier_name_' + str(i))
if supplier:
try:
doc = frappe.get_doc({
'doctype': self.doctype,
'supplier_name': supplier,
'supplier_group': _('Local'),
'company': company
}).insert()

if args.get('supplier_email_' + str(i)):
from erpnext.selling.doctype.customer.customer import create_contact
create_contact(supplier, 'Supplier',
doc.name, args.get('supplier_email_' + str(i)))
except frappe.NameError:
pass

@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_supplier_primary_contact(doctype, txt, searchfield, start, page_len, filters):
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 @@ -132,7 +132,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 @@ -262,9 +262,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"]

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