Commit 77d77475 authored by Yavor Grancharov's avatar Yavor Grancharov
Browse files

fix: hide unavailable products

parent b09d42c1

packages/core/package.json

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	"name": "@ever-platform/core",

	"description": "Ever Platform Headless Framework",

	"license": "AGPL-3.0",

	"version": "0.3.13",

	"version": "0.3.14",

	"homepage": "https://ever.co",

	"repository": {

		"type": "git",

packages/core/src/graphql/warehouses-products/warehouses-products.types.graphql

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ type WarehouseProduct { 
	isManufacturing: Boolean

	isCarrierRequired: Boolean

	isDeliveryRequired: Boolean

	isProductAvailable: Boolean

	isTakeaway: Boolean

	deliveryTimeMin: Int

	deliveryTimeMax: Int
@@ -36,6 +37,7 @@ input WarehouseProductInput { 
	isManufacturing: Boolean

	isCarrierRequired: Boolean

	isDeliveryRequired: Boolean

	isProductAvailable: Boolean

	isTakeaway: Boolean

	deliveryTimeMin: Int

	deliveryTimeMax: Int

packages/shop-mobile-ionic/src/app/services/geo-location/geo-location-products.ts

+6 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ export class GeoLocationProductsService { 
								isManufacturing

								isCarrierRequired

								isDeliveryRequired

								isProductAvailable

								isTakeaway

								deliveryTimeMin

								deliveryTimeMax
@@ -84,7 +85,11 @@ export class GeoLocationProductsService { 
				pollInterval: 2000,

			})

			.valueChanges.pipe(

				map((res) => res.data.geoLocationProductsByPaging),

				map((res) =>

					res.data.geoLocationProductsByPaging.filter(

						(p) => p.warehouseProduct.isProductAvailable === true

					)

				),

				share()

			);

	}

packages/shop-web-angular/src/app/+products/products.component.ts

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ export class ProductsComponent implements OnInit, OnDestroy { 
	searchText: string;

	modelChanged: Subject<string> = new Subject<string>();

	isWideView: boolean;

	isProductAvailable: boolean = true;



	private getOrdersGeoObj: { loc: ILocation };

	private productsCount: number;

packages/shop-web-angular/src/app/services/geo-location-products.ts

+6 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ export class GeoLocationProductsService { 
								isManufacturing

								isCarrierRequired

								isDeliveryRequired

								isProductAvailable

								isTakeaway

								deliveryTimeMin

								deliveryTimeMax
@@ -77,7 +78,11 @@ export class GeoLocationProductsService { 
				pollInterval: 2000,

			})

			.valueChanges.pipe(

				map((res) => res.data.geoLocationProductsByPaging),

				map((res) =>

					res.data.geoLocationProductsByPaging.filter(

						(p) => p.warehouseProduct.isProductAvailable === true

					)

				),

				share()

			);

	}