feat(payment): update/fix/complete payment wording

bimdata · Dec 9, 2021 · 7b314be · 7b314be
1 parent 7b158e2
commit 7b314be
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 75 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "test:e2e": "start-server-and-test 'npm run dev -- --port 3030' 3030 'cypress open'"
   },
   "dependencies": {
-    "@bimdata/design-system": "^1.1.0-rc.8",
+    "@bimdata/design-system": "^1.1.0-rc.9",
     "@bimdata/typescript-fetch-api-client": "^6.20.0",
     "@bimdata/viewer": "^1.9.0-rc.10",
     "@uppy/core": "^2.1.2",

diff --git a/...tions-list/organization-card/organization-card-action-menu/OrganizationCardActionMenu.vue b/...tions-list/organization-card/organization-card-action-menu/OrganizationCardActionMenu.vue
@@ -19,7 +19,7 @@
         <BIMDataButton ghost rounded icon @click="$emit('update')">
           <BIMDataIcon name="edit" size="xxs" />
         </BIMDataButton>
-        <BIMDataButton ghost rounded icon @click="$emit('delete')">
+        <BIMDataButton ghost rounded icon disabled @click="$emit('delete')">
           <BIMDataIcon name="delete" size="xxs" />
         </BIMDataButton>
       </div>

diff --git a/src/components/specific/subscriptions/pro-plan-form/ProPlanForm.scss b/src/components/specific/subscriptions/pro-plan-form/ProPlanForm.scss
@@ -14,7 +14,7 @@
 
     &__price {
       .value {
-        font-size: 1.6rem;
+        font-size: 1.8rem;
         font-weight: bold;
       }
       .unit {

diff --git a/src/components/specific/subscriptions/space-creator/SpaceCreator.vue b/src/components/specific/subscriptions/space-creator/SpaceCreator.vue
@@ -1,16 +1,17 @@
 <template>
   <div class="space-creator flex m-t-18">
-    <BIMDataCard class="orga-card text-center">
+    <BIMDataCard class="orga-card">
       <template #content>
         <div class="flex items-center justify-center">
           <BIMDataIcon
+            style="min-width: 22px"
             margin="2px 0 0 0"
             name="organization"
             size="m"
             fill
             color="primary"
           />
-          <h3 class="color-primary">
+          <h3 class="text-center color-primary">
             {{ $t("SpaceCreator.createSelectOrgaTitle") }}
           </h3>
         </div>
@@ -52,10 +53,18 @@
             @element-click="orga = $event"
           >
             <template #header>
-              {{ orga.name }}
+              <BIMDataTextBox
+                maxWidth="220px"
+                :text="orga.name"
+                :tooltip="false"
+              />
             </template>
             <template #element="{ element }">
-              {{ element.name }}
+              <BIMDataTextBox
+                maxWidth="240px"
+                :text="element.name"
+                :tooltip="false"
+              />
             </template>
           </BIMDataDropdownList>
         </div>

diff --git a/src/components/specific/subscriptions/space-size-preview/SpaceSizePreview.vue b/src/components/specific/subscriptions/space-size-preview/SpaceSizePreview.vue
@@ -24,9 +24,9 @@
           </span>
         </template>
       </ProgressBar>
-      <BIMDataText color="color-granite-light">
+      <!-- <BIMDataText color="color-granite-light">
         {{ $t("SpaceSizePreview.actualStorageText") }}
-      </BIMDataText>
+      </BIMDataText> -->
     </div>
     <div class="space-size-preview__new-size">
       <ProgressBar width="100%" :progress="newUsedSizePercent">
@@ -47,7 +47,11 @@
         </template>
       </ProgressBar>
       <BIMDataText color="color-granite-light">
-        {{ $t("SpaceSizePreview.newStorageText") }}
+        {{
+          $t("SpaceSizePreview.newStorageText", {
+            size: formatBytes(newSizeAvailable)
+          })
+        }}
       </BIMDataText>
     </div>
   </div>

diff --git a/src/components/specific/subscriptions/subscribe-card/SubscribeCard.scss b/src/components/specific/subscriptions/subscribe-card/SubscribeCard.scss
@@ -11,8 +11,9 @@
     min-width: 120px;
     min-height: 120px;
 
-    img {
+    svg {
       width: 100%;
+      height: 100%;
     }
   }
 

diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
@@ -53,7 +53,7 @@
   "SubscriptionPro": {
     "subscribeTitle": "Create Professional Plan",
     "upgradeTitle": "Upgrade to pro platform",
-    "text": "You are about to create your pro plan. This includes: {size} of storage, unlimited projects, unlimited users.",
+    "text": "You are about to subscribe to your pro plan. This includes: {size} of storage, unlimited projects with unlimited users.",
     "spaceCreatedNotification": "You have just created the space {spaceName} in the organization {organizationName}"
   },
   "UserProjects": {
@@ -112,7 +112,7 @@
   "BillingActionsCell": {
     "updateButtonText": "Modify the payment card",
     "datapackButtonText": "Manage datapacks",
-    "cancelButtonText": "Cancel this payment"
+    "cancelButtonText": "Cancel this subscription"
   },
 
   "BillingsTable": {
@@ -159,7 +159,7 @@
   },
 
   "DatapackForm": {
-    "baseNote": "Storage included",
+    "baseNote": "Storage",
     "baseText": "Included with pro plan",
     "datapackNote": "Additional storage",
     "datapackText": "",
@@ -587,17 +587,17 @@
     "title": "Your subscription",
     "subTitle": "Professionnal plan",
     "priceUnit": "/ month",
-    "bulletsHead": "Subscription includes",
+    "bulletsHead": "The subscription includes",
     "bullet1": "{size} of storage",
     "bullet2": "BIMData Platform",
-    "bullet3": "Unlimited users",
-    "bullet4": "Unlimited projects",
-    "bullet5": "Unlimited comments (BCF)",
-    "bullet6": "SaaS License",
-    "bullet7": "IFC Merge / Split",
-    "bullet8": "IFC Edition",
-    "bullet9": "Support",
-    "bullet10": "Microsoft Power BI connector"
+    "bullet3": "3D Viewer",
+    "bullet4": "2D Viewer",
+    "bullet5": "Unlimited projects",
+    "bullet6": "Unlimited users",
+    "bullet7": "Unlimited comments (BCF)",
+    "bullet8": "IFC Merge / Split",
+    "bullet9": "IFC Edition",
+    "bullet10": "Support"
   },
 
   "SpaceCard": {

diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
@@ -56,7 +56,7 @@
   "SubscriptionPro": {
     "subscribeTitle": "Créer un espace pro",
     "upgradeTitle": "Passer à la platforme professionnelle",
-    "text": "Vous êtes sur le point de créer votre plan professionel. Votre plan inclus: {size} de stockage, création de projets illimités, utilisateurs illimités.",
+    "text": "Vous êtes sur le point de lancer votre abonnement professionel. Il inclus: {size} de stockage, création de projets illimités avec utilisateurs illimités.",
     "spaceCreatedNotification": "Vous venez de créer l'espace {spaceName} dans l'organisation {organizationName}"
   },
   "UserProjects": {
@@ -69,7 +69,8 @@
   },
   "UserSubscriptions": {
     "title": "Abonnement à la plateforme",
-    "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+    "text": "Naviguez parmis vos organisations pour gérer les abonnements et factures de vos espaces plateforme.",
+    "list": "Liste de mes organisations :"
   },
 
 
@@ -116,7 +117,7 @@
   "BillingActionsCell": {
     "updateButtonText": "Modifier la carte de paiement",
     "datapackButtonText": "Gérer mes datapacks",
-    "cancelButtonText": "Annuler ce paiement"
+    "cancelButtonText": "Annuler cet abonnement"
   },
 
   "BillingsTable": {
@@ -163,14 +164,14 @@
   },
 
   "DatapackForm": {
-    "baseNote": "Stockage inclus",
+    "baseNote": "Stockage",
     "baseText": "Inclus dans l'abonnement",
     "datapackNote": "Stockage additionnel",
     "datapackText": "",
     "priceUnit": " / GB / mois",
     "totalUnit": " / mois",
-    "actualStorage": "",
-    "newStorage": "",
+    "actualStorage": "Stockage actuel",
+    "newStorage": "Nouveau stockage",
     "submitButtonText": "Valider",
     "cancelButtonText": "Annuler"
   },
@@ -592,20 +593,20 @@
   },
 
   "ProPlanInfo": {
-    "title": "Votre souscription",
-    "subTitle": "Professionnelle",
+    "title": "Votre abonnement",
+    "subTitle": "Professionnel",
     "priceUnit": "/ mois",
-    "bulletsHead": "La souscription inclue",
+    "bulletsHead": "L'abonnement inclut",
     "bullet1": "{size} de stockage",
     "bullet2": "BIMData Plateforme",
-    "bullet3": "Utilisateurs illimités",
-    "bullet4": "Projets illimités",
-    "bullet5": "Commentaires (BCF) illimités",
-    "bullet6": "Licence SaaS",
-    "bullet7": "Fusion / Division IFC",
-    "bullet8": "Edition IFC",
-    "bullet9": "Support par emails",
-    "bullet10": "Connecteur Microsoft Power BI"
+    "bullet3": "Visionneuse 3D",
+    "bullet4": "Visionneuse 2D",
+    "bullet5": "Projets illimités",
+    "bullet6": "Utilisateurs illimités",
+    "bullet7": "Commentaires (BCF) illimités",
+    "bullet8": "Fusion / Division IFC",
+    "bullet9": "Edition IFC",
+    "bullet10": "Support par email"
   },
 
   "SpaceCard": {
@@ -650,7 +651,7 @@
     "selectOrgaRadio": "Sélectionner une organisation",
     "orgaValidateButton": "Valider",
     "createSpaceTitle": "Créer un espace",
-    "createSpaceText": "Texte expliquant ce qu'est un espace ici.",
+    "createSpaceText": "Votre espace regroupe vos différents projets BIM.",
     "createSpaceInput": "Nom de mon nouvel espace",
     "spaceValidateButton": "Valider"
   },
@@ -676,9 +677,8 @@
   "SpaceSizePreview": {
     "title": "Stockage",
     "actualStorage": "Stockage actuel",
-    "actualStorageText": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
     "newStorage": "Nouveau stockage",
-    "newStorageText": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit."
+    "newStorageText": "En souscrivant à l'abonnement professionnel, vous bénéficiez de {size} de stockage. Vous pouvez acheter du stockage additionnel directement depuis votre espace."
   },
 
   "SpaceUsersManager": {
@@ -693,8 +693,8 @@
 
   "SubscribeCard": {
     "title": "Créez votre nouvel espace",
-    "text": "Envie de profiter pleinement de la plateforme ? Profitez de {size} pour vos projets et d'utilisateurs illimités en passant à le version profesionnelle.",
-    "button": "Créer un espace"
+    "text": "Envie de profiter pleinement de la plateforme ? Profitez de {size} pour vos projets et d'utilisateurs illimités en passant à l'abonnement professionnel.",
+    "button": "Souscrire à un abonnement"
   },
 
   "UserCard": {

diff --git a/src/views/user-subscriptions/UserSubscriptions.vue b/src/views/user-subscriptions/UserSubscriptions.vue
@@ -13,29 +13,40 @@
         <p>
           {{ $t("UserSubscriptions.text") }}
         </p>
-        <BIMDataDropdownList
-          :list="organizations"
-          :perPage="6"
-          elementKey="dropdown"
-          :closeOnElementClick="true"
-          @element-click="selectedOrga = $event"
-        >
-          <template #header>
-            <div class="flex items-center">
-              <span
-                class="number-organizations flex items-center justify-center"
-              >
-                {{ organizations.length }}
-              </span>
-              <span class="m-l-12">
-                {{ selectedOrga.name }}
-              </span>
-            </div>
-          </template>
-          <template #element="{ element }">
-            {{ element.name }}
-          </template>
-        </BIMDataDropdownList>
+        <div>
+          <div class="primary-font-bold">
+            {{ $t("UserSubscriptions.list") }}
+          </div>
+          <BIMDataDropdownList
+            :list="organizations"
+            :perPage="6"
+            elementKey="dropdown"
+            :closeOnElementClick="true"
+            @element-click="selectedOrga = $event"
+          >
+            <template #header>
+              <div class="flex items-center">
+                <span
+                  class="number-organizations flex items-center justify-center m-r-12"
+                >
+                  {{ organizations.length }}
+                </span>
+                <BIMDataTextBox
+                  maxWidth="240px"
+                  :text="selectedOrga.name"
+                  :tooltip="false"
+                />
+              </div>
+            </template>
+            <template #element="{ element }">
+              <BIMDataTextBox
+                maxWidth="280px"
+                :text="element.name"
+                :tooltip="false"
+              />
+            </template>
+          </BIMDataDropdownList>
+        </div>
       </div>
       <div class="user-subscriptions__header__right">
         <SubscribeCard />