refactor: E-commerce (port to develop) (backport #27923) by mergify[bot] · Pull Request #29615 · frappe/erpnext

mergify · 2022-02-03T08:51:17Z

This is an automatic backport of pull request #27923 done by Mergify.
Cherry-pick of 939b0dd has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is up to date with 'origin/version-14-beta-pre-release'.

You are currently cherry-picking commit 939b0dd67d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	renamed:    erpnext/portal/doctype/products_settings/__init__.py -> erpnext/e_commerce/__init__.py
	new file:   erpnext/e_commerce/doctype/__init__.py
	new file:   erpnext/e_commerce/doctype/e_commerce_settings/__init__.py
	renamed:    erpnext/portal/doctype/products_settings/products_settings.js -> erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.js
	new file:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.json
	new file:   erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py
	new file:   erpnext/e_commerce/doctype/website_item/__init__.py
	new file:   erpnext/e_commerce/doctype/website_item/templates/website_item.html
	new file:   erpnext/e_commerce/doctype/website_item/templates/website_item_row.html
	new file:   erpnext/e_commerce/doctype/website_item/test_website_item.py
	new file:   erpnext/e_commerce/doctype/website_item/website_item.js
	new file:   erpnext/e_commerce/doctype/website_item/website_item.json
	new file:   erpnext/e_commerce/doctype/website_item/website_item.py
	new file:   erpnext/e_commerce/doctype/website_item/website_item_list.js
	modified:   erpnext/hooks.py
	deleted:    erpnext/portal/doctype/products_settings/products_settings.json
	deleted:    erpnext/portal/doctype/products_settings/products_settings.py
	modified:   erpnext/portal/product_configurator/test_product_configurator.py
	modified:   erpnext/portal/product_configurator/utils.py
	modified:   erpnext/setup/doctype/item_group/item_group.py
	modified:   erpnext/shopping_cart/filters.py
	modified:   erpnext/shopping_cart/product_query.py
	modified:   erpnext/stock/doctype/item/item.js
	modified:   erpnext/www/all-products/index.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	both modified:   erpnext/modules.txt
	deleted by them: erpnext/portal/doctype/products_settings/test_products_settings.py
	both modified:   erpnext/stock/doctype/item/item.json

Cherry-pick of eef9cf1 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit eef9cf152f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/payment_request/payment_request.py
	modified:   erpnext/accounts/doctype/tax_rule/tax_rule.py
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.js
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.json
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py
	modified:   erpnext/e_commerce/doctype/website_item/website_item.json
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	modified:   erpnext/hooks.py
	modified:   erpnext/portal/product_configurator/utils.py
	modified:   erpnext/portal/utils.py
	modified:   erpnext/public/js/shopping_cart.js
	modified:   erpnext/selling/doctype/quotation/quotation.py
	modified:   erpnext/setup/doctype/item_group/item_group.py
	modified:   erpnext/setup/setup_wizard/operations/company_setup.py
	modified:   erpnext/setup/setup_wizard/operations/install_fixtures.py
	deleted:    erpnext/shopping_cart/doctype/shopping_cart_settings/__init__.py
	deleted:    erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
	deleted:    erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
	modified:   erpnext/shopping_cart/product_query.py
	modified:   erpnext/shopping_cart/test_shopping_cart.py
	modified:   erpnext/templates/generators/item/item_image.html
	modified:   erpnext/templates/includes/cart/cart_address.html
	modified:   erpnext/templates/includes/products_as_list.html
	modified:   erpnext/templates/pages/order.py
	modified:   erpnext/www/all-products/index.js
	modified:   erpnext/www/all-products/index.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	both modified:   erpnext/shopping_cart/cart.py
	deleted by them: erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
	deleted by them: erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py
	both modified:   erpnext/shopping_cart/product_info.py
	both modified:   erpnext/shopping_cart/utils.py
	both modified:   erpnext/stock/doctype/item/item.py

Cherry-pick of 025574d has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 025574d9b5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/coupon_code/test_coupon_code.py
	modified:   erpnext/buying/doctype/supplier/supplier.py
	deleted:    erpnext/buying/onboarding_slide/add_a_few_suppliers/add_a_few_suppliers.json
	modified:   erpnext/controllers/item_variant.py
	modified:   erpnext/demo/data/drug_list.json
	modified:   erpnext/e_commerce/doctype/website_item/website_item.js
	modified:   erpnext/e_commerce/doctype/website_item/website_item.json
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	modified:   erpnext/hooks.py
	modified:   erpnext/portal/doctype/homepage/homepage.js
	modified:   erpnext/portal/doctype/homepage/homepage.json
	modified:   erpnext/portal/doctype/homepage/homepage.py
	modified:   erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
	modified:   erpnext/portal/doctype/website_attribute/website_attribute.json
	modified:   erpnext/selling/doctype/customer/customer.py
	deleted:    erpnext/selling/onboarding_slide/add_a_few_customers/add_a_few_customers.json
	modified:   erpnext/setup/doctype/item_group/item_group.py
	deleted:    erpnext/setup/onboarding_slide/welcome_back_to_erpnext!/welcome_back_to_erpnext!.json
	deleted:    erpnext/setup/onboarding_slide/welcome_to_erpnext!/welcome_to_erpnext!.json
	modified:   erpnext/shopping_cart/filters.py
	modified:   erpnext/shopping_cart/search.py
	modified:   erpnext/stock/doctype/item/item.js
	modified:   erpnext/stock/doctype/item/item.py
	modified:   erpnext/stock/doctype/item/test_records.json
	modified:   erpnext/stock/doctype/item_variant_settings/item_variant_settings.js
	deleted:    erpnext/stock/onboarding_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/item/item.json
	both modified:   erpnext/stock/doctype/item_variant_settings/item_variant_settings.py

Cherry-pick of f1ce418 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f1ce418bdc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	modified:   erpnext/portal/product_configurator/utils.py
	modified:   erpnext/shopping_cart/product_query.py
	modified:   erpnext/stock/doctype/item/item.py
	modified:   erpnext/www/all-products/index.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/shopping_cart/filters.py

Cherry-pick of 37a246e has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 37a246e738.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/coupon_code/test_coupon_code.py
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	new file:   erpnext/patches/v13_0/create_website_items.py
	new file:   erpnext/patches/v13_0/make_homepage_products_website_items.py
	new file:   erpnext/patches/v13_0/populate_e_commerce_settings.py
	modified:   erpnext/portal/doctype/homepage/homepage.py
	modified:   erpnext/shopping_cart/cart.py
	modified:   erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
	modified:   erpnext/templates/pages/home.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

Cherry-pick of 22f41a1 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 22f41a17b7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/controllers/item_variant.py
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	renamed:    erpnext/shopping_cart/filters.py -> erpnext/e_commerce/filters.py
	renamed:    erpnext/portal/product_configurator/__init__.py -> erpnext/e_commerce/product_configurator/__init__.py
	renamed:    erpnext/portal/product_configurator/item_variants_cache.py -> erpnext/e_commerce/product_configurator/item_variants_cache.py
	renamed:    erpnext/portal/product_configurator/test_product_configurator.py -> erpnext/e_commerce/product_configurator/test_product_configurator.py
	renamed:    erpnext/portal/product_configurator/utils.py -> erpnext/e_commerce/product_configurator/utils.py
	renamed:    erpnext/shopping_cart/product_query.py -> erpnext/e_commerce/product_query.py
	renamed:    erpnext/shopping_cart/web_template/hero_slider/__init__.py -> erpnext/e_commerce/shopping_cart/__init__.py
	renamed:    erpnext/shopping_cart/cart.py -> erpnext/e_commerce/shopping_cart/cart.py
	renamed:    erpnext/shopping_cart/product_info.py -> erpnext/e_commerce/shopping_cart/product_info.py
	renamed:    erpnext/shopping_cart/search.py -> erpnext/e_commerce/shopping_cart/search.py
	renamed:    erpnext/shopping_cart/test_shopping_cart.py -> erpnext/e_commerce/shopping_cart/test_shopping_cart.py
	renamed:    erpnext/shopping_cart/web_template/item_card_group/__init__.py -> erpnext/e_commerce/web_template/__init__.py
	renamed:    erpnext/shopping_cart/web_template/product_card/__init__.py -> erpnext/e_commerce/web_template/hero_slider/__init__.py
	renamed:    erpnext/shopping_cart/web_template/hero_slider/hero_slider.html -> erpnext/e_commerce/web_template/hero_slider/hero_slider.html
	renamed:    erpnext/shopping_cart/web_template/hero_slider/hero_slider.json -> erpnext/e_commerce/web_template/hero_slider/hero_slider.json
	renamed:    erpnext/shopping_cart/web_template/product_category_cards/__init__.py -> erpnext/e_commerce/web_template/item_card_group/__init__.py
	renamed:    erpnext/shopping_cart/web_template/item_card_group/item_card_group.html -> erpnext/e_commerce/web_template/item_card_group/item_card_group.html
	renamed:    erpnext/shopping_cart/web_template/item_card_group/item_card_group.json -> erpnext/e_commerce/web_template/item_card_group/item_card_group.json
	renamed:    erpnext/shopping_cart/web_template/product_card/product_card.html -> erpnext/e_commerce/web_template/product_card/__init__.py
	new file:   erpnext/e_commerce/web_template/product_card/product_card.html
	renamed:    erpnext/shopping_cart/web_template/product_card/product_card.json -> erpnext/e_commerce/web_template/product_card/product_card.json
	new file:   erpnext/e_commerce/web_template/product_category_cards/__init__.py
	renamed:    erpnext/shopping_cart/web_template/product_category_cards/product_category_cards.html -> erpnext/e_commerce/web_template/product_category_cards/product_category_cards.html
	renamed:    erpnext/shopping_cart/web_template/product_category_cards/product_category_cards.json -> erpnext/e_commerce/web_template/product_category_cards/product_category_cards.json
	modified:   erpnext/hooks.py
	modified:   erpnext/modules.txt
	modified:   erpnext/patches/v13_0/populate_e_commerce_settings.py
	modified:   erpnext/portal/utils.py
	modified:   erpnext/public/js/conf.js
	modified:   erpnext/public/js/shopping_cart.js
	deleted:    erpnext/shopping_cart/utils.py
	modified:   erpnext/stock/doctype/item/item.py
	modified:   erpnext/templates/generators/item/item_configure.js
	modified:   erpnext/templates/generators/item/item_inquiry.js
	modified:   erpnext/templates/includes/cart.js
	modified:   erpnext/templates/includes/cart/cart_address.html
	modified:   erpnext/templates/includes/product_page.js
	modified:   erpnext/templates/pages/cart.html
	modified:   erpnext/templates/pages/cart.py
	modified:   erpnext/templates/pages/product_search.py
	modified:   erpnext/www/all-products/index.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/e_commerce/shopping_cart/utils.py
	both modified:   erpnext/setup/doctype/item_group/item_group.py
	both modified:   erpnext/stock/doctype/item/item.json

Cherry-pick of 6026185 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 18 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 60261852b2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	modified:   erpnext/e_commerce/product_query.py
	modified:   erpnext/e_commerce/shopping_cart/cart.py
	modified:   erpnext/e_commerce/shopping_cart/product_info.py
	modified:   erpnext/public/scss/shopping_cart.scss
	modified:   erpnext/templates/generators/item/item.html
	modified:   erpnext/templates/generators/item/item_add_to_cart.html
	modified:   erpnext/templates/includes/macros.html
	modified:   erpnext/templates/pages/wishlist.html
	modified:   erpnext/templates/pages/wishlist.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/utilities/product.py

Cherry-pick of 817f695 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 19 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 817f695c57.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

Cherry-pick of 8e55c95 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 25 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8e55c95ecc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	new file:   erpnext/e_commerce/website_item_indexing.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/templates/pages/product_search.py

Cherry-pick of 41a5ebc has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 48 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 41a5ebc6c0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/www/all-products/search.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/templates/pages/product_search.py

Cherry-pick of aca3c8f has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 55 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit aca3c8fce7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/product_grid.js
	modified:   erpnext/e_commerce/product_list.js
	modified:   erpnext/e_commerce/product_search.js
	modified:   erpnext/patches/v13_0/create_website_items.py
	modified:   erpnext/public/scss/shopping_cart.scss
	modified:   erpnext/templates/generators/item/item_add_to_cart.html
	modified:   erpnext/templates/generators/item/item_inquiry.html
	modified:   erpnext/templates/generators/item_group.html
	modified:   erpnext/templates/includes/cart/address_card.html
	modified:   erpnext/templates/includes/cart/cart_address.html
	modified:   erpnext/templates/includes/macros.html
	modified:   erpnext/templates/pages/cart.html
	modified:   erpnext/www/all-products/index.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/templates/pages/product_search.py

Cherry-pick of 16abfd4 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 61 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 16abfd4410.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/doctype/website_item/website_item.json
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	modified:   erpnext/e_commerce/product_list.js
	modified:   erpnext/e_commerce/product_query.py
	modified:   erpnext/stock/doctype/item/item.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/item/item.json

Cherry-pick of 6432219 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 68 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 64322199df.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/item/item.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 3fd929c has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 69 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3fd929c4ee.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/doctype/website_item/test_website_item.py
	modified:   erpnext/e_commerce/product_configurator/test_product_configurator.py
	modified:   erpnext/e_commerce/product_search.js
	modified:   erpnext/e_commerce/product_view.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/item/test_item.py

Cherry-pick of 335a237 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 73 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 335a237383.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/api.py
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	deleted:    erpnext/e_commerce/filters.py
	renamed:    erpnext/e_commerce/shopping_cart/search.py -> erpnext/e_commerce/legacy_search.py
	modified:   erpnext/e_commerce/product_configurator/test_product_configurator.py
	renamed:    erpnext/e_commerce/product_query.py -> erpnext/e_commerce/product_data_engine/query.py
	renamed:    erpnext/e_commerce/product_grid.js -> erpnext/e_commerce/product_ui/grid.js
	renamed:    erpnext/e_commerce/product_list.js -> erpnext/e_commerce/product_ui/list.js
	renamed:    erpnext/e_commerce/product_search.js -> erpnext/e_commerce/product_ui/search.js
	renamed:    erpnext/e_commerce/product_view.js -> erpnext/e_commerce/product_ui/views.js
	renamed:    erpnext/e_commerce/website_item_indexing.py -> erpnext/e_commerce/redisearch.py
	modified:   erpnext/public/build.json
	modified:   erpnext/public/scss/shopping_cart.scss
	modified:   erpnext/setup/doctype/item_group/item_group.py
	modified:   erpnext/templates/pages/cart.html
	deleted:    erpnext/templates/pages/cart_terms.html
	modified:   erpnext/www/all-products/index.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/e_commerce/product_data_engine/filters.py
	both modified:   erpnext/templates/pages/product_search.py

Cherry-pick of dc42c45 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 95 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dc42c45ebb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/patches/v13_0/create_website_items.py
	new file:   erpnext/patches/v13_0/fetch_thumbnail_in_website_items.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

Cherry-pick of 9fb61ef has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 100 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9fb61efba8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/api.py
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py
	modified:   erpnext/e_commerce/doctype/e_commerce_settings/test_e_commerce_settings.py
	modified:   erpnext/e_commerce/doctype/item_review/item_review.py
	modified:   erpnext/e_commerce/doctype/item_review/test_item_review.py
	modified:   erpnext/e_commerce/doctype/recommended_items/recommended_items.py
	modified:   erpnext/e_commerce/doctype/website_item/test_website_item.py
	modified:   erpnext/e_commerce/doctype/website_item/website_item.py
	modified:   erpnext/e_commerce/doctype/website_item_tabbed_section/website_item_tabbed_section.py
	modified:   erpnext/e_commerce/doctype/website_offer/website_offer.py
	modified:   erpnext/e_commerce/doctype/wishlist/test_wishlist.py
	modified:   erpnext/e_commerce/doctype/wishlist/wishlist.py
	modified:   erpnext/e_commerce/doctype/wishlist_item/wishlist_item.py
	modified:   erpnext/e_commerce/product_data_engine/filters.py
	modified:   erpnext/e_commerce/product_data_engine/query.py
	modified:   erpnext/e_commerce/product_data_engine/test_item_group_product_data_engine.py
	modified:   erpnext/e_commerce/product_data_engine/test_product_data_engine.py
	modified:   erpnext/e_commerce/redisearch.py
	modified:   erpnext/e_commerce/shopping_cart/cart.py
	modified:   erpnext/e_commerce/shopping_cart/product_info.py
	modified:   erpnext/e_commerce/shopping_cart/utils.py
	modified:   erpnext/e_commerce/variant_selector/test_variant_selector.py
	modified:   erpnext/e_commerce/variant_selector/utils.py
	modified:   erpnext/patches/v13_0/create_website_items.py
	modified:   erpnext/patches/v13_0/make_homepage_products_website_items.py
	modified:   erpnext/patches/v13_0/populate_e_commerce_settings.py
	modified:   erpnext/portal/utils.py
	modified:   erpnext/stock/doctype/price_list/price_list.py
	modified:   erpnext/templates/pages/customer_reviews.py
	modified:   erpnext/templates/pages/order.py
	modified:   erpnext/templates/pages/wishlist.py
	modified:   erpnext/utilities/product.py
	modified:   erpnext/www/all-products/index.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/templates/pages/product_search.py

Cherry-pick of 456f277 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 109 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 456f27724c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/web_template/item_card_group/item_card_group.html
	modified:   erpnext/e_commerce/web_template/item_card_group/item_card_group.json
	new file:   erpnext/patches/v13_0/convert_to_website_item_in_item_card_group_template.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

Cherry-pick of 2933cf2 has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 126 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2933cf243a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/e_commerce/product_data_engine/test_product_data_engine.py
	modified:   erpnext/e_commerce/variant_selector/test_variant_selector.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/item/item.py

Cherry-pick of bd3b47f has failed:

On branch mergify/bp/version-14-beta-pre-release/pr-27923
Your branch is ahead of 'origin/version-14-beta-pre-release' by 132 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bd3b47fd50.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   erpnext/patches/v13_0/shopping_cart_to_ecommerce.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

- Created "Website Item" to handle website related information - Publishing Item new flow - Created "E Commerce Settings" - Removed Products Settings (cherry picked from commit 939b0dd) # Conflicts: # erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py # erpnext/modules.txt # erpnext/portal/doctype/products_settings/test_products_settings.py # erpnext/stock/doctype/item/item.json

- 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 (cherry picked from commit eef9cf1) # Conflicts: # erpnext/e_commerce/doctype/e_commerce_settings/e_commerce_settings.py # erpnext/shopping_cart/cart.py # erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py # erpnext/shopping_cart/doctype/shopping_cart_settings/test_shopping_cart_settings.py # erpnext/shopping_cart/product_info.py # erpnext/shopping_cart/utils.py # erpnext/stock/doctype/item/item.py

- 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 (cherry picked from commit 025574d) # Conflicts: # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/item_variant_settings/item_variant_settings.py

(cherry picked from commit b38339c)

…ce 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 (cherry picked from commit f1ce418) # Conflicts: # erpnext/shopping_cart/filters.py

- 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) (cherry picked from commit 37a246e) # Conflicts: # erpnext/patches.txt

