md-components-mdigial-azamat 0.0.295 → 0.0.296

package/dist/FinanceApplicationForm/FinanceApplicationFormBuilder.js

@@ -1,12 +1,12 @@
-import { jsxs as t, jsx as e, Fragment as w } from "react/jsx-runtime";
-import { useState as M } from "react";
-import { sectionClass as m, Field as c, inputClass as d, PresetNotice as O, NumberInput as b, TextInput as i } from "../FinanceCalculator/builder/components.js";
-import { ApiCollectionsEditor as j, FieldsEditor as B, DocumentsEditor as E, UrlsByCurrencyEditor as _, RatesByCurrencyEditor as $ } from "./builder/editors.js";
-import { mergeFinanceApplicationFormConfig as k } from "./builder/config.js";
-import { financeApplicationPresets as A } from "./builder/presets.js";
-import { buildFinanceApplicationPayload as L, getFinanceApplicationTemplateValues as z } from "./payloadTemplate.js";
-const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
-`), V = (p) => p.split(/\r?\n/).reduce((o, a) => {
+import { jsxs as t, jsx as e, Fragment as O } from "react/jsx-runtime";
+import { useState as j } from "react";
+import { sectionClass as m, Field as c, inputClass as u, PresetNotice as B, NumberInput as b, TextInput as i } from "../FinanceCalculator/builder/components.js";
+import { ApiCollectionsEditor as E, FieldsEditor as _, DocumentsEditor as $, UrlsByCurrencyEditor as L, RatesByCurrencyEditor as z } from "./builder/editors.js";
+import { mergeFinanceApplicationFormConfig as I } from "./builder/config.js";
+import { financeApplicationPresets as S } from "./builder/presets.js";
+import { buildFinanceApplicationPayload as D, getFinanceApplicationTemplateValues as U } from "./payloadTemplate.js";
+const V = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
+`), J = (p) => p.split(/\r?\n/).reduce((o, a) => {
   const r = a.trim();
   if (!r || r.startsWith("#"))
     return o;
@@ -15,21 +15,21 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
     return o;
   const n = r.slice(0, h).trim(), s = r.slice(h + 1).trim();
   return n && s && (o[n] = s), o;
-}, {}), Q = ({
+}, {}), Y = ({
   config: p,
   onChange: o
 }) => {
-  var f, x, N, C, R, P, F, T;
-  const a = k(p), [r, h] = M(""), n = (l) => {
+  var N, C, R, P, F, T, k, A;
+  const a = I(p), [r, h] = j(""), n = (l) => {
     o({ ...a, ...l });
   }, s = (l) => {
     n({ submit: { ...a.submit, ...l } });
-  }, S = (l) => {
-    const g = A[l];
-    g && (h(l), o(k(g.config)));
-  }, y = a.calculation.rateType === "monthly_rate", u = a.calculation.rateSource === "api", v = u && ((f = a.calculation.apiRate) == null ? void 0 : f.fallbackToManual) !== !1, I = L(
+  }, w = (l) => {
+    const g = S[l];
+    g && (h(l), o(I(g.config)));
+  }, y = a.calculation.rateType === "monthly_rate", v = a.calculation.rateType === "annual_decimal", d = a.calculation.rateSource === "api", f = d && ((N = a.calculation.apiRate) == null ? void 0 : N.fallbackToManual) !== !1, x = !d || f, M = D(
     a.submit.payloadTemplate,
-    z(a.fields, a.topic)
+    U(a.fields, a.topic)
   );
   return /* @__PURE__ */ t("div", { className: "h-full min-h-[560px] w-full overflow-auto rounded-xl bg-gray-50 p-6", children: [
     /* @__PURE__ */ t("div", { className: "mb-6 rounded-xl border border-gray-200 bg-white p-4", children: [
@@ -41,12 +41,12 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
         /* @__PURE__ */ e("div", { className: "grid grid-cols-1 gap-3 md:grid-cols-2", children: /* @__PURE__ */ e(c, { label: "Быстро заполнить по пресету", children: /* @__PURE__ */ t(
           "select",
           {
-            className: d,
+            className: u,
             value: r,
-            onChange: (l) => S(l.target.value),
+            onChange: (l) => w(l.target.value),
             children: [
               /* @__PURE__ */ e("option", { value: "", children: "Выберите пресет" }),
-              Object.entries(A).map(([l, g]) => /* @__PURE__ */ e(
+              Object.entries(S).map(([l, g]) => /* @__PURE__ */ e(
                 "option",
                 {
                   value: l,
@@ -57,17 +57,17 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
             ]
           }
         ) }) }),
-        /* @__PURE__ */ e("div", { className: "mt-3", children: /* @__PURE__ */ e(O, { children: "Пресет только быстро заполняет настройки. Его необязательно использовать: после выбора можно вручную изменить поля, расчет и отправку." }) })
+        /* @__PURE__ */ e("div", { className: "mt-3", children: /* @__PURE__ */ e(B, { children: "Пресет только быстро заполняет настройки. Его необязательно использовать: после выбора можно вручную изменить поля, расчет и отправку." }) })
       ] }),
       /* @__PURE__ */ e("div", { className: m, children: /* @__PURE__ */ e(
-        j,
+        E,
         {
           items: a.apiCollections,
           onChange: (l) => n({ apiCollections: l })
         }
       ) }),
       /* @__PURE__ */ e("div", { className: m, children: /* @__PURE__ */ e(
-        B,
+        _,
         {
           items: a.fields,
           apiCollections: a.apiCollections,
@@ -75,7 +75,7 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
         }
       ) }),
       /* @__PURE__ */ e("div", { className: m, children: /* @__PURE__ */ e(
-        E,
+        $,
         {
           title: a.documents.title,
           items: a.documents.items,
@@ -88,7 +88,7 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
           /* @__PURE__ */ e(c, { label: "Preset", children: /* @__PURE__ */ t(
             "select",
             {
-              className: d,
+              className: u,
               value: a.calculation.preset || "annuity",
               onChange: (l) => n({
                 calculation: {
@@ -105,7 +105,7 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
           /* @__PURE__ */ e(c, { label: "Тип ставки", children: /* @__PURE__ */ t(
             "select",
             {
-              className: d,
+              className: u,
               value: a.calculation.rateType || "annual_percent",
               onChange: (l) => n({
                 calculation: {
@@ -114,15 +114,16 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
                 }
               }),
               children: [
-                /* @__PURE__ */ e("option", { value: "annual_percent", children: "Годовой процент" }),
-                /* @__PURE__ */ e("option", { value: "monthly_rate", children: "Месячный коэффициент" })
+                /* @__PURE__ */ e("option", { value: "annual_percent", children: "Годовой процент (16.66)" }),
+                /* @__PURE__ */ e("option", { value: "annual_decimal", children: "Годовая decimal ставка (0.1666)" }),
+                /* @__PURE__ */ e("option", { value: "monthly_rate", children: "Месячный коэффициент (0.01583)" })
               ]
             }
           ) }),
           /* @__PURE__ */ e(c, { label: "Источник ставки", children: /* @__PURE__ */ t(
             "select",
             {
-              className: d,
+              className: u,
               value: a.calculation.rateSource || "manual",
               onChange: (l) => n({
                 calculation: {
@@ -136,26 +137,32 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
               ]
             }
           ) }),
-          !y && /* @__PURE__ */ e(c, { label: "Годовая ставка / наценка, %", children: /* @__PURE__ */ e(
-            b,
+          !y && x && /* @__PURE__ */ e(
+            c,
             {
-              value: a.calculation.annualRate,
-              onChange: (l) => n({
-                calculation: {
-                  ...a.calculation,
-                  annualRate: l
+              label: d ? v ? "Fallback годовая decimal ставка" : "Fallback годовая ставка, %" : v ? "Годовая decimal ставка" : "Годовая ставка, %",
+              children: /* @__PURE__ */ e(
+                b,
+                {
+                  value: a.calculation.annualRate,
+                  onChange: (l) => n({
+                    calculation: {
+                      ...a.calculation,
+                      annualRate: l
+                    }
+                  })
                 }
-              })
+              )
             }
-          ) }),
-          y && (!u || v) && /* @__PURE__ */ e(
+          ),
+          y && x && /* @__PURE__ */ e(
             c,
             {
-              label: u ? "Fallback месячный коэффициент" : "Месячный коэффициент",
+              label: d ? "Fallback месячный коэффициент" : "Месячный коэффициент",
               children: /* @__PURE__ */ e(
                 b,
                 {
-                  value: ((x = a.calculation.manualRate) == null ? void 0 : x.defaultRate) ?? a.calculation.monthlyRate,
+                  value: ((C = a.calculation.manualRate) == null ? void 0 : C.defaultRate) ?? a.calculation.monthlyRate,
                   onChange: (l) => n({
                     calculation: {
                       ...a.calculation,
@@ -170,11 +177,11 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
               )
             }
           ),
-          u && /* @__PURE__ */ t(w, { children: [
+          d && /* @__PURE__ */ t(O, { children: [
             /* @__PURE__ */ e(c, { label: "API URL для ставки", children: /* @__PURE__ */ e(
               i,
               {
-                value: (N = a.calculation.apiRate) == null ? void 0 : N.url,
+                value: (R = a.calculation.apiRate) == null ? void 0 : R.url,
                 onChange: (l) => n({
                   calculation: {
                     ...a.calculation,
@@ -189,7 +196,7 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
             /* @__PURE__ */ e(c, { label: "API зависит от поля", children: /* @__PURE__ */ e(
               i,
               {
-                value: (C = a.calculation.apiRate) == null ? void 0 : C.dependsOnField,
+                value: (P = a.calculation.apiRate) == null ? void 0 : P.dependsOnField,
                 onChange: (l) => n({
                   calculation: {
                     ...a.calculation,
@@ -204,7 +211,7 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
             /* @__PURE__ */ e(c, { label: "Путь ставки в ответе API", children: /* @__PURE__ */ e(
               i,
               {
-                value: (R = a.calculation.apiRate) == null ? void 0 : R.responsePath,
+                value: (F = a.calculation.apiRate) == null ? void 0 : F.responsePath,
                 onChange: (l) => n({
                   calculation: {
                     ...a.calculation,
@@ -217,9 +224,9 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
               }
             ) }),
             /* @__PURE__ */ e(
-              _,
+              L,
               {
-                items: (P = a.calculation.apiRate) == null ? void 0 : P.urlByCurrency,
+                items: (T = a.calculation.apiRate) == null ? void 0 : T.urlByCurrency,
                 onChange: (l) => n({
                   calculation: {
                     ...a.calculation,
@@ -232,10 +239,10 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
               }
             )
           ] }),
-          y && (!u || v) && /* @__PURE__ */ e(
-            $,
+          y && (!d || f) && /* @__PURE__ */ e(
+            z,
             {
-              items: ((F = a.calculation.manualRate) == null ? void 0 : F.byCurrency) || a.calculation.monthlyRateByCurrency,
+              items: ((k = a.calculation.manualRate) == null ? void 0 : k.byCurrency) || a.calculation.monthlyRateByCurrency,
               onChange: (l) => n({
                 calculation: {
                   ...a.calculation,
@@ -264,12 +271,12 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
             ),
             "Округлять платеж до целого"
           ] }),
-          u && /* @__PURE__ */ t("label", { className: "flex items-center gap-2 text-sm text-gray-700", children: [
+          d && /* @__PURE__ */ t("label", { className: "flex items-center gap-2 text-sm text-gray-700", children: [
             /* @__PURE__ */ e(
               "input",
               {
                 type: "checkbox",
-                checked: ((T = a.calculation.apiRate) == null ? void 0 : T.fallbackToManual) !== !1,
+                checked: ((A = a.calculation.apiRate) == null ? void 0 : A.fallbackToManual) !== !1,
                 onChange: (l) => n({
                   calculation: {
                     ...a.calculation,
@@ -389,7 +396,7 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
           /* @__PURE__ */ e(c, { label: "Method", children: /* @__PURE__ */ e(
             "select",
             {
-              className: d,
+              className: u,
               value: a.submit.method || "POST",
               onChange: (l) => s({ method: l.target.value }),
               children: /* @__PURE__ */ e("option", { value: "POST", children: "POST" })
@@ -400,26 +407,26 @@ const U = (p) => Object.entries(p ?? {}).map(([o, a]) => `${o}: ${a}`).join(`
           /* @__PURE__ */ e(c, { label: "Payload template", children: /* @__PURE__ */ e(
             "textarea",
             {
-              className: `${d} min-h-[220px] resize-y font-mono`,
+              className: `${u} min-h-[220px] resize-y font-mono`,
               value: a.submit.payloadTemplate,
               onChange: (l) => s({ payloadTemplate: l.target.value })
             }
           ) }),
           /* @__PURE__ */ t("div", { className: "flex flex-col gap-1", children: [
             /* @__PURE__ */ e("span", { className: "text-xs font-medium text-gray-500", children: "Payload preview" }),
-            /* @__PURE__ */ e("pre", { className: "m-0 min-h-[220px] overflow-auto rounded-lg border border-gray-300 bg-gray-950 p-3 text-xs leading-5 text-gray-50", children: JSON.stringify(I, null, 2) })
+            /* @__PURE__ */ e("pre", { className: "m-0 min-h-[220px] overflow-auto rounded-lg border border-gray-300 bg-gray-950 p-3 text-xs leading-5 text-gray-50", children: JSON.stringify(M, null, 2) })
           ] })
         ] }),
         /* @__PURE__ */ t("div", { className: "mt-3 grid grid-cols-1 gap-3 md:grid-cols-2", children: [
           /* @__PURE__ */ e(c, { label: "Ошибки API -> поля формы", children: /* @__PURE__ */ e(
             "textarea",
             {
-              className: `${d} min-h-[120px] resize-y font-mono`,
-              value: U(a.submit.errorFieldMap),
+              className: `${u} min-h-[120px] resize-y font-mono`,
+              value: V(a.submit.errorFieldMap),
               placeholder: `period: period
 price: price
 product: subject`,
-              onChange: (l) => s({ errorFieldMap: V(l.target.value) })
+              onChange: (l) => s({ errorFieldMap: J(l.target.value) })
             }
           ) }),
           /* @__PURE__ */ t("div", { className: "rounded-lg border border-blue-100 bg-blue-50 p-3 text-xs leading-5 text-blue-900", children: [
@@ -441,5 +448,5 @@ product: subject`,
   ] });
 };
 export {
-  Q as FinanceApplicationFormBuilder
+  Y as FinanceApplicationFormBuilder
 };

package/dist/FinanceApplicationForm/builder/presets.js

@@ -1,4 +1,4 @@
-import { getFinanceApplicationFormConfig as o } from "../defaultConfig.js";
+import { getFinanceApplicationFormConfig as l } from "../defaultConfig.js";
 const p = {
   text: "Текст",
   phone: "Телефон",
@@ -7,10 +7,7 @@ const p = {
   term_range: "Срок + бегунок",
   computed: "Вычисляемое",
   checkbox: "Чекбокс"
-}, i = "https://murabaha.mbank.kg/callback/api/v1/region/getAllRegions", u = "https://murabaha.mbank.kg/callback/api/v1/percent/getBusinessPercent", c = "https://murabaha.mbank.kg/callback/api/v1/percent/getPotrebPercent", a = {
-  kgs: 0.01583,
-  usd: 833e-5
-}, m = [
+}, i = "https://murabaha.mbank.kg/callback/api/v1/region/getAllRegions", o = "https://murabaha.mbank.kg/callback/api/v1/percent/getBusinessPercent", c = "https://murabaha.mbank.kg/callback/api/v1/percent/getPotrebPercent", u = 0.1666, m = [
   "Паспорт покупателя и продавца",
   "Паспорт супруги/супруга покупателя и продавца",
   "Свидетельство о регистрации брака или расторжения брака покупателя и продавца",
@@ -21,11 +18,11 @@ const p = {
   "Паспорт супруги/супруга покупателя и продавца",
   "Свидетельство о регистрации брака или расторжения брака покупателя и продавца",
   "Документ, подтверждающий доход покупателя"
-], r = (e, n, t, l) => ({
+], a = (e, n, r, t) => ({
   topic: e,
   documents: {
     title: "Необходимые документы",
-    items: l
+    items: t
   },
   apiCollections: [
     {
@@ -61,21 +58,18 @@ const p = {
   },
   calculation: {
     preset: "annuity",
-    rateType: "monthly_rate",
+    rateType: "annual_decimal",
     rateSource: "api",
     amountField: "price",
     termField: "period",
     downPaymentField: "",
     downPaymentPercent: 0,
-    annualRate: 16,
-    monthlyRate: a.kgs,
-    monthlyRateByCurrency: a,
-    manualRate: {
-      defaultRate: a.kgs,
-      byCurrency: a
-    },
+    annualRate: u,
+    monthlyRate: 0,
+    monthlyRateByCurrency: {},
+    manualRate: {},
     apiRate: {
-      url: t,
+      url: r,
       urlByCurrency: {},
       dependsOnField: "currency",
       responsePath: "",
@@ -229,20 +223,20 @@ documents: {{agree}}`
 }), b = {
   istisnaa: {
     label: "Истиснаа",
-    config: o({})
+    config: l({})
   },
   murabaha_business: {
     label: "Мурабаха бизнес",
-    config: r(
+    config: a(
       "Мурабаха бизнес",
       "Все документы для получения финансирования на бизнес цели есть",
-      u,
+      o,
       m
     )
   },
   murabaha_consumer: {
     label: "Мурабаха потребительская",
-    config: r(
+    config: a(
       "Мурабаха потребительская",
       "Все документы для получения финансирования на потребительские цели есть",
       c,

package/dist/FinanceApplicationForm/player/calculation.js

@@ -1,39 +1,52 @@
-import { calculateAnnuity as d } from "../../FinanceCalculator/utils/calculations.js";
-import { toNumber as c } from "./format.js";
-const s = (t, r, a, e) => {
-  if (t <= 0 || r <= 0)
+import { toNumber as d } from "./format.js";
+const f = (t, n, r, e) => {
+  if (t <= 0 || n <= 0)
     return 0;
-  if (a <= 0) {
-    const u = t / r;
-    return e ? parseFloat(u.toFixed()) : u;
+  if (r <= 0) {
+    const y = t / n;
+    return e ? parseFloat(y.toFixed()) : y;
   }
-  const n = Math.pow(1 + a, r), o = t * a * n / (n - 1 || 1);
+  const a = Math.pow(1 + r, n), o = t * r * a / (a - 1 || 1);
   return e ? parseFloat(o.toFixed()) : o;
-}, l = (t, r) => {
-  var o, u, y, m;
-  const a = t.currencyField || "currency", e = r[a], n = e === void 0 ? void 0 : String(e).toLowerCase();
-  return n && ((u = (o = t.manualRate) == null ? void 0 : o.byCurrency) == null ? void 0 : u[n]) !== void 0 ? Number(t.manualRate.byCurrency[n]) : ((y = t.manualRate) == null ? void 0 : y.defaultRate) !== void 0 ? Number(t.manualRate.defaultRate) : n && ((m = t.monthlyRateByCurrency) == null ? void 0 : m[n]) !== void 0 ? Number(t.monthlyRateByCurrency[n]) : Number(t.monthlyRate || 0);
-}, R = (t, r, a) => {
-  var m;
+}, s = (t, n) => {
+  var o, y, u, m;
+  const r = t.currencyField || "currency", e = n[r], a = e === void 0 ? void 0 : String(e).toLowerCase();
+  return a && ((y = (o = t.manualRate) == null ? void 0 : o.byCurrency) == null ? void 0 : y[a]) !== void 0 ? Number(t.manualRate.byCurrency[a]) : ((u = t.manualRate) == null ? void 0 : u.defaultRate) !== void 0 ? Number(t.manualRate.defaultRate) : a && ((m = t.monthlyRateByCurrency) == null ? void 0 : m[a]) !== void 0 ? Number(t.monthlyRateByCurrency[a]) : Number(t.monthlyRate || 0);
+}, c = (t) => Number(t.annualRate || 0), i = (t, n, r) => {
+  var e;
+  if (t.rateSource === "api") {
+    if (r !== void 0)
+      return r;
+    if (((e = t.apiRate) == null ? void 0 : e.fallbackToManual) === !1)
+      return 0;
+  }
+  return t.rateType === "monthly_rate" ? s(t, n) : c(t);
+}, l = (t, n, r) => {
   const e = t.calculation;
   if ((e == null ? void 0 : e.preset) === "none")
     return 0;
-  const n = c(r[e.amountField || "price"]), o = c(r[e.termField || "period"]), u = e.downPaymentField ? c(r[e.downPaymentField]) : n * Number(e.downPaymentPercent || 0) / 100, y = Math.max(n - u, 0);
+  const a = d(n[e.amountField || "price"]), o = d(n[e.termField || "period"]), y = e.downPaymentField ? d(n[e.downPaymentField]) : a * Number(e.downPaymentPercent || 0) / 100, u = Math.max(a - y, 0);
   if (e.rateType === "monthly_rate") {
-    const i = e.rateSource === "api" && a !== void 0 ? a : e.rateSource === "api" && ((m = e.apiRate) == null ? void 0 : m.fallbackToManual) === !1 ? 0 : l(e, r);
-    return s(
-      y,
+    const m = i(e, n, r);
+    return f(
+      u,
       o,
-      i,
+      m,
       e.roundMonthlyPayment !== !1
     );
   }
-  return d({
-    amount: y,
-    term: o,
-    annualRate: Number(e.annualRate || 0)
-  }).monthlyPayment;
+  return e.rateType === "annual_decimal" ? f(
+    u,
+    o,
+    i(e, n, r) / 12,
+    e.roundMonthlyPayment !== !1
+  ) : f(
+    u,
+    o,
+    i(e, n, r) / 100 / 12,
+    e.roundMonthlyPayment !== !1
+  );
 };
 export {
-  R as getMonthlyPayment
+  l as getMonthlyPayment
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "md-components-mdigial-azamat",
   "author": "Azamat Raimbekov",
   "private": false,
-  "version": "0.0.295",
+  "version": "0.0.296",
   "type": "module",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",