@redneckz/wildless-cms-uni-blocks 0.14.978 → 0.14.980

package/mobile/src/retail/components/Fields/RegionRetailField.tsx

@@ -9,20 +9,11 @@ import { SelectControl } from '../../../ui-kit/Select/SelectControl';
 import { getRegionsCardDelivery } from '../../api/getRegionsCardDelivery';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
-
-const DEFAULT_BIBLIOLOBUS_VALUES = {
-  region: {
-    key: 'REGION_77',
-    text: 'Москва и Московская область',
-  },
-  office: {
-    key: '3041100',
-    text: 'Аэропорт Шереметьево, МО, г.Химки, Шереметьевское шоссе, вл39с1',
-  },
-};
+import { DEFAULT_BIBLIOLOBUS_VALUES, DEFAULT_SALARY_CARD_VALUES } from '../../utils/rshbConstants';
 
 export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { programId, productType } = useRetailFormStore();
+  const { programId, productType, leadForm } = useRetailFormStore();
+  const regionRetail = leadForm?.regionRetail;
   const { data: regions } = useLeadFormData('REGION_RF');
   const { data: regionsDelivery } = useAsyncData('regionsDelivery', getRegionsCardDelivery);
   const { data: productSettings } = useLeadFormData(getCurrentProductSettings(productType));
@@ -70,20 +61,25 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       handleChangeRegionHasDelivery?.(checkRegionDeliveryStatus(DEFAULT_BIBLIOLOBUS_VALUES.region));
       handleChangeMethodObtain?.('office');
     }
-  }, [checkRegionDeliveryStatus]);
-
-  useEffect(() => {
-    if (!isEsiaAuth && isDebit) {
-      handleChangeRegionHasDelivery?.(false);
+    if (isSalaryCard) {
+      handleChangeRegion?.(DEFAULT_SALARY_CARD_VALUES.region);
+      handleChangeOffice?.(DEFAULT_SALARY_CARD_VALUES.office);
       handleChangeMethodObtain?.('office');
     }
-  }, []);
+    if (regionRetail) {
+      const regionHasDelivery = checkRegionDeliveryStatus(regionRetail);
+      handleChangeRegionHasDelivery?.(regionHasDelivery);
+      handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
+      handleChangeRegion?.(regionRetail);
+    }
+  }, [checkRegionDeliveryStatus]);
 
   return (
     <SelectControl
       label="Регион"
       placeholder="Выберите регион"
       isSearch={true}
+      disabled={isSalaryCard}
       options={formatRegions as Option[]}
       {...field(input?.name ?? '')}
       {...input}

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

@@ -0,0 +1,21 @@
+export const DEFAULT_BIBLIOLOBUS_VALUES = {
+  region: {
+    key: 'REGION_77',
+    text: 'Москва и Московская область',
+  },
+  office: {
+    key: '3041100',
+    text: 'Аэропорт Шереметьево, МО, г.Химки, Шереметьевское шоссе, вл39с1',
+  },
+};
+
+export const DEFAULT_SALARY_CARD_VALUES = {
+  region: {
+    key: 'REGION_77',
+    text: 'Москва и Московская область',
+  },
+  office: {
+    key: '3',
+    text: 'г. Москва, Пресненская наб., д. 10, стр. 2',
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.978",
+  "version": "0.14.980",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -118,8 +118,8 @@ export const getDebitLeadFormTaskData = ({
         },
       ],
       marketingInfo,
+      claimChannelCode,
     },
-    claimChannelCode,
   };
 };
 

package/src/retail/api/createUserTaskDebit.ts

@@ -10,8 +10,8 @@ export type CreateUserTaskDebitBody = {
     };
     participants: Participant[];
     marketingInfo?: Nullable<MarketingInfo>;
+    claimChannelCode?: string;
   };
