Unverified Commit 94efe627 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Merge pull request #1258 from ever-co/fix/#1243-hide-unavailable-products 

Fix/#1243 hide unavailable products
parents 0b4d15be 47c3f592

packages/admin-web-angular/src/app/@shared/warehouse/+warehouse-order-modal/warehouse-order-modal.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ export class WarehouseOrderModalComponent implements OnInit, OnDestroy { 


	private _loadWarehouseProducts() {

		this._warehouseProductsRouter

			.get(this.warehouseId)

			.getAvailable(this.warehouseId)

			.pipe(takeUntil(this._ngDestroy$))

			.subscribe((p) => {

				Object.assign(this._warehouseProducts, p);

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/core/src/services/warehouses/WarehousesProductsService.ts

+3 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ export class WarehousesProductsService 
			map((warehouseProducts) =>

				_.filter(

					warehouseProducts,

					(warehouseProduct) => warehouseProduct.count > 0

					(warehouseProduct) =>

						warehouseProduct.count > 0 &&

						warehouseProduct.isProductAvailable === true

				)

			)

		);

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()

			);

	}