nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,190 Commits 485 Branches 1,768 Tags
v13.52.5
Commit Graph

77 Commits

Author SHA1 Message Date
marination
b393c230bd chore: Make image field obsolete in Website Item (redundant) 
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item

(cherry picked from commit 9541354ec7)

# Conflicts:
#	erpnext/e_commerce/doctype/website_item/website_item.py
 2022-07-27 10:14:16 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +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
Marica
321b8afbff Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-05-13 14:28:45 +05:30
Ankush Menat
90e671905a chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Walstan Baptista
ee822a9dcd test: use different product attribute value; cleanup (#25043) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-27 19:42:25 +05:30
marination
31d97b43e6 chore: Removed Shopping Cart Module 
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
 2021-03-08 10:28:02 +05:30
marination
d93e3a32da chore: Patches for Website Item 
- Patch to make website item from item
- Patch to move Products and Shopping Cart Settings into E Commerce Settings
- Patch to move products in Homepage from Item to Website Item
- Minor cleanup, replacing/removing references to Item website fields (obsolete)
 2021-03-08 10:28:02 +05:30
marination
333d08f459 fix: Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings 
- Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings
- Consider 'Hide Variants' in ProductQuery Engine
- Added docstrings
- Remove `get_e_commerce_settings`, redundant
 2021-03-08 10:26:05 +05:30
marination
2a3f5da6af fix: Sider and indexing (minor) 2021-03-08 10:26:05 +05:30
marination
862a924cd2 chore: Removing Item's Website section & references 
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
 2021-03-08 10:26:05 +05:30
marination
675e2af3ea chore: Drive E-commerce via Website Item 
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
 2021-03-08 10:26:05 +05:30
marination
978e8aa31c feat: E-commerce Refactor 
- Created "Website Item" to handle website related information
- Publishing Item new flow
- Created "E Commerce Settings"
- Removed Products Settings
 2021-03-08 10:24:45 +05:30
prssanna
91b41db9e3 fix: check if product_info exists before setting price 2021-02-05 17:34:56 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
prssanna
ac7bc78afe fix: show product price in item card 2021-01-20 17:46:19 +05:30
Shivam Mishra
d0437cfb59 feat: clear document cache on validate 2020-12-24 14:15:09 +05:30
Anupam Kumar
8089b00df2 Merge branch 'develop' into item-group-filter-portal 2020-08-31 16:42:47 +05:30
Anupam K
42092cc377 fix: Homepage Featured Product image fetch issue 2020-08-25 15:29:18 +05:30
Anupam K
28f4417fc5 fix: added filter show in website for filtering product 2020-08-25 08:59:37 +05:30
Shivam Mishra
33a5fdfb78 fix: unbound error in product configurator 2020-08-06 17:23:51 +05:30
Nabin Hait
9cc2d340ba Reset home page based on product settings (#22875) 2020-08-03 10:43:47 +05:30
Deepesh Garg
718870f4a2 Merge pull request #22736 from Thunderbottom/set-homepage 
fix: reset homepage to home after unchecking products page
 2020-07-23 18:53:37 +05:30
Chinmay D. Pai
3e503e4404 chore: do not reset homepage through hooks 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-23 12:06:19 +05:30
Marica
3994aa8b06 fix: Same Contact name for different parties at Portal Login (#22715) 2020-07-22 19:49:54 +05:30
Chinmay D. Pai
33bf0574a3 chore: fix get single value call 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-19 15:54:11 +05:30
Chinmay D. Pai
5bda28eae6 fix: reset homepage to home after unchecking products page 
resets homepage back to home when "home page is products" is unchecked

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-19 00:15:40 +05:30
Sun Howwrongbum
ecff8f9582 fix: UnboundLocalError when setting product_info (#22436) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-25 14:25:53 +05:30
Marica
2112834743 fix: Handle unavailable Variants in Website (#22195) 
* fix: Handle unavailable Variants in Website

* fix: Fetch cart setting from argument
 2020-06-16 00:20:57 +05:30
thefalconx33
f195ccd85f fix: review changes 2019-12-16 15:04:17 +05:30
thefalconx33
5b622eace1 fix: handle scenario with no condition 2019-12-11 16:08:31 +05:30
thefalconx33
2944301c87 fix: website showing disabled items in list of products 2019-12-09 16:35:54 +05:30
Shivam Mishra
5128f3bd0f feat: allow searching from meta fields (#19711) 
* feat: allow searching from meta fields

* feat: remove description in query based on number of items
 2019-12-03 17:27:22 +05:30
Gavin D'souza
23b1dae6a7 chore: dropped dead setup_wizard test 
fix: fixed imports for teste utils
 2019-11-29 20:22:06 +05:30
Gavin D'souza
611d2ccd04 chore: updated path for set_request in v13-develop 2019-11-29 17:42:32 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221) 
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
 2019-10-09 11:41:33 +05:30
Faris Ansari
2b969a469a fix: Build item cache in long worker (#18165) 2019-07-04 18:52:32 +05:30
Faris Ansari
9a45bd11d6 Merge branch 'develop' into item-variant-attributes-optional 2019-05-07 14:25:03 +05:30
Faris Ansari
fde4fa7b60 fix(test): Convert values to list 2019-05-07 13:29:00 +05:30
Faris Ansari
ff9177a6ce fix: Handle attribute filter when no items found 2019-05-06 15:59:51 +05:30
Faris Ansari
aa7ce883ed fix: Dont include disabled items in cache 2019-05-06 15:59:34 +05:30
Faris Ansari
14425575b7 fix: Rebuild cache in background (#17487) 2019-05-04 22:38:13 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +05:30
Nabin Hait
c64cc331b7 Update item_variants_cache.py 2019-05-01 19:27:23 +05:30
Nabin Hait
284e5a284e Update item_variants_cache.py 2019-05-01 19:26:56 +05:30
Faris Ansari
4ca948d7ea fix: Skip disabled items in product configurator 2019-05-01 18:19:24 +05:30
Faris Ansari
61b4afc3c5 perf: Order by name instead of parent (#17404) 
Changing the order by column reduced the query time from 60s to 12s
 2019-04-29 22:41:24 +05:30
Faris Ansari
dd201b0797 fix: Order Item attribute values dynamically 2019-04-25 13:03:50 +05:30