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

296 Commits

Author SHA1 Message Date
Karl Stolley 76220fdc2c features: Suppress plan-comparison subheadings. 2024-02-13 15:11:02 -08:00
Karl Stolley 04b94f6ad5 features: Swap in redesigned feature-comparison table. 2024-02-13 15:11:02 -08:00
Lauryn Menard b275e9c4d6 stripe: Add billing portal for customer name and address. 
Adds a link on the upgrade and billing pages that opens a stripe
billing portal for the customer to update their name and address
that will appear on invoices and receipts.

On the billing page, updating the credit card information will
no longer update the customer billing address, since they can
now do this directly through the billing portal. To be consistent
with the credit card form on the upgrade page, we still require
inputting a billing address for the card.

Note that, once an invoice is paid/complete, then changes to the
customer's name and address will not be applied to those invoices.
 2024-02-13 14:18:38 -08:00
Aman Agrawal 8cba101e05 support: Add button to delete configured fixed next plan. 
This will help us modify the configured plan if we need to.
 2024-02-13 09:40:53 -08:00
Karl Stolley 35098f4959 Revert "plans: Handle table widths in CSS." 
This reverts commit 960e29dc5a.

An earlier draft of the comparison table made this CSS necessary;
it should have been removed before merging.
 2024-02-12 15:18:01 -08:00
Karl Stolley 5be2e8fa64 portico: Beef up IntersectionObserver on comparison table. 2024-02-12 15:18:01 -08:00
Lauryn Menard 831381f160 email-log: Update CSS styles for dev environment email log. 
Removes reliance on bootstrap alert and label rules/styles that
were used or expected for this email log page.
 2024-02-12 11:35:36 -08:00
Karl Stolley 0290642f1d plans: Use IntersectionObserver to handle subheaders. 2024-02-09 09:20:34 -08:00
Karl Stolley 960e29dc5a plans: Handle table widths in CSS. 2024-02-09 09:20:34 -08:00
Karl Stolley 5aa3615f4b plans: Add comparison-switcher logic and styles. 2024-02-09 09:20:34 -08:00
Karl Stolley 0e3699c3dc plans: Open up spacing around feature-cell text. 2024-02-09 09:20:34 -08:00
Karl Stolley 33fd82ead3 plans: Add comparison-tab buttons and icons. 2024-02-09 09:20:34 -08:00
Karl Stolley 7d2adda31c plans: Filter table based on active plans tab. 2024-02-09 09:20:34 -08:00
Karl Stolley 5031d7a06c plans: Avoid hover effect on header row. 2024-02-09 09:20:34 -08:00
Prakhar Pratyush 2055dfa83e support: Add support to configure fixed-price plan with pay-by-invoice. 
* Manually create & send invoice
* Configure a fixed-price plan with sent invoice-id.
* When customer pays, upgrade them to concerned plan.
 2024-02-06 18:43:23 -08:00
Karl Stolley f68d770312 portico: Center hero content on /apps. 2024-01-31 16:10:32 -08:00
Karl Stolley 6763456290 portico: Remove screenshots from /apps. 2024-01-31 16:10:32 -08:00
Karl Stolley b522ffa317 plans: Add explicit values for uniform plans display. 2024-01-31 07:23:50 -08:00
Karl Stolley 30926ae62f plans: Remove discount-related layout cruft. 
These classes and styles were introduced as hacky layout fixes,
and are no longer necessary with tooltip-style discount balloons.
 2024-01-31 07:23:50 -08:00
Karl Stolley e622332cdf plans: Add tooltip-style discount balloon. 2024-01-31 07:23:50 -08:00
Karl Stolley f361a9bb50 plans: Enable better collapsing of plans panes. 2024-01-31 07:23:50 -08:00
Karl Stolley dc52194ecc plans: Remove underline from comparison subhead links. 2024-01-31 07:23:50 -08:00
Karl Stolley 16e1cbe374 plans: Implement background colors for hovers, dark mode. 2024-01-31 07:23:50 -08:00
Lauryn Menard efd0d689fc templates: Move activity templates to /templates/corporate/activity. 
Also, renames `ad_hoc_query.html` to `activity_table.html`,
`realm_summary_table.html` to `installation_activity_table.html`,
and `activity_details_template.html` to `activity.html`.

Removes the style attribute in the installation activity template
and uses a CSS class, "installation-activity-header", to center the
h3 and p tags instead. This removes an exception from the custom
lint check.
 2024-01-30 10:06:48 -08:00
