[Do Not Merge] 2 2 stable head upgrade#1

Closed

gmacdougall wants to merge 238 commits intosolidusio:rebased-rewritten-bonobos-2-2-devfrom

gmacdougall:2-2-stable-head-upgrade

Commits on Feb 23, 2015

Bump to 2.2.3.beta

radar
authored and
Gregor MacDougall
committed
Set CreditCard#confirmation_value when reusing cards

huoxito
authored and
Gregor MacDougall
committed
Add I18n.locale for views cache

BGuimberteau
authored and
Gregor MacDougall
committed
Fix FA class for picture

davekiss
authored and
Gregor MacDougall
committed
fix typo in data-hook.

peterberkenbosch
authored and
Gregor MacDougall
committed
Add data-hooks to admin/products/new and admin/products/_form

brchristian
authored and
Gregor MacDougall
committed
use fa-check since fa-ok is no longer available.

peterberkenbosch
authored and
Gregor MacDougall
committed
updated ga snippet

BrianTheCoder
authored and
Gregor MacDougall
committed
Always pass currency to Spree::Money for multi-currency.

Jeff Dutil
authored and
Gregor MacDougall
committed
Need to only try specifying currency in case order doesnt exist yet.

Jeff Dutil
authored and
Gregor MacDougall
committed
Update Rails Version in README.md

buck3000
authored and
Gregor MacDougall
committed
make sure we only build the year when it's there. Validtion error otherwise.

peterberkenbosch
authored and
Gregor MacDougall
committed
Reorder short circuit evaluation of Estimator#shipping_methods

Senjai
authored and
Gregor MacDougall
committed
Changing currency variable according to google analytics docs

tiagoamaro
authored and
Gregor MacDougall
committed
add configurable option to clone products without copying original images

Michael Tucker
authored and
Gregor MacDougall
committed
Loosen friendly_id restriction.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix recalculating included tax adjustments. Fixes spree/spree#4671

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix html safe when cart is empty

ddomingues
authored and
Gregor MacDougall
committed
Use the payments currency rather than config for multi-currency.

Jeff Dutil
authored and
Gregor MacDougall
committed
Added data-hooks where values were empty and fixed some repeated ids.

richardnuno
authored and
Gregor MacDougall
committed
Fix broken cache on api/orders

huoxito
authored and
Gregor MacDougall
committed
Populate Order#shipment_total for users upgrading

huoxito
authored and
Gregor MacDougall
committed
Fall back to name on CreditCard#to_active_merchant

huoxito
authored and
Gregor MacDougall
committed
handle credit card names with spaces

jordan-brough
authored and
Gregor MacDougall
committed
Fixes entering localized amounts for payments

Daan-
authored and
Gregor MacDougall
committed
Add top level rake task to run all tests

Andrew Thal
authored and
Gregor MacDougall
committed
remove reference to shipment.adjustment

Clarke Brunsdon
authored and
Gregor MacDougall
committed
Add spec for overriding order token

huoxito
authored and
Gregor MacDougall
committed
check_authorization should use params token first

wuboy0307
authored and
Gregor MacDougall
committed
Refactor stock transfers variant select JS - Allow user to search for a variant by name or SKU, rather than just returning the first 25 items from a stock location

LBRapid
authored and
Gregor MacDougall
committed
update the default email template to include all the proper taxes, shipments and adjustments

peterberkenbosch
authored and
Gregor MacDougall
committed
Update payment risk assessment, and fix broken specs. Fixes spree/spree#4630

Jeff Dutil
authored and
Gregor MacDougall
committed
Ensure shipments are also destroyed when the order is emptied.

Senjai
authored and
Gregor MacDougall
committed
Payments with a cvv_response_message are not necessarily risky.

Jeff Dutil
authored and
Gregor MacDougall
committed
Remove defunkt spec that's no longer true.

Jeff Dutil
authored and
Gregor MacDougall
committed
Use permitted_option_value_attributes instead of permitted_option_type_attributes

iwano
authored and
Gregor MacDougall
committed
[api] Ensure order ids are ordered in orders_controller_spec

