Update pricing (#540)

Author: alex-cit

scripts/wordlist.txt

@@ -163,6 +163,8 @@ VDOP
 Vue
 VuePress
 Webmap
+Webmaps
+webmaps
 WFS
 WGS
 WMS
@@ -269,4 +271,4 @@ workspaces
 zlib
 zoomstack
 SSL
-TLS
+TLS

src/dev/dbsync.md

@@ -9,13 +9,6 @@
 
 Windows users may use a Windows executable for DB sync. On Linux/Mac users are advised to use a docker container. [DB Sync configuration wizard](#db-sync-configuration-wizard) can help you with creating the configuration file.
 
-:::tip Usage details
-DB Sync can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../server/) and [<EnterprisePlatformName />](../server/).
-
-It is not available in *Individual* or *Professional* subscriptions.
-
-You can try DB Sync for free during the trial period.
-:::
 
 ## DB Sync configuration wizard
 <SinceBadge type="Plugin" version="2023.4" />

src/dev/integration.md

@@ -3,13 +3,6 @@
 
 Do you want to integrate <MainPlatformNameLink />? <MainPlatformName /> is an open platform that aims to be developer friendly and it has been designed to allow easy integration with other software.
 
-:::tip Usage details
-Python client module and C++ standalone client can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../server/) and [<EnterprisePlatformName />](../server/).
-
-They are not available in *Individual* or *Professional* subscriptions.
-
-You can try these tools for free during the trial period.
-:::
 
 ## Python client module
 The Python client module is the easiest way to programmatically use <MainPlatformNameLink />. You can use Python API or a command-line tool to easily work with <MainPlatformName /> projects, such as to get project status, push and pull changes, or to download, create and delete projects.

src/dev/media-sync/index.md

@@ -9,10 +9,3 @@ Media Sync has two sync modes: in copy mode, media files are only copied the ext
 
 **Interested in using Media Sync?** Go to <GitHubRepo id="MerginMaps/media-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between a new <MainPlatformName /> project and your existing bucket (<NoSpellcheck id="MinIO" /> or S3).
 
-:::tip Usage details
-Media Sync can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../../server/) and [<EnterprisePlatformName />](../../server/).
-
-It is not available in *Individual* or *Professional* subscriptions.
-
-You can try Media Sync for free during the trial period.
-:::

src/dev/work-packages/index.md

@@ -10,10 +10,3 @@ The main <MainPlatformNameLink/> project (*Survey*) contains all data. The admin
 
 **Interested in using Work Packages?** Go to <GitHubRepo id="MerginMaps/work-packages" /> repository for the source code, more details and a quick start with a simple project.
 
-:::tip Usage details
-Work Packages can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../../server/) and [<EnterprisePlatformName />](../../server/).
-
-It is not available in *Individual* or *Professional* subscriptions.
-
-You can try Work Packages for free during the trial period.
-:::

src/manage/dashboard-maps/index.md

@@ -1,33 +1,29 @@
-# Maps in Dashboard
+# Webmaps
 [[toc]]
 
 The spatial data of your project can be displayed in the **Map** tab of the project on the <DashboardShortLink />. You need to be logged in to see the maps.
 
 ![Mergin Maps dashboard map](./dashboard-webmap.gif "Mergin Maps dashboard map")
 
 :::tip Usage details
-Maps can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>.
-
-They are not available for *Individual* or *Professional* subscriptions, <CommunityPlatformName /> and <EnterprisePlatformName />.
-
-You can try this feature for free during the trial period.
+Webmaps are not available for <CommunityPlatformNameLink /> and on-premises <EnterprisePlatformNameLink />.
 :::
 
-## Maps content
+## Webmaps content
 
