Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
55,974 Commits 28 Branches 143 Tags 614 MiB
Commit Graph

55974 Commits

Author SHA1 Message Date
Lauryn Menard 68d117e60a support: Add sponsorship request information to remote support view. 2023-12-13 10:28:11 -08:00
Lauryn Menard e8500fbdb0 support: Include sponsorship request for remote server support view. 
Preparation for updating the sponsorship forms template to include
information about the latest sponsorship request if sponsorship is
pending.
 2023-12-13 10:28:11 -08:00
Aman Agrawal 35b644c564 populate_billing_realms: Don't create plan for sponsored remote realm. 2023-12-13 08:13:33 -08:00
Aman Agrawal 9efb236c35 remote_billing_page: Fix redirects for self hosted login. 2023-12-13 08:13:33 -08:00
Aman Agrawal 081d94c4e8 stripe: Add user and org metadata to stripe payments. 2023-12-13 08:13:33 -08:00
Aman Agrawal 039f6af79e billing: Link plan name to /plans page. 2023-12-13 08:13:33 -08:00
Aman Agrawal 998685f2e7 sponsorship: Show sponsored plan name for sponsored orgs. 
The `plan_name` is incorrect here since the customer will not
have an active plan for approved sponsorship.
 2023-12-13 08:13:33 -08:00
Aman Agrawal 0c99420ceb stripe: Don't approve sponsorship for customers on paid plan. 
This would avoid us accidentally approving sponsorship for customers
on paid plan.
 2023-12-13 08:13:33 -08:00
Sayam Samal c61b353b4b gear_menu_popover: Update the rocket icon used for plan and pricing. 
Fixes #28163.
 2023-12-13 07:59:13 -08:00
Sahil Batra 27d236fb52 popover: Fix user popover and profile for bot with inaccessible users. 
We incorrectly passed bot owner ID to get_bot_owner_user instead of
the bot object.
 2023-12-13 00:45:20 -08:00
Tim Abbott 95f4b31ce7 billing: Don't require data to add to legacy plan. 2023-12-13 00:44:50 -08:00
Tim Abbott af83093a65 billing: Remove some stale TODOs. 2023-12-13 00:33:37 -08:00
Aman Agrawal 45a2f7eac1 portico: Pass requested sponsorship context to plan page. 2023-12-12 23:27:39 -08:00
Sayam Samal 7f26905fe0 compose_actions: Hide compose box when navigating to inbox/recent view. 
Currently, given that the compose box is already open, it stays open
when the user navigates to the inbox/recent view, even when there is
no modifications to the message or recipients.

This commit adds conditions to close the compose box when navigating
to the inbox/recent view, except when we can reasonably infer that it
was the intended action.
 2023-12-12 22:56:53 -08:00
Tim Abbott f281199d2f billing_session: Push nocoverage comments down a layer. 2023-12-12 22:03:24 -08:00
Aman Agrawal 63f4fc51de server_deactivate: Show error message for server on active plan. 2023-12-12 21:00:42 -08:00
Aman Agrawal c2636354a5 remote_billing_login: Show different title for deactivate login. 2023-12-12 21:00:42 -08:00
Alex Vandiver 19575b46f7 remote_activity: Hide deactivated remote servers. 2023-12-12 20:36:03 -08:00
Aman Agrawal 0d08fe90a8 remote_billing_email_confirm: Minor text changes. 
* Move email early in text to reduce change of it wrapping to
  next line.

* Change 2 hours to 24 hours.
 2023-12-12 20:32:42 -08:00
Karl Stolley 180dd00d5f portico: Update strings for RemoteRealm login flow. 2023-12-12 20:32:42 -08:00
Alex Vandiver 44e9171a46 register_server: POST requests take data, not params. 
This currently _works_, but only because we are very forgiving about
how we parse requests.
 2023-12-12 19:58:19 -08:00
Lauryn Menard aebafcc43f corporate: Show error page if mobile push data has not been uploaded. 
Adds a template that displays an error message when the billing
or upgrade context for a remote server or remote realm raises a
MissingDataError.
 2023-12-12 19:36:06 -08:00
Aman Agrawal e9ce69aaf6 populate_billing_realms: Call sessions with billing_user. 2023-12-12 17:31:41 -08:00
Aman Agrawal da74b9ade7 billing: Apply common styles to billing pages. 2023-12-12 17:31:41 -08:00
Karl Stolley 9cc0ded092 portico: Correct layout on deactivation pages. 2023-12-12 17:31:41 -08:00
Karl Stolley 2b879e646c portico: Move billing contact to above payment method. 2023-12-12 16:24:56 -08:00
Alya Abbott a2f72edc68 email: Update strings in remote_realm log in confirmation email. 2023-12-12 14:51:00 -08:00
Mateusz Mandera e515574b3e remote_billing: Add endpoint and a helper to make deactivation links. 
This is a general link for logging into the billing system on behalf of
a server, but it's tied to the .contact_email and takes the user
straight to the /deactivate/ page via the next_page mechanism.
 2023-12-12 13:31:59 -08:00
