@redneckz/wildless-cms-uni-blocks 0.14.776 → 0.14.778

package/mobile/src/retail/hooks/useRetailFormStore.tsx

@@ -0,0 +1,32 @@
+import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
+import { type LeadFormStoreSlice } from '../../components/ApplicationLeadForm/useLeadFormStore';
+import { type DictionaryItem } from '../model/LeadFormData';
+
+export type StatusInfoState = {
+  regionRetail?: string;
+  addressRetail?: string;
+  cardCategory?: string;
+  deliveryDate?: Date | string;
+  deliveryAddress?: string;
+  methodObtain?: string;
+  calculator?: {
+    monthsValue?: number;
+    moneyValue?: number;
+    isAnnuity?: boolean;
+  };
+};
+
+export interface CreditFormDictionarySlice {
+  amountWorkers: DictionaryItem[] | null;
+  organization: DictionaryItem[] | null;
+  employerActivities: DictionaryItem[] | null;
+  employerOrganization: DictionaryItem[] | null;
+}
+
+export interface CreditFormStoreSlice extends CreditFormDictionarySlice, LeadFormStoreSlice {
+  statusInfo: StatusInfoState;
+}
+
+export const useRetailFormStore = () => {
+  return useLocalStore<CreditFormStoreSlice>();
+};

package/mobile/src/retail/inputs.tsx

