применение скидок

src/Components/LoggedIn/Content/Discounts/index.tsx

@@ -107,8 +107,16 @@ const Discounts: React.FC = () =>  {
     setService(event.target.value as string);
   };
 
+
   let { discountsArray, discountsArraySet } = useStore<StoreState>((state) => state);
-  //discountsArray = [...rows];   //УДАЛИТЬ
+
+  const getDiscounts = localStorage.getItem("discounts");
+  const store = useStore( (state) => state );
+
+  if( getDiscounts && !store.discountsArray.length )   { 
+    const rows:Array<DiscountProps> = JSON.parse(getDiscounts); 
+    if( rows.length )   { store.discountsArraySet( rows ); };
+  }
 
   const { discountsActiveArray, discountsActiveArraySet } = useStore<StoreState>((state) => state);
   let discountsActiveArrayUpdated:Array<number>;
@@ -124,11 +132,19 @@ const Discounts: React.FC = () =>  {
 
     if( JSON.stringify(discountsActiveArray) != JSON.stringify(discountsActiveArrayUpdated) )   {
       discountsActiveArraySet( discountsActiveArrayUpdated );
+      localStorage.setItem("activeDiscounts", JSON.stringify( discountsActiveArrayUpdated ));
     }
   }
 
   findActiveDiscounts();
 
+  const getActiveDiscounts = localStorage.getItem("activeDiscounts");
+
+  if( getActiveDiscounts && !store.discountsArray.length )   { 
+    const rows:Array<number> = JSON.parse(getActiveDiscounts); 
+    if( rows.length )   { store.discountsActiveArraySet( rows ); };
+  }
+
   const discountsArrayConverted = discountsArray.map( (item) => {
     const dateFrom = item.from ? new Date( Number(item.from) ) : "";
     const dateDueTo = item.from ? new Date( Number(item.dueTo) ) : "";
@@ -172,6 +188,7 @@ const Discounts: React.FC = () =>  {
 
     const discountsArrayUpdated = [ ...discountsArray, newDiscount ];
     discountsArraySet( discountsArrayUpdated );
+    localStorage.setItem("discounts", JSON.stringify( discountsArrayUpdated ));
   }
 
   const fieldName = React.useRef<HTMLInputElement | null>(null);
@@ -208,6 +225,7 @@ const Discounts: React.FC = () =>  {
     } );
 
     discountsArraySet( discountsArray );
+    localStorage.setItem("discounts", JSON.stringify( discountsArray ));
   }
 
   return (

src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx

@@ -15,6 +15,7 @@ import DeleteIcon from "@mui/icons-material/Delete";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Checkbox from "@mui/material/Checkbox";
 import { PrivilegesProps, PromocodeProps } from "../../Promocode/types";
+import { DiscountProps } from "../../Discounts/types";
 import theme from "../../../../../theme";
 
 
@@ -107,6 +108,24 @@ const DataGridElement: React.FC<MWProps> = ({ openModal }) =>  {
   let price = 0;
   let prices = 0;
 
+  const { discountsArray, discountsArraySet } = useStore<StoreState>((state) => state);
+  const { discountsActiveArray, discountsActiveArraySet } = useStore<StoreState>((state) => state);
+
+  const getDiscounts = localStorage.getItem("discounts");
+  const store = useStore( (state) => state );
+
+  if( getDiscounts && !store.discountsArray.length )   { 
+    const rows:Array<DiscountProps> = JSON.parse(getDiscounts); 
+    if( rows.length )   { store.discountsArraySet( rows ); };
+  }
+
+  const getActiveDiscounts = localStorage.getItem("activeDiscounts");
+
+  if( getActiveDiscounts && !store.discountsArray.length )   { 
+    const rows:Array<number> = JSON.parse(getActiveDiscounts); 
+    if( rows.length )   { store.discountsActiveArraySet( rows ); };
+  }
+
   const [checkboxStates, setCheckboxStates] = React.useState(1);
 
   const checkboxToggle = () => {
@@ -403,25 +422,45 @@ const DataGridElement: React.FC<MWProps> = ({ openModal }) =>  {
 
             { cartRowsData.map( (item) => {
               if( item.type == "package" )  {
-                // считаем цену
+                // считаем цену в пакетах
                 price = 0;
 
                 if( item.tariffs ) {
                   item.tariffs.forEach( (tariff) => {
-                    price += tariff.price;
+                    let tariffPrice = tariff.price;
 
                     // применяем скидки по промокоду
                     if( selectedPromocode >= 0 && checkboxStates == 1 )   {
                       promocodeArray[ selectedPromocode ].privileges.forEach( (privilege) => {
                         if( tariff.service == privilege.good )  {
-                          price = price * privilege.discount;
+                          tariffPrice = tariffPrice * privilege.discount;
                         }
                       } )
                     }
+
+                    // применяем активные скидки
+                    if( discountsActiveArray.length >= 0 && checkboxStates == 1 && selectedPromocode < 0 )   {
+                      discountsActiveArray.forEach( (activeDiscount) => {
+                        discountsArray.forEach( (discount, i) => {
+                          if( i == activeDiscount )  {
+                            discount.privileges.forEach( (privilege) => {
+                              if( tariff.service == privilege.good )  {
+                                if( privilege.discount != 0 )  {
+                                  tariffPrice = tariffPrice * privilege.discount;
+                                }
+                              }
+                            });
+                          }
+                        });
+                      });
+                    }
+
+                    price += tariffPrice;
+
                   } );
                 }
               } else {
-                // считаем цену
+                // считаем цену в тарифах
                 price = item.price;
 
                 // применяем скидки по промокоду
@@ -432,6 +471,24 @@ const DataGridElement: React.FC<MWProps> = ({ openModal }) =>  {
                     }
                   } )
                 }
+
+                // применяем активные скидки
+                if( discountsActiveArray.length >= 0 && checkboxStates == 1 && selectedPromocode < 0 )   {
+                  discountsActiveArray.forEach( (activeDiscount) => {
+                    discountsArray.forEach( (discount, i) => {
+                      if( i == activeDiscount )  {
+                        discount.privileges.forEach( (privilege) => {
+                          if( item.service == privilege.good )  {
+                            if( privilege.discount != 0 )  {
+                              price = price * privilege.discount;
+                            }
+                          }
+                        });
+                      }
+                    });
+                  });
+                }
+
               }
 
               prices += price;