radar
authored and
Gregor MacDougall
committed
Include sample in top level rake test and test_app

jhawthorn
authored and
Gregor MacDougall
committed
Fixes an issue where entering 30.49 would preauthorize 3049$.

Jim
authored and
Gregor MacDougall
committed
Pagination and search in property list

Willianvdv
authored and
Gregor MacDougall
committed
make sure we fail fast and exit when a spec fails

peterberkenbosch
authored and
Gregor MacDougall
committed
Javascript fixes for IE8.

Jeff Dutil
authored and
Gregor MacDougall
committed
Update backends adjustments controller to fix order.update! call.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fixes receiving RMA's when inventory tracking is turned off.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix broken spec.

Jeff Dutil
authored and
Gregor MacDougall
committed

Commits on Feb 24, 2015

Dont destroy all order payments in api/checkouts

huoxito
authored and
Gregor MacDougall
committed
Improving performance of migration add_line_item_id_to_spree_inventory_units

brchristian
authored and
Gregor MacDougall
committed
Adding data-hooks to search results header

brchristian
authored and
Gregor MacDougall
committed
Fixes Zone #contains? n+1 query performance.

mtomov
authored and
Gregor MacDougall
committed
fix permalink handling to force uniqueueness and rename on product destroy

Michael Tucker
authored and
Gregor MacDougall
committed
Make migration more tolerant of deleted Variants

brchristian
authored and
Gregor MacDougall
committed
Don't assume default variant in JS. Let this be controlled by HTML markup.

shopjoy
authored and
Gregor MacDougall
committed
Downcasing locale for jquery.validate i18n messages

tiagoamaro
authored and
Gregor MacDougall
committed
Set extract first and last name from CreditCard#name

huoxito
authored and
Gregor MacDougall
committed
Fix pagination for taxons

frankiek3
authored and
Gregor MacDougall
committed
Bump Rails to 4.0.6

radar
authored and
Gregor MacDougall
committed
Bump to 2.2.3

radar
authored and
Gregor MacDougall
committed
Bump to 2.2.4.beta

radar
authored and
Gregor MacDougall
committed
Fix typo in add_line_item_id_to_spree_inventory_units migration

radar
authored and
Gregor MacDougall
committed
Bump to 2.2.4

radar
authored and
Gregor MacDougall
committed
Bump to 2.2.5.beta

radar
authored and
Gregor MacDougall
committed
Clean changelogs

radar
authored and
Gregor MacDougall
committed
Add Jersey to the default list of countries

oguzcanhuner
authored and
Gregor MacDougall
committed
Lock jquery-rails to 3.1.0 as 3.1.1 breaks data-confirm.

Jeff Dutil
authored and
Gregor MacDougall
committed
make incl/excl in ShippingRate#display_price translatable

valpackett
authored and
Gregor MacDougall
committed
make click_and_drag_on_the_products_to_sort_them in spree/admin/taxons/index translatable

valpackett
authored and
Gregor MacDougall
committed
Only destroy tax adjustment for open order when the associated tax rate is deleted. For closed order just nullify the source_id.

ifan-godaddy
authored and
Gregor MacDougall
committed
Merge pull request spree/spree#4900 from reinaris/patch-3

huoxito
authored and
Gregor MacDougall
committed
Update shipment in proper chronological order

huoxito
authored and
Gregor MacDougall
committed
When creating shipment assign orders shipping address.

Jeff Dutil
authored and
Gregor MacDougall
committed
Payment methods should be scoped to available.

Jeff Dutil
authored and
Gregor MacDougall
committed
Bump to Rails 4.0.8

radar
authored and
Gregor MacDougall
committed
Added without_children = true in taxon autocomplete API Call

Ishank Gupta
authored and
Gregor MacDougall
committed
Optimize available_countries

jhawthorn
authored and
Gregor MacDougall
committed
Add blank to ShippingMethod's TaxCategory select

brchristian
authored and
Gregor MacDougall
committed
[api] Convert payment_method_id to string in CheckoutsController

radar
authored and
Gregor MacDougall
committed
[api] Do not wrap parameters in OrdersController

