@@ -4,19 +4,19 @@ |
||
| 4 | 4 | |
| 5 | 5 | class BaseRepository |
| 6 | 6 | { |
| 7 | - public function selectAll() |
|
| 8 | - { |
|
| 9 | - return $this->model->where('shop_id', auth('hideyobackend')->user()->selected_shop_id)->get(); |
|
| 10 | - } |
|
| 7 | + public function selectAll() |
|
| 8 | + { |
|
| 9 | + return $this->model->where('shop_id', auth('hideyobackend')->user()->selected_shop_id)->get(); |
|
| 10 | + } |
|
| 11 | 11 | |
| 12 | 12 | public function selectAllByShopId($shopId) |
| 13 | 13 | { |
| 14 | - return $this->model->where('shop_id', $shopId)->get(); |
|
| 14 | + return $this->model->where('shop_id', $shopId)->get(); |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | public function selectAllActiveByShopId($shopId) |
| 18 | 18 | { |
| 19 | - return $this->model->where('shop_id', $shopId)->where('active', 1)->get(); |
|
| 19 | + return $this->model->where('shop_id', $shopId)->where('active', 1)->get(); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public function getModel() { |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | public function selectOneByShopIdAndId($shopId, $sendingMethodId) |
| 21 | 21 | { |
| 22 | 22 | return $this->model->with( |
| 23 | - array('relatedPaymentMethods' => function ($query) { |
|
| 23 | + array('relatedPaymentMethods' => function($query) { |
|
| 24 | 24 | $query->where('active', 1); |
| 25 | 25 | }) |
| 26 | 26 | )->where('shop_id', $shopId)->where('active', 1) |
@@ -32,6 +32,6 @@ |
||
| 32 | 32 | |
| 33 | 33 | function selectAllActiveByShopId($shopId) |
| 34 | 34 | { |
| 35 | - return $this->model->where('shop_id', $shopId)->get(); |
|
| 35 | + return $this->model->where('shop_id', $shopId)->get(); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -20,10 +20,10 @@ |
||
| 20 | 20 | |
| 21 | 21 | public function selectBySendingMethodIdAndPaymentMethodId($paymentMethodId, $sendingMethodId) |
| 22 | 22 | { |
| 23 | - $result = $this->model->with(array('sendingPaymentMethodRelated' => function ($query) use ($paymentMethodId, $sendingMethodId) { |
|
| 24 | - $query->with(array('sendingMethod' => function ($query) use ($sendingMethodId) { |
|
| 23 | + $result = $this->model->with(array('sendingPaymentMethodRelated' => function($query) use ($paymentMethodId, $sendingMethodId) { |
|
| 24 | + $query->with(array('sendingMethod' => function($query) use ($sendingMethodId) { |
|
| 25 | 25 | $query->where('id', $sendingMethodId); |
| 26 | - }, 'paymentMethod' => function ($query) use ($paymentMethodId) { |
|
| 26 | + }, 'paymentMethod' => function($query) use ($paymentMethodId) { |
|
| 27 | 27 | $query->where('id', $paymentMethodId); |
| 28 | 28 | })); |
| 29 | 29 | } )) |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | |
| 76 | 76 | public function orderProductsByClientId($clientId, $shopId) |
| 77 | 77 | { |
| 78 | - return $this->modelOrderProduct->with(array('product'))->whereHas('Order', function ($query) use ($clientId, $shopId) { |
|
| 78 | + return $this->modelOrderProduct->with(array('product'))->whereHas('Order', function($query) use ($clientId, $shopId) { |
|
| 79 | 79 | $query->where('client_id', '=', $clientId)->where('shop_id', $shopId); |
| 80 | 80 | }); |
| 81 | 81 | } |
@@ -40,17 +40,17 @@ |
||
| 40 | 40 | |
| 41 | 41 | function selectAllByShopId($shopId) |
| 42 | 42 | { |
| 43 | - return $this->model->where('shop_id', $shopId)->orderBy('title', 'asc')->get(); |
|
| 43 | + return $this->model->where('shop_id', $shopId)->orderBy('title', 'asc')->get(); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | function selectAllActiveByShopId($shopId) |
| 47 | 47 | { |
| 48 | - return $this->model->where('shop_id', $shopId)->where('active', 1)->orderBy('title', 'asc')->get(); |
|
| 48 | + return $this->model->where('shop_id', $shopId)->where('active', 1)->orderBy('title', 'asc')->get(); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | function selectAllByShopIdAndRoot($shopId) |
| 52 | 52 | { |
| 53 | - return $this->model->roots()->where('shop_id', $shopId)->where('active', 1)->orderBy('title', 'asc')->get(); |
|
| 53 | + return $this->model->roots()->where('shop_id', $shopId)->where('active', 1)->orderBy('title', 'asc')->get(); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | function selectCategoriesByParentId($shopId, $parentId, $imageTag = false) |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | $result = $this->model->where('id', '=', $parentId)->first()->children() |
| 59 | 59 | ->with( |
| 60 | - array('productCategoryImages' => function ($query) use ($imageTag) { |
|
| 60 | + array('productCategoryImages' => function($query) use ($imageTag) { |
|
| 61 | 61 | if ($imageTag) { |
| 62 | 62 | $query->where('tag', '=', $imageTag); |
| 63 | 63 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | { |
| 81 | 81 | $result = $this->model |
| 82 | 82 | ->with( |
| 83 | - array('productCategoryImages' => function ($query) use ($imageTag) { |
|
| 83 | + array('productCategoryImages' => function($query) use ($imageTag) { |
|
| 84 | 84 | if ($imageTag) { |
| 85 | 85 | $query->where('tag', '=', $imageTag); |
| 86 | 86 | } |
@@ -119,14 +119,14 @@ discard block |
||
| 119 | 119 | $result = $this->model-> |
| 120 | 120 | with( |
| 121 | 121 | array( |
| 122 | - 'products' => function ($query) { |
|
| 122 | + 'products' => function($query) { |
|
| 123 | 123 | $query->where('active', 1)->with( |
| 124 | - array('productImages' => function ($query) { |
|
| 124 | + array('productImages' => function($query) { |
|
| 125 | 125 | $query->orderBy('rank', 'asc'); |
| 126 | 126 | }) |
| 127 | 127 | ); |
| 128 | 128 | }, |
| 129 | - 'productCategoryImages' => function ($query) use ($imageTag) { |
|
| 129 | + 'productCategoryImages' => function($query) use ($imageTag) { |
|
| 130 | 130 | if ($imageTag) { |
| 131 | 131 | $query->where('tag', '=', $imageTag); |
| 132 | 132 | } $query->orderBy('rank', 'asc'); |
@@ -32,10 +32,10 @@ |
||
| 32 | 32 | return $this->model->select('extra_field.*') |
| 33 | 33 | ->leftJoin('product_category_related_extra_field', 'extra_field.id', '=', 'product_category_related_extra_field.extra_field_id') |
| 34 | 34 | |
| 35 | - ->where(function ($query) use ($productCategoryId) { |
|
| 35 | + ->where(function($query) use ($productCategoryId) { |
|
| 36 | 36 | |
| 37 | 37 | $query->where('all_products', 1) |
| 38 | - ->orWhereHas('categories', function ($query) use ($productCategoryId) { |
|
| 38 | + ->orWhereHas('categories', function($query) use ($productCategoryId) { |
|
| 39 | 39 | |
| 40 | 40 | $query->where('product_category_id', $productCategoryId); |
| 41 | 41 | }); |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | |
| 17 | 17 | function selectAllActiveByShopId($shopId) |
| 18 | 18 | { |
| 19 | - return $this->model->where('shop_id', $shopId)->get(); |
|
| 19 | + return $this->model->where('shop_id', $shopId)->get(); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | function selectOneByShopIdAndSlug($shopId, $slug) |
@@ -18,8 +18,8 @@ |
||
| 18 | 18 | |
| 19 | 19 | function selectAllByTagAndShopId($shopId, $tag) |
| 20 | 20 | { |
| 21 | - $result = $this->model->with(array('relatedProducts' => function ($query) { |
|
| 22 | - $query->with(array('productCategory', 'productImages' => function ($query) { |
|
| 21 | + $result = $this->model->with(array('relatedProducts' => function($query) { |
|
| 22 | + $query->with(array('productCategory', 'productImages' => function($query) { |
|
| 23 | 23 | $query->orderBy('rank', 'asc'); |
| 24 | 24 | }))->where('active', 1); |
| 25 | 25 | }))->where('shop_id', $shopId)->where('tag', '=', $tag)->get(); |