@redneckz/wildless-cms-uni-blocks 0.14.745 → 0.14.747

package/mobile/lib/components/CardTransfer/CardTransfer.js

@@ -1,29 +1,31 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm.js';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
 import { Button } from '../../ui-kit/Button/Button.js';
 import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput.js';
 import { Heading } from '../../ui-kit/Heading/Heading.js';
 import { style } from '../../utils/style.js';
+import { useSubmitCardTransfer } from './useSubmitCardTransfer.js';
 const DEFAULT_TITLE = 'Укажите сумму перевода';
 const DEFAULT_LABEL = 'Сумма перевода';
 const MAX_AMOUNT = 300000;
 const MIN_AMOUNT = 1;
-const FORM_URL_MAP = {
-    private: 'https://old.rshb.ru/p2p/',
-    business: 'https://old.rshb.ru/smallbusiness/p2p/',
-};
 const INITIAL_FORM_STATE = {
     amount: 1500,
 };
 export const CardTransfer = JSX(({ className = '', title = DEFAULT_TITLE, label = DEFAULT_LABEL, button, formType = 'private', ...rest }) => {
-    const [{ amount }, { field }] = useForm(INITIAL_FORM_STATE);
-    const [isDisabled, setDisabled] = useState(false);
+    const [isDisabled, { setValue: setDisabled }] = useBool(false);
+    const handleSubmit = useSubmitCardTransfer(formType);
+    const [{ amount }, { field, onSubmit }] = useForm(INITIAL_FORM_STATE, {
+        onSubmit: handleSubmit,
+    });
+    // TODO: dont set state in useEffect
     useEffect(() => {
         setDisabled(amount <= 0);
     }, [amount]);
-    return (_jsxs(BlockWrapper, { className: style('flex flex-col items-center', className), defaultPadding: "p-6xl", ...rest, children: [title ? (_jsx(Heading, { className: "pb-lg xl:pb-4xl self-start xl:self-center", headingType: "h3", title: title })) : null, _jsxs("form", { className: "w-full xl:max-w-[468px]", method: "POST", action: FORM_URL_MAP[formType], children: [_jsx(CurrencyInput, { valid: !isDisabled, label: label, max: MAX_AMOUNT, min: MIN_AMOUNT, ...field('amount', { parse: Number, format: String }) }), _jsx("input", { type: "hidden", name: "amount", value: amount }), button?.text ? (_jsx(Button, { className: "w-full mt-lg", type: "submit", disabled: isDisabled, children: button.text })) : null] })] }));
+    return (_jsxs(BlockWrapper, { className: style('flex flex-col items-center', className), defaultPadding: "p-6xl", ...rest, children: [title ? (_jsx(Heading, { className: "pb-lg xl:pb-4xl self-start xl:self-center", headingType: "h3", title: title })) : null, _jsxs("form", { className: "w-full xl:max-w-[468px]", method: "POST", onSubmit: onSubmit, children: [_jsx(CurrencyInput, { valid: !isDisabled, label: label, max: MAX_AMOUNT, min: MIN_AMOUNT, ...field('amount', { parse: Number, format: String }) }), _jsx("input", { type: "hidden", name: "amount", value: amount }), button?.text ? (_jsx(Button, { className: "w-full mt-lg", type: "submit", disabled: isDisabled, children: button.text })) : null] })] }));
 });
 //# sourceMappingURL=CardTransfer.js.map

