Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/admin into dev
This commit is contained in:
commit
f8b6afdd18
@ -46,7 +46,6 @@ interface MergedTariff {
|
||||
}
|
||||
|
||||
export default function Cart({ selectedTariffs }: Props) {
|
||||
const tariffs = useTariffStore((store) => store.tariffs);
|
||||
const discounts = useDiscountStore((store) => store.discounts);
|
||||
const cartTotal = useCartStore((state) => state.cartTotal);
|
||||
const setCartTotal = useCartStore((store) => store.setCartTotal);
|
||||
@ -56,8 +55,8 @@ export default function Cart({ selectedTariffs }: Props) {
|
||||
const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false);
|
||||
|
||||
const exampleTariffs = useTariffStore((state) => state.tariffs);
|
||||
const [tariffss, setTariffs] = useState<any>();
|
||||
const mergeTariffs: MergedTariff[] = [...exampleTariffs, ...(tariffss || [])];
|
||||
const [tariffs, setTariffs] = useState<any>();
|
||||
const mergeTariffs: MergedTariff[] = [...exampleTariffs, ...(tariffs || [])];
|
||||
|
||||
console.log(cartTotal, "cartTotal");
|
||||
|
||||
@ -122,11 +121,12 @@ export default function Cart({ selectedTariffs }: Props) {
|
||||
function handleCalcCartClick() {
|
||||
//рассчитать
|
||||
const cartTariffs = mergeTariffs.filter((tariff) => selectedTariffs.includes(tariff._id ? tariff._id : tariff.id));
|
||||
|
||||
const cartItems = cartTariffs.map((tariff) => createCartItem(tariff));
|
||||
console.log(cartTariffs);
|
||||
console.log(cartItems);
|
||||
console.log("selectedTariffs");
|
||||
console.log(selectedTariffs);
|
||||
// console.log(cartItems);
|
||||
// console.log("selectedTariffs");
|
||||
// console.log(selectedTariffs);
|
||||
|
||||
let loyaltyValue = parseInt(loyaltyField);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user