radar
authored and
Gregor MacDougall
committed
Fix typo in Spree::ReturnAuthorization model

Jerrold Thompson
authored and
Gregor MacDougall
committed
Destroy asocaited adjustments when order is changed to move out of taxable zones.

ifan-godaddy
authored and
Gregor MacDougall
committed
Allow token-based payment sources in Payment::Processing

radar
authored and
Gregor MacDougall
committed
Avoid name clashing when including modules

Carlos Palhares
authored and
Gregor MacDougall
committed
Merge pull request spree/spree#4923 from jordan-brough/fix-order-reload

huoxito
authored and
Gregor MacDougall
committed
Move set_shipments_cost call to Order#update_from_params

radar
authored and
Gregor MacDougall
committed
Shipment cost is now included in spec totals.

Jeff Dutil
authored and
Gregor MacDougall
committed
Revert "Add pry and pry debuggers to common spree dependencies"

huoxito
authored and
Gregor MacDougall
committed
Use prepend_before_filter to try calling before apply_coupon_code. refs spree/spree#4926

Jeff Dutil
authored and
Gregor MacDougall
committed
Added missing translation for back_to_shipping_categories_list

Dylan Kendal
authored and
Gregor MacDougall
committed
Do not blindly accept just any month for CreditCard expiry

radar
authored and
Gregor MacDougall
committed
Silence two warnings

jordan-brough
authored and
Gregor MacDougall
committed
Revert "Use prepend_before_filter to try calling before apply_coupon_code. refs spree/spree#4926"

Jeff Dutil
authored and
Gregor MacDougall
committed
Improvements to API performance.

BMorearty
authored and
Gregor MacDougall
committed
More code coverage.

BMorearty
authored and
Gregor MacDougall
committed
Reduce the number of cascading touches.

BMorearty
authored and
Gregor MacDougall
committed
Fix simple_current_order to not conflict with order.

Jeff Dutil
authored and
Gregor MacDougall
committed
make unique SKU for sample data

peterberkenbosch
authored and
Gregor MacDougall
committed
Order history should be reverse chronological. Fixes spree/spree#5024

magnusvk
authored and
Gregor MacDougall
committed
Use the proper flash

Dylan Kendal
authored and
Gregor MacDougall
committed
use the variant_full_price on the product show page so the correct currency settings are used. Fixes spree/spree#4995

peterberkenbosch
authored and
Gregor MacDougall
committed
Reduce unnecessary DB round-trips.

BMorearty
authored and
Gregor MacDougall
committed
fix failing specs with variant price

peterberkenbosch
authored and
Gregor MacDougall
committed
refactor the variant price for product.js.coffee. Thanks gmacdougall

peterberkenbosch
authored and
Gregor MacDougall
committed
Wait ajax request a bit for backend spec fix

huoxito
authored and
Gregor MacDougall
committed
Validate uniqueness of order numbers... Why was this FIXME never fixed until now... Fixes spree/spree#5102

Jeff Dutil
authored and
Gregor MacDougall
committed
changed generate_order_number method for insure that generated numbers never finish spree/spree#5102

sanchojaf
authored and
Gregor MacDougall
committed
Fix broken specs from order number refactoring, and improve performance. Fixes spree/spree#5102

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix payment state in order importer. Fixes spree/spree#5109

Jeff Dutil
authored and
Gregor MacDougall
committed
Use rand(10) to cover all digits 0-9. Fixes spree/spree#5113

Jeff Dutil
authored and
Gregor MacDougall
committed
Calculate tax total correctly which depends on the item that could be an Order or a LineItem. Tax adjustments are stored differently in these two cases.

ifan-godaddy
authored and
Gregor MacDougall
committed
Speed up rename_adjustment_fields migration

brchristian
authored and
Gregor MacDougall
committed
Make Shipment.cost default to 0

brchristian
authored and
Gregor MacDougall
committed
Dont advance order state when adding an item to cart

huoxito
authored and
Gregor MacDougall
committed
Update Google Analytics

ymek
authored and
Gregor MacDougall
committed
Allow assigning shipped_at to shipments.

Jeff Dutil
authored and
Gregor MacDougall
committed
Merge pull request spree/spree#5101 from themetric/fix-api-custom-template