package/mobile/lib/components/CardTransfer/CardTransfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardTransfer.js","sourceRoot":"","sources":["../../../src/components/CardTransfer/CardTransfer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAC/C,MAAM,aAAa,GAAG,gBAAgB,CAAC;AACvC,MAAM,UAAU,GAAG,MAAM,CAAC;AAC1B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE,wCAAwC;CACnD,CAAC;AAEF,MAAM,kBAAkB,GAAG;IACzB,MAAM,EAAE,IAAI;CACb,CAAC;AAIF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,KAAK,GAAG,aAAa,EACrB,KAAK,GAAG,aAAa,EACrB,MAAM,EACN,QAAQ,GAAG,SAAS,EACpB,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC5D,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElD,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,CACL,MAAC,YAAY,IACX,SAAS,EAAE,KAAK,CAAC,4BAA4B,EAAE,SAAS,CAAC,EACzD,cAAc,EAAC,OAAO,KAClB,IAAI,aAEP,KAAK,CAAC,CAAC,CAAC,CACP,KAAC,OAAO,IACN,SAAS,EAAC,2CAA2C,EACrD,WAAW,EAAC,IAAI,EAChB,KAAK,EAAE,KAAK,GACZ,CACH,CAAC,CAAC,CAAC,IAAI,EACR,gBAAM,SAAS,EAAC,yBAAyB,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,aACpF,KAAC,aAAa,IACZ,KAAK,EAAE,CAAC,UAAU,EAClB,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,KACX,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GACtD,EACF,gBAAO,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,MAAM,GAAI,EACnD,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CACd,KAAC,MAAM,IAAC,SAAS,EAAC,cAAc,EAAC,IAAI,EAAC,QAAQ,EAAC,QAAQ,EAAE,UAAU,YAChE,MAAM,CAAC,IAAI,GACL,CACV,CAAC,CAAC,CAAC,IAAI,IACH,IACM,CAChB,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"CardTransfer.js","sourceRoot":"","sources":["../../../src/components/CardTransfer/CardTransfer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAC/C,MAAM,aAAa,GAAG,gBAAgB,CAAC;AACvC,MAAM,UAAU,GAAG,MAAM,CAAC;AAC1B,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAM,kBAAkB,GAAG;IACzB,MAAM,EAAE,IAAI;CACb,CAAC;AAIF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,GAAG,EAAE,EACd,KAAK,GAAG,aAAa,EACrB,KAAK,GAAG,aAAa,EACrB,MAAM,EACN,QAAQ,GAAG,SAAS,EACpB,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAErD,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,kBAAkB,EAAE;QACpE,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,oCAAoC;IACpC,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,CACL,MAAC,YAAY,IACX,SAAS,EAAE,KAAK,CAAC,4BAA4B,EAAE,SAAS,CAAC,EACzD,cAAc,EAAC,OAAO,KAClB,IAAI,aAEP,KAAK,CAAC,CAAC,CAAC,CACP,KAAC,OAAO,IACN,SAAS,EAAC,2CAA2C,EACrD,WAAW,EAAC,IAAI,EAChB,KAAK,EAAE,KAAK,GACZ,CACH,CAAC,CAAC,CAAC,IAAI,EACR,gBAAM,SAAS,EAAC,yBAAyB,EAAC,MAAM,EAAC,MAAM,EAAC,QAAQ,EAAE,QAAQ,aACxE,KAAC,aAAa,IACZ,KAAK,EAAE,CAAC,UAAU,EAClB,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,UAAU,KACX,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GACtD,EACF,gBAAO,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,MAAM,GAAI,EACnD,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CACd,KAAC,MAAM,IAAC,SAAS,EAAC,cAAc,EAAC,IAAI,EAAC,QAAQ,EAAC,QAAQ,EAAE,UAAU,YAChE,MAAM,CAAC,IAAI,GACL,CACV,CAAC,CAAC,CAAC,IAAI,IACH,IACM,CAChB,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/lib/components/CardTransfer/CardTransferContent.d.ts

@@ -1,5 +1,6 @@
 import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
+export declare type CardTransferFormType = 'private' | 'business';
 /**
  * @title Перевод с карты на карту
  */
@@ -10,5 +11,5 @@ export declare type CardTransferContent = UniBlockContent & LabelProps & TitlePr
      * @title Тип формы
      * @enumNames ['Частные клиенты', 'Бизнес-клиенты']
      */
-    formType?: 'private' | 'business';
+    formType?: CardTransferFormType;
 };

package/mobile/lib/components/CardTransfer/SubmitFailedDialog.d.ts

@@ -0,0 +1,6 @@
+export interface FormResponseDialogProps {
+    onClose?: () => void;
+    errorCode?: number;
+    errorMessage?: string;
+}
+export declare const SubmitFailedDialog: ({ onClose, errorCode, errorMessage, }: FormResponseDialogProps) => any;

package/mobile/lib/components/CardTransfer/SubmitFailedDialog.js

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

