sync: master to develop

ovh · Sep 2, 2024 · e52ebe8 · e52ebe8
2 parents 592a35e + 6cfb1b4
commit e52ebe8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...ted/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.constants.js b/...ted/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.constants.js
@@ -1,5 +1,5 @@
 export const ELIGIBLE_FOR_UPGRADE = {
-  PLAN_NAME: 'RISE-2',
+  PLANCODE: '24rise02',
   SUBSIDIARIES: ['GB'],
 };
 

diff --git a/...cated/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.routing.js b/...cated/client/app/dedicated/dedicated-server/servers/server/dashboard/dashboard.routing.js
@@ -97,7 +97,7 @@ export default /* @ngInject */ ($stateProvider) => {
 
         if (isEligible) {
           return Server.getUpgradeProductName(
-            ELIGIBLE_FOR_UPGRADE.PLAN_NAME,
+            ELIGIBLE_FOR_UPGRADE.PLANCODE,
             user.ovhSubsidiary,
           ).then((upgradeName) => ({
             isEligible,

diff --git a/packages/manager/modules/bm-server-components/src/server/server.service.js b/packages/manager/modules/bm-server-components/src/server/server.service.js
@@ -1590,7 +1590,12 @@ export default class Server {
         ovhSubsidiary,
       })
       .$promise.then(({ addons, plans, products }) => {
-        const plan = find(plans, { invoiceName: planName });
+        const plan = plans.find(
+          (currentPlan) =>
+            currentPlan.planCode.startsWith(planName) ||
+            currentPlan.invoiceName === planName,
+        );
+        if (!plan) return '';
         const cpu = find(products, { name: plan.product });
         const memoryPlan = find(plan.addonFamilies, { name: 'memory' });
         const memory = find(addons, { planCode: memoryPlan.default });