evo/EvoCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Chika 2022-06-07 11:33:46 +03:00
commit 58297cd35e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/process/bonuses/reactions.ts
View File

@ -98,7 +98,11 @@ export default function ($calculation: ICalculationStore) {
);
const max_sale_bonus =
(evo_coefficient_bonus?.evo_sot_coefficient || 0) * 100;
$calculation.setValue('bonusCoefficient', saleBonus / max_sale_bonus);
if (max_sale_bonus) {
$calculation.setValue('bonusCoefficient', saleBonus / max_sale_bonus);
} else {
$calculation.setValue('bonusCoefficient', 0);
}
} else {
$calculation.setValue('bonusCoefficient', 1);
}

2
src/client/stores/CalculationStore/config/initialFilters.ts
View File

@ -12,7 +12,7 @@ const initialFilters: Partial<Record<ElementsNames, TElementFilter>> = {
export const noResetValueElements: ElementsNames[] = [
'selectTechnicalCard',
// 'selectTownRegistration',
'selectTownRegistration',
];
export const autoSetValuesElements: ElementsNames[] = [
'selectProduct',