PenaSide/adminFront
3
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

проценты скидки

Browse Source
This commit is contained in:
Nikolai 2022-10-19 11:04:45 +06:00
parent 7f47b92c77
commit 8e86e1a0b1
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Components/LoggedIn/Content/Promocode/index.tsx
View File

@ -104,17 +104,22 @@ const Promocode: React.FC = () => {
const { promocodeArray, promocodeArraySet } = useStore<StoreState>((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
}]
}

6
src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx
View File

@ -157,15 +157,12 @@ const DataGridElement: React.FC<MWProps> = ({ openModal }) => {
cartRowsDataSet( selectedRowsData );
}
console.log( cartRowsData )
const handleRemoveBasket = ( id:number ) => {
const cartFiltered = cartRowsData.filter( (row) => row.id != id );
cartRowsDataSet( cartFiltered );
}
const fieldPromocode = React.useRef<HTMLInputElement | null>(null);
const checkPromocode = () => {
if( fieldPromocode.current != null ) {
setPromocode( fieldPromocode.current.value );
@ -176,7 +173,6 @@ const DataGridElement: React.FC<MWProps> = ({ 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<MWProps> = ({ openModal }) => {
return(
<>
{
`${item.good} - ${item.discount}%${period}`
`${item.good} - ${item.discount * 100}%${period}`
}
</>
)