package/mobile/lib/components/CardTransfer/SubmitFailedDialog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubmitFailedDialog.js","sourceRoot":"","sources":["../../../src/components/CardTransfer/SubmitFailedDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQhD,MAAM,YAAY,GAAG,iBAAiB,CAAC;AAEvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,EACjC,OAAO,EACP,SAAS,EACT,YAAY,GACY,EAAE,EAAE;IAC5B,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAC,CAAC,+BAA+B,CAAC;IAE9F,OAAO,CACL,KAAC,MAAM,IAAC,SAAS,EAAC,0CAA0C,EAAC,OAAO,EAAE,OAAO,YAC3E,eAAK,SAAS,EAAC,wDAAwD,aACrE,KAAC,GAAG,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAC,KAAK,EAAC,MAAM,EAAC,KAAK,GAAG,EAC5F,KAAC,QAAQ,IACP,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAE,YAAY,EACnB,WAAW,EAAE,WAAW,EACxB,eAAe,EAAC,IAAI,EACpB,UAAU,EAAE,IAAI,GAChB,EACD,YAAY,CAAC,CAAC,CAAC,CACd,eAAK,SAAS,EAAC,qEAAqE,aAClF,eAAK,SAAS,EAAC,YAAY,kBAAG,YAAY,IAAO,EACjD,cAAK,SAAS,EAAC,YAAY,YACzB,KAAC,GAAG,IAAC,KAAK,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAI,GAC/D,IACF,CACP,CAAC,CAAC,CAAC,IAAI,IACJ,GACC,CACV,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/components/CardTransfer/submitCardTransfer.d.ts

@@ -0,0 +1,16 @@
+import { type CardTransferFormType } from './CardTransferContent';
+export declare type CardTransferResponse = Partial<{
+    errorCode: number;
+    errorMessage: string;
+    orderId: string;
+    formUrl: string;
+}>;
+export declare const submitCardTransfer: (typeForm: CardTransferFormType, amount: number) => Promise<CardTransferResponse | null>;
+export declare const isSuccessResponse: (response: CardTransferResponse | null) => response is {
+    orderId: string;
+    formUrl: string;
+};
+export declare const isErrorInResponse: (response: CardTransferResponse | null) => response is {
+    errorCode: number;
+    errorMessage: string;
+};

package/mobile/lib/components/CardTransfer/submitCardTransfer.js

