Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jun 5, 2014
  1. 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
Commits on Jun 4, 2014
  1. @cbrunsdon @huoxito

    The result call is checked earlier

    cbrunsdon committed with huoxito
    It does nothing inside this function. and its all private. so I can
    change what I want.
    Fixes #4782
  2. @huoxito
  3. @jordan-brough @huoxito

    fix for payments made via /admin

    jordan-brough committed with huoxito
    orders placed via /admin were being charged twice.
    See these two lines from Spree::Admin::PaymentsController:
        while; end
        @payment.process! if @order.completed?
    For incomplete orders the first line will trigger callbacks that cause
    the payment to be charged if the order reaches the "completed" state.
    Then the second line will process the payment *again*, resulting in a
    double charge.
    We can't just remove the second line because orders that are already
    complete won't trigger any callbacks from the first line, so these
    orders need to have their payments charged manually.
    The effect of the bug in our case was that Braintree rejected the second
    (duplicate) billing on the payment, and this resulted in the Payment
    object being marked as failed when actually it succeeded on the first
    attempt. So it appeared from within Spree that a successful payment
    was a failed payment.
    Fixes #4768
Commits on Jun 3, 2014
  1. @jordan-brough @huoxito

    credit card spec fix

    jordan-brough committed with huoxito
    fixes #4778
  2. @athal7
  3. @Daan- @huoxito

    Fixes entering localized amounts for payments

    Daan- committed with huoxito
    While running Spree in Dutch locale, adding a Payment recognizes the decimal separator as thousands separator. So when using the pre filled value (e.g. 45.21) this will be converted to a much larger amount (4521.00). The fix makes sure that a localized value is filled in (45,21 instead of 45.21).
    Tested on Spree 2.2.1
    Fixes #4753
  4. @huoxito
  5. @jordan-brough @huoxito

    handle credit card names with spaces

    jordan-brough committed with huoxito
    this addresses a change from spree@71d4dee
    Fixes #4770
Commits on Jun 2, 2014
  1. @cbrunsdon

    remove reference to shipment.adjustment

    cbrunsdon committed
    shipment.adjustment no longer exists so we can kill this. also wasn't
    tested, so no need to change test cases.
    My understanding is with the adjustment refactoring we don't need to
    deal with the open/close anymore anyway.
Commits on Jun 1, 2014
  1. @montebrown @huoxito
  2. @huoxito

    Populate Order#shipment_total for users upgrading

    huoxito committed
    Previous to Spree 2.2 orders didn't have a shipment_total. This should
    populate that new column for legacy orders
    Fixes #4684
  3. @huoxito

    Fix broken cache on api/orders

    huoxito committed
    The cache keys were not unique anymore because we were passing nil, e.g.
    `@order` is not defined when rendering api/orders.json, same thing
    happened with all nested objects using a instance var instead of rabl
    Fixes #4757
  4. @Senjai @huoxito
  5. @Senjai @huoxito

    Use the root_object instead of @line_item.

    Senjai committed with huoxito
    This is the object the other views use for caching.
Commits on May 31, 2014
  1. @richardnuno @huoxito
  2. @JDutil
Commits on May 30, 2014
  1. @ddomingues
  2. @JDutil
  3. @huoxito
  4. @huoxito

    added 'through: :stock_items' to 'has_many :stock_movements' relation…

    Miguel Sancho committed with huoxito
    … in variant class
    Fixes #4707
  5. @jhawthorn @huoxito

    Admin::Orders test completed? instead of complete?

    jhawthorn committed with huoxito
    Checkout steps are customizable, 'complete' may not be the only state in
    which an order is considered complete.
    Fixes #4751
Commits on May 29, 2014
  1. @JDutil
  2. @JDutil

    Loosen friendly_id restriction.

    JDutil committed
  3. @JDutil

    Fix for sample.

    JDutil committed
  4. @JDutil
Commits on May 28, 2014
  1. @JDutil
  2. @mtuckergd @peterberkenbosch
Commits on May 27, 2014
  1. @peterberkenbosch

    Revert "Drop Spree::Core::TokenResource"

    peterberkenbosch committed
    This reverts commit 239181e.
  2. @peterberkenbosch
  3. @huoxito @peterberkenbosch

    Drop Spree::Core::TokenResource

    huoxito committed with peterberkenbosch
    None of spree components use that feature except for the token attribute
    itself which we could just move to Order so we can run less things when
    creating an object
    Closes #4736
  4. @tiagoamaro @peterberkenbosch

    Changing currency variable according to google analytics docs

    tiagoamaro committed with peterberkenbosch
    Fixes #4743
  5. @huoxito

    Fall back to name on CreditCard#to_active_merchant

    huoxito committed
    Gateway provided via active merchant might use those first and last name
    instead of the single name string
    Fixes #4728
  6. @BenMorganIO @huoxito
  7. @jamesmartinduffy @huoxito
Something went wrong with that request. Please try again.