@redneckz/wildless-cms-uni-blocks 0.14.663 → 0.14.665

package/mobile/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -4,6 +4,7 @@ import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
+import { getDeliveryData, getSixthStepData } from './getSixthStepData';
 import { getThirdStepData } from './getThirdStepData';
 
 type getCreditCardFormTaskDataProps = {
@@ -44,6 +45,7 @@ export const getCreditCardFormTaskData = ({
           ...getCurrentStepData(step, formData),
         },
       ],
+      ...getDeliveryData(formData),
     },
   };
 };
@@ -61,9 +63,7 @@ const getCurrentStepData = (step: number, formData: FormState): Partial<Particip
     case 4:
       return getFifthStepData(formData);
     case 5:
-      return {
-        //TODO: Сделать адаптер данных способа получения карты
-      };
+      return getSixthStepData(formData);
     default:
       return {};
   }

package/mobile/src/components/CreditCardForm/getSixthStepData.ts

@@ -0,0 +1,21 @@
+import { formatDate } from '../../utils/formatDate';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantAddresses } from '../CreditForm/utils';
+
+export const getDeliveryData = (formData: FormState) => {
+  const { methodObtain, deliveryDate = '' } = formData;
+
+  return {
+    courierDeliveryFlg: methodObtain === 'courier',
+    deliveryDate: formatDate(deliveryDate, true),
+    deliveryTimeCd: { value: 'TIME_2' },
+  };
+};
+
+export const getSixthStepData = (formData: FormState) => {
+  const { addressCourier } = formData;
+
+  return {
+    participantAddresses: getParticipantAddresses({ addressCourier }),
+  };
+};

package/mobile/src/ui-kit/VerifyPhoneDialog/InputCode.tsx

