61e0c2693d
billing: Use Subscription.save() instead of calling save on instances.
...
Continuation of 03d77bc
2018-11-17 18:59:21 -08:00
63614f28fe
billing: Upgrade to Stripe API version 2018-11-08.
...
Was hoping to do this after adding timestamp normalization to
normalize_fixture_data, which would have turned this into a <10 line
diff. There is a potentially material change in this API upgrade though
(around how invoices are handled), so just doing it now.
2018-11-17 18:09:56 -08:00
0670976cb1
billing: Remove PRINT_STRIPE_FIXTURE_DATA.
...
Made obsolete by mock_stripe.
2018-11-16 19:41:46 -08:00
b847a100a3
billing: Prevent setup_stripe from being run in production.
2018-11-16 19:29:31 -08:00
2e04cdbe5e
billing: Show estimated subscription revenue on /activity.
...
[Substantial edits by Rishi Gupta]
2018-11-16 13:30:16 -08:00
a7c33e12cb
billing: Make mock_stripe handle calls which dont return object.
2018-11-16 13:30:16 -08:00
2d140bae3e
billing: Cast return value of _mock_stripe to CallableT.
...
Without the cast mypy raises the following error:
Incompatible return value type (got "Callable[..., Any]",
expected "CallableT")
This is a known issue: https://github.com/python/mypy/issues/1927
2018-11-12 23:42:59 -08:00
20c41f3d3e
billing: Replace IDs and other values before writing fixtures.
...
This makes a few other changes to the fixtures as well. Most are from API
updates, though I'm not sure why "Zulip Cloud Standard" got changed to
"Zulip Cloud Premium".
[Substantial edits by Rishi Gupta]
2018-11-12 23:24:33 -08:00
f812b76c3b
billing: Allow mock_stripe to take multiple function_name arguments.
2018-11-10 00:38:32 -05:00
2e89ffb0e2
billing: Make it easier to access /billing in tests.
2018-11-07 22:18:54 -05:00
9b6b842f00
billing: Merge test_billing_home into test_initial_upgrade.
2018-11-07 22:18:54 -05:00
7dc021a6b2
billing: Improve error message for require_billing_access.
2018-11-01 14:17:36 -07:00
677f34c2b9
billing: Use require_billing_access decorator in JSON endpoints.
2018-11-01 12:45:29 -07:00
b527c3c4ef
billing: Make mock_stripe handle StripeErrors.
2018-10-30 09:55:13 -07:00
be162d5428
billing: Disable fixture generation in setUp function.
...
This means you'll need access to our Stripe API key to add new fixtures.
Will be undone eventually, but having this in place will make it easier to
finish the mock.patch to mock_stripe migration.
2018-10-30 09:33:02 -07:00
0cf4a75fb5
coverage: Enforce full test coverage for corporate/views.py.
2018-10-24 19:39:23 -07:00
052640dfd5
billing: Add test for error during source replacement.
2018-10-24 19:39:23 -07:00
20de90066b
billing: Add test for exception during initial upgrade.
2018-10-24 18:54:53 -07:00
a7f4ea4b2c
billing: Add test for billing disabled settings.
2018-10-24 18:54:18 -07:00
458169928c
billing: Rename Zulip Premium to Zulip Standard.
2018-10-24 10:42:16 -07:00
a4d3606bad
billing: Assume we are charging right away when adding new users.
...
The actual implementation of the change will be a cron job that runs once a
day and generates invoices for anyone with an account_balance > 0.
There are currently no tests for that part of the flow, so no tests had to
change.
2018-10-23 16:19:47 -07:00
fbd884f934
billing: Rename MAX_INVITES_PREMIUM.
...
Largely to have parallel structure with INVITES_DEFAULT_REALM_DAILY_MAX.
2018-10-23 14:47:00 -07:00
3b026559d4
stripe: Make stripe.error stubs more similiar to stripe python lib.
...
This will also fix the error that is generated during
the mypy 0.641 upgrade in PR #10691 .
2018-10-22 13:51:05 +05:30
690705858a
billing: Update test_upgrade_where_..._fails_at_first to use @mock_stripe.
2018-10-18 11:16:00 -07:00
03d77bc6af
billing: Replace instance.save() Stripe API calls with class.save(instance).
...
This will make it easier to mock the calls in our new stripe mocking
framework. I believe the two forms are equivalent, assuming the Stripe
Python bindings aren't doing anything crazy. And if not, well hopefully our
new testing framework will catch it :).
[Idea originally from Vishnu KS.]
2018-10-18 11:16:00 -07:00
80c482428d
billing: Update test_upgrade_with_outdated_seat_count to use @mock_stripe.
2018-10-18 10:08:40 -07:00
509707007c
billing: Update test_billing_page_permissions to use @mock_stripe.
2018-10-18 09:49:50 -07:00
c4bad258f7
billing: Import from mock in test_stripe.py.
...
The string 'mock' appears over 200 times in this file. This removes about 80
of them.
2018-10-17 21:06:09 -07:00
50de59102d
billing: Add system to generate fixture data from the billing tests.
...
This will improve both the maintainability and accuracy of the fixture
data. It also makes it less scary to upgrade Stripe API versions.
[With significant changes by Rishi Gupta.]
2018-10-17 20:35:42 -07:00
d8c19cb003
models: Move billing models from zilencer to corporate.
2018-10-11 14:54:29 -07:00
59865797ac
billing: Move billing tests from zilencer to corporate.
2018-10-01 15:44:02 -07:00
c01ebaa8d8
billing: Move billing management commands from zilencer to corporate.
2018-10-01 15:43:55 -07:00
93b398bc0a
billing: Move zilencer/lib/stripe to corporate.
2018-10-01 15:43:44 -07:00
daf3b46262
billing: Move billing related templates from zilencer to corporate.
2018-10-01 15:43:39 -07:00
6914ee126c
billing: Move billing-related views and urls to corporate.
2018-10-01 15:43:21 -07:00
c4f09156ff
corporate: Remove unused imports (F401).
2017-11-07 16:37:04 -08:00
4891a8d850
Add default response for `terms` and `privacy` endpoints.
...
- Add setting for `privacy policy` template defining.
- Configure default templates for `privacy policy` and
`terms of service` pages.
- Add route for privacy page.
- Remove condition for showing `privacy` and `terms` pages.
- Add `privacy_policy` setting to context processor.
- Add documentaion part for `privacy` and `terms` templates
configuration.
- Add tests.
Fixes #3686 .
2017-04-12 14:09:14 -07:00
a45f8b463a
app_filters.py: Use Django to load template.
...
This commit allows us to load template using Django in
render_markdown_path.
2017-04-07 15:52:15 -07:00
bd6f71580e
docs: Remove obsolete terms-enterprise page.
...
This was documentation for the old zulip.com enterprise service that
no longer exists.
2017-01-28 18:12:19 -08:00
9cc83f87fc
lint: Clean up E241 PEP-8 rule.
2017-01-23 21:21:14 -08:00
9fec519b3d
Zephyr: Remove obsolete mit.html template.
2016-11-16 17:33:42 -08:00
b140236fcf
Django 1.10: Do not use patterns function.
2016-11-04 10:06:00 -07:00
b7ccf64c79
Move Zulip's TOS to TERMS_OF_SERVICE markdown file.
...
This reimplements zulip.com/terms using the new markdown system.
2016-07-29 20:47:42 -07:00
f9bbc5d6ff
Enable i18n support in URL configuration.
...
This supports i18n using all of the following:
- I18N urls
- Session
- Cookie
- HTTP header
2016-05-19 08:33:30 -07:00
5c28b0340a
Don't show Zulip.com terms on other sites
...
While we already don't link to /terms anywhere on the site, they can still be
accessed if you navigate to /terms directly. Now, those routes will only be
exported on the Zulip.com service.
We should ideally provide a mechanism for deployments to specify their own
terms without modifying source code; in the interim, sites that have already
customised the provided Zulip.com terms can simply carry a patch reverting this
commit.
2016-03-21 05:46:28 +00:00
bded0d9d54
Remove corporate beta signup form
...
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
2015-08-20 18:40:34 -07:00
cb88147ca9
Remove corporate marketing page
...
(imported from commit 24128853fd78ef9e89df7f3353f45ac2531a42e1)
2015-08-20 18:40:34 -07:00
1b5f9e4374
Remove corporate jobs pages
...
(imported from commit 3f1789f6a4f90a33ddd2352fab85d3cf751b0f46)
2015-08-20 18:40:34 -07:00
3a982c7c06
Modify /hello to go to register instead of signup on Enterprise
...
Also move the urls.py lines to the right place
(imported from commit f9d9805fe599ceffb6cdd1ed572d8656cb0d6d95)
2013-11-22 13:50:24 -05:00
c3d176a480
Move marketing pages to corporate app.
...
(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
2013-11-06 12:07:32 -05:00
6193f60d45
Move static MIT-related pages to corporate app.
...
(imported from commit e2c5f72d3f3e4d8f8fa888326b2ba455beb9156c)
2013-11-06 12:07:31 -05:00
a827d727cc
Create non-localserver "corporate" app with jobs pages.
...
The corporate "app" is not a full-fledged Django app, but it has
a urls.py and a templates directory. This commit creates the app
and moves the jobs pages into it. Localserver deployments will
not see any of the corporate code.
(imported from commit 35889c3cf92329258c30741fdfa564769a4fac1a)
2013-11-06 12:07:31 -05:00
Rishi Gupta
Vishnu Ks
rht
K.Kanakhin
Umair Khan
Tim Abbott
acrefoot
Luke Faraone
Anders Kaseorg
Steve Howell