Lauryn Menard 15ba9cf8ec bootstrap: Remove bootstrap.btn classes from support view buttons. 
Moves CSS styles for support view buttons to
`web/styles/portico.activity.css`.

Also removed the "sea-green" and "small" classes from a few buttons
as no CSS rules were being applied and most of those buttons will
be removed when these forms are refactored to use a modal.
 2024-01-29 10:59:33 -08:00
Tim Abbott 41fa2e7174 css: Remove unused portico tab-content CSS rules. 2024-01-28 16:08:30 -08:00
Lauryn Menard bfd9eec4b3 activity: Add totals row as sticky footer to activity charts. 
Updates the total row for the installation and remote activity
charts to be in the table footer. Makes the footer class sticky
to the bottom of the view so that it is always visible on the
chart.

Also, updates the installation activity column for revenue to
be formatted as a dollar string, since this formatting was being
applied in the updated total row.
 2024-01-26 09:04:39 -08:00
Tim Abbott f04b54ff47 css: Remove unused boostrap nav-header styles. 2024-01-25 18:35:38 -08:00
Tim Abbott f105c6b12e css: Remove unused Bootstrap nav-tabs styles. 2024-01-25 18:35:38 -08:00
Lauryn Menard ccfcb34bea activity-css: Make activity charts header row sticky. 
This will be applied to both the overall installation activity chart
as well as the associated remote, client, realm and user views.

Co-authored-by: Karl Stolley <karl@zulip.com>
 2024-01-23 09:31:05 -08:00
Vidhi Agrawal b21dc465b8 billing: Change background color of reactivate subscription. 
Fixes #28428
 2024-01-17 12:43:01 -08:00
Karl Stolley 906559c2b5 portico: Extend proper background gradients to /plans. 2024-01-15 18:43:33 -08:00
Karl Stolley f5245285b4 portico: Isolate global plans-page styles in own file. 2024-01-15 18:43:33 -08:00
Tim Abbott 40f99d0990 Revert "portico: Extend proper background gradients to /plans." 
This reverts commit 536d2f4e7f.

Apparently pricing_plans.css is included in many unrelated pages.
 2024-01-12 14:43:28 -08:00
Aman Agrawal 03254bea5b billing: Change how flat discount on billing/upgrade page is displayed. 2024-01-12 08:50:51 -08:00
Aman Agrawal c9a4660911 header: Avoid using `.dropdown` for class name. 
This is avoid conflict with styles defined for `.dropdown` in
bootstrap.
 2024-01-12 08:40:51 -08:00
Aman Agrawal 9d1e977e2a portico: Don't use `dropdown-toggle` class. 
We want to avoid using `dropdown-toggle` class to avoid
properties leaking from bootstrap.
 2024-01-12 08:40:51 -08:00
afeefuddin d0deaff7fd portico-header: Dropped find accounts link for smaller windows. 
Fixes #27477
 2024-01-09 16:46:24 -08:00
Karl Stolley 5c0e37844b plans: Reduce font-size of text comparison elements. 2024-01-09 16:00:16 -08:00
Karl Stolley f71c7458a7 plans: Consolidate positioning on comparison values. 2024-01-09 16:00:16 -08:00
Karl Stolley 941b76f510 plans: Reduce font-weight on push placeholder button. 2024-01-09 15:59:38 -08:00
ecxtacy 62fcb08b1b dev: Center devtool link buttons on devlogin page. 2024-01-09 10:42:47 -08:00
Karl Stolley b80f8eabd4 plans: Specify text color on :active comparison links. 2024-01-09 10:20:00 -08:00
Karl Stolley 6d3f0361f5 plans: Remove overwrought !important declarations. 
These were unnecessary, and interfered with expected link, :hover,
and :active styles.
 2024-01-09 10:20:00 -08:00
Aman Agrawal 3cb1ebeb34 plans: Align price with `details` when no discount is applied. 2024-01-08 14:41:22 -08:00
Karl Stolley 536d2f4e7f portico: Extend proper background gradients to /plans. 2024-01-08 14:15:37 -08:00
Karl Stolley 9fde83c161 billing: Add Cloud comparison table. 2024-01-04 18:46:05 -08:00
Karl Stolley 0c8730a723 portico: Correct spacing at footer bottom. 
This reduces reliance on margin for layout, preventing undesired
space appearing below the footer and better using flexbox to align
elements in the legal area.
 2024-01-04 10:26:36 -08:00
