Merge pull request #112 from topcoder-platform/PROD-2332_incorrect-web-price

Prod 2332 incorrect web prices -> dev

Author: mmattlin

src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work-prices.config.ts

@@ -10,17 +10,17 @@ export const WorkPrices: { [workType: string]: WorkPrice } = {
     },
     [WorkType.design]: {
         base: 499,
-        getPrice: getPriceDesign,
+        getPrice: getPriceDefault,
         perPage: 99,
         promo: 299,
         usePromo: false,
     },
     [WorkType.designLegacy]: {
         base: 398,
-        getPrice: getPriceDesign,
+        getPrice: getPriceDesignLegacy,
         perPage: 99,
         promo: 100,
-        usePromo: false,
+        usePromo: true,
     },
     [WorkType.findData]: {
         base: 399,
@@ -51,10 +51,11 @@ function getPriceDefault(price: WorkPrice): number {
     return price.usePromo && price.promo ? price.promo : price.base
 }
 
-function getPriceDesign(price: WorkPrice, pageCount?: number, deviceCount?: number): number {
+function getPriceDesignLegacy(price: WorkPrice, pageCount?: number, deviceCount?: number): number {
     const safePageCount: number = pageCount || 1
     const safeDeviceCount: number = deviceCount || 1
-    return (price.promo || 1)
+    const basePrice: number = getPriceDefault(price)
+    return (basePrice || 1)
         + (safePageCount * (price.perPage || 1))
         + (safePageCount * (safeDeviceCount - 1) * (price.perPage || 1))
 }

src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work.factory.ts

@@ -269,7 +269,7 @@ function getCost(challenge: Challenge, type: WorkType): number | undefined {
 
             // get the device and page count from the intake form from the metadata
             const intakeForm: ChallengeMetadata | undefined = findMetadata(challenge, ChallengeMetadataName.intakeForm)
-            const form: IntakeForm = !!intakeForm?.value ? JSON.parse(intakeForm.value) : undefined
+            const form: IntakeForm = !!intakeForm?.value ? JSON.parse(intakeForm.value)?.form : undefined
             const legacyPageCount: number | undefined = form?.pageDetails?.pages?.length || 1
             const legacyDeviceCount: number | undefined = form?.basicInfo?.selectedDevice?.option?.length
             return priceConfig.getPrice(priceConfig, legacyPageCount, legacyDeviceCount)