-  claimChannelCode?: string;
 };
 
 export type CreateUserTaskDebitResponse = {

package/src/retail/components/Fields/AddressRetailField.tsx

@@ -8,10 +8,13 @@ import { SelectControl } from '../../../ui-kit/Select/SelectControl';
 import { YandexMap } from '../../../ui-kit/YandexMap/YandexMap';
 import { fetchRegionOffices, type OfficeType } from '../../api/regionOffices';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
 export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
   const [offices, setOffices] = useState<OfficeType[]>([]);
   const { data } = useLeadFormData('REGION_RF');
+  const { programId } = useRetailFormStore();
+  const isSalaryCard = programId === '38';
 
   const regionValue = field('regionRetail')?.value || {};
   const addressField = field(input?.name ?? '');
@@ -34,6 +37,7 @@ export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       <SelectControl
         label="Адрес отделения"
         placeholder="Выберите отделение"
+        disabled={isSalaryCard}
         options={offices.map(({ id, address = '' }) => ({
           key: id?.toString() || '',
           text: address,

package/src/retail/components/Fields/CardCategoryField.tsx

@@ -17,14 +17,6 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem')?.value?.key;
   const isOffice = leadForm?.methodObtain === 'office';
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  const noop = () => {};
-
-  const handleChangeIsMomentDebitCard = useMemo(() => {
-    const onChange = field('isMomentDebitCard')?.onChange;
-
-    return onChange ?? noop;
-  }, [field]);
 
   const isInstantSelectedCardCategory = field('cardCategory')
     ?.value?.text?.toLowerCase()
@@ -43,7 +35,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
 
   const onChange = useCallback((value: Option) => {
     cardCategoryChange?.(value);
-    handleChangeIsMomentDebitCard?.(value?.text?.toLowerCase()?.includes('неимен'));
+    field('isMomentDebitCard')?.onChange?.(value?.text?.toLowerCase()?.includes('неимен'));
   }, []);
 
   useEffect(() => {
@@ -60,7 +52,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
           cardCategoryChange?.(getCardCategoryValue(actualCardTypes));
         }
         if (isDebit) {
-          handleChangeIsMomentDebitCard(isInstantSelectedCardCategory ?? false);
+          field('isMomentDebitCard')?.onChange?.(isInstantSelectedCardCategory);
         }
       })();
     }

package/src/retail/components/Fields/RegionRetailField.tsx

@@ -9,20 +9,11 @@ import { SelectControl } from '../../../ui-kit/Select/SelectControl';
 import { getRegionsCardDelivery } from '../../api/getRegionsCardDelivery';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
-
-const DEFAULT_BIBLIOLOBUS_VALUES = {
-  region: {
-    key: 'REGION_77',
-    text: 'Москва и Московская область',
-  },
-  office: {
-    key: '3041100',
-    text: 'Аэропорт Шереметьево, МО, г.Химки, Шереметьевское шоссе, вл39с1',
-  },
-};
+import { DEFAULT_BIBLIOLOBUS_VALUES, DEFAULT_SALARY_CARD_VALUES } from '../../utils/rshbConstants';
 
 export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { programId, productType } = useRetailFormStore();
+  const { programId, productType, leadForm } = useRetailFormStore();
+  const regionRetail = leadForm?.regionRetail;
   const { data: regions } = useLeadFormData('REGION_RF');
   const { data: regionsDelivery } = useAsyncData('regionsDelivery', getRegionsCardDelivery);
   const { data: productSettings } = useLeadFormData(getCurrentProductSettings(productType));
@@ -70,20 +61,25 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       handleChangeRegionHasDelivery?.(checkRegionDeliveryStatus(DEFAULT_BIBLIOLOBUS_VALUES.region));
       handleChangeMethodObtain?.('office');
     }
-  }, [checkRegionDeliveryStatus]);
-
-  useEffect(() => {
-    if (!isEsiaAuth && isDebit) {
-      handleChangeRegionHasDelivery?.(false);
+    if (isSalaryCard) {
+      handleChangeRegion?.(DEFAULT_SALARY_CARD_VALUES.region);
+      handleChangeOffice?.(DEFAULT_SALARY_CARD_VALUES.office);
       handleChangeMethodObtain?.('office');
     }
-  }, []);
+    if (regionRetail) {
+      const regionHasDelivery = checkRegionDeliveryStatus(regionRetail);
+      handleChangeRegionHasDelivery?.(regionHasDelivery);
+      handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
+      handleChangeRegion?.(regionRetail);
+    }
+  }, [checkRegionDeliveryStatus]);
 
   return (
     <SelectControl
       label="Регион"
       placeholder="Выберите регион"
       isSearch={true}
+      disabled={isSalaryCard}
       options={formatRegions as Option[]}
       {...field(input?.name ?? '')}
       {...input}

package/src/retail/utils/rshbConstants.ts

@@ -0,0 +1,21 @@
+export const DEFAULT_BIBLIOLOBUS_VALUES = {
+  region: {
+    key: 'REGION_77',
+    text: 'Москва и Московская область',
+  },
+  office: {
+    key: '3041100',
+    text: 'Аэропорт Шереметьево, МО, г.Химки, Шереметьевское шоссе, вл39с1',
+  },
+};
+
+export const DEFAULT_SALARY_CARD_VALUES = {
+  region: {
+    key: 'REGION_77',
+    text: 'Москва и Московская область',
+  },
+  office: {
+    key: '3',
+    text: 'г. Москва, Пресненская наб., д. 10, стр. 2',
+  },
+};