- 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 (cherry picked from commit 22f41a1) # Conflicts: # erpnext/e_commerce/shopping_cart/utils.py # erpnext/setup/doctype/item_group/item_group.py # erpnext/stock/doctype/item/item.json

- Added Shop by Category Page - Tabbed sections for item fields in Shop by Category Page - Added Shop by Category Section in E commerce Settings - Nested Navigation & Breadcrumbs in Item group pages - Added scrollable & clickable Sub categories in Item Group page - Made breadcrumbs slightly dynamic in Item Page - Added image to Brand doctype (cherry picked from commit d7130e3)

- Rough UI for card actions - Wishlist doctype - Indicators on card based on stock availability (cherry picked from commit 16b9c8c)

- Increased qty in cart on clicking add to cart for existing item - Simplified macro arguments - Navbar cart icon animation - Explore button for template item in card - Add to cart button animation (cherry picked from commit 4f64d1c)

- Add remove items from wishlist - Wishlist icon at nav bar - Animate wishlist icon in card and navbar - Remember wished state after refresh as well (cherry picked from commit 96cc506)

- Navbar icon with badge count for wishlist - Wishlist page with cards - Cards can be moved to cart or removed in a click - Separated all wishlist related methods into wishlist.js - Made a common js method(util) to add/remove wishlist items - Bug fix: Make sure items are removed from session user's wishlist (cherry picked from commit 5951440)

