Skip to content

Conversation

@kieckhafer
Copy link
Member

This update will allow users to update their email address through our Profile UI.

It will not allow a user to update their email to an address that is already in use by another user.

Spencer Norman and others added 30 commits April 5, 2017 10:41
Adds link to requirements docs above installation instructions
* Init second request on after next url returned

* Refactor to fetch carriers recursively from api
…-safari

Remove isHidden check from core startup b/c blocking safari
)

* Fix issue #2016 changed price not displayed for prod on grid page

* Add getVariantQuantity function to ProductRevision
* fix pdp url path for grid settings

* remove commented code
* Remove revision conditional

* Remove templates
jm-wanja and others added 28 commits August 22, 2017 11:15
* Fix notification page not found error (#2614)

* Remove unused view all notifications code (#2614)
* Add new show/hideForShopTypes setting to the registry

* Add provides marketplaceMerchantSettings reactionApp

marketplaceMerchantSettings only shows up for non-primary shop owners.
Will be used for stripe merchant account setup and other merchant specific settings

* update provides shopSettings loop to use template instead of name for uniqueness

* add shopAppSwitch helper for showing plugin/app enable switch

only show switch to primary shops if marketplace is enabled.

* Init merchant stripe connect settings

* Unify payments-stripe-connect and payments-stripe plugins

* getPackageSettingsWithOptions method

This should probably replace getPackageSettingsWith options, but not sure what our deprecation path should look like right now.

* WIP Stripe Connect Integration

* Create new shops with account address if it exists

* Guard shopType in reactionApps

* WIP - Authorize stripe connect. Save connect credentials on merchant's reaction-stripe pkg

* Direct users to stripe dashboard to check earnings if they have already completed Stripe account setup.

* Update Reaction.marketplace helper

* Update tax rate calculator to be multi-shop aware

* Update cart and cartItem schemas to support taxes on each item and taxRates for each shop

* add reaction-taxes to the default package list for merchant shops

* Add marketplace needed cart transforms.

Also adjusts getSummary function to support shopId filtered reducers

* Fixes for updated taxes methods.

* check if merchant's have a stripe account better

* WIP Experimental stripe connect multi-payment method

* Check to make sure that we haven't authorized this merchant yet.

For some reason two auths in Stripe equal an auth then immediate deauthorization

* Successfully charge on behalf of a connected account

* Edits to make stripe marketplace method work from checkout

* Update stripe/createCharges to create a "Payment" object for each charge and call cart/submitPayment

* [WIP] use call createCharges from client

* Update getApiKey in stripeapi to use primaryShop's stripe acct

* update payments schema to store shopId

* [HACK] Don't check for refunds when sending order notifications
This needs to be reversed once listing refunds for connect is figured out

* [WIP] Start working on figuring out stripe connect refunds

* Cleanup

* Update cart/submitPayment to work with multiple payments

* Update stripe/createCharges to respect request to "authorize" instead of "capture"

* Place order with stripe/createCharges and handle order creation on server side

* Client side validation and confirm that all stripe client safe errors get passed through to client and prevent charge

* Send `card_error`s back to the client, throw on all other errors. Perform luhn, exp, and cvc checks on client before passing to stripe

* Updates to cart and stripe payment methods to support multi-payments as discussed with Brent and Aaron yesterday

* Properly charge primary shop and permit order splitting between primary and merchant shops instead of just multiple merchant shops

* remove comments

* Make standard taxes work with stripe connect / marketplace checkout.
Mask true tax rates

* enable all tests

* Demo application fee for stripe connect accounts

* Fix issues in cart transforms

* Adjust packages publications so that we have primary shop routes available on load

* Don't refresh active shop package publication if active shop is primary shop

* Remove comments

* Fix issue where order would fail if no taxes are enabled for any shop

* Update error handling to follow Reaction convention

* Fix issue where shop not having tax data would cause checkout to fail

* Export stripe methods

* Initial tests for updated Stripe package that supports connect

* Remove old lib stripe api that's no longer used

* Add nock to package.json

* Stub stripe package fetching for marketplace shops in stripe createCharges test

* Fix stripe create charges test

* Revert unfinished experimental updates to stripe/refunds/list

* export stripe connect methods

* cast invoice values to numbers before updating cart billing
… shop currency. (#2716)

* Fix default currency from locale currency to owner's shop default #2668

* Fix default currency from locale currency to owner's shop default #2668

* Set currency of the product to default to owner's shop currency (#2668)

* Fix currency dropdown change to reflect on PDP on merchant shop (#2668)
* fixed typo in data-i18n attribute

* uncommented index file

* added new english translations

* edited spanish translations file

* added missing translations

* added more missing translations for dashboard

* added new translaations for shop and search sections of dashboard

* resolved changes
development to marketplace
* init Reaction.Endpoints for managing HTTP endpoints (receiving webhooks, etc)

* Successfully receive webhook from shopify with this endpoint code. Examples to follow

* Comment for Endpoints module

* Rename sendResult to sendResponse

* Remove example code that snuck in

* Add todo for adding a rate limiter to the endpoints module
…t shops #2726;#2728 (#2734)

* Move groups list check into parent component, freeing form component

* Add comment to func

* Add missing shopId to Packages.find

* Reduce text line length
* more props passed to wrapper

* fixes for email table

* update Email table to use ReactTable

* email table convert to ReactTable

* Bunyan and Loggly updates (#2425)

* switch to official Loggly lib for Node and write new Bunyan connector for it

* update bunyan to 2.0.0

* add REACTION_LOG_FORMAT config option

* add extra comments about log formatting options

* refactor default admin user creation (#2453)

* update memory usage in CircleCI build (#2462)

* finished implementing design

* Navbar hover issue (#2451)

* added default hover style for languages and currencies class #2444

* added accounts css class to div in mainDropdownContainer #2444

* added hover styles for account class #2444

* added hover style for notification class #2444

* set css property overflow on horizontal to hidden (#2458)

* [WIP] 2452 fix on UI icon toolbar (#2460)

2452 fix on UI icon toolbar

* [WIP] 2356 fix on tag menu-sidebar glitch (#2472)

Fix on tag menu-sidebar glitch

* format price string for invoice details

* update media gallery new / deleted image indicators (#2469)

* add new status for mediaGalleryIndicator

* i18n translations for tooltips

* status-badge styles for media gallery

* update media gallery image new / deleted indicator

* style updates

* lint fix

* Remove random regex checks on names. Fixes #2461 (#2471)

* remove older Blaze based launchdock plugin (#2467)

* 2459 router range error fix (#2476)

* simple fix

* fix typo & linting

* fix linting issues

* custom pagination component for React-Table

* update Avalara to use ReactTable

* add spacing below tables

* 2422 Fix on email invite link leading to blank screen (#2437)

* imported LoginFormValidation to forgotContainer

* imported LoginFormValidation to passwordOverlayContainer

* added setTimeout function to delay rendering

* wrap component in translations (#2434)

* removed setTimeouts from updatePassword.js

* added spinner before mounting the component

* replaced setTimeout with life-cycle hook(componentWillRecieveProps) #2422

* imported LoginFormValidation to prevent console error

* Update current user's name on Navbar and profile page when address is added. (#2455)

* Update current user's name and profile when address is added

* Update user's name when address is updated

* Get correct admin user's name from env variables

* add invoice actions

* Updated dependencies (#2463)

* Move babelrc into package.json

* Updated dependencies

* Define missing options variable

* remove leftover console.logs

* lint fixes

* lint fix

* query prop validation

* pagination updates

* Revert minifier to abernix fork (#2486)

* Use abernix:standard-minifier-js

Replace standard-minifier-js with
abernix:[email protected]

This should be compatible with current 1.5 tools, and is what we were
using before 1.5, because of the faster compilation and reduced memory
footprint.  Restoring in an attempt to diagnose build issues related to
memory.

* updated meteor package versions

* componetize pagination

* Release 1.3.0 (#2417)

## Features

-   **Meteor 1.5 (#2371)**
-   **Order fulfillment UI updates (#2400)**
-   **React Router updated (#2123)**
-   **React Navbar (and deprecated Blaze navbar) (#2306)**
-   **Re-introduce icon toolbar as shortcutBar (#2261)**
-   **React unit testing example (#2170)**
-   **[WIP] [Style guide](https://styleguide.reactioncommerce.com)**

## Changes / Fixes
- __Update current user's name on Navbar and profile page when address is added. (#2455)__
- __Fix #2422 on email invite link leading to blank screen (#2437)__
- __Fix #2459 router range error fix (#2476)__
- __Remove older Blaze based launchdock plugin (#2467)__
- __Remove random regex checks on names. Fixes #2461 (#2471)__
- __Update media gallery new / deleted image indicators (#2469)__
- __Fix #2356 on tag menu-sidebar glitch (#2472)__
- __Fix #2452 on UI icon toolbar (#2460)__
- __set css property overflow on horizontal to hidden (#2458)__
- __Navbar hover issue (#2451)__
- __update memory usage in CircleCI build (#2462)__
- __refactor default admin user creation (#2453)__
- __Bunyan and Loggly updates (#2425)__
- __Updated chai package__
- __add missing "orders not found" text (#2424)__
- __Add closeOnClick option to DropDownMenu component (#2418)__
-   **Fixed console error when dragging product images (#2443)**
-   **Remove unmaintained Browserstack acceptance tests (#2430)**
-   **Add css style to differentiate read from unread notifications (#2442)**
-   **Added module aliases @reactioncommerce/reaction-ui (#2436)**
-   **Switch to Reaction’s new fork of Nodemailer (#2427)**
-   **Admin should be able to invite a user with the same name (#2386)**
-   **Updated yarn.lock and removed npm-shrinkwrap.json**
-   **use route permissions in register.js files (#2388)**
-   **Updated, refreshed order/fulfillment UI (#2400)**
-   **Change line width to match GH PR review width (#2407)**
-   **Fix Improper Cart Merge (#2387)**
-   **Implement missing router functions (#2393)**
-   **Correct the way we record tax overrides**
-   **CollectionFS  cfs:tempstore and cfs:worker to Fix concurrency issues with GridFS uploads (#2096)**
-   **Fix typo in inventory test description (#2364)**
-   **Added Nigerian Naira to currency list in (#2366)**
-   **Fix git tagging on CircleCI 2.0 (#2362)**
-   **Adding the license description with link on README (#2365)**
-   **Better handling for unique routes for React Router (#2327)**
-   **Don't throwback a step if tax fails**
-   **Updated UI colors for styleguide (#2339)**
-   **Add loading component to Fix error (#2340)**
-   **Allow a MAIL_URL string without auth (#2330)**
-   **Defer Fixture load until the default shop is loaded (#2329)**
-   **Fix conditional in Circle deploy script (#2338)**
-   **Fix refunds not showing (#2317)**
-   **Add Verification Url to Welcome Email (#2216)**
-   **CircleCI 2.0 and docker base update (#2334)**
-   **i18n translation updates (#2302 #2420)**
-   **Change customer notification message when order is processed. (#2290)**
-   **Allow loader to show when one is passed in and defined BUGFIX (#2303)**
-   **Add the Vietnamese Dong as a supported currency (#2248)**
-   **Updated shipping / payment error messages in checkout (#2271)**
-   **Fix #2203 Long Strings Handling in Product Option Title (#2266)**
-   **Simplify core layout component (#2257)**
-   **Fix multiple refunds for stripe (#2260)**

* Fix error when inviting already invited user (#2433)

* Refactor invite function to send invites only to non invited members

* Refactor error message to show status code

* Change the error message to use inline Alert

* Clear input fields when there is error

* Use Reaction's blaze inlineAlerts for error message

* Eliminate console error on inviteShopMember call

* move emailconfig css to LESS file

* Updated timeout time. (#2492)

* Updated timeout time.

* don't autohide

This should not autohide, the error should display until a user resubmits with a new email address. If the error is hidden, they might not see it right away and miss it. This is a blocking error for this field so it should stay until resolved.

* style updates for sortableTable

* update translations

* custom full-table filter for ReactTable

* Fixed product images not displaying on order completed page (#2490)

* custom full table filter

* new match-sorter package for custom filter

* Fix hard refresh on clicking tag link on product detail page (#2489)

* Provide tag component with missing click function

* Remove hard refresh on PDP link in Grid settings

* Remove redundant risul:moment-timezone (#2491)

* add translations for default table text

* translations

* kill translations for the moment, something is acting up

* add catch for error when no data is available

* List view toggle

* Use sortableTable to display list

* finish order line item popover functionality

* First styling iteration

* Add table classname

* allow only users with the orders and dashboard/orders permission to view the popover

* Merge with marketplace

* Styling second iteration

* Rewrite orders.js into React; Remve filters on orders

* Add onto checking capabilty

* Buyah

* Replace span toggles with buttons

* Styling iteration

* Toggle bulk order actions bar on checkbox select

* Select all checkbox

* Change import to match style guide

* Handle multiple select of orders (part 1)

* Toggle ReactTable header visibility on order(s) select

* Handle multiple select of orders (part 2)

* Handle multiple select of orders: fully working

* Check all

* Massive refactor

* few style additions

* Hide columns on screen size change

* Checkbox multi select tweak

* Select all orders on 'Check All' even if one was already selected

* Vertically align bulk actions bar contents

* Corrections from review

* Center align checkbox/avatar with parent check-all box

* Center column data

* Change checkbox class name

* Change checkbox class name

* Change checked icon to font-awesome check

* Add className prop to badge component

* Allow for selected rows to be styled in React Table

* Style selected order rows

* Styling merge with checkboxes

* Pagination reorder

* Match padding between top and bottom in bulk order actions bar

* Toggle, control buttons

* Remove border from selected orders

* Add i18n for bulk order actiobs bar elements

* Update badge snapshot to include provided className

* Change sortable bar color

* Toggle buttons within container and pagination margin increse

* Remove old pagination

* Checkboxes add

* Fix collapsable column problem

* Center align row data

* Bulk order actions bar styling based on new order table styles (part 1)

* Fix row size change

* Bulk order actions bar styling based on new order table styles (part 2)

* Fix bithound issues

* Add @reactioncommerce/reaction-collections

* Fix bithound issues

* Remove line items code from merged in PR

* Fix minor issues as commented on PR

* Use assign as opposed to extend

* Fix button new/prrocessing change

* Make button unresizable

* Use less files to style table

* Remove hardcoded selected row background color, give selected row a className and style in stylesheet

* Refactor code

* Fix lint issues

* Fix table moving up and down

* Modify list component to receive className, change undefined data to props

* Bulk order actions button list onClick

* Toggle background color and icons on list items click

* Further styling of shipping list

* Remove hardcoded styles in the table

* remove order actions files not being used anymore(might be reason for pagination error)

* Prefer this.props over long destructuring statement

* Select Orders from main orders screen (#2549)

* Toggle bulk order actions bar on checkbox select

* Handle multiple select of orders (part 1)

* Toggle ReactTable header visibility on order(s) select

* Handle multiple select of orders (part 2)

* Handle multiple select of orders: fully working

* Select all orders on 'Check All' even if one was already selected

* Vertically align bulk actions bar contents

* Center align checkbox/avatar with parent check-all box

* Change checkbox class name

* Change checkbox class name

* Change checked icon to font-awesome check

* Add className prop to badge component

* Allow for selected rows to be styled in React Table

* Style selected order rows

* Match padding between top and bottom in bulk order actions bar

* Remove border from selected orders

* Add i18n for bulk order actiobs bar elements

* Update badge snapshot to include provided className

* Bulk order actions bar styling based on new order table styles (part 1)

* Bulk order actions bar styling based on new order table styles (part 2)

* Fix bithound issues

* Fix bithound issues

* Remove hardcoded selected row background color, give selected row a className and style in stylesheet

* Remove hardcoded styles in the table

* Prefer this.props over long destructuring statement

* Final styling of shipping list

* Final styling of shipping list

* Iteration 1 of order select and set status

* First working instance for new Orders detail view

* Refactor code

* Wrap up on styling

* Fix broken bulk order select

* Fix header padding

* Iteration 2 of order select and set status

* Fix toggle of shipping flow list, rename labels

* Create back end methods for labeled and picked shipping statuses, refine front end methods to reflect this

* Implement skipping flow statuses

* Add event to order history showing bulk action state setting

* Remove bulk order bar on orders detail view

* Fix lint error

* Fix moving table

* Break down shippingStatus function into smaller functions

* Reorder shipping flow

* Set bulk selected orders to a specific state (iteration 1)

* Remove unnecessary ordersContainer

* Refactor repeated code into common function that's re-usable

* Remove unnecessary method binding

* Set multiple orders to labeled state

* Provide optional shipped param to shipmentShipped method

* Set multiple orders to shipped state

* Move bulk actions bar code to it's own component

* Add allowOutsideClick and cancelButtonText as alert options

* Document and add comments for shipping methods

* Use reaction color variables over hardcoded colors

* Oops

* Delay success modal until all orders' state has been set

* Fix interchanged states

* Translation (part 1)

* Correct i18nKeyLabel typo

* Translation (part 2), extract alerts to common function that's reusable

* Standardise case in translation key

* Fix typo in comment

* Remove testing of truthiness of order object, prefer 'check' of object

* Move shipping string states to constant

* Remove unneeded call to shop for currency display

* Standardise naming of shipping flow steps

* Rethink wording of alerts

* Use workflow object to store/determine shipping status (part 1)

* Remove shipping booleans from shipping schema

* Rewrite shipping status methods to fit use of workflow status (part 1)

* Rewrite shipping status methods to fit use of workflow status (part 2)

* Tests for orders/shipmentPicked and orders/shipmentLabeled; tweak tests for orders/shipmentPacked, orders/shipmentShipped and orders/shipmentDelivered

* Import order

* Remove unnecessary closing brace

* Render spinner while waiting for action on bulk orders

* UI consistency when selecting bulk actions

* Show bottom pagination on bulk orders select

* Implement regression alert

* Refine regression alert

* Commenting shipping state methods

* remove deprecated use of number as first argument of Meteor.Error

* Switch order of shipping flow checks

* Tweak 'picked' status regression method

* Fix line length

* Rename variable

* Add back missing 'Processing' translation

* Fix random opening of status bar

* Use props as passed down from parent container

* Turn all avatars to checkboxes on order select

* Add printing step to flow list

* Enable Capture button

* Set loading state of captore button to false on error

* Rename file names

* Fix error on payment approving
* Check input before using

* Ensure that Groups are ready before using
…solves #2732/#2713) (#2741)

* Always grab shipping from the primary shop

* When checking if shipping is enabled, check the primary shop

* TODO: Check merchantShippingRates flag

And get shipping rates from the appropriate shop based on that

* Don't grab settings template for primary shop

* show link to adjust shipping settings conditionally
- Adds optional type field for better categorization needs
- Adds optional metafields array for instances where schema may fall short
- Adds isVisible field, useful for hiding a tag from showing in a list
- Adds groups array, allowing for hiding tags by specific user groups
* Get tabs right

* Status dropdown

* Implement list as a DropDown as opposed to list

* Add onMenuItemClick first iteration

* Use queries to find orders

* Add queries to order filtering

* Move query into sortable table

* Use ordersListContainer

* Change queries for captured and approved statuses

* Add clear filter and active filter

* Add i18n keys

* Order page was rendering twice fix that bug

* Delete dummy file

* Uninstall bcrypt

* Remove commented out code

* Use fa-angle-down instead of fa-chevron-down

* Change dropdown default styling

* Rename components appropriately

* Add blue color for activated filter names

* Only completed orders when completed selected

* Fix Approve issue

* Delete file
* Combine order and cart transforms into one, replace usages

* Rename to method style names to avoid naming conflicts with properties on object

* Update doc string

* Fix changed references in payment methods

* Add references that were missed

* Change to method naming

* Fix references in Stripe tests

* Fix conflicts introduced by Stripe Connect PR

* Remove only

* Remove console.log

* Eslint fix

* Eslint fix
* Get variant images to grid

* Filter out unpublished or archived images
* allow saving an SMTP provider config with no username/password

* hide user/pass input fields in email settings when local provider selected

* use nodemailer-wellknown to populate email settings in database too

* allow custom email provider to not have user/pass

* allow configuring localhost mail providers with the “custom” option

* better debug output on email settings verify

* reset email settings component state on preset change
* Add migration for tags isVisible field

* Add import for tag migration

* Added down migration

* Updated up function to match style of down function
* Various fixes for Shopify, and adds marketplace style product publication
- make shopify api password a password type input
- Fix "Handelized Shop Name" (sic) -> Shop Slug
- Publish tags globally
- Publish all visible products from all shops to main marketplace product grid

* Remove "review" todo

* Remove commented code
* Fix broken marketplace orders dashboard

* Prefer options params over long list of parameters, code commenting part 1

* Close shipping flow list on multiple select

* Assign 'order.shipping[0].workflow' to variable and use that throughout instead of this long version

* Comments for variables in shipping methods

* Add TODO blocks for code that needs to be marketplace-d

* Move order workflow updating method from client-side to server-side

* Code commenting for clarity and adding TODO blocks for (not so distant) future marketplace-d code

* Comments on state variables that'll need to be edited
@kieckhafer
Copy link
Member Author

Already have a PR in the correct branch... #2745

@kieckhafer kieckhafer closed this Aug 31, 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.