@@ -81,7 +81,7 @@ export const InputCode = JSX<InputCodeProps>(({ values, setValues, hasError, err
 const getInputStyle = (index: number, values: string[], hasError = false) => {
   const isInputEmpty = !values[index];
 
-  return `w-16 h-20 text-3xl text-center p-2 m-2 border ${
+  return `w-20 h-24 text-5xl text-center p-lg m-2 border ${
     hasError && isInputEmpty ? 'border-error' : 'border-gray'
   } rounded-md caret-transparent outline-none`;
 };

package/mobile/src/ui-kit/VerifyPhoneDialog/SubmitButton.tsx

@@ -11,7 +11,7 @@ interface SubmitButtonProps {
 export const SubmitButton = JSX<SubmitButtonProps>(({ isDisabled, onClick, text }) => {
   return (
     <Button type="button" onClick={onClick} disabled={isDisabled}>
-      <Text font="font-medium">{text}</Text>
+      <Text font="font-normal">{text}</Text>
     </Button>
   );
 });

package/mobile/src/ui-kit/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -67,14 +67,15 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     }, []);
 
     return (
-      <Dialog className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg">
-        <div className="flex flex-col gap-lg items-center rounded-md">
+      <Dialog className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0">
+        <div className="flex flex-col gap-xl items-center rounded-md">
           <Headline
             className="w-full"
             title={title}
             description={description}
-            headlineVersion="S"
+            headlineVersion="XS"
             isEmbedded={true}
+            as="h6"
           />
           {code ? (
             <InputCode
@@ -108,9 +109,9 @@ const renderText = (
   sendCode: () => void,
 ) =>
   timeNextReq ? (
-    <div className="flex flex-row text-l font-light text-primary-main">
+    <div className="flex flex-row text-l font-light text-base">
       Получить новый код можно через
-      <Timer className="text-primary-main ml-1" time={timeNextReq} setTime={setTimeNextReq} />
+      <Timer className="text-base ml-1" time={timeNextReq} setTime={setTimeNextReq} />
     </div>
   ) : (
     <LinkButton onClick={sendCode} className="text-primary-main">

package/package.json

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

package/src/api/RetailAPI/updateUserTask.ts

@@ -120,6 +120,11 @@ export type UpdateUserTaskBody = {
     office?: {
       id: string;
     };
+    courierDeliveryFlg?: boolean;
+    deliveryDate?: string;
+    deliveryTimeCd?: {
+      value: string;
+    };
     authorizedAgentId?: number;
     participants: Participant[];
     esiaAccountTypeCd?: {

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -4,6 +4,7 @@ import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
+import { getDeliveryData, getSixthStepData } from './getSixthStepData';
 import { getThirdStepData } from './getThirdStepData';
 
 type getCreditCardFormTaskDataProps = {
@@ -44,6 +45,7 @@ export const getCreditCardFormTaskData = ({
           ...getCurrentStepData(step, formData),
         },
       ],
+      ...getDeliveryData(formData),
     },
   };
 };
@@ -61,9 +63,7 @@ const getCurrentStepData = (step: number, formData: FormState): Partial<Particip
     case 4:
       return getFifthStepData(formData);
     case 5:
-      return {
-        //TODO: Сделать адаптер данных способа получения карты
-      };
+      return getSixthStepData(formData);
     default:
       return {};
   }

package/src/components/CreditCardForm/getSixthStepData.ts

@@ -0,0 +1,21 @@
+import { formatDate } from '../../utils/formatDate';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantAddresses } from '../CreditForm/utils';
+
+export const getDeliveryData = (formData: FormState) => {
+  const { methodObtain, deliveryDate = '' } = formData;
+
+  return {
+    courierDeliveryFlg: methodObtain === 'courier',
+    deliveryDate: formatDate(deliveryDate, true),
+    deliveryTimeCd: { value: 'TIME_2' },
+  };
+};
+
+export const getSixthStepData = (formData: FormState) => {
+  const { addressCourier } = formData;
+
+  return {
+    participantAddresses: getParticipantAddresses({ addressCourier }),
+  };
+};

package/src/ui-kit/VerifyPhoneDialog/InputCode.tsx

@@ -81,7 +81,7 @@ export const InputCode = JSX<InputCodeProps>(({ values, setValues, hasError, err
 const getInputStyle = (index: number, values: string[], hasError = false) => {
   const isInputEmpty = !values[index];
 
-  return `w-16 h-20 text-3xl text-center p-2 m-2 border ${
+  return `w-20 h-24 text-5xl text-center p-lg m-2 border ${
     hasError && isInputEmpty ? 'border-error' : 'border-gray'
   } rounded-md caret-transparent outline-none`;
 };

package/src/ui-kit/VerifyPhoneDialog/SubmitButton.tsx

@@ -11,7 +11,7 @@ interface SubmitButtonProps {
 export const SubmitButton = JSX<SubmitButtonProps>(({ isDisabled, onClick, text }) => {
   return (
     <Button type="button" onClick={onClick} disabled={isDisabled}>
-      <Text font="font-medium">{text}</Text>
+      <Text font="font-normal">{text}</Text>
     </Button>
   );
 });

package/src/ui-kit/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -67,14 +67,15 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     }, []);
 
     return (
-      <Dialog className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg">
-        <div className="flex flex-col gap-lg items-center rounded-md">
+      <Dialog className="my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0">
+        <div className="flex flex-col gap-xl items-center rounded-md">
           <Headline
             className="w-full"
             title={title}
             description={description}
-            headlineVersion="S"
+            headlineVersion="XS"
             isEmbedded={true}
+            as="h6"
           />
           {code ? (
             <InputCode
@@ -108,9 +109,9 @@ const renderText = (
   sendCode: () => void,
 ) =>
   timeNextReq ? (
-    <div className="flex flex-row text-l font-light text-primary-main">
+    <div className="flex flex-row text-l font-light text-base">
       Получить новый код можно через
-      <Timer className="text-primary-main ml-1" time={timeNextReq} setTime={setTimeNextReq} />
+      <Timer className="text-base ml-1" time={timeNextReq} setTime={setTimeNextReq} />
     </div>
   ) : (
     <LinkButton onClick={sendCode} className="text-primary-main">