(cherry picked from commit cd11714)

… Page - Add to Wishlist button next to add to cart - Beautified Product Specifications table section - Product Specifications can be optionally in a tabbed section with custom tabs added - Removed hard coded gray bg to allow custom theme overwrites - Fixed resizing issues in Item Full Page view - Cleaned up inline styles and ported to scss (cherry picked from commit 25ffafa)

- Removed wish-red variable - Removed hover state from remove wishlist item button in card - Removed inline css from wishlist item card (cherry picked from commit 07d7cf0)

- Added Ratings and Reviews section in Item full page view - Added provision to write a review with popup - Created Item Review Doctype to store User-Item unique reviews - Added privision to enable/disable wishlist and reviews in e commerce settings - Hide cart and wishlist actions everywhere (even navbar) depending on settings - Moved some more inline css to scss - Small logic fixes TODO: Reviews full page view with paging (cherry picked from commit b15ff57)

- Created macros for repetitive snippets - Created Customer Reviews full page - View more button to reveal 10 more reviews at a time - Common function to get reviews with start and end (cherry picked from commit c842305)

(cherry picked from commit 3d5f029)

- Registered mrp and price after discounts - slashed price with discount in listing, item page and wishlist - removed redundant imports - renamed method to `get_web_item_qty_in_stock` to get Website Item stock - adjusted styles for resizing - made add to cart button full width on cards (cherry picked from commit 6026185) # Conflicts: # erpnext/utilities/product.py