-In the maps, you will see your survey layers or raster layers that are [packaged](../project/#packaging-qgis-project) with the project. Other layers, such as online [background maps](../../gis/settingup_background_map/#background-maps) or PostgreSQL layers are not displayed. The extent of maps is defined by the [extent set in the QGIS project](../../gis/features/#project-extent).
+On the webmaps, you will see your survey layers or raster layers that are [packaged](../project/#packaging-qgis-project) with the project. Other layers, such as online [background maps](../../gis/settingup_background_map/#background-maps) or PostgreSQL layers are not displayed. The extent of maps is defined by the [extent set in the QGIS project](../../gis/features/#project-extent).
 
-All maps in the <DashboardShortLink /> use [<MainPlatformName /> vector tile service](../../gis/settingup_background_map/#mergin-maps-vector-tile-service) as a background map.
+All maps on the <DashboardShortLink /> use [<MainPlatformName /> vector tile service](../../gis/settingup_background_map/#mergin-maps-vector-tile-service) as a background map.
 
 The content of the maps and of the **Layers** panel is refreshed after every synchronisation of the project. This means you should always see your current spatial data here.
 
 The **Layers** panel lists all layers displayed on the map. The check button :white_check_mark: controls the visibility of layers.
 
 ![Mergin Maps dashboard maps](../dashboard/mergin-maps-web-map.jpg "Mergin Maps dashboard maps")
 
-## Maps extent
+## Webmaps extent
 
-The extent of maps is defined in QGIS in the **Project Properties**. 
+The extent of webmaps is defined in QGIS in the **Project Properties**. 
 
 When displaying maps on the <DashboardShortLink />, <MainPlatformName /> uses primarily the [project full extent](../../gis/features/#project-extent) defined in the **View Settings** tab.
 

src/manage/dashboard/mergin-maps-dashboard-subscriptions.jpg

@@ -1,20 +1,30 @@
 # Subscriptions and Invoicing
 [[toc]]
 
-After signing up to <MainPlatformNameLink />, you can use your workspace for free during the **28 day trial**. After the trial, you can choose from our <MainDomainNameLink id="pricing" desc="subscription plans"/> depending on the storage size, size of your team, support level and other features that you need for your [workspace](../../manage/workspaces/). 
+::: tip Pricing and features
+Subscription details and pricing are summarised on our <MainDomainNameLink id="pricing" desc="pricing page"/>. 
 
-::: tip
-For details about different subscription plans visit our <MainDomainNameLink id="pricing" desc="pricing page"/>.
-
-If you are interested in <MainDomainNameLink id="pricing-for-ce-and-ee" desc="On-Premise deployment"/>  or looking for other options, please <MerginMapsEmail id="sales" desc="contact us" /> directly.
+The current *Premium* subscription system is explained in more detail in our blog <MainDomainNameLink id="blog/unlocking-premium-features-of-mergin-maps-for-all" desc="Unlocking premium features of Mergin Maps for all"/>.
 :::
 
-There are three paid plans: *Individual*, *Professional*, and *Team* plan. Students and educators can use our free *Academia* plan and there is also a *Non-profit* plan available to charities and non-profit organisations. Subscriptions are billed monthly or annually.
+Subscriptions are based on the number of *contributors* on the workspace. Per each contributor seat, you get 1 GB of storage. Storage is shared across the whole workspace. 
+
+*Contributors* are workspace members or guests who have Writer, Editor, Admin or Owner [access rights](../permissions/).  The number of read-only users is unlimited: they do not count towards your workspace contributors. 
 
-The overview of your current subscription plan and usage of storage, number of projects and number of users in your workspace can be found in the **Subscription** tab in <DashboardLink />. It is available only to the [owners](../permissions/#workspace-member-roles-and-project-permissions) of the workspace.
+The overview of your current subscription plan, such as storage usage, number of projects and number of contributors in your workspace can be found in the **Subscription** tab on <DashboardLink />. It is available only to the [owners](../permissions/#workspace-member-roles-and-project-permissions) of the workspace.
 
 ![Mergin Maps Dashboard Subscription tab](../dashboard/mergin-maps-dashboard-subscriptions.jpg "Mergin Maps Dashboard Subscription tab")
 
+::: tip Trial period
+After signing up to <MainPlatformNameLink />, you can use your workspace for free during the **28 day trial**. After the trial, you can [choose a premium plan](#how-to-upgrade-a-subscription-from-the-trial-plan).
+:::
+
+::: details Legacy subscription plans: Individual, Professional and Team plan
+The subscription plans of <MainPlatformName /> may change over time as the platform evolves. You can decide to switch to a new plan anytime in the subscription management page.
+
+Even if you still use a plan that is no longer offered, features included in this plan stay unaltered. For instance, previously-used *Individual* or *Professional* subscriptions did not include features such as [webmaps](../dashboard-maps/) or developer tools ([Python and C++ integrations](../../dev/integration/), [DB Sync](../../dev/dbsync/), [Media Sync](../../dev/media-sync/), [Work Packages](../../dev/work-packages/)). To use these features, you will have to switch to a *Premium* subscription.
+:::
+
 ## Subscriptions management portal
 Subscriptions, payments and billing information are managed in our subscription management portal. 
 
@@ -50,16 +60,16 @@ To access the portal directly:
 1. Log into <AppDomainNameLink />
 2. Navigate to the **Subscription** tab. 
 
-   The overview of available plans is listed in the **Upgrade subscription** section.
+   Choose your *Premium* plan by using the slider. You can also specify if you want to be billed yearly or monthly.
 
-   Specify if you want to pay yearly or monthly and click on the **Upgrade** button under the plan of your choice.
+   Click on the **Sign up now** button to confirm your new plan.
    ![Mergin Maps Subscription details](./subscriptions-upgrade.jpg "Mergin Maps Subscription details")
 
 3. You will be redirected to a checkout page. Here, fill out the billing information.
 
    The email you enter here will receive all billing-related information such as invoices or failed payments notifications.
 
-   If you are a business, check the **I'm purchasing as a business** option and fill out your business name and VAT number.
+   If you are a business, check the **I'm purchasing as a business** :heavy_check_mark: option and fill out your business name and VAT number.
    - the VAT number has to be associated with the entered (VAT registered) address
    - the address you enter has to match the address registered with your payment method
 
@@ -81,23 +91,23 @@ Click on the **Sign Up Now** button and fill out the form. We will review your a
 ## How to change a subscription
 1. Navigate to the [subscription management portal](#subscriptions-management-portal)
 
-2. In the *Current plan* section, click on the **Update plan** button
+2. In the *Current subscription* section, click on the **Update subscription** button
    ![Update Mergin Maps subscription plan](./stripe-update-subscription.jpg "Update Mergin Maps subscription plan")
 
-3. Choose *Monthly* or *Yearly* payment, **Select** your new plan and **Continue**
+3. Choose a *Monthly* or *Yearly* billing, **Select** your new plan and **Continue**
    ![Changing Mergin Maps subscription plan](./stripe-update-your-plan.jpg "Changing Mergin Maps subscription plan")
 
-4. Review the details of your updates and **Confirm** the subscription update
-   ![Confirm Mergin Maps subscription plan update](./stripe-update-plan-confirmation.jpg "Confirm Mergin Maps subscription plan update")
+4. Confirm your updates and proceed by clicking on the **Subscribe and pay** button
 
 ## How to cancel a subscription
 1. Navigate to the [subscription management portal](#subscriptions-management-portal)
 
-2. In the *Current plan* section, click on **Cancel plan**
+2. In the *Current subscription* section, click on **Cancel subscription**
    ![Cancel Mergin Maps Subscription](./stripe-cancel-subscription.jpg "Cancel Mergin Maps Subscription")
 
-3. Review the details of your subscription plan and confirm that you want to cancel the plan by clicking **Cancel plan** again
-   ![Cancel Mergin Maps Subscription](./stripe-cancel-subscription-confirm.jpg "Cancel Mergin Maps Subscription")
+3. Review the details and confirm that you want to cancel the plan by clicking **Cancel subscription**.
+
+   Your subscription will be available to the end of your billing period.
 
 ## Billing information and payment method
 1. Navigate to the [subscription management portal](#subscriptions-management-portal)

src/manage/dashboard/mergin-maps-dashboard-subscriptions.xcf

@@ -2,9 +2,7 @@
 [[toc]]
 
 ## Workspaces in Mergin Maps
-Workspaces are used to efficiently manage projects, users and subscriptions. 
-
-Every workspace is tied to a [subscription](https://merginmaps.com/pricing). The subscription plan defines the amount of data storage for the workspace as well as other features, such as commercial use or the level of [support](../../misc/troubleshoot/#support).
+Workspaces are used to efficiently manage projects, users and subscriptions. Every workspace is tied to a [subscription](../subscriptions/). The subscription plan defines the number of contributors and the amount of data storage for the workspace.
 
 One workspace can contain multiple projects. The only limit is the storage quota (as defined by the subscription). If needed, projects can be transferred to another workspace.
 
@@ -58,9 +56,7 @@ From the list of available workspaces, select the one you want to switch to:
 ## How to create a new workspace 
 A new workspace can be created through the <DashboardShortLink /> or through the <MobileAppNameShort />. Note that the name of a workspace cannot be changed later.
 
-Every workspace has its own subscription. When created, the workspace starts with a free trial. After the trial period, you will have to [switch to a paid subscription](../../manage/subscriptions/#how-to-change-a-subscription). Currently, it is possible to have up to 3 workspaces without a subscription (using the trial) simultaneously. 
-
-See our [pricing](https://merginmaps.com/pricing) for details about different plans.
+Every workspace has its own [subscription](../subscriptions/). With your first workspace, you can use a free trial to try out <MainPlatformName /> features. After the trial period, you will have to [switch to a paid subscription](../../manage/subscriptions/#how-to-change-a-subscription). See our [pricing](https://merginmaps.com/pricing) for more details.
 
 ### Create a workspace in Mergin Maps dashboard 
 1. Log in to <AppDomainNameLink />

src/manage/subscriptions/dashboard-manage-subscriptions.jpg

@@ -1,10 +1,11 @@
 # Migrate from QField
 [[toc]]
 
-This guide is intended for current QField and QFieldCloud users considering switching to <MainPlatformName /> as well as for <MainPlatformName /> users looking to transfer their data from QField ecosystem.
+This guide is intended for current QField and QFieldCloud users considering switching to <MainPlatformName /> as well as for <MainPlatformName /> users looking to transfer their data from the QField ecosystem.
 
 Mergin Maps is the closest alternative to QField Ecosystem. Both QField and <MainPlatformName /> are open-source projects powered by QGIS. Their respective mobile apps are both officially recommended for QGIS projects by <QGIS link="en/site/forusers/download.html" text="QGIS.org" />. Both platforms support almost the same set of [supported formats](../../gis/supported_formats/) via QGIS data providers and GDAL. Moreover, the mobile apps are based on the same open-source GIS stack and technology. As such their projects are almost fully interoperable.
 
+
 ## QField and Mergin Maps ecosystems
 The QField ecosystem consists of QField (mobile application), QFieldCloud (geo data collaboration server), QFieldSync (QGIS plugin) and QFieldCloud SDK (Python API client). Let's see the tools from <MainPlatformName /> that are counterparts:
 
@@ -94,14 +95,10 @@ Therefore, you will have to manually set up workspaces (if needed) and assign ap
 For a smooth transition, it is best to read about [working collaboratively](../../tutorials/working-collaboratively/index.md) in <MainPlatformName />.
 
 ### Billing, subscriptions and plans 
+Both QFieldCloud and <MainPlatformName /> have per-seat models you can choose from to fit your needs. In <MainPlatformName />, each [workspace](../../manage/workspaces/) has its own [subscription](../../manage/subscriptions/).
 
-In <MainPlatformName />, each workspace has its own subscription. Read more about <MainPlatformName /> subscription [here](../../manage/subscriptions/).
-
-* If you own Organisation plan in QFieldCloud, you will likely need <MainPlatformName /> Professional or Team subscription.
-* If you own Pro plan in QFieldCloud, you will likely need <MainPlatformName /> Individual or Professional subscription.
-* If you are Community plan in QFieldCloud, you will likely need <MainPlatformName /> Individual subscription or deploy your own <MainPlatformName /> Community Edition (<CommunityPlatformNameLink />)
-
-While QFieldCloud has a per-seat model, the <MainPlatformName /> has tiers that you can choose from. Comparison of subscription models and costs can be found in our <MainDomainNameLink id="blog/qfield-vs-mergin-maps" desc="blog" /> post.
+* If you own Organisation or Pro plan in QFieldCloud, you will likely need a <MainPlatformName /> Premium subscription.
+* If you are Community plan in QFieldCloud, you will likely need a <MainPlatformName /> Premium subscription or deploy your own <MainPlatformName /> Community Edition (<CommunityPlatformNameLink />)
 
 ## Known differences between QField and Mergin Maps platforms
 Here are some key differences between QField and <MainPlatformName />.
@@ -111,6 +108,10 @@ Here are some key differences between QField and <MainPlatformName />.
 
 - synchronisation in <MainPlatformName /> is conceptually based on ideas from Git. <GitHubRepo id="MerginMaps/geodiff" desc="Geodiff" /> creates difference files from GeoPackages that are sent over the network and applied. QFieldCloud synchronisation uses a concept of storage of differences made in SQL format and this difference log is then transmitted and applied. 
    In <MainPlatformName />, synchronisation is an inherent part of the platform. As such, it is already set up for end-users in a smart way and there are no extra steps needed for mobile users. All synchronisation on mobile devices is done by hitting a single button. 
+   
+:::tip QField vs. Mergin Maps - blog post
+In our blog <MainDomainNameLink id="blog/qfield-vs-mergin-maps" desc="QField vs. Mergin Maps - App Comparison" />, we compared QField and <MainPlatformName /> in terms of the respective mobile apps, cloud sync options, pricing and customer support.
+:::
 
 Here is a non-definitive list of other known differences:
 
@@ -131,7 +132,8 @@ Book a short video call with our <MerginMapsEmail id="sales" desc="sales team" /
 
 <CommunityJoin />
 
-If you are looking for a professional partner to migrate your workflow, you can ask our <MainDomainNameLink id="partners" desc="partners"/> network or <LutraConsultingWeb />, the developers of <MainPlatformName />
+If you are looking for a professional partner to migrate your workflow, you can ask our <MainDomainNameLink id="partners" desc="partners"/> network or <LutraConsultingWeb />, the developers of <MainPlatformName />.
+
 <PublicImage src="logo_lutra.svg" title="Lutra Consulting Ltd. logo" style="width:50%" />
 
 ## Credits