Skip to content
This repository was archived by the owner on Oct 16, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: payolapayments/payola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: payolapayments/payola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: TrevorHinesley-master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 14 files changed
  • 2 contributors

Commits on Dec 15, 2014

  1. Attempt to fix the ENV load order problem 

    Lots of users use gems like Dotenv or Figaro to handle their ENV
setup. The problem is that sometimes these gems get loaded after
Payola, which means the secret and publishable keys end up nil.
This patch changes the default secret and publishable keys into
lambdas that get called at the appropriate time, which should
fix the problem.
    @peterkeen
    peterkeen committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    6a71e5b View commit details
    Browse the repository at this point in the history

  2. Added spec/dummy/config/initializers/payola.rb to gitignore

    @TrevorHinesley
    TrevorHinesley committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    4bffa6b View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2014

  1. Removed unnecessary line in change_subscription_plan_spec

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    32c3b83 View commit details
    Browse the repository at this point in the history

  2. updated subscription js forms to pass in quantity

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    e74b813 View commit details
    Browse the repository at this point in the history

  3. add quantity to async params if subscription is being created

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    2f629fb View commit details
    Browse the repository at this point in the history

  4. Added change_quantity method to subscriptions_controller

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    e4a231e View commit details
    Browse the repository at this point in the history

  5. Added old_quantity to Payola::Subscription

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    ec5944c View commit details
    Browse the repository at this point in the history

  6. quantity_changed event is executed now

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    995020e View commit details
    Browse the repository at this point in the history

  7. quantity is set when subscription is created now

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    a1dddd0 View commit details
    Browse the repository at this point in the history

  8. Added change_quantity to routes

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    250ae1c View commit details
    Browse the repository at this point in the history

  9. Added test for change_quantity, fixed old tests that weren't actually… 

    … testing anything (the ones testing if they could modify the subscription were always calling cancel, not just change_card and change_quantity)
    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    d52236c View commit details
    Browse the repository at this point in the history

  10. Added quantity to dummy app form

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    5871435 View commit details
    Browse the repository at this point in the history

  11. Added Payola::ChangeSubscriptionQuantity, similar to Payola::ChangeSu… 

    …bscriptionPlan
    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    fbc4647 View commit details
    Browse the repository at this point in the history

  12. Added testing for Payola::ChangeSubscriptionQuantity

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    62596f0 View commit details
    Browse the repository at this point in the history

  13. uhhh.. gitignoring payola.rb wasn't necessary. sorry.

    @TrevorHinesley
    TrevorHinesley committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    33e34fd View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' of https://github.com/TrevorHinesley/payola int… 

    …o TrevorHinesley-master
    @peterkeen
    peterkeen committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    82d2929 View commit details
    Browse the repository at this point in the history
Loading