- Modified date changed due to merge conflict - Changed it to a later date to make sure Item migrates correctly (cherry picked from commit 817f695)

- Discount filters in filters section - Code cleanup (cherry picked from commit 1d94914)

(cherry picked from commit 71f4b98)

(cherry picked from commit 0c47f3a)

(cherry picked from commit e82833f)

(cherry picked from commit 3160187)

- Move indexing logic to separate file - Add more validation logic for 'search index fields' field (cherry picked from commit 8e55c95) # Conflicts: # erpnext/templates/pages/product_search.py

(cherry picked from commit f342155)

(cherry picked from commit ba25460)

(cherry picked from commit ffc8616)

(cherry picked from commit 70b164e)

(cherry picked from commit 5a462db)

…fter selection of one (cherry picked from commit 2623046)

(cherry picked from commit f2fbe90)

(cherry picked from commit 47c8ad0)

- Also, optionally get image from template web item for cart if variant has no image (cherry picked from commit 4f7ec25)

(cherry picked from commit 606f23b)

(cherry picked from commit 143ff71)

(cherry picked from commit 00752ca)

(cherry picked from commit 1d7f313)

- Remove unused imports - fix test `test_product_list_attribute_filter_builder` (cherry picked from commit 2933cf2) # Conflicts: # erpnext/stock/doctype/item/item.py

