Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 28, 2015
  1. @JDutil

    Merge pull request #6698 from groundctrl/sufficient_stock_extraction

    JDutil authored
    Extract availability check in validator
  2. @sikachu

    Extract availability check in validator

    sikachu authored
    This allows better extendability as you can override only one method if
    you want to change how you calculate remaining stock.
Commits on Aug 27, 2015
  1. @JDutil
  2. @JDutil
Commits on Aug 26, 2015
  1. @JDutil

    Add v1 namespace.

    JDutil authored
  2. @JDutil

    Merge pull request #6696 from calvinl/3-0-stable

    JDutil authored JDutil committed
    Bump spree_api's rabl dependency to latest version and fix taxonomy tree rendering
Commits on Aug 25, 2015
  1. @JDutil

    Add meta title back. Fixes #6694

    JDutil authored
Commits on Aug 24, 2015
  1. @JDutil

    Merge pull request #6690 from alanzheng88/master

    JDutil authored
    imagemagick is a prerequisite for adding Spree to existing Rails application
  2. @alanzheng88
  3. @alanzheng88
  4. @JDutil

    Merge pull request #6691 from suryart/master

    JDutil authored
    Correcting initializers path for spree preferences.
  5. @JDutil

    Merge pull request #6688 from odk211/add-missing-order-payment-data-hook

    JDutil authored
    Add missing order payment data hook
Commits on Aug 23, 2015
  1. Correcting initializers path for spree preferences.

    Surya Tripathi authored
Commits on Aug 22, 2015
  1. @odk211

    add order-payment data-hook

    odk211 authored
Commits on Aug 21, 2015
  1. @JDutil

    Merge pull request #6684 from odk211/to-use-address-full-name

    JDutil authored
    tiny fix, to use address.full_name
  2. @JDutil

    Merge pull request #6683 from odk211/use-local-order-variable

    JDutil authored
    tiny fix. to use local order variable
  3. @JDutil

    Merge pull request #6677 from alepore/globalize-workaround

    JDutil authored
    minor change to workaround globalize bug, fixes
  4. @odk211
Commits on Aug 20, 2015
  1. @alepore
Commits on Aug 19, 2015
  1. @athal7 @JDutil
  2. @athal7 @JDutil

    Stop sending response code through the api

    athal7 authored JDutil committed
  3. @JDutil

    Merge pull request #6678 from FabianOudhaarlem/master

    JDutil authored
    Add form-control class to sku order filter
  4. @FabianOudhaarlem
  5. @odk211
Commits on Aug 13, 2015
  1. @JDutil

    Merge pull request #6671 from wuboy0307/add_two_cache

    JDutil authored
    add cache for default store and current tracker.
  2. @wuboy0307

    add cache for default store and current tracker.

    wuboy0307 authored
    These data are read frequently but you won't update all the time.
    It would be great to cache this kind of data.
Commits on Aug 11, 2015
  1. @JDutil

    Merge pull request #6667 from eric1234/patch-3

    JDutil authored
    Use builder to initialize related record
  2. @eric1234

    Use builder to initialize related record

    eric1234 authored
    When automatically creating a related record via delegated attributes prefer the
    `build_*` method instead of doing a straight assignment from an instance of the
    class of the related object. This ensures relationship constraints are followed.
    Without the meta-programming mess this is basically the difference between:
    
        product.master = Spree::Variant.new
    
    and
    
        product.build_master
    
    This is important because `Spree::Product.new(price: 0).master.is_master` will return `false` as
    the assignment of `price` (a delegated attribute) will cause a new variant to be assigned to master
    but that variant won't have the `is_master` flag automatically set.
    
    I believe this is sort of fixed up by `set_master_variants_default`[1] in the case of
    products but this is a more general fix. It might be worth investigating if the callback
    can be removed. Not causing any real performance issue but had having unnecessary
    code hanging around.
    
    1. https://github.com/spree/spree/blob/master/core/app/models/spree/product.rb#L322
Commits on Aug 6, 2015
  1. @JDutil

    Merge pull request #6662 from magiclabs/feature/allow-more-price-options

    JDutil authored
    Allow more options than tax zone for price calculation
  2. @mamhoff

    Hint at where to patch Spree in controller_helpers/store.rb

    mamhoff authored
    Just adding something to the Hash won't do the trick. You'll also
    have to patch the price generation, copying prices to line items,
    the price generation for shipments, and you'll have to subclass the
    DefaultTax calculator.
  3. @mamhoff
  4. @mamhoff

    Allow more options than tax zone for price calculation

    mamhoff authored
    Our client needs to display different prices to different customers. The MOSS
    refactoring has enabled different prices for different tax zones, which is great,
    but they also need to display prices excluding VAT for *some* business customers.
    
    The logic for that is (while in accordance with EU tax law) rather custom. This PR
    is supposed only to enable passing more than just the tax zone as options for price calculation.
    
    In order to accomplish this, the `current_tax_zone` helper is replaced with a `current_price_options`
    helper which returns a Hash. All the values of that Hash are used to calculate product cache keys.
    I took care to order those so that we don't end up with different caches for the same content.
    
    * Remove current_tax_zone helper and replace with current_price_options
    * Adapt product cache key to price options hash
    * Adapt base helper to call #price_including_vat_for with price_options hash
    * Adapt price model for price_options hash
    * Adapt VAT price calculation module
    * Use new #included_tax_amount signature
    * Adapt tax_rate.rb
    * Adapt line_item.rb
    * Add tests for edge case price options
    * Adapt StockEstimator
Commits on Aug 5, 2015
  1. @JDutil

    Merge pull request #6654 from magiclabs/fix-user-promotion-rule-users…

    JDutil authored
    …-association
    
    Fix wrong association class bug in User PromotionRule
  2. @JDutil

    Merge pull request #6646 from alepore/default-scopes

    JDutil authored
    add Base.spree_base_scopes method
  3. @JDutil

    Update comment. Fixes #6650

    JDutil authored
Something went wrong with that request. Please try again.