From c035abb955cb1d8a16de8e1ad86767c8b1a2548b Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 13 Feb 2023 15:26:30 +0300 Subject: [PATCH] get-kp-data: remove override default values --- apps/web/process/bonuses/get-kp-data.ts | 2 +- apps/web/process/payments/get-kp-data.ts | 10 +++++----- apps/web/process/price/get-kp-data.ts | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/web/process/bonuses/get-kp-data.ts b/apps/web/process/bonuses/get-kp-data.ts index d3cbd3e..4928a40 100644 --- a/apps/web/process/bonuses/get-kp-data.ts +++ b/apps/web/process/bonuses/get-kp-data.ts @@ -34,7 +34,7 @@ export default async function getBonusDataFromKP({ return { values: { - saleBonus: quote?.evo_sale_bonus || 0, + saleBonus: quote?.evo_sale_bonus ?? undefined, }, }; } diff --git a/apps/web/process/payments/get-kp-data.ts b/apps/web/process/payments/get-kp-data.ts index fe630f2..460522f 100644 --- a/apps/web/process/payments/get-kp-data.ts +++ b/apps/web/process/payments/get-kp-data.ts @@ -65,18 +65,18 @@ export default async function getPaymentsDataFromKP({ return { payments: { values: [ - quote?.evo_first_payment_perc || 0, + quote?.evo_first_payment_perc ?? 0, ...paymentsValues, - quote?.evo_last_payment_perc || 0, + quote?.evo_last_payment_perc ?? 0, ], }, values: { - firstPaymentPerc: quote?.evo_first_payment_perc || 0, + firstPaymentPerc: quote?.evo_first_payment_perc ?? undefined, graphType: quote?.evo_graph_type ?? undefined, highSeasonStart: quote?.evo_high_season, - lastPaymentPerc: quote?.evo_last_payment_perc || 0, + lastPaymentPerc: quote?.evo_last_payment_perc ?? undefined, leasingPeriod, - parmentsDecreasePercent: quote?.evo_payments_decrease_perc || 0, + parmentsDecreasePercent: quote?.evo_payments_decrease_perc ?? undefined, seasonType: quote?.evo_seasons_type, }, }; diff --git a/apps/web/process/price/get-kp-data.ts b/apps/web/process/price/get-kp-data.ts index 7654f2c..5c218df 100644 --- a/apps/web/process/price/get-kp-data.ts +++ b/apps/web/process/price/get-kp-data.ts @@ -45,18 +45,18 @@ export default async function getPriceDataFromKP({ return { values: { - VATInLeaseObjectPrice: quote?.evo_nds_in_price_supplier_currency || 0, - comissionPerc: quote?.evo_comission_perc || 0, - // comissionRub: quote?.evo_comission_rub || 0, - firstPaymentPerc: quote?.evo_first_payment_perc || 0, - // lastPaymentRub: quote?.evo_last_payment_rub || 0, - lastPaymentPerc: quote?.evo_last_payment_perc || 0, + VATInLeaseObjectPrice: quote?.evo_nds_in_price_supplier_currency ?? undefined, + comissionPerc: quote?.evo_comission_perc ?? undefined, + // comissionRub: quote?.evo_comission_rub ?? undefined, + firstPaymentPerc: quote?.evo_first_payment_perc ?? undefined, + // lastPaymentRub: quote?.evo_last_payment_rub ?? undefined, + lastPaymentPerc: quote?.evo_last_payment_perc ?? undefined, lastPaymentRule: quote?.evo_last_payment_calc, - leaseObjectPrice: quote?.evo_supplier_currency_price || 0, - // leaseObjectPriceWthtVAT: quote?.evo_price_without_nds_supplier_currency || 0, + leaseObjectPrice: quote?.evo_supplier_currency_price ?? undefined, + // leaseObjectPriceWthtVAT: quote?.evo_price_without_nds_supplier_currency ?? undefined, supplierCurrency: quote?.evo_transactioncurrencyid, - supplierDiscountPerc: quote?.evo_discount_perc || 0, - // supplierDiscountRub: quote?.evo_discount_supplier_currency || 0, + supplierDiscountPerc: quote?.evo_discount_perc ?? undefined, + // supplierDiscountRub: quote?.evo_discount_supplier_currency ?? undefined, }, }; }