Tim Abbott fa9e3fb35c version: Update version after 8.0-beta2 release. 2023-12-12 12:28:02 -08:00
Tim Abbott 555cdd0a57 Release Zulip Server 8.0-beta2. 2023-12-12 12:17:56 -08:00
Prakhar Pratyush 4ad03804cf stripe: Add `sync_license_ledger...` for RemoteServerBillingSession. 
This commit implements the 'sync_license_ledger_if_needed' method
for RemoteServerBillingSession.
 2023-12-12 12:15:32 -08:00
Prakhar Pratyush 1d515a57cd stripe: Make 'sync_license_ledger_if_needed' abstract method. 
This prep commit makes 'sync_license_ledger_if_needed'
function a 'BillingSession' abstract method.

We'll override the method for RemoteServerBillingSession
in the next commit.
 2023-12-12 12:15:32 -08:00
Prakhar Pratyush 88fb3b735a stripe: Add 'get_last_ledger_for_automanaged_plan_if_exists' method. 
This prep commit extracts out the code block that determines the
last license ledger for the customer plan having automanage_licenses
set to True into a new BillingSession method named
'get_last_ledger_for_automanaged_plan_if_exists'.

We'll be using this function while implementing the
'sync_license_ledger_if_needed' method for RemoteServerBillingSession.
 2023-12-12 12:15:31 -08:00
Prakhar Pratyush 88fe0a7561 zilencer: Update last_audit_log_update before `sync_license_ledger..`. 
We need to update 'last_audit_log_update' before calling the
'sync_license_ledger_if_needed' method to avoid 'MissingDataError'
due to 'has_stale_audit_log' being True.

Also, we made the code block that creates audit logs,
updates 'last_audit_log_update', and syncs LicenseLedger in
an atomic operation.

This helps to rely on 'last_audit_log_update' to assume
'RemoteRealmAuditLog' and 'LicenseLedger' are up-to-date.
 2023-12-12 12:15:31 -08:00
Anders Kaseorg cae11a60b6 help: Fix “community norms” link. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2023-12-12 12:14:21 -08:00
Anders Kaseorg cd65849f7e tests: Fix “inaccesible” typo. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2023-12-12 12:13:51 -08:00
Alex Vandiver 6d7037e867 analytics: Show latest number in "Analytics users", not max. 2023-12-12 12:09:51 -08:00
Aman Agrawal fba49ca33d stripe: Implement various TODOs. 2023-12-12 11:45:14 -08:00
Aman Agrawal 2e8aba2e83 billing: Show special success msg for legacy upgrade scheduled server. 2023-12-12 11:45:14 -08:00
Aman Agrawal ccaef86e20 stripe: Fix manual licenses not being propagated to next plan. 
We already calculate the correct `billed_licenses` early in the
function, so just used that to fix the bug where a legacy server
scheduled for upgrade doesn't respect the manual license count
set by the user.
 2023-12-12 11:45:14 -08:00
Aman Agrawal 7587ee2289 Revert "stripe: Remove non-relevant context override." 
This reverts commit 4bf018f09f.

While `payment_method` is attached to customer, the type of
payment method used is attached to plan.
 2023-12-12 11:45:14 -08:00
Tim Abbott bd539d7d12 docs: Update changelog with latest changes. 2023-12-12 11:38:19 -08:00
Anders Kaseorg ed02b568e5 personal_menu: Handle undefined user_time. 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
 2023-12-12 11:37:14 -08:00
Karl Stolley 857630707a portico: Disable self-hosted tab for logged-in cloud users. 2023-12-12 11:30:57 -08:00
Tim Abbott b0b6716892 i18n: Update translation data from Transifex. 2023-12-12 10:37:31 -08:00
Alex Vandiver 7e1f212366 tornado: Handle the handler having been cleared by connection close. 
As premonitioned in c741c527d7, it is
indeed possible for `get_handler_by_id` to error out by cause the
handler has been unset elsewhere.

Protect the callsites of `get_handler_by_id` to be able to gracefully
handle when the handler has already done away.
 2023-12-12 10:29:37 -08:00
Aman Agrawal 20a1037b92 stripe: Fix incorrect licenses at next renewal for legacy customers. 
When a legacy plan is scheduled for an upgrade, licenses at
next renewal should reflect the licenses according to the next plan.
 2023-12-12 09:30:17 -08:00
Aman Agrawal 4bf018f09f stripe: Remove non-relevant context override. 
`payment_method` is attached to customer so we don't need to
override it here.
 2023-12-12 09:30:17 -08:00
Aman Agrawal 689aa12fce stripe: Enforce min license for plan throughout. 
I missed a some places to check on last pass:
* For automanaged licenses when the license updates.
* When plan is changed.
* When migrating existing customers to legacy plan.
 2023-12-12 09:30:17 -08:00
Aman Agrawal 89a28f6577 stripe: Allow customers without a plan to upgrade. 
I am not sure why I added this silly assert statement. Probably
related to legacy customers always having a plan.
 2023-12-12 09:30:17 -08:00