Commit Graph

699 Commits

Author SHA1 Message Date
Marica
bfb2fbea5f
Merge branch 'develop' into redisearch-app-install 2022-04-04 13:27:50 +05:30
marination
397b46a08b chore: Add TODOs(perf) for Redisearch Query 2022-04-04 13:24:56 +05:30
marination
07f17453cd fix: Use Payload in AutoCompleter (categories in search) and misc
- Separate Item group and Item autocomplete dict definition
- Add payload along with Item group, containing namke and route
- Pass weightage while defining item group autocomplete dict (auto sort)
- Use payload while getting results for categories in search
- Remove check to show categories, always show
- Search fields mandatory if reidsearch enabled
- Code separation (rough)
2022-04-01 18:47:01 +05:30
Ankush Menat
257623509d
perf: use cached single docs (#30536)
frappe.local is request specific thread local, hence is almost as good
as no caching.
2022-04-01 11:55:19 +05:30
marination
7e207c8901 fix: Call Redisearch index creation functions on enabling redisearch in settings 2022-03-31 16:29:18 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
marination
f6e64c2cac fix: Product Filters Lookup
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
2022-03-21 17:58:39 +05:30
marination
3507cf5985 test: Test include_descendants in Item Group Product Listing
- Also made include_descendants field's visibility dependant on show_in_website
2022-03-09 13:50:24 +05:30
Rushabh Mehta
4e2c284be7 fix(minor): nix the ugly banner 2022-03-01 08:52:42 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit 2022-02-24 17:03:52 +05:30
marination
b0a1cd6a7b chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon
- `icon-heart` got a stroke colour that needs to be overriden via var `icon-stroke
- Use `icon-heart` instead of `icon-heart-active` as the latter has a color fill now
2022-02-23 00:13:44 +05:30
ChillarAnand
72fe559031 refactor: Remove non profit templates 2022-02-17 08:42:32 +05:30
marination
017a882f90 fix: Remove cart.js from erpnext-web bundle
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05 fix: Load control & dialog assets with cart.js
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
2022-02-03 20:06:24 +05:30
marination
4b62d2d7fe fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip 2022-02-02 12:58:31 +05:30
marination
8c90c505c0 fix: (minor) build issues on cart and item page
- Move `cart.js` to public/js directory
- Reorder import sequence in erpnext web bundle
- Removed unused script block
2022-02-02 10:40:45 +05:30
marination
9eeddc28b0 fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931 2022-02-01 12:15:48 +05:30
marination
47c8ad0b94 fix: Cart Logic of Item variant without Website Item 2022-02-01 11:11:11 +05:30
Dany Robert
d4c74b546d 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
2022-02-01 10:58:18 +05:30
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
2022-02-01 10:51:50 +05:30
marination
9fb61efba8 chore: Fix imports and formatting (linter) & Sider (unused import) 2022-02-01 00:54:54 +05:30
marination
b2b827f50f chore: Adjust to ESbuild and missing imports
- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
2022-02-01 00:03:08 +05:30
marination
3a32596784 style: Fixed indentation for visible heirarchy 2021-11-16 17:57:59 +05:30
marination
f5594c865d fix: SO Portal fixes
- SO Portal: fixed missing images issue
- SO Portal: fallback state when no images
- SO Portal: code indentation in `order_macros.html`
- SO Portal: Actions and indicator font size
- Recommendations: fixed space between image and title
- Recommendations: give empty image state min height
2021-11-16 17:57:46 +05:30
marination
8d389fd433 fix: Item Variant selection empty popup on website
- pass item_code instead of website item name to fetch attributes
2021-11-16 17:51:37 +05:30
marination
ba52d7c23f 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-11-16 17:51:01 +05:30
Marica
4096b1471f fix: Shopping Cart and Variant Selection (Hotfix PR #27508) 2021-11-16 17:46:57 +05:30
marination
bbcbcf7a20 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-11-16 17:37:40 +05:30
marination
45f64bd930 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-11-16 17:37:08 +05:30
marination
1bb135b2d3 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-11-16 17:23:39 +05:30
marination
6b2b9dcee2 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-11-16 17:22:57 +05:30
marination
80fbe16be8 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-11-16 17:21:17 +05:30
marination
335a237383 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-11-16 17:15:05 +05:30
marination
b4529b8511 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-11-16 17:10:23 +05:30
marination
4d254a7ad3 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-11-16 17:10:07 +05:30
marination
929a24ea5c feat: Cart minor UI/UX Refresh
- Added Setting to show or hide price if checkout is disabled
- Show Web Item name in cart instead of Desk Item name
- Cart minor UI Refresh: added images in cart
- Cart minor UI Refresh: repositioned remove button and redesigned
- Cart minor UI Refresh: Payment Summary section
- Cart minor UI Refresh: Disable input on free item
- Cart minor UI Refresh: Add address button in cards
- New file for cart payment summary UI with coupon code (old)
2021-11-16 17:03:17 +05:30
marination
ef4579e4eb chore: Wishlist UI (minor)
- Minor wishlist UI refresh, actions on hover, new icon
- Increase max length of wishlist card title
- Dont fetch outdated price in wishlist
- Translate 'out of stock'
- Use ORM
2021-11-16 17:03:01 +05:30
marination
2fec068aff feat: Recommended Items and Item full page refresh
- Added Optional Recommended Items
- Item Full Page minor UI Refresh
- Floating wishlist button in item full page
- Reviews section UI Refresh
2021-11-16 17:02:43 +05:30
marination
b5e7f04b33 chore: UI refresh for grid/list view and search
- enhanced UI for grid/list view, actions visible on hover only
- enhanced search UI
- Added indicator to show if item is in cart
- Moved search with view togglers
2021-11-16 17:01:06 +05:30
marination
d897062304 fix: Rename Wishlist Item, Use Website Item Name in Wishlist Cards
- Renamed Wishlist Items to Wishlist Item
- Use Website Item Name in Wishlist
- Add Website Item Name field in Wishlist Item
- Remove accidental extra `font-size` attribute
2021-11-16 16:55:28 +05:30
marination
cb52c98f02 fix: Missing Image in Item Page and Variants in Cart
- Added fallback for missing image in item page
- Explore button font
- Incorrectly fetching route from Item master, use Website Item instead
2021-11-16 16:50:27 +05:30
marination
24c8967232 fix: Checkbox sizes and paging buttons
- Show paging buttons at all times and enable/disable buttons
- Define checkbox and radio button  sizes within erpnext
- Wishlist cards even height
2021-11-16 16:48:47 +05:30
marination
aca3c8fce7 fix: Font size, empty image styles, and minor cleanup
- some frappe css font variables weren't loading, remove dependency
- fixed fallback display for missing images in views
- py code cleanup (minor)
2021-11-16 16:48:33 +05:30
marination
b0d7e32018 feat: Search UI
- Search UI with dropdown results
- Client class to handle Product Search actions and results
- Integrated Search bar into all-products and item group pages
- Run db search without redisearch
- Cleanup: [Search] change decorator names and variables
- Sider fixes
2021-11-16 16:45:48 +05:30
Hussain Nagaria
41a5ebc6c0 feat: Add fallback when redisearch not loaded 2021-11-16 16:40:45 +05:30
marination
53bb7a9cd1 chore: Shopping Cart styles and cleanup shallow
- Added remove button to cart item rows
- Freeze on change in Shopping Cart (UX)
- Fixed cart items and taxes/totals alignment issues
- Made Cart responsive
- Added free item indicator
- Fixed item group nested routing issue
- Sales Order is populated with right source warehouse
2021-11-16 16:39:58 +05:30
marination
b29c5d6e84 fix: Discount Filters and Web templates
- Fixed discount filters (didn’t work after js render change)
- Fix Item Card Group template height and style
- Add placeholder to missing images in Product Category Cards template
- Code cleanup
2021-11-16 16:37:08 +05:30
marination
423d7516b4 fix: Empty states and miscellanous fixes
- Added Wishlist and Product Listing empty states
- Hide ‘Write Review’ button f user is not Customer
- Fixed grid view title (missing arg)
- Render empty state if no items form server side
- Removed unused function
- Guest user redirected to login on clicking Wishlist button
- Fixed ‘Notes’ field clearing issue
2021-11-16 16:35:43 +05:30
marination
897c08c8e7 feat: Product View toggling
- Added fully functional list and grid view toggling
- Added ProductGrid and ProductList controllers
- Moved html snippets, rendered via JS now
- Item Group page also rendered via common controller
- Paging section rendered via JS
- Minor style changes
2021-11-16 16:14:59 +05:30
marination
48b3ce82b9 feat: (wip) Toggle Views
- Auto Height on Cards
- Title with ellipses on length exceed
- Changed namepaces
- Moved product card rendering to JS
- Added Image and List View Toggling buttons
- Kept basic filters rendering just as before
2021-11-16 16:11:09 +05:30