huoxito
authored and
Gregor MacDougall
committed
add validation to verify that count_on_hand of backorderable should not go negative if it is not backorderable

nishant-cyro
authored and
Gregor MacDougall
committed
add a before_transition to verify if order is resumed only if there are no insufficient stock lines

nishant-cyro
authored and
Gregor MacDougall
committed
Fix conflict.

Jeff Dutil
authored and
Gregor MacDougall
committed
Reload to make sure shipment.inventory_units have the latest status so that shipment.backordered? return correct value

ifan-godaddy
authored and
Gregor MacDougall
committed
Fix line item proper currency check

huoxito
authored and
Gregor MacDougall
committed
Fix shipment persistence on order importer

huoxito
authored and
Gregor MacDougall
committed
Test to see if a better coupon exists already

Clarke Brunsdon
authored and
Gregor MacDougall
committed
Revert "Fix Spree::Promotion not applying all of the time."

Jeff Dutil
authored and
Gregor MacDougall
committed
Use rspec-retry to get past random phantomjs failures (turn off by default)

ifan-godaddy
authored and
Gregor MacDougall
committed
Create tax adjustment label with inclusive information if applicable

ifan-godaddy
authored and
Gregor MacDougall
committed
Change order updater to refresh shipment rates and amounts on change

dkubb
authored and
Gregor MacDougall
committed
Finally fixes last backend spec.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix using check payment method in admin.

Jeff Dutil
authored and
Gregor MacDougall
committed
Add state_text to StockLocation

brchristian
authored and
Gregor MacDougall
committed
Bump version.

Jeff Dutil
authored and
Gregor MacDougall
committed
Bump for next beta.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix item_adjustment_spec.rb

deodad
authored and
Gregor MacDougall
committed
Allow partial emails when searching for orders

bbuchalter
authored and
Gregor MacDougall
committed
addi18n to prom index

Paveltarno
authored and
Gregor MacDougall
committed
Update jquery dep. refs spree/spree#3203

Jeff Dutil
authored and
Gregor MacDougall
committed
RSpec 3.1 support & Fix a couple Rails 4.0.10 regressions.

Jeff Dutil
authored and
Gregor MacDougall
committed
Use email regex from Devise. Fixes spree/spree#5368

Jeff Dutil
authored and
Gregor MacDougall
committed
Implemented fix for duplicate addresses being created in checkout

ericsaupe
authored and
Gregor MacDougall
committed
Added failed state to the admin variables

reinaris
authored and
Gregor MacDougall
committed
Fix variable css.

Jeff Dutil
authored and
Gregor MacDougall
committed
add select2 call after loading new images

BenMorganIO
authored and
Gregor MacDougall
committed
we fixed mail validator.

Jeff Dutil
authored and
Gregor MacDougall
committed
change precision for amount to 10

Gonzalo
authored and
Gregor MacDougall
committed
Bump version.

Jeff Dutil
authored and
Gregor MacDougall
committed
bump next beta

Jeff Dutil
authored and
Gregor MacDougall
committed
Close a table in variant autocomplete

reinaris
authored and
Gregor MacDougall
committed
Show line items for orders that have not advanced to delivery state yet.