@@ -0,0 +1,39 @@
+import { API_BASE_URI } from '../../api/apiBaseUrl.js';
+import { locationNavigator } from '../../external/locationNavigator.js';
+const paymentURLMap = {
+    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, amount) => {
+    const navigator = locationNavigator();
+    const submitBody = {
+        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) => Boolean(response?.formUrl) && Boolean(response?.orderId);
+export const isErrorInResponse = (response) => Boolean(response?.errorMessage) && response?.errorCode !== 0;
+//# sourceMappingURL=submitCardTransfer.js.map

package/mobile/lib/components/CardTransfer/submitCardTransfer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"submitCardTransfer.js","sourceRoot":"","sources":["../../../src/components/CardTransfer/submitCardTransfer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAkBrE,MAAM,aAAa,GAAyC;IAC1D,OAAO,EAAE,iBAAiB;IAC1B,QAAQ,EAAE,iBAAiB;CAC5B,CAAC;AAEF,MAAM,WAAW,GAAG,cAAc,CAAC;AACnC,MAAM,QAAQ,GAAG,cAAc,CAAC;AAChC,MAAM,aAAa,GAAG,KAAK,CAAC;AAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC;AAEtB,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,QAA8B,EAC9B,MAAc,EACwB,EAAE;IACxC,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;IAEtC,MAAM,UAAU,GAA2B;QACzC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACtB,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,GAAG,SAAS,CAAC,MAAM,GAAG,WAAW,EAAE;QAC9C,OAAO,EAAE,GAAG,SAAS,CAAC,MAAM,GAAG,QAAQ,EAAE;QACzC,QAAQ,EAAE,QAAQ;KACnB,CAAC;IAEF,MAAM,GAAG,GAAG,GAAG,YAAY,YAAY,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;IAEjE,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAC3B,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,OAAO,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;KACzB;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAqC,EACa,EAAE,CACpD,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,QAAqC,EACoB,EAAE,CAC3D,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,QAAQ,EAAE,SAAS,KAAK,CAAC,CAAC"}

package/mobile/lib/components/CardTransfer/useSubmitCardTransfer.d.ts

@@ -0,0 +1,11 @@
+import { type CardTransferFormType } from './CardTransferContent';
+export interface TransactionStore {
+    transaction: {
+        orderId: string;
+        type: 'p2p' | 'b2c';
+        url: string;
+    };
+}
+export declare const useSubmitCardTransfer: (formType: CardTransferFormType) => ({ amount }: {
+    amount: number;
+}) => Promise<void>;

package/mobile/lib/components/CardTransfer/useSubmitCardTransfer.js

@@ -0,0 +1,30 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { locationNavigator } from '../../external/locationNavigator.js';
+import { useDialog } from '../../ui-kit/DialogManager/useDialog.js';
+import { isErrorInResponse, isSuccessResponse, submitCardTransfer } from './submitCardTransfer.js';
+import { SubmitFailedDialog } from './SubmitFailedDialog.js';
+export const useSubmitCardTransfer = (formType) => {
+    const responseTypeDialog = useDialog(SubmitFailedDialog);
+    const sessionStore = useSessionStore();
+    const navigator = locationNavigator();
+    const adjustedTypeForm = formType === 'private' ? 'p2p' : 'b2c';
+    return useCallback(async ({ amount }) => {
+        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]);
+};
+//# sourceMappingURL=useSubmitCardTransfer.js.map

package/mobile/lib/components/CardTransfer/useSubmitCardTransfer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useSubmitCardTransfer.js","sourceRoot":"","sources":["../../../src/components/CardTransfer/useSubmitCardTransfer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAU1D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAA8B,EAAE,EAAE;IACtE,MAAM,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,eAAe,EAAoB,CAAC;IACzD,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;IAEtC,MAAM,gBAAgB,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAEhE,OAAO,WAAW,CAChB,KAAK,EAAE,EAAE,MAAM,EAAsB,EAAE,EAAE;QACvC,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAE5D,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE;YAC/B,YAAY,CAAC,WAAW,GAAG;gBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,IAAI,EAAE,gBAAgB;gBACtB,GAAG,EAAE,SAAS,CAAC,IAAI;aACpB,CAAC;YAEF,SAAS,CAAC,MAAM,CAAC,GAAG,gBAAgB,aAAa,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC1F;QAED,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE;YAC/B,kBAAkB,CAAC,IAAI,CAAC;gBACtB,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,YAAY,EAAE,QAAQ,CAAC,YAAY;aACpC,CAAC,CAAC;SACJ;IACH,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/hooks/useLeadFormData.js

@@ -1,7 +1,7 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { fetchJSON } from '../utils/fetchJSON.js';
 export const useLeadFormData = (typeField) => {
-    const { data, error } = useAsyncData(`/api/v1/dictionary?dictionaryType=${encodeURIComponent(typeField)}`, fetchData);
+    const { data, error } = useAsyncData(`/light-api-cash/v1/dictionary?dictionaryType=${encodeURIComponent(typeField)}`, fetchData);
     if (data && 'errorMessage' in data) {
         return { error };
     }

package/mobile/lib/hooks/useLeadFormData.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLeadFormData.js","sourceRoot":"","sources":["../../src/hooks/useLeadFormData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM/C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAiB,EAAE,EAAE;IACnD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,CAClC,qCAAqC,kBAAkB,CAAC,SAAS,CAAC,EAAE,EACpE,SAAS,CACV,CAAC;IACF,IAAI,IAAI,IAAI,cAAc,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,KAAK,EAAE,CAAC;KAClB;IAED,OAAO,EAAE,IAAI,EAAE,IAAwB,EAAE,KAAK,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,EAAE,GAAW,EAA0C,EAAE;IAC9E,MAAM,MAAM,GAAG,MAAM,SAAS,CAAgC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,OAAO,MAAM,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC"}
+{"version":3,"file":"useLeadFormData.js","sourceRoot":"","sources":["../../src/hooks/useLeadFormData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM/C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAiB,EAAE,EAAE;IACnD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,CAClC,gDAAgD,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAC/E,SAAS,CACV,CAAC;IACF,IAAI,IAAI,IAAI,cAAc,IAAI,IAAI,EAAE;QAClC,OAAO,EAAE,KAAK,EAAE,CAAC;KAClB;IAED,OAAO,EAAE,IAAI,EAAE,IAAwB,EAAE,KAAK,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,EAAE,GAAW,EAA0C,EAAE;IAC9E,MAAM,MAAM,GAAG,MAAM,SAAS,CAAgC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,OAAO,MAAM,IAAI,EAAE,CAAC;AACtB,CAAC,CAAC"}

package/mobile/src/api/RetailAPI/doRequest.ts

@@ -1,4 +1,4 @@
-import { API_BASE_URI } from '../apiBaseUrl';
+import { RETAIL_API_BASE_URI } from '../apiBaseUrl';
 
 export const fetchRetailJSON = async <R>(
   url: string,
@@ -21,7 +21,7 @@ export async function doRequest(
   method: 'POST' | 'GET' | 'PUT',
   body?: any,
 ): Promise<Response> {
-  return globalThis?.fetch?.(`${API_BASE_URI}${url}`, {
+  return globalThis?.fetch?.(`${RETAIL_API_BASE_URI}${url}`, {
     method,
     headers: {
       'Content-Type': 'application/json',

package/mobile/src/api/apiBaseUrl.ts

@@ -1 +1,2 @@
 export const API_BASE_URI = '/api/v1';
+export const RETAIL_API_BASE_URI = '/light-api-cash/v1';

package/mobile/src/components/CardTransfer/CardTransfer.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
@@ -8,17 +9,13 @@ import { Heading } from '../../ui-kit/Heading/Heading';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { type CardTransferContent } from './CardTransferContent';
+import { useSubmitCardTransfer } from './useSubmitCardTransfer';
 
 const DEFAULT_TITLE = 'Укажите сумму перевода';
 const DEFAULT_LABEL = 'Сумма перевода';
 const MAX_AMOUNT = 300000;
 const MIN_AMOUNT = 1;
 
-const FORM_URL_MAP = {
-  private: 'https://old.rshb.ru/p2p/',
-  business: 'https://old.rshb.ru/smallbusiness/p2p/',
-};
-
 const INITIAL_FORM_STATE = {
   amount: 1500,
 };
@@ -34,9 +31,15 @@ export const CardTransfer = JSX<CardTransferProps>(
     formType = 'private',
     ...rest
   }) => {
-    const [{ amount }, { field }] = useForm(INITIAL_FORM_STATE);
-    const [isDisabled, setDisabled] = useState(false);
+    const [isDisabled, { setValue: setDisabled }] = useBool(false);
+
+    const handleSubmit = useSubmitCardTransfer(formType);
+
+    const [{ amount }, { field, onSubmit }] = useForm(INITIAL_FORM_STATE, {
+      onSubmit: handleSubmit,
+    });
 
+    // TODO: dont set state in useEffect
     useEffect(() => {
       setDisabled(amount <= 0);
     }, [amount]);
@@ -54,7 +57,7 @@ export const CardTransfer = JSX<CardTransferProps>(
             title={title}
           />
         ) : null}
-        <form className="w-full xl:max-w-[468px]" method="POST" action={FORM_URL_MAP[formType]}>
+        <form className="w-full xl:max-w-[468px]" method="POST" onSubmit={onSubmit}>
           <CurrencyInput
             valid={!isDisabled}
             label={label}

package/mobile/src/components/CardTransfer/CardTransferContent.ts

@@ -1,6 +1,8 @@
 import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
+export type CardTransferFormType = 'private' | 'business';
+
 /**
  * @title Перевод с карты на карту
  */
@@ -13,5 +15,5 @@ export type CardTransferContent = UniBlockContent &
      * @title Тип формы
      * @enumNames ['Частные клиенты', 'Бизнес-клиенты']
      */
-    formType?: 'private' | 'business';
+    formType?: CardTransferFormType;
   };

package/mobile/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/mobile/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/mobile/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/mobile/src/hooks/useLeadFormData.ts

@@ -8,7 +8,7 @@ type ErrorProps = {
 
 export const useLeadFormData = (typeField: string) => {
   const { data, error } = useAsyncData(
-    `/api/v1/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
+    `/light-api-cash/v1/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
     fetchData,
   );
   if (data && 'errorMessage' in data) {

package/package.json

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

package/src/api/RetailAPI/doRequest.ts

@@ -1,4 +1,4 @@
-import { API_BASE_URI } from '../apiBaseUrl';
+import { RETAIL_API_BASE_URI } from '../apiBaseUrl';
 
 export const fetchRetailJSON = async <R>(
   url: string,
@@ -21,7 +21,7 @@ export async function doRequest(
   method: 'POST' | 'GET' | 'PUT',
   body?: any,
 ): Promise<Response> {
-  return globalThis?.fetch?.(`${API_BASE_URI}${url}`, {
+  return globalThis?.fetch?.(`${RETAIL_API_BASE_URI}${url}`, {
     method,
     headers: {
       'Content-Type': 'application/json',

package/src/api/apiBaseUrl.ts

@@ -1 +1,2 @@
 export const API_BASE_URI = '/api/v1';
+export const RETAIL_API_BASE_URI = '/light-api-cash/v1';

package/src/components/CardTransfer/CardTransfer.fixture.mobile.tsx

@@ -1,4 +1,5 @@
 import '../../setup-fixture';
+import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { type LinkButtonProps } from '../../ui-kit/LinkButton/LinkButtonProps';
 import { CardTransfer } from './CardTransfer';
 
@@ -8,9 +9,16 @@ const button: LinkButtonProps = {
 };
 
 export default {
-  default: (
-    <div className="container grid grid-cols-12">
-      <CardTransfer className="col-span-12" button={button} />
+  private: (
+    <div>
+      <CardTransfer button={button} formType="private" />
+      <DialogManager />
+    </div>
+  ),
+  business: (
+    <div>
+      <CardTransfer button={button} formType="business" />
+      <DialogManager />
     </div>
   ),
 };

package/src/components/CardTransfer/CardTransfer.fixture.tsx

@@ -1,5 +1,6 @@
 import '../../setup-fixture';
 
+import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { type LinkButtonProps } from '../../ui-kit/LinkButton/LinkButtonProps';
 import { CardTransfer } from './CardTransfer';
 
@@ -9,5 +10,16 @@ const button: LinkButtonProps = {
 };
 
 export default {
-  default: <CardTransfer button={button} />,
+  private: (
+    <div>
+      <CardTransfer button={button} formType="private" />
+      <DialogManager />
+    </div>
+  ),
+  business: (
+    <div>
+      <CardTransfer button={button} formType="business" />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/CardTransfer/CardTransfer.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
@@ -8,17 +9,13 @@ import { Heading } from '../../ui-kit/Heading/Heading';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { type CardTransferContent } from './CardTransferContent';
+import { useSubmitCardTransfer } from './useSubmitCardTransfer';
 
 const DEFAULT_TITLE = 'Укажите сумму перевода';
 const DEFAULT_LABEL = 'Сумма перевода';
 const MAX_AMOUNT = 300000;
 const MIN_AMOUNT = 1;
 
-const FORM_URL_MAP = {
-  private: 'https://old.rshb.ru/p2p/',
-  business: 'https://old.rshb.ru/smallbusiness/p2p/',
-};
-
 const INITIAL_FORM_STATE = {
   amount: 1500,
 };
@@ -34,9 +31,15 @@ export const CardTransfer = JSX<CardTransferProps>(
     formType = 'private',
     ...rest
   }) => {
-    const [{ amount }, { field }] = useForm(INITIAL_FORM_STATE);
-    const [isDisabled, setDisabled] = useState(false);
+    const [isDisabled, { setValue: setDisabled }] = useBool(false);
+
+    const handleSubmit = useSubmitCardTransfer(formType);
+
+    const [{ amount }, { field, onSubmit }] = useForm(INITIAL_FORM_STATE, {
+      onSubmit: handleSubmit,
+    });
 
+    // TODO: dont set state in useEffect
     useEffect(() => {
       setDisabled(amount <= 0);
     }, [amount]);
@@ -54,7 +57,7 @@ export const CardTransfer = JSX<CardTransferProps>(
             title={title}
           />
         ) : null}
-        <form className="w-full xl:max-w-[468px]" method="POST" action={FORM_URL_MAP[formType]}>
+        <form className="w-full xl:max-w-[468px]" method="POST" onSubmit={onSubmit}>
           <CurrencyInput
             valid={!isDisabled}
             label={label}

package/src/components/CardTransfer/CardTransferContent.ts

@@ -1,6 +1,8 @@
 import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
+export type CardTransferFormType = 'private' | 'business';
+
 /**
  * @title Перевод с карты на карту
  */
@@ -13,5 +15,5 @@ export type CardTransferContent = UniBlockContent &
      * @title Тип формы
      * @enumNames ['Частные клиенты', 'Бизнес-клиенты']
      */
-    formType?: 'private' | 'business';
+    formType?: CardTransferFormType;
   };