Merge pull request #5 from odeimaiz/matusdrobuliak66-fix/debt-msg

🎨 Frontend changes

Author: matusdrobuliak66

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -633,14 +633,14 @@ qx.Class.define("osparc.data.Resources", {
       },
 
       /*
-       * PRICING PLANS
+       * ADMIN PRICING PLANS
        */
-      "pricingPlans": {
+      "adminPricingPlans": {
         useCache: false, // handled in osparc.store.Pricing
         endpoints: {
-          get: {
+          getPage: {
             method: "GET",
-            url: statics.API + "/admin/pricing-plans"
+            url: statics.API + "/admin/pricing-plans?offset={offset}&limit={limit}"
           },
           getOne: {
             method: "GET",
@@ -657,6 +657,23 @@ qx.Class.define("osparc.data.Resources", {
         }
       },
 
+      /*
+       * PRICING PLANS
+       */
+      "pricingPlans": {
+        useCache: false, // handled in osparc.store.Pricing
+        endpoints: {
+          getPage: {
+            method: "GET",
+            url: statics.API + "/pricing-plans?offset={offset}&limit={limit}"
+          },
+          getOne: {
+            method: "GET",
+            url: statics.API + "/pricing-plans/{pricingPlanId}"
+          },
+        }
+      },
+
       /*
        * PRICING UNITS
        */

services/static-webserver/client/source/class/osparc/data/model/PricingPlan.js

@@ -65,7 +65,7 @@ qx.Class.define("osparc.data.model.PricingPlan", {
       check: "Array",
       nullable: true,
       init: [],
-      event: "changePricingunits"
+      event: "changePricingUnits"
     },
 
     classification: {

services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js

@@ -187,7 +187,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
             if (err["status"] == 402) {
               msg = err["message"];
               // The backend might have thrown a 402 because the wallet was negative
-              const match = msg.match(/Project debt\s([-]?\d+(\.\d+)?)\scredits/);
+              const match = msg.match(/last transaction of\s([-]?\d+(\.\d+)?)\sresulted/);
               let debt = null;
               if ("debtAmount" in err) {
                 // the study has some debt that needs to be paid

services/static-webserver/client/source/class/osparc/store/Pricing.js

@@ -33,7 +33,8 @@ qx.Class.define("osparc.store.Pricing", {
     pricingPlansCached: null,
 
     fetchPricingPlans: function() {
-      return osparc.data.Resources.fetch("pricingPlans", "get")
+      const resourceName = osparc.data.Permissions.getInstance().isAdmin() ? "adminPricingPlans" : "pricingPlans";
+      return osparc.data.Resources.getInstance().getAllPages(resourceName)
         .then(pricingPlansData => {
           const pricingPlans = [];
           pricingPlansData.forEach(pricingPlanData => {
@@ -48,7 +49,7 @@ qx.Class.define("osparc.store.Pricing", {
       const params = {
         data: newPricingPlanData
       };
-      return osparc.data.Resources.fetch("pricingPlans", "post", params)
+      return osparc.data.Resources.fetch("adminPricingPlans", "post", params)
         .then(pricingPlanData => {
           const pricingPlan = this.__addToCache(pricingPlanData);
           this.fireDataEvent("pricingPlansChanged", pricingPlan);
@@ -63,7 +64,7 @@ qx.Class.define("osparc.store.Pricing", {
         },
         data: updateData
       };
-      return osparc.data.Resources.getInstance().fetch("pricingPlans", "update", params)
+      return osparc.data.Resources.getInstance().fetch("adminPricingPlans", "update", params)
         .then(pricingPlanData => {
           return this.__addToCache(pricingPlanData);
         })
@@ -86,7 +87,8 @@ qx.Class.define("osparc.store.Pricing", {
           pricingPlanId,
         }
       };
-      return osparc.data.Resources.fetch("pricingPlans", "getOne", params)
+      const resourceName = osparc.data.Permissions.getInstance().isAdmin() ? "adminPricingPlans" : "pricingPlans";
+      return osparc.data.Resources.fetch(resourceName, "getOne", params)
         .then(pricingPlanData => {
           const pricingPlan = this.__addToCache(pricingPlanData);
           const pricingUnits = pricingPlan.getPricingUnits();