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.

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

Marketplace shop settings #1939

Merged
merged 14 commits into from
Apr 24, 2017
Merged

Marketplace shop settings #1939

merged 14 commits into from
Apr 24, 2017

Conversation

lcampanis
Copy link
Collaborator

@lcampanis lcampanis commented Mar 5, 2017

Please review and merge #1934 before this PR.

This PR is mainly a tidy up of shop settings for sellers.

At the moment Shop settings sit in the user Profile page, this was mainly for simplicity.

In this PR we have:

  1. Moved Seller Shop settings to sidebar Action View, accessible via Shop Settings shortcut
  2. Added Shop Address fields
  3. Added Base Units of Measure to shop settings
  4. Added Timezone to shop settings
  5. Added audience seller permissions to Orders shortcut

The following results are produced from this PR:

User Dropdown shortcuts

image

General Shop Settings

image

Shop Address

image

@lcampanis lcampanis mentioned this pull request Mar 5, 2017
@aaronjudd aaronjudd assigned spencern and unassigned mikemurray and aaronjudd Apr 11, 2017
@spencern spencern self-requested a review April 14, 2017 21:11
@aaronjudd aaronjudd removed the request for review from mikemurray April 22, 2017 00:43
const selector = {
// ignore blank site
_id: {
$ne: "ddzuN2YPvgvx7rJS5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It cannot be assumed that this is the default shop id.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have be updated this publication with observers now, which allow for transforms in seller data and are no longer ignoring any id. Will create a PR by tomorrow with that, and other core changes.

import Blaze from "meteor/gadicc:blaze-react-component";
import { Card, CardHeader, CardBody } from "/imports/plugins/core/ui/client/components";

class SettingsCard extends Component {
Copy link
Contributor

@aaronjudd aaronjudd Apr 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikemurray are we working on something similar? I think we need to do a bit of gap/review here?

(oh, and, this is cool)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This most probably is RC code here. We can update this PR if you think it fits RC's requirements from the description and screenshots. It's just a cleaner version of the shop > shop settings, and without the additional owner stuff.

Unable to resolve some modules:

  "react-bootstrap" in
/Users/sn/dev/marketplace/imports/plugins/included/sms/client/components/smsSettings.js
(web.browser)
…ed' when an order is shipped`

Test was timing out due to an undefined order.
Copy link
Contributor

@spencern spencern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adds needed functionality around setting up and administering shops within a marketplace type shop. Nice work!

I'm not fully sold on using specific functions such as hasMarketplaceAccess and isMarketplaceGuest instead of a more universal role checker, but it's working for now, so let's merge and continue to improve as we define a better coding style guide for RC.

Template.shopSelect.helpers({
sellerShops() {
const currentShopId = Reaction.Router.getParam("shopId") || 0;
const selector = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add TODO: to remove this hardcoded blank site ignorer.

@spencern spencern merged commit 79943b5 into marketplace Apr 24, 2017
@spencern spencern removed the review label Apr 24, 2017
@spencern spencern deleted the marketplace-shop-settings branch April 24, 2017 21:47
@spencern spencern mentioned this pull request Oct 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants