Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

spree-2-2-stable updates #101

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

spree-2-2-stable updates #101

wants to merge 34 commits into from

Commits on Oct 15, 2013

  1. change dependency to allow Spree 2.1

    @charredUtensil
    charredUtensil committed Oct 15, 2013
    Configuration menu
    Copy the full SHA
    263525a View commit details
    Browse the repository at this point in the history

  2. initial 2.0 changes, at least get the app to start

    @charredUtensil
    charredUtensil committed Oct 15, 2013
    Configuration menu
    Copy the full SHA
    db4287f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2013

  1. get product customizations working on spree 2.1 / rails 4

    @charredUtensil
    charredUtensil committed Oct 19, 2013
    Configuration menu
    Copy the full SHA
    88691e1 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2013

  1. get ad hoc options working on spree 2.0 / rails 4

    @charredUtensil
    charredUtensil committed Oct 21, 2013
    Configuration menu
    Copy the full SHA
    5aad882 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2013

  1. vix ad hoc options

    @charredUtensil
    charredUtensil committed Oct 22, 2013
    Configuration menu
    Copy the full SHA
    257dce3 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2013

  1. use correct function to draw routes

    @charredUtensil
    charredUtensil committed Nov 1, 2013
    Configuration menu
    Copy the full SHA
    0148b00 View commit details
    Browse the repository at this point in the history

  2. use actual correct method this time

    @charredUtensil
    charredUtensil committed Nov 1, 2013
    Configuration menu
    Copy the full SHA
    7053116 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2013

  1. fix layout of products page

    @charredUtensil
    charredUtensil committed Nov 4, 2013
    Configuration menu
    Copy the full SHA
    d979cc8 View commit details
    Browse the repository at this point in the history

  2. fix columns correctly

    @charredUtensil
    charredUtensil committed Nov 4, 2013
    Configuration menu
    Copy the full SHA
    5f3a2a8 View commit details
    Browse the repository at this point in the history

  3. fix styling on product cart form

    @charredUtensil
    charredUtensil committed Nov 4, 2013
    Configuration menu
    Copy the full SHA
    14e311e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2013

  1. fix crash on engraving calculator cost = 0, use descriptions for cust… 

    …omizations, tweak cart presentation
    @charredUtensil
    charredUtensil committed Nov 7, 2013
    Configuration menu
    Copy the full SHA
    64b9ed0 View commit details
    Browse the repository at this point in the history

  2. accidentally committed two files

    @charredUtensil
    charredUtensil committed Nov 7, 2013
    Configuration menu
    Copy the full SHA
    aa00ceb View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2013

  1. protect against nil cost_price

    @jsqu99
    jsqu99 committed Nov 11, 2013
    Configuration menu
    Copy the full SHA
    13ba838 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2013

  1. Update merge! method within order_decorator to match the syntax of me… 

    …rge! in the order model of spree_core.
    @jfields
    jfields committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    057c2f4 View commit details
    Browse the repository at this point in the history

  2. undoes the undoing of option.presentation for option.description

    @jsqu99
    jsqu99 committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    1b68779 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2013

  1. Merge pull request jsqu99#87 from jfields/spree-2-1-wip 

    Update merge! method within order_decorator to match the syntax of merge...
    @jsqu99
    jsqu99 committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    64175fa View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2013

  1. beta work on using the 'new' order populator

    @jsqu99
    jsqu99 committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    3b18014 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:jsqu99/spree_flexi_variants into … 

    …spree-2-1-wip
    @jsqu99
    jsqu99 committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    baa18d1 View commit details
    Browse the repository at this point in the history

  3. fixes merge conflict

    @jsqu99
    jsqu99 committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    5124eb8 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2013

  1. more versioning to get right w/ spree 2.1. Also, added a no_charge ca… 

    …lculator
    @jsqu99
    jsqu99 committed Nov 17, 2013
    Configuration menu
    Copy the full SHA
    89c1a94 View commit details
    Browse the repository at this point in the history

  2. adds missing files

    @jsqu99
    jsqu99 committed Nov 17, 2013
    Configuration menu
    Copy the full SHA
    af917e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2013

  1. adds testing improvements

    @jsqu99
    jsqu99 committed Nov 20, 2013
    Configuration menu
    Copy the full SHA
    221e3fd View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2013

  1. made some possibly-unecessary changes to the way the calculators are … 

    …set up
    @jsqu99
    jsqu99 committed Nov 21, 2013
    3 Configuration menu
    Copy the full SHA
    b4d1f18 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2014

  1. fix Javascript error on engraving calculator 

    Fixes jsqu99#95
    @charredUtensil @radar
    charredUtensil authored and radar committed Jan 21, 2014
    Configuration menu
    Copy the full SHA
    2de9573 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2014

  1. Updates to support Spree 2.2

    @chunkerchunker
    chunkerchunker committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    023a361 View commit details
    Browse the repository at this point in the history

  2. Allow host app to predefine product_customization calculators.

    @chunkerchunker
    chunkerchunker committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    ba49995 View commit details
    Browse the repository at this point in the history

  3. Typo in amount_times_constant calculator client js. 

    Calculation was amount * length of number string instead of amount * number.
    @chunkerchunker
    chunkerchunker committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    b802514 View commit details
    Browse the repository at this point in the history

  4. Minor styling cleanup.

    @chunkerchunker
    chunkerchunker committed Feb 25, 2014
    Configuration menu
    Copy the full SHA
    4d61cbb View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2014

  1. typo in order_decorator

    @chunkerchunker
    chunkerchunker committed Mar 1, 2014
    Configuration menu
    Copy the full SHA
    1dcdd86 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2014

  1. Allow product customization pricing based on associated line_item con… 

    …figuration

Previously, product customization pricing only had access to the product customization options.  We have a use case where the customization needs access to the overall line_item configuration.

Specifically, we have a customization whose price is a percentage of (the base line_item price plus the price of a separate customization).

This change just associates each product customization with its host line_item before computing customization prices.
    @chunkerchunker
    chunkerchunker committed Mar 5, 2014
    Configuration menu
    Copy the full SHA
    cd0f2a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2014

  1. typo in order_contents_decorator

    @chunkerchunker
    chunkerchunker committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    be9ff6b View commit details
    Browse the repository at this point in the history

  2. minor style cleanup

    @chunkerchunker
    chunkerchunker committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    fb9404b View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2014

  1. line_item validations could lead to unsaved product_customizations

    @ssendev
    ssendev committed Apr 7, 2014
    Configuration menu
    Copy the full SHA
    e95a76a View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2014

  1. Merge remote-tracking branch 'ssendev/spree_flexi_variants/patch-1' i… 

    …nto spree-2-2-wip
    @chunkerchunker
    chunkerchunker committed Jun 19, 2014
    Configuration menu
    Copy the full SHA
    92c4b73 View commit details
    Browse the repository at this point in the history