fix cyrrilic C letter

This commit is contained in:
Chika 2020-11-15 22:26:49 +03:00
parent 02227ba75b
commit 368103b733
4 changed files with 44 additions and 44 deletions

View File

@ -860,8 +860,8 @@ const sections: ISection[] = [
title: 'Условие АВ ЮЛ поставщика',
Component: Select,
props: {
name: 'selectDealerRewardСondition',
valueName: 'dealerRewardСondition',
name: 'selectDealerRewardCondition',
valueName: 'dealerRewardCondition',
},
},
{
@ -894,8 +894,8 @@ const sections: ISection[] = [
title: 'Условие АВ брокера поставщика',
Component: Select,
props: {
name: 'selectDealerBrokerRewardСondition',
valueName: 'dealerBrokerRewardСondition',
name: 'selectDealerBrokerRewardCondition',
valueName: 'dealerBrokerRewardCondition',
},
},
{

View File

@ -1422,7 +1422,7 @@ const reactionEffects: IReactionEffect[] = [
);
if (dealerBroker) {
calculationStore.setStatus(
'selectDealerBrokerRewardСondition',
'selectDealerBrokerRewardCondition',
Status.Default,
);
@ -1455,15 +1455,15 @@ const reactionEffects: IReactionEffect[] = [
}).then(({ entities: { evo_reward_condition } }) => {
if (evo_reward_condition && Array.isArray(evo_reward_condition))
calculationStore.setOptions(
'selectDealerBrokerRewardСondition',
'selectDealerBrokerRewardCondition',
evo_reward_condition,
);
});
}
} else {
calculationStore.setValue('dealerBrokerRewardСondition', null);
calculationStore.setValue('dealerBrokerRewardCondition', null);
calculationStore.setStatus(
'selectDealerBrokerRewardСondition',
'selectDealerBrokerRewardCondition',
Status.Disabled,
);
}
@ -1481,7 +1481,7 @@ const reactionEffects: IReactionEffect[] = [
effect: ([dealerBrokerId, dealerPersonId]) => {
if (dealerPersonId && !dealerBrokerId) {
calculationStore.setStatus(
'selectDealerRewardСondition',
'selectDealerRewardCondition',
Status.Default,
);
@ -1514,14 +1514,14 @@ const reactionEffects: IReactionEffect[] = [
}).then(({ entities: { evo_reward_condition } }) => {
if (evo_reward_condition && Array.isArray(evo_reward_condition))
calculationStore.setOptions(
'selectDealerRewardСondition',
'selectDealerRewardCondition',
evo_reward_condition,
);
});
} else {
calculationStore.setValue('dealerRewardСondition', null);
calculationStore.setValue('dealerRewardCondition', null);
calculationStore.setStatus(
'selectDealerRewardСondition',
'selectDealerRewardCondition',
Status.Disabled,
);
}
@ -1533,16 +1533,16 @@ const reactionEffects: IReactionEffect[] = [
calculationStore => ({
expression: () => {
const { dealerRewardСondition } = calculationStore.values;
return dealerRewardСondition;
const { dealerRewardCondition } = calculationStore.values;
return dealerRewardCondition;
},
effect: dealerRewardСonditionId => {
if (!dealerRewardСonditionId) {
effect: dealerRewardConditionId => {
if (!dealerRewardConditionId) {
calculationStore.setValue('dealerRewardSumm', 0);
calculationStore.setStatus('tbxDealerRewardSumm', Status.Disabled);
} else {
const dealerRewardContition = calculationStore.options.selectDealerRewardСondition?.find(
x => x.evo_reward_conditionid === dealerRewardСonditionId,
const dealerRewardContition = calculationStore.options.selectDealerRewardCondition?.find(
x => x.evo_reward_conditionid === dealerRewardConditionId,
);
if (dealerRewardContition) {
if (dealerRewardContition.evo_reward_summ) {
@ -1562,19 +1562,19 @@ const reactionEffects: IReactionEffect[] = [
calculationStore => ({
expression: () => {
const { dealerBrokerRewardСondition } = calculationStore.values;
return dealerBrokerRewardСondition;
const { dealerBrokerRewardCondition } = calculationStore.values;
return dealerBrokerRewardCondition;
},
effect: dealerBrokerRewardСonditionId => {
if (!dealerBrokerRewardСonditionId) {
effect: dealerBrokerRewardConditionId => {
if (!dealerBrokerRewardConditionId) {
calculationStore.setValue('dealerBrokerRewardSumm', 0);
calculationStore.setStatus(
'tbxDealerBrokerRewardSumm',
Status.Disabled,
);
} else {
const dealerBrokerRewardContition = calculationStore.options.selectDealerBrokerRewardСondition?.find(
x => x.evo_reward_conditionid === dealerBrokerRewardСonditionId,
const dealerBrokerRewardContition = calculationStore.options.selectDealerBrokerRewardCondition?.find(
x => x.evo_reward_conditionid === dealerBrokerRewardConditionId,
);
if (dealerBrokerRewardContition) {
if (dealerBrokerRewardContition.evo_reward_summ) {
@ -1601,11 +1601,11 @@ const reactionEffects: IReactionEffect[] = [
return dealerRewardSumm;
},
effect: dealerRewardSumm => {
const dealerRewardСonditionId =
calculationStore.values.dealerRewardСondition;
if (dealerRewardСonditionId) {
const dealerRewardCondition = calculationStore.options.selectDealerRewardСondition?.find(
x => x.evo_reward_conditionid === dealerRewardСonditionId,
const dealerRewardConditionId =
calculationStore.values.dealerRewardCondition;
if (dealerRewardConditionId) {
const dealerRewardCondition = calculationStore.options.selectDealerRewardCondition?.find(
x => x.evo_reward_conditionid === dealerRewardConditionId,
);
if (dealerRewardCondition) {
if (dealerRewardCondition.evo_reward_summ) {
@ -1652,17 +1652,17 @@ const reactionEffects: IReactionEffect[] = [
return dealerBrokerRewardSumm;
},
effect: dealerBrokerRewardSumm => {
const dealerBrokerRewardСonditionId =
calculationStore.values.dealerBrokerRewardСondition;
if (dealerBrokerRewardСonditionId) {
const dealerBrokerRewardСondition = calculationStore.options.selectDealerBrokerRewardСondition?.find(
x => x.evo_reward_conditionid === dealerBrokerRewardСonditionId,
const dealerBrokerRewardConditionId =
calculationStore.values.dealerBrokerRewardCondition;
if (dealerBrokerRewardConditionId) {
const dealerBrokerRewardCondition = calculationStore.options.selectDealerBrokerRewardCondition?.find(
x => x.evo_reward_conditionid === dealerBrokerRewardConditionId,
);
if (dealerBrokerRewardСondition) {
if (dealerBrokerRewardСondition.evo_reward_summ) {
if (dealerBrokerRewardCondition) {
if (dealerBrokerRewardCondition.evo_reward_summ) {
if (
parseFloat(dealerBrokerRewardSumm) >
dealerBrokerRewardСondition.evo_reward_summ
dealerBrokerRewardCondition.evo_reward_summ
) {
calculationStore.setValidation(
'tbxDealerBrokerRewardSumm',
@ -1678,12 +1678,12 @@ const reactionEffects: IReactionEffect[] = [
}
}
if (
!dealerBrokerRewardСondition.evo_reduce_reward &&
dealerBrokerRewardСondition.evo_reward_summ
!dealerBrokerRewardCondition.evo_reduce_reward &&
dealerBrokerRewardCondition.evo_reward_summ
) {
if (
parseFloat(dealerBrokerRewardSumm) <
dealerBrokerRewardСondition.evo_reward_summ
dealerBrokerRewardCondition.evo_reward_summ
) {
calculationStore.setValidation(
'tbxDealerBrokerRewardSumm',

View File

@ -65,10 +65,10 @@ export type ElementsNames =
| 'selectLeaseObjectUseFor'
| 'selectDealer'
| 'selectDealerPerson'
| 'selectDealerRewardСondition'
| 'selectDealerRewardCondition'
| 'tbxDealerRewardSumm'
| 'selectDealerBroker'
| 'selectDealerBrokerRewardСondition'
| 'selectDealerBrokerRewardCondition'
| 'tbxDealerBrokerRewardSumm'
| 'selectIndAgent'
| 'selectIndAgentRewardCondition'

View File

@ -64,10 +64,10 @@ export type ValuesNames =
| 'leaseObjectUseFor'
| 'dealer'
| 'dealerPerson'
| 'dealerRewardСondition'
| 'dealerRewardCondition'
| 'dealerRewardSumm'
| 'dealerBroker'
| 'dealerBrokerRewardСondition'
| 'dealerBrokerRewardCondition'
| 'dealerBrokerRewardSumm'
| 'indAgent'
| 'indAgentRewardCondition'