diff --git a/src/Components/LoggedIn/Content/Promocode/index.tsx b/src/Components/LoggedIn/Content/Promocode/index.tsx index d8e8458..af5a23b 100644 --- a/src/Components/LoggedIn/Content/Promocode/index.tsx +++ b/src/Components/LoggedIn/Content/Promocode/index.tsx @@ -104,17 +104,22 @@ const Promocode: React.FC = () => { const { promocodeArray, promocodeArraySet } = useStore((state) => state); const promocodeArrayConverted = promocodeArray.map( (item) => { - const dateFrom = new Date( Number(item.from) ); - const dateDueTo = new Date( Number(item.dueTo) ); + const dateFrom = item.from ? new Date( Number(item.from) ) : ""; + const dateDueTo = item.from ? new Date( Number(item.dueTo) ) : ""; - const strFrom = `${dateFrom.getDate()}.${dateFrom.getMonth()}.${dateFrom.getFullYear()}`; - const strDueTo = `${dateDueTo.getDate()}.${dateDueTo.getMonth()}.${dateDueTo.getFullYear()}`; + const strFrom = dateFrom + ? `${dateFrom.getDate()}.${dateFrom.getMonth()}.${dateFrom.getFullYear()}` + : "-" + + const strDueTo = dateDueTo + ? `${dateDueTo.getDate()}.${dateDueTo.getMonth()}.${dateDueTo.getFullYear()}` + : "-" if( item.privileges.length ) { const result = item.privileges.reduce( (acc, privilege) => { acc = acc ? `${acc}, ${privilege.good} - ${privilege.discount}%` - : `${privilege.good} - ${privilege.discount}%`; + : `${privilege.good} - ${privilege.discount * 100}%`; return acc; }, "" ); @@ -134,7 +139,7 @@ const Promocode: React.FC = () => { dueTo: checkboxState ? "" : new Date( value2 ).getTime() +"", privileges: [{ good: service, - discount + discount: discount / 100 }] } diff --git a/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx b/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx index 99f93ee..fa575eb 100644 --- a/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx +++ b/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx @@ -157,15 +157,12 @@ const DataGridElement: React.FC = ({ openModal }) => { cartRowsDataSet( selectedRowsData ); } - console.log( cartRowsData ) - const handleRemoveBasket = ( id:number ) => { const cartFiltered = cartRowsData.filter( (row) => row.id != id ); cartRowsDataSet( cartFiltered ); } const fieldPromocode = React.useRef(null); - const checkPromocode = () => { if( fieldPromocode.current != null ) { setPromocode( fieldPromocode.current.value ); @@ -176,7 +173,6 @@ const DataGridElement: React.FC = ({ openModal }) => { const [selectedPromocode, setSelectedPromocode] = React.useState( -1 ); promocodeArray = [ ...rowz ]; - console.log(promocodeArray) const setPromocode = ( name:string ) => { let codeNumber = -1; @@ -344,7 +340,7 @@ const DataGridElement: React.FC = ({ openModal }) => { return( <> { - `${item.good} - ${item.discount}%${period}` + `${item.good} - ${item.discount * 100}%${period}` } )