-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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] Spencer 799 marketplace stripe connect #2167
Merged
spencern
merged 352 commits into
marketplace
from
spencer-799-marketplace-stripe-connect
Apr 26, 2017
Merged
[Marketplace] Spencer 799 marketplace stripe connect #2167
spencern
merged 352 commits into
marketplace
from
spencer-799-marketplace-stripe-connect
Apr 26, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated package registry handling, updates for payments.
more email templates
…admin role, amended shopIdAutoValue, product publication, gridControls
Resolve `websocket because it does not appear in the connect-src directive of the Content Security Policy` error in safari when using —production build.
- removes name from some payment method registry entries - use name if separate settings and permissions are needed - applies permission checks in package publication for filtering enabled views - uses package name as default settings key, used when no name
- Cleanup handling in taxes, discounts, catalog package handling - Fix error where registry update was overwriting existing settings - use mergeDeep for registry updates
- remove excessive panels - add i18n - generic alerts - convert panel-title to alert info - show alert message only pre-setup
momentjs:moment upgraded from 2.16.0 to 2.17.0
- Process multiple matching entries in registry - adds i18n for PayPal client views - splits PayPal into two payment methods for settings/checkout - todo add migration for express_enabled to express.enabled - todo add migration for payflow_enabled to payflow.enabled - add browser policy akamai.mathtag.com - apply standard button style + i18n to all payment settings
…faultSellerRoles in Account Schema, add ShopTaxes in shop schema, added become seller panel in accounts when MP is enabled, amended shop/createShop to allow guests to create a shop once when marketplace is enabled
- single card payment layout - removes default payment method and collapse handling in checkout - commented in dashboard payment settings. TBD. - resolves #1408
- could have just used if in template, or alternate display - but this is clean and simple for now.
Fix error loading moment for template helpers.
- remove Authnet/dashboard - unused legacy settings?
Updated Apps, payment packages
Feature update reaction
* Remove unused settings icon * Fix "required" name field * Update sidebar Reactively when changes are made * Removed references to "email" Templates are not just for emails, so I removed references to “Email” in all the i18n translations * Removed "email" as Templates are more than email * Remove unused functions * Updated i18n * Renamed variable away from "template"
…w lines. renamed methods folder.
# Conflicts: # imports/plugins/core/revisions/server/hooks.js # imports/plugins/included/payments-stripe/server/methods/stripeapi.js
Tweaks, fixing linting issues, basic code cleanup and some commenting out of partial functionality.
aaronjudd
suggested changes
Apr 26, 2017
Template.stripeConnectRedirect.onCreated(function () { | ||
// TODO: Verify that this works and define steps to reproduce. | ||
// grab stripe connects oauth values and redirect the user | ||
const authCode = FlowRouter.getQueryParam("code"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be Reaction.Router -> directly using flow router could be an issue during upgrades.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 Not sure how that slipped through
aaronjudd
approved these changes
Apr 26, 2017
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a replacement for #1942 Marketplace Stripe Connect. This replacement includes almost all of the code in the original, but has been linted and cleaned up for the merge.
A few notes.
There is some commented out code in
imports/plugins/included/payments-stripe/server/methods/stripe.js
this code was not ready to be merged and was experimental in nature. Because this PR is replacing [WIP][Marketplace] 799 marketplace stripe connect #1942, i've commented out the code rather than removing it for now so that the progress towards the Stripe Connect integration is intact. It will be removed or refactored in a future update. I am not indicating that I believe the commented out code is the correct direction, that is a decision that should be made by the implementer when we finish this plugin.There are a number of
import
s that were removed during this cleanup. I have not left those intact or included them in comments. I don't believe that the imports indicated any specific direction and could not tell if they were related to the Stripe Connect integration.I've removed code in
server/methods/core/cart.js
that started to implement splitting items by shopId in an order. I believe that should be a separate PR and issue and the progress was not far enough along to warrant commenting out the code or leaving it in. There is also some higher level discussion that should happen before we start working on cart/order splitting.