Commit Graph

40885 Commits

Author SHA1 Message Date
Marica
612bb5c749
Merge branch 'develop' into se-required-items-from-jc 2021-11-16 18:03:40 +05:30
Marica
6bd0c1dbf1
Merge pull request from marination/pr-return-ux
refactor:  (ux) Accepted/Rejected/Received Qty UX
2021-11-16 18:00:42 +05:30
Marica
0afcdecb9b
Merge branch 'develop' into e-commerce-refactor-develop 2021-11-16 17:58:53 +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
dc42c45ebb fix: Move thumbnail updation to different patch
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup
2021-11-16 17:57:10 +05:30
marination
871e9ca6af fix: Check if thumbnail column exists in case of table trimming 2021-11-16 17:53:43 +05:30
marination
a97ee918b2 fix: Get db values as dict when checking for thumbnail in existing web item 2021-11-16 17:53:30 +05:30
marination
e7819f7abf fix: re-run patch
- Patch will just fetch thumbnails if website items are created, else it will create new website items
2021-11-16 17:53:17 +05:30
marination
d7d70ec9e0 fix: Fetch thumbnail from Item master instead of regenerating 2021-11-16 17:52:14 +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
296f2f6d52 fix: Pre-commit formatting 2021-11-16 17:51:16 +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
d637f79517 fix: Handle is_search_module_loaded for redis version < 4.0.0 ()
- Return False if error occurs
2021-11-16 17:48:31 +05:30
Marica
4096b1471f fix: Shopping Cart and Variant Selection (Hotfix PR ) 2021-11-16 17:46:57 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging () 2021-11-16 17:46:26 +05:30
Deepesh Garg
cbfdbd8442 fix: Website item patch fixes 2021-11-16 17:42:04 +05:30
marination
685c453be0 test: Product Discounts 2021-11-16 17:40:49 +05:30
marination
942dedddb4 fix: Paging and Discount filter
- Convert incoming api args to frappe dict
- Change discount filter condition due to reversal of behaviour
2021-11-16 17:40:05 +05:30
marination
78b791cd1d test: Set Price list and company in data engine test setup 2021-11-16 17:38:25 +05:30
marination
e2b9a38f28 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-11-16 17:38:09 +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
9aeb211142 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-11-16 17:21:46 +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
7d1df9d4c3 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-11-16 17:18:08 +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
78ee51c6ca chore: debug travis 2021-11-16 17:11:02 +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
3fd929c4ee 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-11-16 17:09:34 +05:30
marination
64322199df fix: Remove Website Item from Item Dashboard
- Install breaks on CI, will add later
2021-11-16 17:03:58 +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
c0811c4c74 fix: Discount Filtes & Filter behaviour
- Client: Maintain state where listing is re-rendered due filter trigger
- Client: Handle binding/restoring discount filters separately on filter trigger
- Client: Placeholder Image for search results
- If any filter is checked, query and display items from page 1
- Query Engine: Smaller functions and handle discount filter properly
- Added index on item group and brand for Website item
2021-11-16 16:57:49 +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
16abfd4410 fix: Sync Website Items on Item Change, Short Website Description
- Added Short Description in Website Item for List View
- Update Website Item on Item info change
- Un-publish Web Item if Item is disabled
- Removed unnecessary dependency on Item from query engine
- Rearranged item detail fields in Website Item
- Added Link to Website Item on Item Dashboard
2021-11-16 16:55:12 +05:30
marination
82f8f3caf2 feat: Guest Display Settings
- Re-arranged Settings checkboxes
- Deleted `show_availability_status` from E Commerce Settings
- Added `Hide Price for Guest` functionality
- Added Custom Redirection for Guest Actions in  E Commerce Settings
- Minor cleanups
2021-11-16 16:54:21 +05:30
marination
b450f1c583 fix: Filters state, Search input clearing, Paging buttons
- Fixed repetitive calls on checking filter checkbox
- Query count of items after offset for accurate Paging button display
- Order items by ranking in query
- Search results get empty on clearing input
2021-11-16 16:53:53 +05:30
marination
0dadf535c1 chore: Cleanup Query Engine and Product query API
- Resolved merge conflicts in item_group.py
- Separate api.py file for product listing backend api
- Brought back ORM in query engine, handled missing cases (website item groups, etc)
- Return results from API in a descriptive manner, helps keep sanity in JS
- On toggling views store view preference in localStorage
2021-11-16 16:53:30 +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
24ba06c37b fix: Mixin import issue, search error handling, shop-by-category slideshow 2021-11-16 16:47:04 +05:30
marination
0c73f688e9 fix: Search UI open/close and Empty product search results 2021-11-16 16:46:54 +05:30
marination
ea30ce4c51 fix: Sider and Patch tests 2021-11-16 16:46:22 +05:30