Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Marketplace settings, publications, subscriptions, and routing #2577

Merged
merged 37 commits into from
Jul 28, 2017
Merged

Marketplace settings, publications, subscriptions, and routing #2577

merged 37 commits into from
Jul 28, 2017

Commits on Jul 12, 2017

  1. New settings, publications, schemas for marketplace settings

    @spencern
    spencern committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    b285fdc View commit details
    Browse the repository at this point in the history

  2. providesShopSettings panels now collapsable and display icon

    @spencern
    spencern committed Jul 12, 2017
    Configuration menu
    Copy the full SHA
    3306b07 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. Add PrimaryShop and MerchantShops pubs/subs. remove Shops pub/sub & S… 

    …ellerShops global sub
    @spencern
    spencern committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    3139f5a View commit details
    Browse the repository at this point in the history

  2. Init marketplace flags. This enables user to checkout from the main s… 

    …hop with vendor shops products
    @spencern
    spencern committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    9fd1efc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2017

  1. Replace temp marketplace flags with actual marketplace settings

    @spencern
    spencern committed Jul 14, 2017
    Configuration menu
    Copy the full SHA
    ce47f87 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Use getPrimaryShopid in email config

    @spencern
    spencern committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    c9be086 View commit details
    Browse the repository at this point in the history

  2. Add new marketplace setting marketplaceNakedRoute

    @spencern
    spencern committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    e8b3ee6 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2017

  1. Merge branch 'marketplace' into spencer-marketplace-settings

    @spencern
    spencern committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    4c9a813 View commit details
    Browse the repository at this point in the history

  2. Remove default 2nd shop for marketplace

    @spencern
    spencern committed Jul 18, 2017
    Configuration menu
    Copy the full SHA
    c53a2f8 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2017

  1. New settings for default packages enabled by shop type

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    7a9b8cb View commit details
    Browse the repository at this point in the history

  2. client side getMarketplaceSettings method

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    b63c924 View commit details
    Browse the repository at this point in the history

  3. set locale conditionally for marketplace

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    7884cc8 View commit details
    Browse the repository at this point in the history

  4. guard getShopPrefix on client

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    f699d3b View commit details
    Browse the repository at this point in the history

  5. guard getLogo

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    fb82f44 View commit details
    Browse the repository at this point in the history

  6. conditionally get shop for brand

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    c4bb61d View commit details
    Browse the repository at this point in the history

  7. Only return marketplace settings if marketplace is enabled

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    2cf76e3 View commit details
    Browse the repository at this point in the history

  8. Set package enabled status for new shops based on marketplace settings

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    078bdba View commit details
    Browse the repository at this point in the history

  9. Don’t create a second primary shop

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    c9bbe5e View commit details
    Browse the repository at this point in the history

  10. Conditionally create the cart for the correct shop

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    d21ff6c View commit details
    Browse the repository at this point in the history

  11. Flag merchantLanguage and merchantLocale for removal

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    4954409 View commit details
    Browse the repository at this point in the history

  12. Flush currency for correct shop

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    7e99d4c View commit details
    Browse the repository at this point in the history

  13. Primary shop package sub

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    9272751 View commit details
    Browse the repository at this point in the history

  14. Cache client side marketplace settings

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    53bc2fe View commit details
    Browse the repository at this point in the history

  15. Use cached marketplace settings for brand and cart shopId lookups

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    abdd48c View commit details
    Browse the repository at this point in the history

  16. rename/refactor getMarketplaceSettings on the client to match server … 

    …method
    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    3adf509 View commit details
    Browse the repository at this point in the history

  17. Update the templates publication to ignore shopId unless merchantTemp… 

    …lates is enabled
    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    eededf2 View commit details
    Browse the repository at this point in the history

  18. Publish tags for both the active shop and the primary shop

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    739e9ab View commit details
    Browse the repository at this point in the history

  19. Use the primary shop for routing ReactionLayouts unless merchantTempl… 

    …ates is enabled
    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    b404513 View commit details
    Browse the repository at this point in the history

  20. publish the cart from the primaryShop unless merchantCarts is enabled

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    1193f4c View commit details
    Browse the repository at this point in the history

  21. stub getPrimaryShopId

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    ab310a3 View commit details
    Browse the repository at this point in the history

  22. Stub getPrimaryShopId in another test

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    55e0176 View commit details
    Browse the repository at this point in the history

  23. Deprecate and replace getCurrentShop and getCurrentShopCursor

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    63e8ca3 View commit details
    Browse the repository at this point in the history

  24. Add getPrimaryShopId to /lib/api

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    4b0acb6 View commit details
    Browse the repository at this point in the history

  25. Use primaryShop to determine if revision control is enabled

    @spencern
    spencern committed Jul 19, 2017
    Configuration menu
    Copy the full SHA
    f645b0f View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. Merge branch 'marketplace' of github.com:reactioncommerce/reaction in… 

    …to spencer-marketplace-settings

# Conflicts:
#	imports/plugins/core/email/client/containers/emailConfig.js
#	server/publications/collections/products.js
#	server/startup/accounts.js
    @spencern
    spencern committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    dd63469 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'marketplace' of github.com:reactioncommerce/reaction in… 

    …to spencer-marketplace-settings
    @spencern
    spencern committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    6cd5778 View commit details
    Browse the repository at this point in the history

  3. Add connectors and connectors-shopify to the default enabled packages… 

    … for merchant shops
    @spencern
    spencern committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    748dbc3 View commit details
    Browse the repository at this point in the history