Merge branch 'dev' into 'main'

fix при добавлении в корзину тарифа получаем данные пользователя вместо массива айдишников

See merge request frontend/marketplace!56
This commit is contained in:
Nastya 2023-09-16 23:55:46 +00:00
commit c01010cb51
3 changed files with 6 additions and 4 deletions

@ -11,13 +11,13 @@ export async function patchCart(
tariffId: string tariffId: string
): Promise<[string[], string?]> { ): Promise<[string[], string?]> {
try { try {
const patchCartResponse = await makeRequest<never, string[]>({ const patchCartResponse = await makeRequest<never, UserAccount>({
url: apiUrl + `/cart?id=${tariffId}`, url: apiUrl + `/cart?id=${tariffId}`,
method: "PATCH", method: "PATCH",
useToken: true, useToken: true,
}); });
return [patchCartResponse]; return [patchCartResponse.cart];
} catch (nativeError) { } catch (nativeError) {
const [error] = parseAxiosError(nativeError); const [error] = parseAxiosError(nativeError);
@ -29,13 +29,13 @@ export async function deleteCart(
tariffId: string tariffId: string
): Promise<[string[], string?]> { ): Promise<[string[], string?]> {
try { try {
const deleteCartResponse = await makeRequest<never, string[]>({ const deleteCartResponse = await makeRequest<never, UserAccount>({
url: apiUrl + `/cart?id=${tariffId}`, url: apiUrl + `/cart?id=${tariffId}`,
method: "DELETE", method: "DELETE",
useToken: true, useToken: true,
}); });
return [deleteCartResponse]; return [deleteCartResponse.cart];
} catch (nativeError) { } catch (nativeError) {
const [error] = parseAxiosError(nativeError); const [error] = parseAxiosError(nativeError);

@ -277,6 +277,7 @@ export const sendUserData = async () => {
export const addTariffToCart = async (tariffId: string) => { export const addTariffToCart = async (tariffId: string) => {
const [patchCartResponse, patchCartError] = await patchCart(tariffId); const [patchCartResponse, patchCartError] = await patchCart(tariffId);
console.log(patchCartResponse)
if (!patchCartError) { if (!patchCartError) {
setCart(patchCartResponse); setCart(patchCartResponse);

@ -25,6 +25,7 @@ export function useCart() {
function addTariffsToCart() { function addTariffsToCart() {
const knownTariffs: Tariff[] = []; const knownTariffs: Tariff[] = [];
console.log(cartTariffIds)
cartTariffIds?.forEach(async (tariffId) => { cartTariffIds?.forEach(async (tariffId) => {
if (typeof cartTariffMap[tariffId] === "object") return; if (typeof cartTariffMap[tariffId] === "object") return;