Commit Graph

323 Commits

Author SHA1 Message Date
Sabu Siyad
0df28c7174
fix(ecommerce): throw invalid doctype error in shop by category (#33901)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-02-11 12:28:42 +05:30
Devin Slauenwhite
98c39c4f5f
fix: update payment entry references (#33274)
* fix: set_amounts after deductions and losses are set

* test: difference_amount changes after update_references_in_payment_entry

* chore: linter

* fix: use kwargs instad of destructing a dict

[skip ci]

* fix(test): test payment entry difference_amount after payment reconciliation.
2023-01-02 08:55:12 +05:30
Daizy Modi
4802d719ed fix: removed unused data and minor changes 2022-12-16 15:55:58 +05:30
Daizy Modi
56f3ac15d8 fix: removed unncessary changes 2022-12-15 18:02:14 +05:30
Daizy Modi
ac51c27500 fix: fetch required details from appointment booking settings 2022-12-15 16:53:51 +05:30
Daizy Modi
9a00b3bdbd fix: format html of verify email for book appointment 2022-12-15 16:51:00 +05:30
Daizy Modi
25f0b26a17 fix: remove unused page book-appointment 2022-12-15 16:49:23 +05:30
Muvuk
73e5a7d671
fix: update with new Frappe color. fix #32455 (#32456)
* Update with new Frappe color.

* refactor: use css variables

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-10-02 22:30:36 +05:30
Ernesto Ruiz
499ce5139c
fix: add translate function to book appointment verify html 2022-09-26 08:04:14 -06:00
Ernesto Ruiz
728ef46048
fix: add translate function to book appointment index.js 2022-09-26 08:01:48 -06:00
Ernesto Ruiz
e683cccf35
fix: add translate function to book appointment html 2022-09-26 07:59:13 -06:00
Deepesh Garg
b6184ce471 test: Add tests 2022-09-14 09:13:02 +05:30
Deepesh Garg
41e2959389 chore: remove files related to LMS 2022-04-28 10:41:30 +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
Rucha Mahabal
f066427913
fix: program enrollment button labels (#30148) 2022-03-10 10:06:07 +05:30
Marica
856d3f63b5
Merge pull request #29953 from marination/heart-icon-and-shop-by-category
chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix
2022-02-23 13:01:30 +05:30
marination
714325071f fix: Remove accidental as_dict in frappe.db.get_all 2022-02-23 00:15:39 +05:30
Rucha Mahabal
87b59fc96c
fix(LMS): program enrollment does not give any feedback (#29922) 2022-02-21 22:53:29 +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
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
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
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
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
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
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
ea30ce4c51 fix: Sider and Patch tests 2021-11-16 16:46:22 +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
499fb56c0f fix: Move get_product_filtrs_data to website item file 2021-11-16 16:36:15 +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
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Hussain Nagaria
4309239d6c feat: Show Recent Searches 2021-10-12 18:14:43 +05:30
Hussain Nagaria
34f3a6629f feat: Show brand line in search results 2021-10-12 18:14:29 +05:30
Hussain Nagaria
55d2bf0ff9 chore: Add placeholder image 2021-10-12 18:14:04 +05:30
Hussain Nagaria
ba25460edf chore: Make it a little beautiful 2021-10-12 18:13:27 +05:30
Hussain Nagaria
f3421554ad feat: Add Category autocomplete with config in settings 2021-10-12 18:02:24 +05:30
Hussain Nagaria
e82833f14a feat: Basic Query + Autocomplete 2021-10-12 17:57:46 +05:30
Hussain Nagaria
0c47f3a876 feat: Add basic autocomplete using redisearch 2021-10-12 17:57:19 +05:30
marination
1d94914102 feat: Discount Filters
- Discount filters in filters section
- Code cleanup
2021-10-12 17:46:03 +05:30