@zenky/storefront-vue 0.9.34 → 0.9.35

package/dist/cjs/index.js

@@ -1630,10 +1630,13 @@ var ProductsFiltersType;
     ProductsFiltersType["FeaturesGroups"] = "featuresGroups";
 })(ProductsFiltersType || (ProductsFiltersType = {}));
 
-function getSourceParams(source) {
+function getSourceParams(source, promotion) {
     if (source === null || !source.id || !source.type) {
         return {};
     }
+    else if (promotion !== null) {
+        return {};
+    }
     switch (source.type) {
         case ProductsSourceType.Category:
             return { category_id: source.id };
@@ -1720,9 +1723,15 @@ function getLoaderParams(page, loader) {
     if (loader.search) {
         params.search = loader.search;
     }
-    if (typeof loader.promotionReward === 'string' && loader.promotionReward) {
-        params.promotion_reward = loader.promotionReward;
+    if (typeof loader.promotion === 'undefined' || loader.promotion === null) {
+        return params;
     }
+    params.promotion_reward = 'all';
+    if (!loader.promotion.context_type || !loader.promotion.context_id) {
+        return params;
+    }
+    params.context_type = loader.promotion.context_type;
+    params.context_id = loader.promotion.context_id;
     return params;
 }
 function getProductsPaginationRequest(page, loader) {
@@ -1730,7 +1739,7 @@ function getProductsPaginationRequest(page, loader) {
         return null;
     }
     return {
-        ...getSourceParams(loader.source),
+        ...getSourceParams(loader.source, loader.promotion),
         ...getSortingParams(loader.sorting),
         ...getFiltersParams(loader.filters),
         ...getPricesFiltersParams(loader.pricesFilters),
@@ -1771,7 +1780,7 @@ function useProductsList(config, errorHandler) {
             count: config.value.count,
         },
         with: config.value.with || '',
-        promotionReward: config.value.promotionReward || null,
+        promotion: config.value.promotion || null,
     }));
     const load = async (page, reset = false, callback) => {
         const request = getProductsPaginationRequest(page, loader.value);
@@ -1832,9 +1841,26 @@ function getFiltersFromUrl(param) {
     });
     return filters;
 }
+function getProductsListQueryParamsWithPromotion(params, promotion) {
+    if (!promotion) {
+        return params;
+    }
+    const clone = {
+        ...params,
+        promotion_id: promotion.id,
+        reward_id: promotion.reward_id,
+    };
+    if (promotion.context_type) {
+        clone.context_type = promotion.context_type;
+    }
+    if (promotion.context_id) {
+        clone.context_id = promotion.context_id;
+    }
+    return clone;
+}
 function getProductsListQueryParams(config, request) {
     if (request === null) {
-        return {};
+        return getProductsListQueryParamsWithPromotion({}, config.promotion);
     }
     const query = {};
     if (request.order_by && request.order_by !== config.sorting) {
@@ -1852,7 +1878,25 @@ function getProductsListQueryParams(config, request) {
     if (request.search) {
         query.search = request.search;
     }
-    return query;
+    return getProductsListQueryParamsWithPromotion(query, config.promotion);
+}
+function getQueryParam(query, param) {
+    return typeof query[param] !== 'undefined' && query[param] ? query[param] : null;
+}
+function getPromotionFromQuery(query) {
+    const promotionId = getQueryParam(query, 'promotion_id');
+    const rewardId = getQueryParam(query, 'reward_id');
+    if (!promotionId || !rewardId) {
+        return null;
+    }
+    const contextType = getQueryParam(query, 'context_type');
+    const contextId = getQueryParam(query, 'context_id');
+    return {
+        id: promotionId,
+        reward_id: rewardId,
+        context_type: contextType,
+        context_id: contextId,
+    };
 }
 function getProductsListParamsFromQuery(query) {
     if (!query) {
@@ -1861,9 +1905,10 @@ function getProductsListParamsFromQuery(query) {
     return {
         sorting: typeof query.order_by !== 'undefined' ? query.order_by : null,
         f: typeof query.f === 'string' ? getFiltersFromUrl(query.f) : null,
-        min_price: typeof query.min_price !== 'undefined' && query.min_price ? query.min_price : null,
-        max_price: typeof query.max_price !== 'undefined' && query.max_price ? query.max_price : null,
-        search: typeof query.search !== 'undefined' && query.search ? query.search : null,
+        min_price: getQueryParam(query, 'min_price'),
+        max_price: getQueryParam(query, 'max_price'),
+        search: getQueryParam(query, 'search'),
+        promotion: getPromotionFromQuery(query),
     };
 }
 

package/dist/esm/index.js

@@ -1622,10 +1622,13 @@ var ProductsFiltersType;
     ProductsFiltersType["FeaturesGroups"] = "featuresGroups";
 })(ProductsFiltersType || (ProductsFiltersType = {}));
 
-function getSourceParams(source) {
+function getSourceParams(source, promotion) {
     if (source === null || !source.id || !source.type) {
         return {};
     }
+    else if (promotion !== null) {
+        return {};
+    }
     switch (source.type) {
         case ProductsSourceType.Category:
             return { category_id: source.id };
@@ -1712,9 +1715,15 @@ function getLoaderParams(page, loader) {
     if (loader.search) {
         params.search = loader.search;
     }
-    if (typeof loader.promotionReward === 'string' && loader.promotionReward) {
-        params.promotion_reward = loader.promotionReward;
+    if (typeof loader.promotion === 'undefined' || loader.promotion === null) {
+        return params;
     }
+    params.promotion_reward = 'all';
+    if (!loader.promotion.context_type || !loader.promotion.context_id) {
+        return params;
+    }
+    params.context_type = loader.promotion.context_type;
+    params.context_id = loader.promotion.context_id;
     return params;
 }
 function getProductsPaginationRequest(page, loader) {
@@ -1722,7 +1731,7 @@ function getProductsPaginationRequest(page, loader) {
         return null;
     }
     return {
-        ...getSourceParams(loader.source),
+        ...getSourceParams(loader.source, loader.promotion),
         ...getSortingParams(loader.sorting),
         ...getFiltersParams(loader.filters),
         ...getPricesFiltersParams(loader.pricesFilters),
@@ -1763,7 +1772,7 @@ function useProductsList(config, errorHandler) {
             count: config.value.count,
         },
         with: config.value.with || '',
-        promotionReward: config.value.promotionReward || null,
+        promotion: config.value.promotion || null,
     }));
     const load = async (page, reset = false, callback) => {
         const request = getProductsPaginationRequest(page, loader.value);
@@ -1824,9 +1833,26 @@ function getFiltersFromUrl(param) {
     });
     return filters;
 }
+function getProductsListQueryParamsWithPromotion(params, promotion) {
+    if (!promotion) {
+        return params;
+    }
+    const clone = {
+        ...params,
+        promotion_id: promotion.id,
+        reward_id: promotion.reward_id,
+    };
+    if (promotion.context_type) {
+        clone.context_type = promotion.context_type;
+    }
+    if (promotion.context_id) {
+        clone.context_id = promotion.context_id;
+    }
+    return clone;
+}
 function getProductsListQueryParams(config, request) {
     if (request === null) {
-        return {};
+        return getProductsListQueryParamsWithPromotion({}, config.promotion);
     }
     const query = {};
     if (request.order_by && request.order_by !== config.sorting) {
@@ -1844,7 +1870,25 @@ function getProductsListQueryParams(config, request) {
     if (request.search) {
         query.search = request.search;
     }
-    return query;
+    return getProductsListQueryParamsWithPromotion(query, config.promotion);
+}
+function getQueryParam(query, param) {
+    return typeof query[param] !== 'undefined' && query[param] ? query[param] : null;
+}
+function getPromotionFromQuery(query) {
+    const promotionId = getQueryParam(query, 'promotion_id');
+    const rewardId = getQueryParam(query, 'reward_id');
+    if (!promotionId || !rewardId) {
+        return null;
+    }
+    const contextType = getQueryParam(query, 'context_type');
+    const contextId = getQueryParam(query, 'context_id');
+    return {
+        id: promotionId,
+        reward_id: rewardId,
+        context_type: contextType,
+        context_id: contextId,
+    };
 }
 function getProductsListParamsFromQuery(query) {
     if (!query) {
@@ -1853,9 +1897,10 @@ function getProductsListParamsFromQuery(query) {
     return {
         sorting: typeof query.order_by !== 'undefined' ? query.order_by : null,
         f: typeof query.f === 'string' ? getFiltersFromUrl(query.f) : null,
-        min_price: typeof query.min_price !== 'undefined' && query.min_price ? query.min_price : null,
-        max_price: typeof query.max_price !== 'undefined' && query.max_price ? query.max_price : null,
-        search: typeof query.search !== 'undefined' && query.search ? query.search : null,
+        min_price: getQueryParam(query, 'min_price'),
+        max_price: getQueryParam(query, 'max_price'),
+        search: getQueryParam(query, 'search'),
+        promotion: getPromotionFromQuery(query),
     };
 }
 

package/dist/zenky.d.ts

@@ -1102,7 +1102,7 @@ interface ProductsLoader {
         count: number;
     };
     with?: string;
-    promotionReward?: string | null;
+    promotion?: ProductsPromotion | null;
 }
 declare type ProductsRequestCallback = (request: ProductsPaginationRequest | null) => void;
 interface ProductsListProvider {
@@ -1123,6 +1123,12 @@ declare enum ProductsFiltersType {
     Features = "features",
     FeaturesGroups = "featuresGroups"
 }
+interface ProductsPromotion {
+    id: string;
+    reward_id: string;
+    context_type: string | null;
+    context_id: string | null;
+}
 interface ProductsListConfig {
     source: ProductsSource | null;
     search?: string | null;
@@ -1132,7 +1138,7 @@ interface ProductsListConfig {
     count: number;
     filtersType: ProductsFiltersType | null;
     with?: string;
-    promotionReward?: string;
+    promotion?: ProductsPromotion | null;
 }
 
 declare function useFeaturesFilters(categoryId: string | null, values: ProductsFilters | null): {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenky/storefront-vue",
-  "version": "0.9.34",
+  "version": "0.9.35",
   "description": "Zenky Storefront library for Vue 3.",
   "author": "Timur Zurbaev <hello@zurbaev.ru>",
   "license": "MIT",