(cherry picked from commit 9eeddc2)

- Move `cart.js` to public/js directory - Reorder import sequence in erpnext web bundle - Removed unused script block (cherry picked from commit 8c90c50)

…mgrep to skip (cherry picked from commit 4b62d2d)

- Add cart.js to web bundle - Hide icon conditionally since now this file loads on every single page (cherry picked from commit f47db26)

… notation due to reserved pypika keywords (cherry picked from commit f97642e)

(cherry picked from commit bd3b47f) # Conflicts: # erpnext/patches.txt

The goal of this fix is to not break the patch in case of customizations In this particular case, it's regarding a customized Note DocType with multiple custom mandatory fields (cherry picked from commit 7eb9dc0)

marination and others added 30 commits February 3, 2022 08:49

fix: Sider and indexing (minor)

3c1b022

(cherry picked from commit b38339c)

feat: Card Actions and Wishlist

fb83a1b

- Rough UI for card actions - Wishlist doctype - Indicators on card based on stock availability (cherry picked from commit 16b9c8c)

feat: Animate Add to Cart List interactions (UX)

b2be6ef

- Increased qty in cart on clicking add to cart for existing item - Simplified macro arguments - Navbar cart icon animation - Explore button for template item in card - Add to cart button animation (cherry picked from commit 4f64d1c)

