make sure that current price is used for new purchases of licenses

Author: williamstein

src/packages/frontend/purchases/edit-license.tsx

@@ -23,6 +23,7 @@ import type { Changes } from "@cocalc/util/purchases/cost-to-edit-license";
 import { isEqual } from "lodash";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
 import { compute_cost } from "@cocalc/util/licenses/purchase/compute-cost";
+import { CURRENT_VERSION } from "@cocalc/util/licenses/purchase/consts";
 
 interface Props {
   license_id: string;
@@ -112,6 +113,7 @@ export default function EditLicense({ license_id, refresh }: Props) {
         }
         subInfo.start = null;
         subInfo.end = null;
+        subInfo.version = CURRENT_VERSION;
         setModifiedSubscriptionCost(compute_cost(subInfo).cost);
       }
     } catch (err) {
@@ -258,7 +260,7 @@ export default function EditLicense({ license_id, refresh }: Props) {
                     modifiedSubscriptionCost != null &&
                     modifiedSubscriptionCost != subscription.cost && (
                       <>
-                        cost:{" "}
+                        cost at current rates:{" "}
                         <b>
                           {currency(modifiedSubscriptionCost)}/
                           {subscription.interval}
@@ -270,17 +272,18 @@ export default function EditLicense({ license_id, refresh }: Props) {
                   {subscription?.cost != null && (
                     <div>
                       {" "}
-                      Current cost: {currency(subscription?.cost)}/
-                      {subscription.interval}.
+                      What you currently pay: {currency(subscription?.cost)}/
+                      {subscription.interval}
                     </div>
                   )}
                   {subscription != null &&
                     modifiedSubscriptionCost != null &&
                     modifiedSubscriptionCost != subscription.cost && (
                       <div>
                         <b>
-                          New cost: {currency(modifiedSubscriptionCost)}/
-                          {subscription.interval}.
+                          New cost after changes:{" "}
+                          {currency(modifiedSubscriptionCost)}/
+                          {subscription.interval}
                         </b>
                       </div>
                     )}

src/packages/frontend/site-licenses/site-license-public-info.tsx

@@ -342,7 +342,7 @@ export const SiteLicensePublicInfoTable: React.FC<PropsTable> = (
       if (rec.expired) {
         return (
           <>
-            Expired {when}.{delimiter}Could update {runLimit} running{" "}
+            Expired {when}.{delimiter}Could upgrade {runLimit} running{" "}
             {plural(runLimit, "project")}.
           </>
         );

src/packages/util/licenses/purchase/cost-versions.ts

@@ -58,7 +58,7 @@ const COST = {
       disk: 0.1,
       non_pre_factor: 3.5,
     },
-    COST_MULTIPLIER: 1,
+    COST_MULTIPLIER: 0.9,
     NONMEMBER_DENSITY: 2,
     ACADEMIC_DISCOUNT: 0.6,
     DISK_FACTOR: 10,

src/packages/util/licenses/purchase/purchase-info.ts

@@ -7,6 +7,7 @@ import { CURRENT_VERSION } from "./consts";
 import type { Date0 } from "@cocalc/util/types/store";
 import dayjs from "dayjs";
 
+// this ALWAYS returns purchaseInfo that is the *current* version.
 export default function getPurchaseInfo(
   conf: SiteLicenseDescriptionDB,
 ): PurchaseInfo {

src/packages/util/purchases/cost-to-edit-license.ts

@@ -9,6 +9,7 @@ import { LicenseIdleTimeouts } from "@cocalc/util/consts/site-license";
 import type { Uptime } from "@cocalc/util/consts/site-license";
 import { MAX } from "@cocalc/util/licenses/purchase/consts";
 import { round2up } from "../misc";
+import { CURRENT_VERSION } from "@cocalc/util/licenses/purchase/consts";
 
 export interface Changes {
   end?: Date;
@@ -104,7 +105,9 @@ export default function costToEditLicense(
   log("editLicense with start date updated:", { origInfo });
 
   // Make copy of data with modified params.
-  const modifiedInfo = cloneDeep(origInfo);
+  // modifiedInfo uses the current default pricing algorithm, since that the cost today
+  // to make this purchase, hence changing version below.
+  const modifiedInfo = { ...cloneDeep(origInfo), version: CURRENT_VERSION };
   if (changes.start != null) {
     modifiedInfo.start = changes.start;
   }
@@ -222,6 +225,8 @@ export default function costToEditLicense(
   log({ modifiedInfo });
 
   // Determine price for the change
+
+  // the value of the license the user currently owned.  The pricing algorithm version is important here.
   const currentValue = currentLicenseValue(origInfo);
 
   if (numChanges > 0 && modifiedInfo.type == "quota") {
@@ -234,6 +239,9 @@ export default function costToEditLicense(
     delete modifiedInfo.cost_per_hour;
   }
 
+  // Determine price for the modified license they would like to switch to.
+  // modifiedInfo uses the current default pricing algorithm, since that the cost today
+  // to make this purchase, hence changing version below.
   const modifiedValue = currentLicenseValue(modifiedInfo);
   // cost can be negative, when we give user a refund.
   // **We round away from zero!**  The reason is because
@@ -288,17 +296,17 @@ function currentLicenseValue(info: PurchaseInfo): number {
   // Perhaps we won't raise rates before switching to a full
   // pay as you go model....
 
-//   if (info.cost_per_hour) {
-//     // if this is set, we use it to compute the value
-//     // The value is cost_per_hour times the number of hours left until info.end.
-//     const end = dayjs(info.end);
-//     const start = dayjs(info.start);
-//     const hoursRemaining = end.diff(start, "hours", true);
-//     // the hoursRemaining can easily be *negative* if info.end is
-//     // in the past.
-//     // However the value of a license is never negative, so we max with 0.
-//     return Math.max(0, hoursRemaining * info.cost_per_hour);
-//   }
+  //   if (info.cost_per_hour) {
+  //     // if this is set, we use it to compute the value
+  //     // The value is cost_per_hour times the number of hours left until info.end.
+  //     const end = dayjs(info.end);
+  //     const start = dayjs(info.start);
+  //     const hoursRemaining = end.diff(start, "hours", true);
+  //     // the hoursRemaining can easily be *negative* if info.end is
+  //     // in the past.
+  //     // However the value of a license is never negative, so we max with 0.
+  //     return Math.max(0, hoursRemaining * info.cost_per_hour);
+  //   }
 
   // Compute value using the current rate.
   // As mentioned above, we can keep old rates if/when we change the rate,