@redneckz/wildless-cms-uni-blocks 0.14.744 → 0.14.746

package/src/components/CardTransfer/SubmitFailedDialog.tsx

@@ -0,0 +1,42 @@
+import { Dialog } from '../../ui-kit/DialogManager/Dialog';
+import { Img } from '../../ui-kit/Img/Img';
+import { Headline } from '../Headline/Headline';
+
+export interface FormResponseDialogProps {
+  onClose?: () => void;
+  errorCode?: number;
+  errorMessage?: string;
+}
+
+const FAILED_TITLE = 'Ошибка перевода';
+
+export const SubmitFailedDialog = ({
+  onClose,
+  errorCode,
+  errorMessage,
+}: FormResponseDialogProps) => {
+  const description = errorCode ? `Код ошибки - ${errorCode}` : 'Пожалуйста, повторите позднее';
+
+  return (
+    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto" onClose={onClose}>
+      <div className="flex flex-col gap-lg items-center rounded-md space-x-m">
+        <Img image={{ icon: 'ResponseFailIcon', iconVersion: 'normal' }} width="136" height="136" />
+        <Headline
+          className="w-full"
+          title={FAILED_TITLE}
+          description={description}
+          headlineVersion="XS"
+          isEmbedded={true}
+        />
+        {errorMessage ? (
+          <div className="bg-secondary-dark rounded-xl px-4 pt-4 pb-8 grid gap-4 grid-cols-12">
+            <div className="col-span-8"> {errorMessage}</div>
+            <div className="col-span-4">
+              <Img image={{ icon: 'ResponseFailIcon', iconVersion: 'normal' }} />
+            </div>
+          </div>
+        ) : null}
+      </div>
+    </Dialog>
+  );
+};

package/src/components/CardTransfer/submitCardTransfer.ts

@@ -0,0 +1,72 @@
+import { API_BASE_URI } from '../../api/apiBaseUrl';
+import { locationNavigator } from '../../external/locationNavigator';
+import { type CardTransferFormType } from './CardTransferContent';
+
+type CardTransferSubmitBody = {
+  amount: string;
+  currency: string;
+  returnUrl: string;
+  failUrl: string;
+  language: string;
+};
+
+export type CardTransferResponse = Partial<{
+  errorCode: number;
+  errorMessage: string;
+  orderId: string;
+  formUrl: string;
+}>;
+
+const paymentURLMap: Record<CardTransferFormType, string> = {
+  private: 'p2p/registerP2P',
+  business: 'b2c/registerB2C',
+};
+
+const SUCCESS_URL = '/p2p/success';
+const FAIL_URL = '/p2p/success';
+const CURRENCY_CODE = '643';
+const LANGUAGE = 'ru';
+
+export const submitCardTransfer = async (
+  typeForm: CardTransferFormType,
+  amount: number,
+): Promise<CardTransferResponse | null> => {
+  const navigator = locationNavigator();
+
+  const submitBody: CardTransferSubmitBody = {
+    amount: String(amount),
+    currency: CURRENCY_CODE,
+    returnUrl: `${navigator.origin}${SUCCESS_URL}`,
+    failUrl: `${navigator.origin}${FAIL_URL}`,
+    language: LANGUAGE,
+  };
+
+  const url = `${API_BASE_URI}/payment/${paymentURLMap[typeForm]}`;
+
+  try {
+    const res = await fetch(url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      mode: 'cors',
+      body: JSON.stringify(submitBody),
+    });
+
+    if (!res.ok) {
+      return null;
+    }
+
+    return await res.json();
+  } catch (ex) {
+    return null;
+  }
+};
+
+export const isSuccessResponse = (
+  response: CardTransferResponse | null,
+): response is { orderId: string; formUrl: string } =>
+  Boolean(response?.formUrl) && Boolean(response?.orderId);
+
+export const isErrorInResponse = (
+  response: CardTransferResponse | null,
+): response is { errorCode: number; errorMessage: string } =>
+  Boolean(response?.errorMessage) && response?.errorCode !== 0;

package/src/components/CardTransfer/useSubmitCardTransfer.tsx

@@ -0,0 +1,47 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { locationNavigator } from '../../external/locationNavigator';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog';
+import { type CardTransferFormType } from './CardTransferContent';
+import { isErrorInResponse, isSuccessResponse, submitCardTransfer } from './submitCardTransfer';
+import { SubmitFailedDialog } from './SubmitFailedDialog';
+
+export interface TransactionStore {
+  transaction: {
+    orderId: string;
+    type: 'p2p' | 'b2c';
+    url: string;
+  };
+}
+
+export const useSubmitCardTransfer = (formType: CardTransferFormType) => {
+  const responseTypeDialog = useDialog(SubmitFailedDialog);
+  const sessionStore = useSessionStore<TransactionStore>();
+  const navigator = locationNavigator();
+
+  const adjustedTypeForm = formType === 'private' ? 'p2p' : 'b2c';
+
+  return useCallback(
+    async ({ amount }: { amount: number }) => {
+      const response = await submitCardTransfer(formType, amount);
+
+      if (isSuccessResponse(response)) {
+        sessionStore.transaction = {
+          orderId: response.orderId,
+          type: adjustedTypeForm,
+          url: navigator.href,
+        };
+
+        navigator.assign(`${adjustedTypeForm}/?formUrl=${encodeURIComponent(response.formUrl)}`);
+      }
+
+      if (isErrorInResponse(response)) {
+        responseTypeDialog.open({
+          errorCode: response.errorCode,
+          errorMessage: response.errorMessage,
+        });
+      }
+    },
+    [formType],
+  );
+};

package/src/components/CreditCardForm/getDeliveryCreditCardData.ts

@@ -1,4 +1,5 @@
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
+import { dateToISO } from '../../utils/dateToISO';
 import { getParticipantAddresses } from '../CreditForm/utils';
 
 export const getDeliveryData = (formData: LeadFormState) => {
@@ -9,7 +10,7 @@ export const getDeliveryData = (formData: LeadFormState) => {
   return isCourierDelivery
     ? {
         courierDeliveryFlg: isCourierDelivery,
-        deliveryDate: deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000'),
+        deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
         deliveryTimeCd: { value: 'TIME_2' },
         //TODO временный хардкод для тестирования, не забыть удалить
         office: { id: '3' },

package/src/ui-kit/FormField/getField.tsx

@@ -96,9 +96,11 @@ export const getField =
       ...externalInputs,
     };
 
-    return (
-      shouldRenderField({ input, field }) && (
-        <div key={i}>{fieldsRegister[String(input.name)]?.({ field, input, params })}</div>
-      )
-    );
+    const Component = fieldsRegister[String(input.name)];
+
+    return shouldRenderField({ input, field }) && Component ? (
+      <div key={i}>
+        <Component field={field} input={input} params={params} />
+      </div>
+    ) : null;
   };