Aman Agrawal 0337c726d3 plans: Align basic plan price detail at bottom. 2023-12-20 23:09:21 -08:00
Karl Stolley a37354f92a corporate: Add a Basic plan. 2023-12-20 23:09:21 -08:00
Karl Stolley 3a0be097f4 portico: Reduce bold in additional info area. 2023-12-20 23:09:21 -08:00
Karl Stolley e4a3b1b1a3 plans: Precisely determine min- and max-widths. 2023-12-19 13:31:57 -08:00
Aman Agrawal d85462a459 pricing_plans: Fix scrollbars always visible. 
Kick in min-width at the required width.
This will ensure that scrollbars are only visible if the window
is at this width.
 2023-12-16 22:51:21 -08:00
Karl Stolley e44ba3b1f1 portico: Add new self-hosted plans. 
Co-authored-by: Alya Abbott <alya@zulip.com>
 2023-12-15 11:03:42 -08:00
Karl Stolley 92de3d11d2 portico: Add self-hosted plans comparison table. 
Co-authored-by: Vlad Korobov <vlad.korobov@zulip.com>
Co-authored-by: Alya Abbott <alya@zulip.com>
 2023-12-15 11:03:42 -08:00
Tim Abbott 1757b88760 billing: Offer release announcement subscriptions. 
Also avoid prompting for full name time more than once.
Adds TOS version field to Remote server user.

Co-authored-by: Karl Stolley <karl@zulip.com>
Co-authored-by: Aman Agrawal <amanagr@zulip.com>
 2023-12-14 10:51:16 -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 da74b9ade7 billing: Apply common styles to billing pages. 2023-12-12 17:31:41 -08:00
Aman Agrawal c61275cab2 upgrade: Show sponsorship requested banner like billing page. 2023-12-12 09:30:17 -08:00
Aman Agrawal ab1a8a0151 legacy_server_login: Do better error handling. 
Show better error messages and validate zulip_org_id in JS before
sending it to the server and give an appropriate error message.
 2023-12-12 08:05:45 -08:00
Aman Agrawal 2da1bfcbd0 remote_billing: Fix strings and styling for remote login pages. 2023-12-11 20:16:37 -08:00
Lauryn Menard 2684c21cca support: Create separate template for remote sponsorship/discounts. 
Creates a separate template for the forms related to sponsorship
and discounts on the remote support view.
 2023-12-11 10:33:50 -08:00
Karl Stolley 9c66b4a660 portico: Make Cloud tab inactive for self-hosters. 
Copy here also points to the Cloud plans as described on zulip.com.
 2023-12-11 09:03:00 -08:00
Mateusz Mandera a0ea14bdb1 remote_billing: Fold the separate .ts files into remote_billing_auth.ts. 
The separation of files no longer makes any sense, with some of these
forms being used by the RemoteRealm and legacy server flows together.
And in general we don't need to scatter this stuff across files.

Also, the unifying of the class of loader on the buttons, fixes a visual
bug on the final "Confirm login" page where you would see it spinning
for half a second upon loading the page, until the .hide() code
triggered.
 2023-12-10 16:15:28 -08:00
Mateusz Mandera 1e6d9d28f8 remote_billing: Fix up templates and HTML names in them. 
These pages are generally used by both remoterealm and legacy server
flows, so should have general names.
 2023-12-10 16:15:28 -08:00
Aman Agrawal 12dec4234e billing: Minor adjustments across the billing system. 
* Reformat "This is a legacy plan" notice on billing page.
* Add a link to the plan name on upgrade page title.
* Tweak discount style on billing page.
* Add line break to server login page title.
* Match server login page title and tab title.
 2023-12-08 11:24:15 -08:00
Karl Stolley 8d76231dda portico: Hide Cloud-plan buttons for self-hosters. 2023-12-07 19:19:21 -08:00
Aman Agrawal 2165486c88 upgrade: Allow showing downgrade success message for legacy server. 2023-12-07 13:55:39 -08:00
Aman Agrawal 00b7424d11 legacy_server_login: Restyle page. 2023-12-07 13:55:39 -08:00
Lauryn Menard ea725aaaf3 support: Handle missing current licenses data for support views. 2023-12-06 11:01:26 -08:00
Lauryn Menard d079a13760 support: Use shared template for current plan details on support views. 
Moves the section in support views for any current plan details
to a new template: `templates/analytics/current_plan_details.html`.

Also, updates the PlanData dataclass to have a boolean that checks
if the current plan tier is the self-hosted legacy plan.
 2023-12-06 11:01:26 -08:00
