leap_web.git/billing, branch 0.5.0.rc [leap_web] enable billing engine by default, consolidate APP_CONFIG[:payments] and APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree] 2013-12-20T18:56:01+00:00 elijah elijah@riseup.net 2013-12-18T08:10:01+00:00 34ac576bf7efbddac0a89731292eac8974f95114 






Merge branch 'develop' into feature/billing-no-authenticated-payments
2013-12-17T20:02:07+00:00

jessib
jessib@riseup.net

2013-12-17T20:02:07+00:00

98a247acb4d1be484c2982d48ec038eed3de3d55

Conflicts:
	billing/config/locales/en.yml





Conflicts:
	billing/config/locales/en.yml







use https sources in Gemfiles and also in the documentation (#4109)
2013-10-18T11:12:50+00:00

Azul
azul@leap.se

2013-10-18T11:12:50+00:00

936015afe051c82d5677601f7f58944ed42b4623












Some cleanup of code to deal with past due subscriptions.
2013-10-17T20:58:54+00:00

jessib
jessib@riseup.net

2013-10-17T20:58:54+00:00

92cb054d53aaac6864a6a805d9cdd3919f4a38bc












Add permissions to subscriptions index, and fix test to stub the subscription's balance.
2013-10-15T22:08:35+00:00

jessib
jessib@riseup.net

2013-10-15T22:08:35+00:00

a6f32017f5c7802798f10e2f4041037fb5684def












Admins can cancel pastdue subscriptions, but users cannot cancel their own pastdue subscription, as then admins won't be able to search for them.
2013-10-10T18:35:26+00:00

jessib
jessib@riseup.net

2013-10-10T18:35:26+00:00

51f93fc87c9cadbe52877ddc3e7c5fd07866b397












Merge branch 'develop' into feature/billing-past-due-subscriptions
2013-10-10T18:05:09+00:00

jessib
jessib@riseup.net

2013-10-10T18:05:09+00:00

5627b01230cdfa918ad144b26183b4c0bf151360












Consider pending & past due subscriptions as 'active' in the sense that they should prevent one from adding a new subscription.
2013-10-08T21:33:02+00:00

jessib
jessib@riseup.net

2013-10-08T21:33:02+00:00

4e471f6b35c012d2825f6be19e24ecd5fef8d636












Payments made when authenticated will be donations, and not connected to customer in any way.
2013-10-08T19:32:07+00:00

jessib
jessib@riseup.net

2013-10-08T19:32:07+00:00

014ff5bda0802d51b4cbca5a2fd904d953223d2f












Minor tweaks.
2013-10-08T17:44:50+00:00

jessib
jessib@riseup.net

2013-10-08T17:44:50+00:00

8b378d916caeaf7fd4b1da2aea45eab4b0ccbb39