From ab56a005f279cc9b7276e1eda02f9b0387d98a88 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Sep 2023 11:02:22 +0000 Subject: [PATCH] server fixes --- bootstrap/cache/.gitignore | 0 packages/Sarga/API/Http/Controllers/Banners.php | 4 ++-- packages/Sarga/API/Http/Controllers/Categories.php | 10 ++++------ packages/Sarga/API/Http/Controllers/Orders.php | 4 ++-- storage/app/.gitignore | 0 storage/app/private/.gitignore | 0 storage/app/public/.gitignore | 0 storage/debugbar/.gitignore | 0 storage/fonts/.gitignore | 0 storage/framework/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/cache/data/.gitignore | 0 storage/framework/sessions/.gitignore | 0 storage/framework/testing/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 16 files changed, 8 insertions(+), 10 deletions(-) mode change 100644 => 100755 bootstrap/cache/.gitignore mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/app/private/.gitignore mode change 100644 => 100755 storage/app/public/.gitignore mode change 100644 => 100755 storage/debugbar/.gitignore mode change 100644 => 100755 storage/fonts/.gitignore mode change 100644 => 100755 storage/framework/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/cache/data/.gitignore mode change 100644 => 100755 storage/framework/sessions/.gitignore mode change 100644 => 100755 storage/framework/testing/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/packages/Sarga/API/Http/Controllers/Banners.php b/packages/Sarga/API/Http/Controllers/Banners.php index 80e0c90..5b443af 100644 --- a/packages/Sarga/API/Http/Controllers/Banners.php +++ b/packages/Sarga/API/Http/Controllers/Banners.php @@ -8,7 +8,7 @@ use Webkul\RestApi\Http\Controllers\V1\Shop\ResourceController; class Banners extends ResourceController { - protected $requestException = ['page', 'limit', 'pagination', 'sort', 'order', 'token','locale']; + protected $requestException = ['page', 'limit', 'pagination', 'sort', 'order', 'token','locale', '/api/sliders']; /** * Resource class name. * @@ -38,4 +38,4 @@ class Banners extends ResourceController { return false; } -} \ No newline at end of file +} diff --git a/packages/Sarga/API/Http/Controllers/Categories.php b/packages/Sarga/API/Http/Controllers/Categories.php index a4bdbc6..0fc36de 100644 --- a/packages/Sarga/API/Http/Controllers/Categories.php +++ b/packages/Sarga/API/Http/Controllers/Categories.php @@ -11,7 +11,7 @@ use Webkul\RestApi\Http\Controllers\V1\Shop\Catalog\CategoryController; class Categories extends CategoryController { - protected $requestException = ['page', 'limit', 'pagination', 'sort', 'order', 'token','locale']; + protected $requestException = ['page', 'limit', 'pagination', 'sort', 'order', 'token','locale', '/api/categories']; /** * Repository class name. * @@ -32,19 +32,17 @@ class Categories extends CategoryController } public function filters($id){ - $category = $this->getRepositoryInstance()->with(['filterableAttributes','brands' => function ($q){ - $q->take(20)->orderBy('position', 'desc')->orderBy('name', 'asc'); - } ]) + $category = $this->getRepositoryInstance()->with(['filterableAttributes']) ->find($id); if($category) return response([ 'attributes' => Attribute::collection($category->filterableAttributes), - 'brands' => Brand::collection($category->brands), + //'brands' => Brand::collection($category->brands), ]); else{ return response(['error'=>'not found'],404); } } -} \ No newline at end of file +} diff --git a/packages/Sarga/API/Http/Controllers/Orders.php b/packages/Sarga/API/Http/Controllers/Orders.php index 27deafe..e1fb76c 100644 --- a/packages/Sarga/API/Http/Controllers/Orders.php +++ b/packages/Sarga/API/Http/Controllers/Orders.php @@ -10,7 +10,7 @@ use Webkul\RestApi\Http\Controllers\V1\Shop\Customer\OrderController; class Orders extends OrderController { - protected $requestException = ['page', 'limit', 'pagination', 'sort', 'order', 'token','locale']; + protected $requestException = ['page', 'limit', 'pagination', 'sort', 'order', 'token','locale', '/api/customer/orders']; public function __construct(protected OrderRepository $orderRepository, protected OrderItemRepository $orderItemRepository) { @@ -51,4 +51,4 @@ class Orders extends OrderController ]); } } -} \ No newline at end of file +} diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/private/.gitignore b/storage/app/private/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100644 new mode 100755 diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore old mode 100644 new mode 100755 diff --git a/storage/fonts/.gitignore b/storage/fonts/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755