Jeff Dutil
authored and
Gregor MacDougall
committed
Dont let order import fail silently on bad line items.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix my mistakes from 933c773a234048b72fbd7cb4fccce8810ec55c83 :(

Jeff Dutil
authored and
Gregor MacDougall
committed
fix user address default user spec.

peterberkenbosch
authored and
Gregor MacDougall
committed
add more logic to outstancing balance and order updater to set the correct payment_state on the order when the order is canceled.

peterberkenbosch
authored and
Gregor MacDougall
committed
Touch Adjustment#adjustable, and fix some rspec deprecations.

Jeff Dutil
authored and
Gregor MacDougall
committed
Standardizing use of colons in checkout summary

brchristian
authored and
Gregor MacDougall
committed
User store location when signing in

marcosteixeira
authored and
Gregor MacDougall
committed
Fix specs broken by 09ccf8a

Jeff Dutil
authored and
Gregor MacDougall
committed
refactoing code to call find_adjustment in before_action rather than calling it in each menthod

abhishek
authored and
Gregor MacDougall
committed
Fix db:bootstrap task

hnatt
authored and
Gregor MacDougall
committed
Regression spec for 'stack level too deep' spree/spree#5384

andrzejpolis
authored and
Gregor MacDougall
committed
Add in fix from andrzejpolis Fixes spree/spree#5384 Fixes spree/spree#5386

Jeff Dutil
authored and
Gregor MacDougall
committed
create proposed shipments if is no shippment data

peterberkenbosch
authored and
Gregor MacDougall
committed
Fix example to contain expectation

mbj
authored and
Gregor MacDougall
committed
allow guests to use the payments api for their orders

pdamer
authored and
Gregor MacDougall
committed
Improve localization of stock_locations/_form

hnatt
authored and
Gregor MacDougall
committed
Fix broken rspec.

ifan-godaddy
authored and
Gregor MacDougall
committed
Remove 'disabled' from inputs in payments

ericsaupe
authored and
Gregor MacDougall
committed
Ignore guides.

Jeff Dutil
authored and
Gregor MacDougall
committed
Make best-promotion query more deterministic

jordan-brough
authored and
Gregor MacDougall
committed
Fix running just rake for specs.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix rerunning sample specs without new dummy app.

Jeff Dutil
authored and
Gregor MacDougall
committed
Check payment method should respond to cancel. Fixes spree/spree#5307

Jeff Dutil
authored and
Gregor MacDougall
committed
Improve the presentation during creating prototypes. Fixes spree/spree#2526

Jeff Dutil
authored and
Gregor MacDougall
committed
Use slower but robust ActiveRecord for migration

brchristian
authored and
Gregor MacDougall
committed
No need for partial. Fixes spree/spree#5475

Jeff Dutil
authored and
Gregor MacDougall
committed
Looking up stock location by the admin name as well

alexstoick
authored and
Gregor MacDougall
committed
Add spec for looking up stock location by admin name.

Jeff Dutil
authored and
Gregor MacDougall
committed
Do not allow leading or trailing dot(.) in the first part of email address

ifan-godaddy
authored and
Gregor MacDougall
committed
Add inverse_of for more associations involved in cart processing

dkubb
authored and
Gregor MacDougall
committed
remove extra dependent destroy

Divya Talwar
authored and
Gregor MacDougall
committed
Fix timecop spec.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fixes messaging after applying coupon code promo with CreateLineItems action. Fixes spree/spree#4697

Jeff Dutil
authored and
Gregor MacDougall
committed
Refactor Spree::ProductHelper#variant_price_diff

dkubb
authored and
Gregor MacDougall
committed
Add required attributes to required product admin form fields

dkubb
authored and
Gregor MacDougall
committed
make bogus gateway match actual gateways. ie. don't assign profile id for failed payments

pdamer
authored and
Gregor MacDougall
committed
Depend on factory_girl_rails 4.5.0

Jeff Dutil
authored and
Gregor MacDougall
committed
We need to be more restrictive with factory girl updates.

Jeff Dutil
authored and
Gregor MacDougall
committed
Implement a state lock version to prevent race conditions in checkout controller. refs spree/spree#4190

Jeff Dutil
authored and
Gregor MacDougall
committed
fix specs

Jeff Dutil
authored and
Gregor MacDougall
committed
include option values when loading option values from option types

BenMorganIO
authored and
Gregor MacDougall
committed
Refactor the duplicate request prevention code ( order.with_lock )

DangerDawson
authored and
Gregor MacDougall
committed
Adds editorConfig.

Seb Ashton
authored and
Gregor MacDougall
committed
Add spec for updating version.

Jeff Dutil
authored and
Gregor MacDougall
committed
add table name for order/line_item association

kennyadsl
authored and
Gregor MacDougall
committed
refactor code to follow DRY in zone model

abhishek
authored and
Gregor MacDougall
committed
Update generated robots.txt

alepore
authored and
Gregor MacDougall
committed
Removes redundant closing li

Seb Ashton
authored and
Gregor MacDougall
committed
Make email field in admin orders#index link to the customer's account page

Andrew Thal
authored and
Gregor MacDougall
committed
Fix optimistic lock to not revert incremented version.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix pagination in /api/taxons/products

KentoMoriwaki
authored and
Gregor MacDougall
committed
Allow tax categories to be destroyed with proper callback order. Fixes spree/spree#5548 Fixes spree/spree#5549

Jeff Dutil
authored and
Gregor MacDougall
committed
Make conditional read nicer.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix Asset position for different viewables.

mtomov
authored and
Gregor MacDougall
committed
Test latest 2.1.5

Jeff Dutil
authored and
Gregor MacDougall
committed
Give spec correct title.

iangreenleaf
authored and
Gregor MacDougall
committed
set the order#payment_state to the correct state when order is canceled

peterberkenbosch
authored and
Gregor MacDougall
committed
Fix specs and update syntax.

Jeff Dutil
authored and
Gregor MacDougall
committed
[backend] Hiding option values handle if object is not persisted

tiagoamaro
authored and
Gregor MacDougall
committed
Bump rails.

Jeff Dutil
authored and
Gregor MacDougall
committed
Bump version

Jeff Dutil
authored and
Gregor MacDougall
committed
Bump to beta

Jeff Dutil
authored and
Gregor MacDougall
committed
Added gif to valid icon types

richardhartme
authored and
Gregor MacDougall
committed
Bump version

Jeff Dutil
authored and
Gregor MacDougall
committed
Bump to next beta.

Jeff Dutil
authored and
Gregor MacDougall
committed
Update i18n.

Jeff Dutil
authored and
Gregor MacDougall
committed
Revert "Update i18n."

Jeff Dutil
authored and
Gregor MacDougall
committed
fix handling of credit cards expiring in current month

pdamer
authored and
Gregor MacDougall
committed
Filter params on api/checkouts_controller#update

huoxito
authored and
Gregor MacDougall
committed
Lockdown monetize to fix specs for now.

Jeff Dutil
authored and
Gregor MacDougall
committed
Update ruble symbol.

Jeff Dutil
authored and
Gregor MacDougall
committed
Bump version.

Jeff Dutil
authored and
Gregor MacDougall
committed
Next beta.

Jeff Dutil
authored and
Gregor MacDougall
committed
Require latest monetize.

Jeff Dutil
authored and
Gregor MacDougall
committed
Fix payment sample card for 2015

jhawthorn
authored and
Gregor MacDougall
committed
Fix expiration year.

Jeff Dutil
authored and
Gregor MacDougall
committed
Do not trigger full order update when fulfilling a backordered order

ifan-godaddy
authored and
Gregor MacDougall
committed
Fix to payment_spec

allisonlarson
authored and
Gregor MacDougall
committed
Fix authorization check. Fixes spree/spree#5624

Jeff Dutil
authored and
Gregor MacDougall
committed
translate hardcoded strings on cc payment form

alepore
authored and
Gregor MacDougall
committed
JS fix for admin resource destroy success message

MattDunbar
authored and
Gregor MacDougall
committed
Fix td element to be within conditional block.

Jeff Dutil
authored and
Gregor MacDougall
committed
Adjustments upgrade migration should fail on save / destroy fail

MattDunbar
authored and
Gregor MacDougall
committed
Adjustments upgrade migration efficiency improvement.

MattDunbar
authored and
Gregor MacDougall
committed
Remove specs from checkout controller.
Gregor MacDougall
committed
Revert "Allow payments with invalid sources to be invalidated"
Gregor MacDougall
committed
Revert "Make update_item_count get called inside updater#update"
Gregor MacDougall
committed

Commits on Feb 25, 2015

update_attributes is now update_attributes!
Gregor MacDougall
committed
Don't pass id in to the API endpoints for address.
Gregor MacDougall
committed
Remove check alerts spec.
Gregor MacDougall
committed
2-2-dev fix for ReimbursementMailer

jordan-brough
authored and
Gregor MacDougall
committed
Add ensure_line_item_in_stock method.
Gregor MacDougall
committed