feat: Wishlist from card actions

c0de1fa

- Add remove items from wishlist - Wishlist icon at nav bar - Animate wishlist icon in card and navbar - Remember wished state after refresh as well (cherry picked from commit 96cc506)

fix: Sider

36ae599

(cherry picked from commit cd11714)

fix: Remove unnecessary css variable and hover state

512cf57

- Removed wish-red variable - Removed hover state from remove wishlist item button in card - Removed inline css from wishlist item card (cherry picked from commit 07d7cf0)

feat: Customer Ratings & Reviews Full Page

9a686d0

- Created macros for repetitive snippets - Created Customer Reviews full page - View more button to reveal 10 more reviews at a time - Common function to get reviews with start and end (cherry picked from commit c842305)

fix: Sider and Tests

38fe632

(cherry picked from commit 3d5f029)

fix: Item schema modified date update

ded1e7d

- Modified date changed due to merge conflict - Changed it to a later date to make sure Item migrates correctly (cherry picked from commit 817f695)

feat: Discount Filters

581de19

- Discount filters in filters section - Code cleanup (cherry picked from commit 1d94914)

chore: Sider and Semgrep

6026449

(cherry picked from commit 71f4b98)

feat: Add basic autocomplete using redisearch

08228cc

(cherry picked from commit 0c47f3a)

