From 5bcaf35c0c666a98608e1b08158707445bc107e1 Mon Sep 17 00:00:00 2001 From: merelendor Date: Tue, 4 Feb 2025 15:44:28 +0300 Subject: [PATCH] update for CALCULATION logic --- .../components/evolution/catalog.promo.brand/component.php | 4 ++-- .../components/evolution/catalog.promo.model/component.php | 4 ++-- local/components/evolution/catalog/component.php | 4 ++-- local/components/evolution/used.catalog/component.php | 7 +++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/local/components/evolution/catalog.promo.brand/component.php b/local/components/evolution/catalog.promo.brand/component.php index bf52df2..a4879b0 100644 --- a/local/components/evolution/catalog.promo.brand/component.php +++ b/local/components/evolution/catalog.promo.brand/component.php @@ -56,8 +56,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['CALCULATION'] = []; $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " "); $brands_ar_res['ITEMS'][] = $ar_res; } diff --git a/local/components/evolution/catalog.promo.model/component.php b/local/components/evolution/catalog.promo.model/component.php index 5c9a571..1acdb8a 100644 --- a/local/components/evolution/catalog.promo.model/component.php +++ b/local/components/evolution/catalog.promo.model/component.php @@ -51,8 +51,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['CALCULATION'] = []; $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " "); $models_ar_res['ITEMS'][] = $ar_res; } diff --git a/local/components/evolution/catalog/component.php b/local/components/evolution/catalog/component.php index 6da0b4f..61bac81 100644 --- a/local/components/evolution/catalog/component.php +++ b/local/components/evolution/catalog/component.php @@ -365,8 +365,8 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['CALCULATION'] = []; $ar_res['CALCULATION']['MONTHLY'] = number_format(($ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE'] / 100) * 4), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($ar_res['PROPERTIES']['PRICE']['VALUE']*0.55 + $ar_res['PROPERTIES']['PRICE']['VALUE'] / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " "); $arResult['ITEMS'][] = $ar_res; } diff --git a/local/components/evolution/used.catalog/component.php b/local/components/evolution/used.catalog/component.php index 6166818..915cca8 100644 --- a/local/components/evolution/used.catalog/component.php +++ b/local/components/evolution/used.catalog/component.php @@ -482,8 +482,11 @@ if($this->StartResultCache(60*60*24, md5(var_export($_POST, true)))) $ar_res['CALCULATION'] = []; $ar_res['CALCULATION']['MONTHLY'] = number_format(($price / CALCULATION_COEFFICIENT), 0, ".", " "); //$ar_res['CALCULATION']['MONTHLY'] = number_format((($price / 100) * 10), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " "); - $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " "); + //$ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price / 100) * 4), 0, ".", " "); + //$ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price / 100) * 4), 0, ".", " "); + + $ar_res['CALCULATION']['SAVINGS_TAX'] = number_format((($price*0.55 + $price / CALCULATION_COEFFICIENT * 58)*SAVINGS_TAX_COEFFICIENT/1.2), 0, ".", " "); + $ar_res['CALCULATION']['SAVINGS_VAT'] = number_format((($price*0.55 + $price / CALCULATION_COEFFICIENT * 58)*SAVINGS_VAT_COEFFICIENT/1.2), 0, ".", " "); $ar_res['PREVIEW_PICTURE'] = CFile::GetPath($ar_res['PROPERTIES']['PHOTO']['VALUE']);