@@ -0,0 +1,154 @@
+import { PhoneField } from '../ui-kit/FormField/Fields/PhoneField';
+import { AddressFactField } from './components/Fields/AddressFactField';
+import { AddressField } from './components/Fields/AddressField';
+import { AddressMatchField } from './components/Fields/AddressMatchField';
+import { AddressRetailField } from './components/Fields/AddressRetailField';
+import { AmountWorkersField } from './components/Fields/AmountWorkersField';
+import { ArmyIdFlgField } from './components/Fields/ArmyIdFlgField';
+import { BankEmpoleeCodeField } from './components/Fields/BankEmployeeCodeField';
+import { BankruptcyFlgField } from './components/Fields/BankruptcyFlgField';
+import { BeginDateField } from './components/Fields/BeginDateField';
+import { BirthPlaceField } from './components/Fields/BirthPlaceField';
+import { CardCategoryField } from './components/Fields/CardCategoryField';
+import { ChildrenField } from './components/Fields/ChildrenField';
+import { CodeWordField } from './components/Fields/CodeWordField';
+import { ConfirmationIncomeField } from './components/Fields/ConfirmationIncomeField';
+import { ConscriptionField } from './components/Fields/ConscriptionField';
+import { ConsentField } from './components/Fields/ConsentField';
+import { CreditCalcField } from './components/Fields/CreditCalcField';
+import { CreditInRshbCdField } from './components/Fields/CreditInRshbCdField';
+import { CurrencyField } from './components/Fields/CurrencyField';
+import { DaDataInnField } from './components/Fields/DaDataInnField';
+import { DeliveryDateFiels } from './components/Fields/DeliveryDateFiels';
+import { DependentsField } from './components/Fields/DependentsField';
+import { DulIssueDateField } from './components/Fields/DulIssueDateField';
+import { DulIssuedByField } from './components/Fields/DulIssuedByField';
+import { DulNumberField } from './components/Fields/DulNumberField';
+import { DulSerieField } from './components/Fields/DulSerieField';
+import { DulSubdivisionCodeField } from './components/Fields/DulSubdivisionCodeField';
+import { EducationField } from './components/Fields/EducationField';
+import { EmailField } from './components/Fields/EmailField';
+import { EmployerActivitiesField } from './components/Fields/EmployerActivitiesField';
+import { EmployerOrganizationField } from './components/Fields/EmployerOrganizationField';
+import { EmploymentField } from './components/Fields/EmploymentField';
+import { ExpensesField } from './components/Fields/ExpensesField';
+import { Experience5YearsField } from './components/Fields/Experience5YearsField';
+import { FamilyMembersField } from './components/Fields/FamilyMembersField';
+import { FamilyStatusField } from './components/Fields/FamilyStatusField';
+import { GeneralSeniorityField } from './components/Fields/GeneralSeniorityField';
+import { HousingField } from './components/Fields/HousingField';
+import { InfoCardField } from './components/Fields/InfoCardField';
+import { JobsNumberField } from './components/Fields/JobsNumberField';
+import { LastJobExperienceField } from './components/Fields/LastJobExperienceField';
+import { LatinNameField } from './components/Fields/LatinNameField';
+import { LatinSurnameField } from './components/Fields/LatinSurnameField';
+import { LegalEntityNameField } from './components/Fields/LegalEntityNameField';
+import { LegalFormField } from './components/Fields/LegalFormField';
+import { LimitedBirthdayField } from './components/Fields/LimitedBirthdayField';
+import { MandatoryPaymentsField } from './components/Fields/MandatoryPaymentsField';
+import { MethodObtainField } from './components/Fields/MethodObtainField';
+import { MiddleNameField } from './components/Fields/MiddleNameField';
+import { NameField } from './components/Fields/NameField';
+import { OrganizationField } from './components/Fields/OrganizationField';
+import { OrganizationNameField } from './components/Fields/OrganizationNameField';
+import { OtherIncomeField } from './components/Fields/OtherIncomeField';
+import { ParticipantDateRegistrationField } from './components/Fields/ParticipantDateRegistrationField';
+import { PartInBusinessField } from './components/Fields/PartInBusinessField';
+import { PaymentSystemField } from './components/Fields/PaymentSystemField';
+import { PositionOrganizationField } from './components/Fields/PositionOrganizationField';
+import { RegionRetailField } from './components/Fields/RegionRetailField';
+import { RetirementIncomeField } from './components/Fields/RetirementIncomeField';
+import { SexField } from './components/Fields/SexField';
+import { ShareholderFlgField } from './components/Fields/ShareholderFlgField';
+import { SnilsField } from './components/Fields/SnilsField';
+import { SurnameField } from './components/Fields/SurnameField';
+import { TotalIncomeField } from './components/Fields/TotalIncomeField';
+import { WagesField } from './components/Fields/WagesField';
+
+export const InputsApplicationLeadMap = {
+  limitedBirthday: LimitedBirthdayField,
+  name: NameField,
+  surname: SurnameField,
+  middleName: MiddleNameField,
+  email: EmailField,
+};
+
+export const InputsConsentsMap = {
+  processPersonalDataFlg: ConsentField,
+  consentProviderFlg: ConsentField,
+  consentOthersFlg: ConsentField,
+  consentInformFlg: ConsentField,
+  consentPfrFlg: ConsentField,
+  consentInformMaterialsFlg: ConsentField,
+  consentPhotoFlg: ConsentField,
+  consentFATCA: ConsentField,
+};
+
+export const InputsRetailMap = {
+  organization: OrganizationField,
+  organizationAddress: AddressField,
+  organizationPhone: PhoneField,
+  organizationName: OrganizationNameField,
+  legalForm: LegalFormField,
+  generalSeniority: GeneralSeniorityField,
+  lastJobExperience: LastJobExperienceField,
+  experience5Years: Experience5YearsField,
+  jobsNumber: JobsNumberField,
+  beginDate: BeginDateField,
+  addressFact: AddressFactField,
+  addressRegistration: AddressField,
+  addressRetail: AddressRetailField,
+  addressMatch: AddressMatchField,
+  sex: SexField,
+  limitedBirthday: LimitedBirthdayField,
+  birthPlace: BirthPlaceField,
+  education: EducationField,
+  housing: HousingField,
+  amountWorkers: AmountWorkersField,
+  employment: EmploymentField,
+  employerActivities: EmployerActivitiesField,
+  employerOrganization: EmployerOrganizationField,
+  positionOrganization: PositionOrganizationField,
+  familyStatus: FamilyStatusField,
+  familyMembers: FamilyMembersField,
+  children: ChildrenField,
+  dependents: DependentsField,
+  totalIncome: TotalIncomeField,
+  expenses: ExpensesField,
+  snils: SnilsField,
+  conscription: ConscriptionField,
+  armyIdFlg: ArmyIdFlgField,
+  dulSerie: DulSerieField,
+  dulNumber: DulNumberField,
+  dulIssueDate: DulIssueDateField,
+  dulSubdivisionCode: DulSubdivisionCodeField,
+  dulIssuedBy: DulIssuedByField,
+  participantDateRegistration: ParticipantDateRegistrationField,
+  retirementIncome: RetirementIncomeField,
+  otherIncome: OtherIncomeField,
+  wages: WagesField,
+  mandatoryPayments: MandatoryPaymentsField,
+  bankruptcyFlg: BankruptcyFlgField,
+  shareholderFlg: ShareholderFlgField,
+  legalEntityName: LegalEntityNameField,
+  creditInRshbCd: CreditInRshbCdField,
+  bankEmployeeCode: BankEmpoleeCodeField,
+  partInBusiness: PartInBusinessField,
+  regionRetail: RegionRetailField,
+  infoCard: InfoCardField,
+  calculator: CreditCalcField,
+  confirmationIncome: ConfirmationIncomeField,
+  inn: DaDataInnField,
+};
+
+export const InputRetailCardMap = {
+  addressCourier: AddressField,
+  paymentSystem: PaymentSystemField,
+  currency: CurrencyField,
+  cardCategory: CardCategoryField,
+  codeWord: CodeWordField,
+  methodObtain: MethodObtainField,
+  deliveryDate: DeliveryDateFiels,
+  latinName: LatinNameField,
+  latinSurname: LatinSurnameField,
+};

package/mobile/src/retail/model/EOrganizationActivityTypes.ts

@@ -0,0 +1,23 @@
+export const enum EOrganizationActivityTypes {
+  FINANCIAL_INSTITUTIONS = 'FINANCIAL_INSTITUTIONS',
+  BANK = 'BANK',
+  INSURER = 'INSURER',
+  CONSULTING_SERVICE = 'CONSULTING_SERVICE',
+  TRADE = 'TRADE',
+  ARMY = 'ARMY',
+  INDUSTRY = 'INDUSTRY',
+  CONSTRUCTION = 'CONSTRUCTION',
+  FUEL_AND_ENERGY = 'FUEL_AND_ENERGY',
+  TRANSPORT = 'TRANSPORT',
+  TOURISM = 'TOURISM',
+  SECURITY = 'SECURITY',
+  SERVICE = 'SERVICE',
+  EDUCATION = 'EDUCATION',
+  HEALTHCARE = 'HEALTHCARE',
+  GOVERNANCE = 'GOVERNANCE',
+  SOCIAL_SPHERE = 'SOCIAL_SPHERE',
+  TECHNOLOGY = 'TECHNOLOGY',
+  AGRICULTURE = 'AGRICULTURE',
+  SCIENCE = 'SCIENCE',
+  OTHER_SECTORS = 'OTHER_SECTORS',
+}

package/mobile/src/retail/model/InputSectionType.ts

@@ -0,0 +1,13 @@
+import { type ColumnsCount } from '../../model/ColumnCount';
+import { type TitleProps } from '../../model/HeadlineType';
+import { type FieldRetailDef } from './RetailFormContent';
+
+export type SectionsRetailProps = TitleProps & {
+  columns?: ColumnsCount;
+  inputs?: FieldRetailDef[];
+};
+
+export interface InputRetailSectionsType {
+  /** @hidden */
+  sections?: SectionsRetailProps[];
+}

package/mobile/src/retail/model/InputSectionsType.ts

@@ -0,0 +1,14 @@
+import { type ColumnsCount } from '../../model/ColumnCount';
+import { type TitleProps } from '../../model/HeadlineType';
+import { type ConditionFieldProps, type FieldRetailDef } from './RetailFormContent';
+
+export type SectionsRetailProps = TitleProps &
+  ConditionFieldProps & {
+    columns?: ColumnsCount;
+    inputs?: FieldRetailDef[];
+  };
+
+export interface InputRetailSectionsType {
+  /** @hidden */
+  sections?: SectionsRetailProps[];
+}

package/mobile/src/retail/model/LeadFormData.ts

@@ -0,0 +1,7 @@
+export interface DictionaryItem {
+  type?: string;
+  key?: string;
+  value?: string;
+  displayOrder?: number;
+  description?: string;
+}

package/mobile/src/retail/model/LeadFormState.ts

@@ -0,0 +1,177 @@
+/* eslint-disable max-lines */
+import { type Option } from '../../ui-kit/Select/Option';
+import { type PaymentType } from '../api/updateUserTask';
+
+export interface CreditFormConsents {
+  processPersonalDataFlg?: boolean;
+  consentProviderFlg?: boolean;
+  consentOthersFlg?: boolean;
+  consentInformFlg?: boolean;
+  consentPfrFlg?: boolean;
+}
+
+export interface CreditCardFormConsents {
+  processPersonalDataFlg?: boolean;
+  consentProviderFlg?: boolean;
+  consentOthersFlg?: boolean;
+  consentInformFlg?: boolean;
+  consentInformMaterialsFlg?: boolean;
+  consentPhotoFlg?: boolean;
+}
+
+export interface DebitCardFormConsents {
+  processPersonalDataFlg?: boolean;
+  consentProviderFlg?: boolean;
+  consentOthersFlg?: boolean;
+  consentInformFlg?: boolean;
+  consentFATCA?: boolean;
+}
+
+export type FormStateDeliveryType = {
+  regionRetail?: Option;
+  bankEmployeeCode?: number;
+  methodObtain?: 'office' | 'courier';
+  deliveryDate?: Date | string;
+  addressRetail?: Option;
+  addressCourier?: Address;
+};
+
+export interface Address {
+  apartment?: string;
+  block?: string;
+  building?: string;
+  city?: string;
+  countryCode?: string;
+  district?: string;
+  fiasCode?: string;
+  fullAddress: string;
+  house?: string;
+  locality?: string;
+  okatoRegionCode?: string;
+  postcode?: string;
+  region?: string;
+  regionCode?: string;
+  street?: string;
+  qc?: string;
+  qcComplete?: string;
+  qcHouse?: string;
+}
+
+export interface Calculator {
+  moneyValue?: number;
+  monthsValue?: number;
+  isAnnuity?: boolean;
+  isInsurance?: boolean;
+  isSalaryClient?: boolean;
+  isPensionClient?: boolean;
+  isStateEmployee?: boolean;
+}
+
+export type FormRetailConsents = CreditFormConsents &
+  CreditCardFormConsents &
+  DebitCardFormConsents;
+
+// TODO Какая то часть должна быть взята из RetailAPI
+export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType {
+  surname?: string;
+  name?: string;
+  middleName?: string;
+  fullName?: string;
+  registrationDate?: Date | string;
+  birthday?: Date | string;
+  limitedBirthday?: Date | string;
+  birthPlace?: string;
+  sex?: string;
+  phone?: string;
+  organizationPhone?: string;
+  secondaryPhone?: string;
+  education?: Option;
+  housing?: Option;
+  employment?: Option;
+  organization?: Option;
+  amountWorkers?: Option;
+  employerActivities?: Option;
+  employerOrganization?: Option;
+  positionOrganization?: Option;
+  dulSerie?: string;
+  dulNumber?: string;
+  dulIssueDate?: Date | string;
+  dulSubdivisionCode?: string;
+  dulIssuedBy?: string;
+  email?: string;
+  acquiringType?: Option;
+  serviceType?: Option;
+  vedTypes?: string;
+  region?: Option;
+  onlineCheckout?: boolean;
+  posTerminal?: boolean;
+  term?: number;
+  amount?: number;
+  annualRevenue?: string;
+  serviceDirection?: string;
+  desiredMeetingDate?: string;
+  inn?: number;
+  legalForm?: string;
+  organizationName?: string;
+  generalSeniority?: string;
+  lastJobExperience?: string;
+  experience5Years?: string;
+  jobsNumber?: string;
+  organizationAddress?: Address;
+  beginDate?: Date | string;
+  addressFact?: Address;
+  addressBranch?: Option;
+  bankEmpolee?: string;
+  applicationDate?: string;
+  comment?: string;
+  isClient?: boolean;
+  feedbackMethod?: string;
+  collectionCount?: number;
+  product?: string;
+  localities?: string[];
+  partnerComments?: string;
+  consentDataProcessing?: boolean;
+  consentPhotoFlg?: boolean;
+  consentAssignmentClaimsFlg?: boolean;
+  consentCollectionFlg?: boolean;
+  familyStatus?: Option;
+  familyMembers?: string;
+  children?: string;
+  dependents?: string;
+  totalIncome?: number;
+  expenses?: number;
+  snils?: string;
+  conscription?: Option;
+  armyIdFlg?: boolean;
+  addressRegistration?: Address;
+  participantDateRegistration?: Date | string;
+  retirementIncome?: number;
+  otherIncome?: number;
+  mandatoryPayments?: number;
+  additionalIncome?: number;
+  otherPayments?: number;
+  rentalIncome?: number;
+  wages?: number;
+  creditInRshbCd?: Option;
+  bankruptcyFlg?: boolean;
+  shareholderFlg?: boolean;
+  legalEntityName?: string;
+  partInBusiness?: string;
+  addressMatch?: boolean;
+  confirmationIncome?: Option;
+  currency?: string;
+  paymentSystem?: Option;
+  cardCategory?: Option;
+  codeWord?: string;
+  esiaAccountTypeCd?: Option;
+  calculator?: Calculator;
+  addressRetail?: Option;
+  loanAmount?: number;
+  creditPeriod?: number;
+  paymentTypeCd?: PaymentType;
+  // TODO: Only fields with value should be in state. Currently, for compatibility, all fields from NameFieldDef are listed here
+  infoCard?: string;
+  latinName?: string;
+  latinSurname?: string;
+  regionHasDelivery?: boolean;
+}

package/mobile/src/retail/model/NameFieldDef.ts

@@ -0,0 +1,94 @@
+type NameFieldApplicationBaseDef =
+  | 'surname'
+  | 'name'
+  | 'middleName'
+  | 'limitedBirthday'
+  | 'email'
+  | 'phone'
+  | 'inn';
+
+type NameFieldConsentDef =
+  | 'processPersonalDataFlg'
+  | 'consentProviderFlg'
+  | 'consentInformFlg'
+  | 'consentPfrFlg'
+  | 'consentOthersFlg'
+  | 'consentInformMaterialsFlg'
+  | 'consentPhotoFlg'
+  | 'consentFATCA';
+
+type NameFieldCreditCardDef =
+  | 'addressCourier'
+  | 'paymentSystem'
+  | 'currency'
+  | 'cardCategory'
+  | 'codeWord'
+  | 'confirmationIncome'
+  | 'methodObtain'
+  | 'deliveryDate'
+  | 'regionHasDelivery'
+  | 'latinName'
+  | 'latinSurname';
+
+type NameFieldRetailDef =
+  | 'organization'
+  | 'organizationAddress'
+  | 'organizationPhone'
+  | 'organizationName'
+  | 'legalForm'
+  | 'generalSeniority'
+  | 'lastJobExperience'
+  | 'experience5Years'
+  | 'jobsNumber'
+  | 'beginDate'
+  | 'addressFact'
+  | 'addressRegistration'
+  | 'addressRetail'
+  | 'addressMatch'
+  | 'sex'
+  | 'birthPlace'
+  | 'education'
+  | 'housing'
+  | 'amountWorkers'
+  | 'employment'
+  | 'employerActivities'
+  | 'employerOrganization'
+  | 'positionOrganization'
+  | 'familyStatus'
+  | 'familyMembers'
+  | 'children'
+  | 'dependents'
+  | 'totalIncome'
+  | 'expenses'
+  | 'snils'
+  | 'conscription'
+  | 'armyIdFlg'
+  | 'dulSerie'
+  | 'dulNumber'
+  | 'dulIssueDate'
+  | 'dulSubdivisionCode'
+  | 'dulIssuedBy'
+  | 'participantDateRegistration'
+  | 'retirementIncome'
+  | 'rentalIncome'
+  | 'otherIncome'
+  | 'otherPayments'
+  | 'additionalIncome'
+  | 'wages'
+  | 'mandatoryPayments'
+  | 'bankruptcyFlg'
+  | 'shareholderFlg'
+  | 'legalEntityName'
+  | 'creditInRshbCd'
+  | 'bankEmployeeCode'
+  | 'partInBusiness'
+  | 'regionRetail'
+  | 'calculator'
+  | 'infoCard'
+  | 'comment';
+
+export type NameFieldDef =
+  | NameFieldApplicationBaseDef
+  | NameFieldConsentDef
+  | NameFieldRetailDef
+  | NameFieldCreditCardDef;

