Merge branch 'master' into introduce-get-wallets-endpoints

bisgaard-itis · Oct 11, 2023 · 5d1f196 · 5d1f196
2 parents 3b387e2 + a8d2126
commit 5d1f196
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/services/static-webserver/client/source/class/osparc/po/Invitations.js b/services/static-webserver/client/source/class/osparc/po/Invitations.js
@@ -101,6 +101,13 @@ qx.Class.define("osparc.po.Invitations", {
       });
       form.add(userEmail, this.tr("User Email"));
 
+      const extraCredits = new qx.ui.form.Spinner().set({
+        minimum: 0,
+        maximum: 1000,
+        value: 0
+      });
+      form.add(extraCredits, this.tr("Welcome Credits"));
+
       const withExpiration = new qx.ui.form.CheckBox().set({
         value: false
       });
@@ -130,6 +137,9 @@ qx.Class.define("osparc.po.Invitations", {
               "guest": userEmail.getValue()
             }
           };
+          if (extraCredits.getValue() > 0) {
+            params.data["extraCredits"] = extraCredits.getValue();
+          }
           if (withExpiration.getValue()) {
             params.data["trialAccountDays"] = trialDays.getValue();
           }

diff --git a/services/static-webserver/client/source/class/osparc/study/TierButton.js b/services/static-webserver/client/source/class/osparc/study/TierButton.js
@@ -58,11 +58,20 @@ qx.Class.define("osparc.study.TierButton", {
           value: pricingUnit.unitName,
           font: "text-16"
         }));
-        // add tier extra info
+        // add price info
         this._add(new qx.ui.basic.Label().set({
           value: qx.locale.Manager.tr("Credits/h") + ": " + pricingUnit.currentCostPerUnit,
           font: "text-14"
         }));
+        // add tier extra info
+        if ("unitExtraInfo" in pricingUnit) {
+          Object.entries(pricingUnit.unitExtraInfo).forEach(([key, value]) => {
+            this._add(new qx.ui.basic.Label().set({
+              value: key + ": " + value,
+              font: "text-13"
+            }));
+          });
+        }
       } else {
         this._setLayout(new qx.ui.layout.HBox(5));
         this._add(new qx.ui.basic.Label().set({