diff --git a/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php b/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php index c186a3816..9143889d2 100644 --- a/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php +++ b/packages/Sarga/API/Http/Resources/Checkout/PickupAddress.php @@ -18,6 +18,7 @@ class PickupAddress extends \Illuminate\Http\Resources\Json\JsonResource 'state' => $this->state, 'city' => $this->city, 'street' => $this->street, + 'postcode' => $this->postcode, ]; } } \ No newline at end of file diff --git a/packages/Sarga/API/Http/routes.php b/packages/Sarga/API/Http/routes.php index e0d1714bf..7eb77ba8e 100644 --- a/packages/Sarga/API/Http/routes.php +++ b/packages/Sarga/API/Http/routes.php @@ -46,7 +46,7 @@ Route::group(['prefix' => 'api'], function () { Route::get('categories', [Categories::class, 'allResources'])->name('api.categories')->middleware('cacheResponse:3600'); Route::get('categories/{id}/filters',[Categories::class,'filters'])->middleware('cacheResponse:3600'); Route::get('attribute-options', [FilterOptions::class, 'allResources'])->middleware('cacheResponse:3600'); - Route::get('brands', [Brands::class, 'allResources']);//->middleware('cacheResponse:3600'); + Route::get('brands', [Brands::class, 'allResources'])->middleware('cacheResponse:3600'); //attributes by code // Route::get('attribute-options', [ResourceController::class, 'index'])->defaults('_config', [ @@ -56,13 +56,13 @@ Route::group(['prefix' => 'api'], function () { //Product routes Route::get('products', [Products::class, 'index']);//->middleware('cacheResponse:3600'); - Route::get('products-discounted', [Products::class, 'discountedProducts'])->middleware('cacheResponse:3600');; - Route::get('products-popular', [Products::class, 'popularProducts'])->middleware('cacheResponse:3600');; - Route::get('products-search', [Products::class, 'searchProducts'])->middleware('cacheResponse:3600');; - Route::get('suggestions', [\Sarga\API\Http\Controllers\SearchController::class, 'index']); - Route::get('products/{id}', [Products::class, 'get'])->middleware('cacheResponse:36000');; - Route::get('product/{id}', [Products::class, 'product'])->middleware('cacheResponse:36000');; - Route::get('products/{id}/variants', [Products::class, 'variants'])->middleware('cacheResponse:3600');; + Route::get('products-discounted', [Products::class, 'discountedProducts'])->middleware('cacheResponse:3600'); + Route::get('products-popular', [Products::class, 'popularProducts'])->middleware('cacheResponse:3600'); + Route::get('products-search', [Products::class, 'searchProducts'])->middleware('cacheResponse:3600'); + Route::get('suggestions', [\Sarga\API\Http\Controllers\SearchController::class, 'index'])>middleware('cacheResponse:3600'); + Route::get('products/{id}', [Products::class, 'get'])->middleware('cacheResponse:36000'); + Route::get('product/{id}', [Products::class, 'product'])->middleware('cacheResponse:36000'); + Route::get('products/{id}/variants', [Products::class, 'variants'])->middleware('cacheResponse:3600'); Route::get('states', [ResourceController::class, 'index'])->defaults('_config', [ 'repository' => CountryStateRepository::class, diff --git a/packages/Sarga/Shop/src/Repositories/ProductRepository.php b/packages/Sarga/Shop/src/Repositories/ProductRepository.php index 0422afbe6..3455e9d40 100644 --- a/packages/Sarga/Shop/src/Repositories/ProductRepository.php +++ b/packages/Sarga/Shop/src/Repositories/ProductRepository.php @@ -98,6 +98,11 @@ class ProductRepository extends WProductRepository ->whereIn('product_categories.category_id', explode(',', $categoryId)); } + if(isset($params['vendor'])){ + $qb->join('marketplace_products','marketplace_products.product_id', '=', 'product_flat.product_id') + ->where('marketplace_seller_id',$params['vendor']); + } + if(isset($params['brand'])) { $qb->whereIn('product_flat.brand_id', explode(',', $params['brand'])); }