Commit Graph

112 Commits

Author SHA1 Message Date
Devin Slauenwhite
6783fc808b Merge remote-tracking branch 'upstream/version-13-hotfix' into fix-ecommerce-selling-price-with-rule 2021-12-22 20:58:34 -05:00
Devin Slauenwhite
bcc436e63e fix(test): e-commerce fetch logged-in user item price. 2021-12-22 20:20:57 -05:00
Devin Slauenwhite
7eafc9ffe8 test: e-commerce customer pricing rule 2021-12-22 13:11:02 -05:00
marination
dfe718ef79 fix: Convert Item links to Website Item links in Item Card Group template data
- Changed link option to Website Item in Item card group template
- patch to convert pre-existing data
2021-12-21 15:43:48 +05:30
Dany Robert
3f686a67e6 fix: no module named 'redisearch' (#28818)
* chore: rename file to avoid the overriding

* fix: rename ref #1

* fix: rename ref in e_commerce_settings

* fix: rename ref in product_search.py

* chore: rename rsearch.py to redisearch_utils.py

* chore: rename rsearch to redisearch_utils in product_search
2021-12-10 18:13:22 +05:30
marination
7fec4ab88b fix: search_box_id instead of search_box_class 2021-11-29 14:23:32 +05:30
marination
9ec58dec4d fix: Sider (missing semicolon) 2021-11-29 13:59:45 +05:30
marination
ae27bbe3c0 feat: Allow addition of custom search box
- allow passing custom search box class to bind search actions on
- this allows users to inject and get a custom search box running on any page
2021-11-29 13:47:14 +05:30
Ankush Menat
d270b320f1 chore: correct docstring
[skip ci]
2021-11-29 13:37:00 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Sagar Vora
442177aeee fix: specify fields to be set in Lead (#28289) 2021-11-09 16:05:03 +05:30
Marica
5388ecf85e Merge pull request #27926 from frappe/mergify/bp/version-13-hotfix/pr-27914
fix: Avoid automatic customer creation on website user login (backport #27914)
2021-10-28 00:05:55 +05:30
Marica
67e5e95466 Merge pull request #27931 from marination/optimize-get-attribute-filters-hotfix
perf: Optimize get_attribute_filters (#26729)
2021-10-27 13:31:58 +05:30
Ankush Menat
5ed32b5995 fix: unused imports 2021-10-21 11:04:40 +05:30
Ankush Menat
71e517f043 test: fix get_attribute_filter test
The function returns strings directly instead of objects now.
2021-10-21 10:55:11 +05:30
marination
94177c0764 fix: Fetch thumbnail from Item master instead of regenerating 2021-10-19 17:31:55 +05:30
Faris Ansari
666e8cd076 perf: Optimize get_attribute_filters (#26729)
* perf: Optimize get_attribute_filters

* fix: handle when filter attributes are undefined

* chore: unused imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-12 23:43:26 +05:30
marination
f3650b4f9d fix: Merge conflicts with e-commerce 2021-10-12 20:29:13 +05:30
marination
6b8dad9454 fix: Sider, Linter
- Moved return to next line
- Space between function import and body

(cherry picked from commit a780f78f38)
2021-10-12 14:55:08 +00:00
marination
1590ac3ec7 fix: Avoid automatic customer creation on website user login
(cherry picked from commit d824a90fac)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/utils.py
2021-10-12 14:55:08 +00:00
Ankush Menat
b6dc71679e fix: remove transaction commit from tests
(cherry picked from commit 8d69ec72a6)
2021-10-12 16:41:48 +05:30
Marica
e9ed379b57 Merge pull request #27743 from frappe/mergify/bp/version-13-hotfix/pr-27611
fix: Hero Slider Control & Alignment fixes (backport #27611)
2021-10-03 14:29:18 +05:30
marination
77d4849ce8 fix: Pre-commit formatting 2021-10-03 13:30:02 +05:30
Shariq Ansari
86e3adf344 fix: Fixed alignment of Title, Subtitle, Action Button
(cherry picked from commit 0de735f20b)
2021-10-02 11:38:31 +00:00
Shariq Ansari
d6152df3b4 fix: Creating unique hash for slider id instead of slider name
(cherry picked from commit 3e8e6ac4e2)
2021-10-02 11:38:30 +00:00
marination
36b519c962 fix: Website Items with same Item name unhandled, thumbnails missing
- Use naming series for Website Item. There could be two items with same name and different item code
- Fix: Website Item Page view breaks if cart is disabled
- Fix: thumbnails not created for Website Items after patch
- Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled
2021-09-30 18:34:26 +05:30
Marica
d6ed6d53e9 fix: Handle is_search_module_loaded for redis version < 4.0.0 (#27574)
- Return False if error occurs
2021-09-18 14:23:44 +05:30
Marica
9e0fb74ab2 Merge pull request #27508 from marination/shopping-cart-fixes
fix: Shopping Cart and Variant Selection
2021-09-15 14:00:14 +05:30
Marica
2a9fbc609d Merge pull request #27488 from marination/validate-cart-settings
fix: Args missing error on changing Price List currency with cart enabled
2021-09-14 18:43:15 +05:30
Deepesh Garg
70c5533646 fix: Website item patch fixes 2021-09-09 09:47:18 +05:30
Marica
aee2e04a45 Merge pull request #27332 from marination/paging-discount-fix
fix: Paging and Discount filter
2021-09-03 19:11:58 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-03 18:57:43 +05:30
marination
477870eb78 test: Product Discounts 2021-09-03 18:51:56 +05:30
marination
99ec4cc7fe fix: Paging and Discount filter
- Convert incoming api args to frappe dict
- Change discount filter condition due to reversal of behaviour
2021-09-03 17:50:14 +05:30
marination
9d05b2ebfb test: Set Price list and company in data engine test setup 2021-09-03 13:46:28 +05:30
marination
10a450cb2c fix: Failing search util import and patch
- Use simple function import instead of global variable to check if field is valid to index
- Commit after every 20 items in patch to  create web items from items
2021-09-02 14:30:37 +05:30
marination
c5efb6dc35 feat: (minor) Backorder indicator and fixed inconsistencies
- Checkbox in website item to indicate if item is on backorder
- Indicator on listing on full page if availbale on backorder.
- fix: Allow provision to add any valid field from Website Item in Search Index
- fix: Settings filter fields are as per Item, make as per Website Item
- "Add to quote/ Go to Quote" if cart checkout is disabled
2021-09-02 14:07:59 +05:30
marination
7ab858a9b0 Chore: Miscellaneous UI review changes
- Added bg (variable) to pages, card space separation visible
- Removed `show brand line` in settings, shown by default
- Re-arranged settings by importance
- View toggling primary colour is grey
- Only populate recent searches on successful search
- Hit only one server side api, once while searching
- List view primary button float right
- Discounts takes upper limit eg. 10% and below
- Navbar icons only wiggle on qty increase in cart/wishlist
- Pay button in SO portal
- Remove bottom white space below item full page image, min-height fits to content
- List view vertical space between heading and item code
- Empty offer subtitle handled
2021-09-01 14:57:50 +05:30
marination
d3702947b8 fix: Sider and CI
- Incorrect path and Settings in price_list.py import due to merge
- Extra space removed in website_item.py
- Changed client side namespace to `erpnext.e_commerce.*`
2021-08-26 20:58:13 +05:30
marination
06a6fd512a Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-26 16:53:59 +05:30
marination
c1f6898f1a refactor: Cache Item Reviews and other review feedback
- `get_doc` -> `get_values` and `db.sql` -> `db.delete` in Wishlist Item deletion
- cache first page of Item Reviews and burst cache on addition and deletion of reviews
- Update redisearch docs link in E Commerce Settings
- Removed unused cint import
- Broke setting attribute context into smaller functions and code cleanup
- Minor recommended items padding tweak
- Item reviews form dict now uses website item as key
- Customer reviews rendered from UI style consistency
- Stock status consistency in listing and full page
- Handle no price in variant dialog for matched item
2021-08-25 14:34:13 +05:30
marination
341d9b4b6d chore: Remove Home Page is Products and Sider fixes
- Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings
- Removed hooks trigger to reset home page as products
- Sider: duplicate color attribute, shift `return` to next line, over-indentation
2021-08-24 13:52:46 +05:30
marination
280f615ded Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-24 11:48:13 +05:30
marination
71b0e0a146 test: Product Query & Filter Engine, Item Group Page
- Test for ProductQuery engine and ProductFilters engine
- Test for engine for Item Group too
- Renamed ‘product_configurator’ to ‘variant_selector’
- Cleaned up filters.py
- Modal freeze backdrop lighter only in cart, since there’s nothing over it
- Fixed unusual spacing in variant selector dialog
- Made `get_child_groups_for_website` more readable
- Replaced ‘Configure’ with ‘Select’ for variant selection
2021-08-17 01:55:46 +05:30
marination
34df274bf2 fix: Error state and passing args for product listing
- Show error state in case of unexpected errors in query engine
- Pass args appropriately from `view.js`
- Use args correctly in `api.py`
- Error handling in `api.py` if query engine raises error
- Instantiated product data engine tests
- Fix dotted path for search api call in `search.js`
2021-08-13 14:23:52 +05:30
marination
1fec5bbdb6 chore: Re-organise files,remove T&C modal in cart
- Moved product query and filters engine to `product_data_engine` folder
- Moved product grid, list, search, view to `product_ui` folder
- Renamed `website_item_indexing.py` to `redisearch.py`
- Render Terms and Conditions server side along with the rest of the Shopping cart. Don’t make another db call
- Style changes to terms and conditions
- Deleted unused `cart_terms.html`
- Removed print statements
2021-08-12 19:01:10 +05:30
marination
e3422f4ba8 chore: debug travis 2021-08-10 12:49:32 +05:30
marination
480dd8b056 test: Recommendations, Reviews and Wishlist
- Tests for verified and unverified item reviewers
- Test for recommended items and their prices
- Test for adding removing items from Wishlist
- Bug: Wishlist deletes all entries of an item code irrespective of user
- Get Item reviews only if enabled
- Removed price fields from Wishlist Item and made fields read only
- Removed unused price stored as data on Wishlist buttons
- Customer Reviews page checks if reviews are enabled else shows No Reviews
- Moved price stock fetching in Wishlist in separate function
- Made fields read only in Item Review
2021-08-10 11:31:09 +05:30
marination
20bc65c97b test: Website Item (Item full page)
- Tests for website item. Desk tests and portal tests
- Allow guests on method `get_offer_details`
- Fetch stock details only if `show_stock_availability` is enabled
- Validation for duplicate web items on item merge
- Separate method for `validate_properties_before_merge`
- Common error title and exception `DataValidationError` for merge validations on Item
2021-08-09 13:25:13 +05:30
marination
7ef2af203f test: Website Item basic test & removed product configurator tests
- Sider fixes: missing semicolons
- Added two basic tests for Website Item
- Commented Product Configurator tests, needs to re-written fully
2021-07-19 13:27:17 +05:30