From 409941fad6cfdd90b95ed42c022d52870ac2f14b Mon Sep 17 00:00:00 2001 From: Meg Martinson Date: Tue, 30 May 2017 14:55:51 -0500 Subject: [PATCH] Merge qa to master (#38) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * changes to PDP product information display * Release 1.1.1 (#2117) * Show Sidebar shipping in checkout * Set actionView after payment checkout step * Hide sidebar on entry to profile page * Using publish-counts to record count of orders in order tabs * Add alert and checkout message when item quantities have been adjusted * Code cleanup * Add 'Show More' button for pagination (to be refined) * Update errors to include when cart is already full * Removing unnecessary subscription.ready from composer function * Modify orders cursor to use state instead; identify filter from 'show more' button * Actually deny when out of stock * Fix 'Show More' button functionality * Add more descriptive error messages * Using publish-counts to record count of orders in order tabs * Code cleanup * Add 'Show More' button for pagination (to be refined) * Removing unnecessary subscription.ready from composer function * Modify orders cursor to use state instead; identify filter from 'show more' button * Fix 'Show More' button functionality * Fix console error on Quantity * Fix PR arising issue on quantity * Using reactiveDict to store order limits * Using camelcase for naming * Passing filter to PaginatedOrders subscription for query builder in publish * Publishing order counts using Mongo aggregate pipeline * Clean up a few edge cases * Add i18n translations * Remove file changes different from development * Turns out I don't need this publication; it doesn't work well anyway because it doesn't return a Mongo cursor * Remove all references to addressbook.js * Set custom layout to override based on priority field (#2023) * Set Custom layout to override based on priority field * Update existing priority field to use new default * Migrate existing priority fields * Fix audience schema to be array of Strings * Check before updating during migration * Add down migration and refactor * Add reaction packages with layouts to migrate * Method to aggregate order counts * fix createDefaultAdminUser behavior with users in the system * Resolve cart addition issue (#2048) * Calling aggregate function in React container * Rewriting aggregate method to use wrapAsync * Returning Toplevel products as per scroll limit for non admin users fixes #2029 (#2063) * Refactor calling aggregate function in React container * Removing unnecessary order subscriptions in order template * Removing unnecessary order Counts.publish from Orders publication * [WIP] Broken Formatting for Non-USD currencies (#2062) * fix nonUSD currencies formatting error * add proper formatting for tax, discount and shipping fields * Set order count to 0 if there are no orders in the database * Remove unnecessary parameter to order/count * Changes to order template: Increasing order limit variables and increment value: using order count to render 'Show More' button * Using publish-counts to display order counts * Removing unnecessary orders/count method * Adding i18n on Show More button * Adding optional check on filter in PaginatedOrders publication * Sending subscription limit as props to React component * Don't subscribe to all media (#2073) * Don't subscribe to all media - Publish brand assets globally in media publication - Publish product media in the `Products` and `Product` publications - Limit media to only published products * De-duplicate fetch product media functionality Ensure permissions and workflows are checked when fetching the media. * Update logic of if / else inclusion / exclusion by workflow * Fix endless spinner issue * Add requirements to readme Adds link to requirements docs above installation instructions * Move requirements below installation * Remove isHidden check from core startup b/c blocking safari - fixes #2088 * Request versions (reaction -v) output in issue template (#2087) * Fetch all Shippo carriers (#2078) * Init second request on after next url returned * Refactor to fetch carriers recursively from api * Fix transliteration package to 1.5.2 which doesn’t leak ES6 into bundle * Fix issue #2026 changed price not displayed for prod on grid page (#2064) * Fix issue #2016 changed price not displayed for prod on grid page * Add getVariantQuantity function to ProductRevision * Convert text field to select field for countries (#2082) * [WIP] #2070 Fix PDP Url Path For Grid Settings (#2094) * fix pdp url path for grid settings * remove commented code * Remove legacy PDP (#2097) * Remove revision conditional * Remove templates * Set total quantity as actual sum of quantity * Don't break out order items * set cartItemId to just _id since they are the same now * Fix unrelated error with missing import * Create shipping record * Don't use cartItemId * Group lineItems by _id rather than cartItemId * Use _id rather than cartItemId. Use sum of quantities rather than length * Restore check for empty items array to fix test * Change cartItemId to _id * 2067 Improper Product Title Wrap (#2108) * fix improper word wrap in product grid * fix improper product title wrap in firefox * Fix Avalara document id (#2114) * Don't pass in a cartID, pass in orderId for SalesInvoice * Don't try to parse lines unless we know we have it. No lines, no tax. * Use order.items to display line items * Update core.js Changed "admin" to "owner", which is the default user we're really checking for. * Meteor 1.4.4.1 * Release 1.1.1 * If cartItemId exists from legacy orders, then use those * Don't create default admin user when running in app test mode * Fix "Set Custom Value" on Avalara Usage Type (#2107) * Get correct id value * Prevent autoform from removing old values * Roll back. Autoform still resetting to old values * Prevent autoform from overriding custom val * show input field for custom; pre-fill with existing custom val * Adjust comment * Adjust comment * Update form reset * Refactor subscription * Fixes #2116 failure to send email (#2118) * Fix parens that were out of place in wrapAsync of Email.verifyConfig * Revert the wrapAsync function - I didn’t understand how it worked and it wasn’t the core issue * Don’t set secure to true for port 587 http://stackoverflow.com/a/22468122/1179341 pointed me in the right direction * Fix async tests (#2128) * Take some newer versions of packages from `meteor update` * Fix test with mixed sync and async * When calling a method with a callback, but the expectations in that callback * Docker base v1.3.0 (#2129) * Fix missing import * Add import, adjust Proptypes * Update read only Quantity in top variant #1919 (#2065) * Update quantity if child variants exist * Change method not to add inentory Quantity when undefined * Add default value for inventoryQuantinty * Fixing non-reactivity of updating quantity field * missing word added to Readme * Fix linting error (#2140) * 1994 Console Dropzone Warnings (#2138) * upgrade react-dropzone to latest version * upgrade react-dropzone to latest version * Add npm-shrinkwrap.json Pinned react, node mailer, griddle * added functional crumbnav to pdp, pointed imports/plugins/custom to new development with merged crumbnav branch (#12) * updated submodules * updated eePlugins and ReactionPublicCustomFolder (both submodules) * Ecomm 305 (#15) * ecomm-305 in plugins folder * ecomm-305 in plugins folder * submodule update * including image placeholder for Wear it with in public custom folder * submodule update * submodule updates * merged PR #20 to development (#21) * submodule update * created submodule for private/settings/reaction.json * submodule changes * submodule update * added style clean up PR (#26) * updated eePlugins and ReactionPublicCustomFolder * submodule updates * submodule updates * updating submodules.. it has been a while I think * publiccustomfolder updates * update submodules * update submodules * submodule update * updated submodules (#33) * changed public custom folder to new repo (#36) * changed public custom folder to new repo * fixing circle problems maybe. --- .gitmodules | 9 +++------ imports/plugins/custom | 2 +- public/custom | 1 + public/custom/.gitkeep | 0 public/custom/ReactionPublicCustomFolder | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) create mode 160000 public/custom delete mode 100644 public/custom/.gitkeep delete mode 160000 public/custom/ReactionPublicCustomFolder diff --git a/.gitmodules b/.gitmodules index 739b6f365ee..1edcced88a0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,9 @@ -[submodule "public/custom/ReactionPublicCustomFolder"] - path = public/custom/ReactionPublicCustomFolder - url = git@github.com:evereveofficial/ReactionPublicCustomFolder.git [submodule "imports/plugins/custom"] path = imports/plugins/custom url = git@github.com:evereveofficial/eePlugins.git -# [submodule "private/settings"] -# path = private/settings -# url = git@github.com:evereveofficial/ReactionPrivateSettings.git [submodule "private/settings"] path = private/settings url = git@github.com:evereveofficial/ReactionPrivateSettings.git +[submodule "public/custom"] + path = public/custom + url = git@github.com:evereveofficial/eePublicCustom.git diff --git a/imports/plugins/custom b/imports/plugins/custom index e8a04d54b29..ce1edd9c1cb 160000 --- a/imports/plugins/custom +++ b/imports/plugins/custom @@ -1 +1 @@ -Subproject commit e8a04d54b29520e9241aeed7cd1cd409c6edd756 +Subproject commit ce1edd9c1cb7dfc42222b6794ca25e7a3c028565 diff --git a/public/custom b/public/custom new file mode 160000 index 00000000000..047a4a0ef7d --- /dev/null +++ b/public/custom @@ -0,0 +1 @@ +Subproject commit 047a4a0ef7dbaad932e6a2fc4ec5948e5a78b8bc diff --git a/public/custom/.gitkeep b/public/custom/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/public/custom/ReactionPublicCustomFolder b/public/custom/ReactionPublicCustomFolder deleted file mode 160000 index d4a8e870234..00000000000 --- a/public/custom/ReactionPublicCustomFolder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4a8e8702343f771edad34df2837c82c4c7b9671