package/mobile/src/retail/model/RetailFormContent.ts

@@ -0,0 +1,35 @@
+import { type LabelProps, type TextProps } from '../../model/HeadlineType';
+import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
+import { type NameFieldDef } from './NameFieldDef';
+
+interface Required {
+  /** @title Обязательно для заполнения */
+  required?: boolean;
+}
+
+export type SubmitButtonProps = TextProps & {
+  version?: LinkButtonVersion;
+};
+
+export type ConditionFieldProps = {
+  /** @title Условия отображения полей формы */
+  condition?: {
+    name: NameFieldDef;
+    /** @title Значения при которых отображаются поля */
+    values: Array<string | boolean>;
+  };
+};
+
+export type FilledByEsiaProps = {
+  /** @title Заполняется через госуслуги */
+  filledByEsia?: boolean;
+};
+
+export type FieldRetailDef = Required &
+  TextProps &
+  LabelProps &
+  ConditionFieldProps &
+  FilledByEsiaProps & {
+    name?: NameFieldDef;
+    dadata?: boolean;
+  };

package/mobile/src/retail/utils/calculateInputs.ts

@@ -0,0 +1,51 @@
+import { type Option } from '../../ui-kit/Select/Option';
+import { type LeadFormState } from '../model/LeadFormState';
+import { type FieldRetailDef } from '../model/RetailFormContent';
+
+export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
+
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[], step: number) =>
+  inputs
+    .filter((_) => _)
+    .map((_) => {
+      if (
+        [
+          checkIsRetiree(step, getValue),
+          checkBusinessOwner(_, getValue),
+          checkConsentPfrFlg(_, getValue),
+          checkAddressFillFromESIA(_, getValue),
+          checkAddressFact(_, getValue),
+          checkCondition(_, getValue),
+        ].some(Boolean)
+      ) {
+        return { ..._, required: false };
+      }
+
+      return _;
+    });
+
+const checkIsRetiree = (step: number, getValue: GetValue) =>
+  step === 2 && getValue('employment')?.key === 'RETIREE';
+
+const checkBusinessOwner = ({ name }: FieldRetailDef, getValue: GetValue) =>
+  name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+
+const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldRetailDef, getValue: GetValue) =>
+  name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+
+const checkAddressFact = ({ name }: FieldRetailDef, getValue: GetValue) =>
+  name === 'addressFact' && getValue('addressMatch');
+
+export const checkCondition = ({ condition }: FieldRetailDef, getValue: GetValue) =>
+  condition?.name &&
+  condition?.values?.some((_) => {
+    const dataValue = getValue(condition?.name);
+
+    return _ !== ((dataValue as Option)?.key ?? dataValue);
+  });
+
+const checkConsentPfrFlg = ({ name }: FieldRetailDef, getValue: GetValue) =>
+  name === 'snils' && isSnilsRequired(getValue);
+
+const isSnilsRequired = (getValue: GetValue) =>
+  getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';

package/mobile/src/retail/utils/getInitialFormState.tsx

@@ -0,0 +1,25 @@
+import { type LeadFormState } from '../model/LeadFormState';
+
+export const getInitialFormState = (
+  step: number,
+  formState: LeadFormState | null,
+  formStateMap: Partial<LeadFormState>[],
+): LeadFormState => ({
+  ...formStateMap[step],
+  ...formState,
+  limitedBirthday: transformStringToData(formState?.limitedBirthday as string),
+  dulIssueDate: transformStringToData(formState?.dulIssueDate as string),
+  participantDateRegistration: transformStringToData(
+    formState?.participantDateRegistration as string,
+  ),
+  beginDate: transformStringToData(formState?.beginDate as string),
+  deliveryDate: transformStringToData(formState?.deliveryDate as string),
+});
+
+const transformStringToData = (text?: string) => {
+  try {
+    return text ? new Date(text) : undefined;
+  } catch (_) {
+    return undefined;
+  }
+};