diff --git a/package.json b/package.json index 5b149aa..3a31932 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,10 @@ "@types/jest": "^27.5.2", "@types/node": "^16.18.30", "@types/react": "^18.2.6", + "@types/react-currency-format": "^1.0.0", + "@types/react-datepicker": "^4.11.2", "@types/react-dom": "^18.2.4", + "@types/react-text-mask": "^5.4.11", "@types/styled-components": "^5.1.26", "ag-grid-community": "^29.3.5", "ag-grid-react": "^29.3.5", @@ -39,6 +42,7 @@ "react-redux": "^8.0.5", "react-router-dom": "^6.11.1", "react-scripts": "5.0.1", + "react-text-mask": "^5.5.0", "styled-components": "^6.0.0-rc.1", "typescript": "^4.9.5", "web-vitals": "^2.1.4", diff --git a/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx b/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx index 82b0ce6..7abcd58 100644 --- a/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx +++ b/src/Components/Catalogos/CatCorresponsales/CatCorresponsales.tsx @@ -13,7 +13,7 @@ import { RootState } from '../../../store/store' import DataTable from 'react-data-table-component' import { ControlledInput } from './ControlledInput/ControlledInput' import { FaEraser, FaTimesCircle } from 'react-icons/fa' -import * as CurrencyFormat from 'react-currency-format' +import CurrencyFormat from 'react-currency-format' interface IProps { canDelete: boolean diff --git a/src/Components/Corresponsales/Anticipos/Anticipos.tsx b/src/Components/Corresponsales/Anticipos/Anticipos.tsx index 0626431..3e5c622 100644 --- a/src/Components/Corresponsales/Anticipos/Anticipos.tsx +++ b/src/Components/Corresponsales/Anticipos/Anticipos.tsx @@ -28,7 +28,7 @@ import { RootState } from '../../../store/store' import { AgGridReact } from 'ag-grid-react' import { RowClickedEvent } from 'ag-grid-community' import { BiCoinStack } from 'react-icons/bi' -import * as CurrencyFormat from 'react-currency-format' +import CurrencyFormat from 'react-currency-format' import FileManager from '../../Utils/FileManager/FileManager' import DTOAnticiposAutoriza from '../../../DTO/Corresponsales/DTOAnticiposAutoriza' diff --git a/src/Components/Corresponsales/Partidas/Dialog/DialogBox.tsx b/src/Components/Corresponsales/Partidas/Dialog/DialogBox.tsx index c50bfc6..b3fdcdf 100644 --- a/src/Components/Corresponsales/Partidas/Dialog/DialogBox.tsx +++ b/src/Components/Corresponsales/Partidas/Dialog/DialogBox.tsx @@ -1,6 +1,6 @@ import React, { FC, useEffect, useState } from "react"; import { Button, Card, Col, Container, Form, Row } from "react-bootstrap"; -import * as CurrencyFormat from "react-currency-format"; +import CurrencyFormat from "react-currency-format"; import ICorresponsalPartidas from "../../../../Interfaces/Corresponsales/ICorresponsalPedimentoPartidas"; import { MsgInformativo } from "../../../Utils/Toast/msgInformativo"; import CPartidasService from "../../../../Services/Corresponsalias/Corresponsales.Trafico.Pedimento.Partidas.Services"; diff --git a/src/Components/Corresponsales/ProveedorFactura/ProveedorFactura.tsx b/src/Components/Corresponsales/ProveedorFactura/ProveedorFactura.tsx index 29f9056..386397b 100644 --- a/src/Components/Corresponsales/ProveedorFactura/ProveedorFactura.tsx +++ b/src/Components/Corresponsales/ProveedorFactura/ProveedorFactura.tsx @@ -14,7 +14,7 @@ import { } from '../../../store/features/Corresponsales/CorresponsalesFacturasSlice'; import '../../../css/react-flexy-table.css'; import { MsgInformativo } from '../../Utils/Toast/msgInformativo'; -import * as CurrencyFormat from 'react-currency-format'; +import CurrencyFormat from 'react-currency-format'; import { CatProveedores } from '../CatProveedores/CatProveedores'; import { FaEraser, FaTimesCircle } from 'react-icons/fa'; import DataTable from 'react-data-table-component'; diff --git a/src/Components/Corresponsales/TraficoCorresponsales.tsx b/src/Components/Corresponsales/TraficoCorresponsales.tsx index 2c5c196..6a16709 100644 --- a/src/Components/Corresponsales/TraficoCorresponsales.tsx +++ b/src/Components/Corresponsales/TraficoCorresponsales.tsx @@ -79,7 +79,8 @@ import CCueCompService from '../../Services/Corresponsalias/Corresponsales.Cuent import FileManService from '../../Services/Utils/FileManager.Services' // Componentes -import * as CurrencyFormat from 'react-currency-format' +import CurrencyFormat from 'react-currency-format' +import MaskedInput from 'react-text-mask' /* import Select from 'custom-item-select' */ import FileManager from '../Utils/FileManager/FileManager' import { Anticipos } from './Anticipos/Anticipos' @@ -104,6 +105,7 @@ import ICorresponsalCatMediosEmbarque from '../../Interfaces/Corresponsales/ICor import { CuentasComplementarias } from './CuentasComplementarias/CuentasComplementarias' import DTOTraficoCompleto from '../../DTO/Corresponsales/DTOTraficoCompleto' import DTORectificacionHistorico from '../../DTO/Corresponsales/DTORectificacionHistorico' +import moment from 'moment' interface IProps { IDTrafico: number @@ -1982,8 +1984,14 @@ export default function TraficoCorresponsales (props:IProps) { showTimeSelect timeClassName={handleColor} dateFormat="MM/dd/yyyy HH:mm:ss" - placeholderText="No definido" + placeholderText="MM/DD/AAAA HH:mm:ss" isClearable + customInput={ + + } />{' '} diff --git a/src/Components/Login/ForgotPassword.tsx b/src/Components/Login/ForgotPassword.tsx index 7308b91..eb344cc 100644 --- a/src/Components/Login/ForgotPassword.tsx +++ b/src/Components/Login/ForgotPassword.tsx @@ -2,6 +2,7 @@ import * as React from 'react' import { Button, Card, Col, Form, Row } from 'react-bootstrap' import logo from '../../images/GEMCO_login.png' import { MsgInformativo } from '../Utils/Toast/msgInformativo' +// @ts-ignore import ReactCaptchaa from 'react-captchaa' import AuthDS from '../../Services/Auth/Auth.Service' import 'react-captchaa/dist/index.css' diff --git a/yarn.lock b/yarn.lock index a39712e..d702529 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2157,6 +2157,23 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/react-currency-format@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/react-currency-format/-/react-currency-format-1.0.0.tgz#7a0cfcdabe3ab9ddcdcc83cb27d0a7a6eaf9592e" + integrity sha512-IUAd/fLv3uW+Z3gyRJ9gumx7jpBk9RLXHHmg1VFjQ806AsVIKljprPMZi3SPpbwjPBiHQEGrrV1H5XbiYcp2ug== + dependencies: + "@types/react" "*" + +"@types/react-datepicker@^4.11.2": + version "4.11.2" + resolved "https://registry.yarnpkg.com/@types/react-datepicker/-/react-datepicker-4.11.2.tgz#44abfc6379faa58d28eb5730a058d6a389d40eac" + integrity sha512-ELYyX3lb3K1WltqdlF1hbnaDGgzlF6PIR5T4W38cSEcfrQDIrPE+Ioq5pwRe/KEJ+ihHMjvTVZQkwJx0pWMNHQ== + dependencies: + "@popperjs/core" "^2.9.2" + "@types/react" "*" + date-fns "^2.0.1" + react-popper "^2.2.5" + "@types/react-dom@^18.0.0", "@types/react-dom@^18.2.4": version "18.2.4" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.4.tgz#13f25bfbf4e404d26f62ac6e406591451acba9e0" @@ -2164,6 +2181,13 @@ dependencies: "@types/react" "*" +"@types/react-text-mask@^5.4.11": + version "5.4.11" + resolved "https://registry.yarnpkg.com/@types/react-text-mask/-/react-text-mask-5.4.11.tgz#dfbfc8642ee27977ed0cdfb1c61b53c85248c01c" + integrity sha512-DIJ3/dS4jd7NK3lEgsOwcgpp+ZlVrNJEiUDRayZRE/PNMbV/nLWmOKGdL0BUS29hnx0CDgITgPudKx0BgbF5fA== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.4.5": version "4.4.6" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.6.tgz#18187bcda5281f8e10dfc48f0943e2fdf4f75e2e" @@ -3758,7 +3782,7 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-fns@^2.24.0: +date-fns@^2.0.1, date-fns@^2.24.0: version "2.30.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== @@ -7750,7 +7774,7 @@ prop-types-extra@^1.1.0: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -8026,7 +8050,7 @@ react-onclickoutside@^6.12.2: resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz#e165ea4e5157f3da94f4376a3ab3e22a565f4ffc" integrity sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A== -react-popper@^2.3.0: +react-popper@^2.2.5, react-popper@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.3.0.tgz#17891c620e1320dce318bad9fede46a5f71c70ba" integrity sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q== @@ -8121,6 +8145,13 @@ react-scripts@5.0.1: optionalDependencies: fsevents "^2.3.2" +react-text-mask@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/react-text-mask/-/react-text-mask-5.5.0.tgz#468ea690160b364981205f5633e7475e939383ff" + integrity sha512-SLJlJQxa0uonMXsnXRpv5abIepGmHz77ylQcra0GNd7Jtk4Wj2Mtp85uGQHv1avba2uI8ZvRpIEQPpJKsqRGYw== + dependencies: + prop-types "^15.5.6" + react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"