Tim Abbott 244b150920 portico: Fix buggy plans gradient in light theme. 2023-12-06 00:02:47 -08:00
Aman Agrawal 8d9a7679bc plans: Show buttons as per current context. 
Also show correct tab based on remote / cloud user.
 2023-12-05 23:44:29 -08:00
Lauryn Menard ba3279e959 support: Add remote realm stub to remote server information. 
Adds a small section for any remote realms attached to the remote
server in the support view.
 2023-12-05 12:48:42 -08:00
Lauryn Menard 9f8fe7989a support: Add current plan information for remote servers. 
For remote servers with a current legacy customer plan,
only the plan name, status and end date are displayed.
 2023-12-05 12:48:42 -08:00
Mateusz Mandera 250b52e3dc remote_billing: Add a "confirm login" page in RemoteRealm auth flow. 2023-12-05 11:34:57 -08:00
Karl Stolley 2ea37a54a6 portico: Update plans tab on other pages. 
This adds the new tabs from /plans to:

* /for/business
* /self-hosting

And it isolates legacy styles to preserve the tabs on
/for/education

Fixes: #28013
 2023-12-05 11:09:41 -08:00
Aman Agrawal 1a063986e3 billing: Render page for legacy server scheduled for upgrade. 2023-12-04 12:36:24 -08:00
Aman Agrawal 895d76f6f0 hello: Add getapp badge on landing page. 2023-12-03 20:43:07 -08:00
Lauryn Menard 4250e9c1c9 support: Update remote server customer default discount. 
Adds ability to update the default discount for a customer attached
to a remote server via the remote server support view.
 2023-12-03 14:27:07 -08:00
Lauryn Menard 6621de6f07 analytics: Add copy email button for remote server support view. 2023-12-03 14:27:07 -08:00
Lauryn Menard 0679bc044a corporate: Make references to billing modality consistent. 
The "send_invoice" and "charge_automatically" strings used by stripe
for the `collection_method` are referred to both as the "billing
method" and "billing modality" in the billing code.

Because we send this as data to stripe as either `collection_method`
or `billing_modality`, renames any references that are any form of
"billing method".
 2023-12-03 14:27:07 -08:00
Karl Stolley 871054bd1e plans_page: Allow different max-widths on cloud, self-hosted panes. 2023-12-01 15:12:31 -08:00
Karl Stolley 5eb86f3fbb plans_page: Add responsive non-JS plan-pane scrolling. 2023-12-01 15:12:31 -08:00
Karl Stolley 056dde8618 plans_page: Place responsive styles, other than plans pane. 2023-12-01 15:12:31 -08:00
Karl Stolley 94cf3b57a3 plans_page: Add dashed separators. 2023-12-01 15:12:31 -08:00
Karl Stolley 5bfe45b244 plans_page: Implement button styles and icons. 2023-12-01 15:12:31 -08:00
Karl Stolley c5b4b452c1 plans_page: Place swooshes on question headers. 2023-12-01 15:12:31 -08:00
Karl Stolley 6fb2e28cd2 plans_page: Add curvature to pricing tabs. 2023-12-01 15:12:31 -08:00
Karl Stolley abbf511322 plans_page: Adjust spacing, curved borders. 2023-12-01 15:12:31 -08:00
Karl Stolley 854d2820d5 plans_page: Place pricing styles. 2023-12-01 15:12:31 -08:00
Karl Stolley 8529d86fc6 plans_page: Place custom bullets with flexbox. 2023-12-01 15:12:31 -08:00
Karl Stolley dbaef860bf plans_page: Place non-button link colors. 2023-12-01 15:12:31 -08:00
Karl Stolley 4f8cc13417 plans_page: Place text, background colors. 2023-12-01 15:12:31 -08:00
Karl Stolley b0db397ec6 plans_page: Add independent additional info sections for cloud, self-hosted. 2023-12-01 15:12:31 -08:00
Karl Stolley c9f33344e2 plans_page: Add JS toggle for showing cloud or self-hosted plans. 2023-12-01 15:12:31 -08:00
Karl Stolley eb36256d7a plans_page: Handle typesetting and vertical alignment. 2023-12-01 15:12:31 -08:00
Karl Stolley 52f8f56286 plans_page: Rough out structures and grid layout. 2023-12-01 15:12:31 -08:00
Karl Stolley a6498ad666 plans_page: Simplify structures and present page header. 2023-12-01 15:12:31 -08:00
Mateusz Mandera 2765c63f56 remote_billing: Add flow for legacy servers. 2023-11-29 14:40:27 -08:00