feat: Basic Query + Autocomplete

7a89fe3

(cherry picked from commit e82833f)

feat: Add search fields field

6cb0c22

(cherry picked from commit 3160187)

feat: Make search index fields configurable

835a4ec

- Move indexing logic to separate file - Add more validation logic for 'search index fields' field (cherry picked from commit 8e55c95) # Conflicts: # erpnext/templates/pages/product_search.py

feat: Add Category autocomplete with config in settings

e34cb8e

(cherry picked from commit f342155)

chore: Make it a little beautiful

69e1469

(cherry picked from commit ba25460)

refactor: Use global redis connection

f273cf0

(cherry picked from commit ffc8616)

chore: Add query clean-up

427fdea

(cherry picked from commit 70b164e)

marination and others added 17 commits February 3, 2022 08:51

test: Variant Selector - Attribute Value fetching

f3ef67c

(cherry picked from commit 5a462db)

test: Variant Selector - Fetch next valid Attribute values fetching a…

3823c61

…fter selection of one (cherry picked from commit 2623046)

fix: Server Side test - teardown correctly

b064e66

(cherry picked from commit f2fbe90)

fix: Cart Logic of Item variant without Website Item

2e92bfe

(cherry picked from commit 47c8ad0)

tests: Variant without web item price fetch and add to cart

d7ca488

- Also, optionally get image from template web item for cart if variant has no image (cherry picked from commit 4f7ec25)

fix: Sider and Linter

95873d6

(cherry picked from commit 606f23b)

fix: (test) set user for price test

8a5f83e

(cherry picked from commit 143ff71)

fix: Wrong variable name breaks Cart Items rendering

fae4bc2

(cherry picked from commit 00752ca)

debug: CI

3b07d90

(cherry picked from commit 1d7f313)

fix: Failing test, sider and linter

527b50a

- Remove unused imports - fix test `test_product_list_attribute_filter_builder` (cherry picked from commit 2933cf2) # Conflicts: # erpnext/stock/doctype/item/item.py

fix: Merge conflict inconsistency due to #27931

a651a86

(cherry picked from commit 9eeddc2)

fix: (minor) build issues on cart and item page

f2c7927

- Move `cart.js` to public/js directory - Reorder import sequence in erpnext web bundle - Removed unused script block (cherry picked from commit 8c90c50)

fix: (Linter) Write queries using QB/ORM and other minor lines for se…

dd3bc1f

…mgrep to skip (cherry picked from commit 4b62d2d)

fix: Cart buttons not working

95ff914

- Add cart.js to web bundle - Hide icon conditionally since now this file loads on every single page (cherry picked from commit f47db26)

fix: Qb query, use isin instead of in and access fields without dot…

42b82b6

… notation due to reserved pypika keywords (cherry picked from commit f97642e)

fix: remove stale doctypes and add msg for ecommerce refactor (#27700)

d27c115

(cherry picked from commit bd3b47f) # Conflicts: # erpnext/patches.txt

fix: Ignore mandatory fields if exist (#27871)

d065560

The goal of this fix is to not break the patch in case of customizations In this particular case, it's regarding a customized Note DocType with multiple custom mandatory fields (cherry picked from commit 7eb9dc0)

mergify Bot requested review from ankush, deepeshgarg007, gavindsouza, marination, nextchamp-saqib and rohitwaghchaure as code owners February 3, 2022 08:51

mergify Bot added the conflicts label Feb 3, 2022

mergify Bot mentioned this pull request Feb 3, 2022

refactor: E-commerce (port to develop) #27923

Merged

3 tasks

github-actions Bot added ecommerce stock labels Feb 3, 2022

marination closed this Feb 3, 2022

mergify Bot deleted the mergify/bp/version-14-beta-pre-release/pr-27923 branch February 3, 2022 08:59

github-actions Bot locked as resolved and limited conversation to collaborators Jan 12, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: E-commerce (port to develop) (backport #27923) - #29615

refactor: E-commerce (port to develop) (backport #27923)#29615
mergify[bot] wants to merge 134 commits into
version-14-beta-pre-releasefrom
mergify/bp/version-14-beta-pre-release/pr-27923

mergify Bot commented Feb 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

mergify Bot commented Feb 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants