@@ -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 | } |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | class OrderService extends BaseService |
15 | 15 | { |
16 | - public function __construct(OrderRepository $order) |
|
17 | - { |
|
18 | - $this->repo = $order; |
|
19 | - } |
|
16 | + public function __construct(OrderRepository $order) |
|
17 | + { |
|
18 | + $this->repo = $order; |
|
19 | + } |
|
20 | 20 | |
21 | 21 | public function createAddress(array $attributes, $orderId) |
22 | 22 | { |
@@ -109,7 +109,7 @@ |
||
109 | 109 | { |
110 | 110 | $attributes['shop_id'] = $shopId; |
111 | 111 | $attributes['client_id'] = $attributes['user_id']; |
112 | - $client = ClientService::selectOneByShopIdAndId($shopId, $attributes['user_id']); |
|
112 | + $client = ClientService::selectOneByShopIdAndId($shopId, $attributes['user_id']); |
|
113 | 113 | |
114 | 114 | $this->repo->getModel()->fill($attributes); |
115 | 115 | $this->repo->getModel()->save(); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | $shop = ShopService::findUrl($request->root()); |
18 | 18 | |
19 | - if(!$shop) { |
|
19 | + if (!$shop) { |
|
20 | 20 | abort(404, "shop cannot be found"); |
21 | 21 | } |
22 | 22 |
@@ -9,10 +9,10 @@ |
||
9 | 9 | |
10 | 10 | class CouponService extends BaseService |
11 | 11 | { |
12 | - public function __construct(CouponRepository $coupon) |
|
13 | - { |
|
14 | - $this->repo = $coupon; |
|
15 | - } |
|
12 | + public function __construct(CouponRepository $coupon) |
|
13 | + { |
|
14 | + $this->repo = $coupon; |
|
15 | + } |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * The validation rules for the model. |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | ); |
31 | 31 | |
32 | 32 | if ($couponId) { |
33 | - $rules['title'] = 'required|between:4,65|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$couponId.' = id'; |
|
34 | - $rules['code'] = 'required|between:4,65|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$couponId.' = id'; |
|
33 | + $rules['title'] = 'required|between:4,65|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$couponId.' = id'; |
|
34 | + $rules['code'] = 'required|between:4,65|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$couponId.' = id'; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | return $rules; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | ); |
45 | 45 | |
46 | 46 | if ($groupId) { |
47 | - $rules['title'] = 'required|between:4,65|unique_with:'.$this->repo->getGroupModel()->getTable().', shop_id, '.$groupId.' = id'; |
|
47 | + $rules['title'] = 'required|between:4,65|unique_with:'.$this->repo->getGroupModel()->getTable().', shop_id, '.$groupId.' = id'; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | return $rules; |
@@ -39,7 +39,7 @@ |
||
39 | 39 | { |
40 | 40 | if (isset($result->id)) { |
41 | 41 | Notification::success($successMsg); |
42 | - if(is_array($routeName)) { |
|
42 | + if (is_array($routeName)) { |
|
43 | 43 | return redirect()->route($routeName[0], $routeName[1]); |
44 | 44 | } |
45 | 45 | return redirect()->route($routeName); |
@@ -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 |
@@ -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() { |
@@ -7,8 +7,8 @@ |
||
7 | 7 | |
8 | 8 | class ExceptionService extends BaseService |
9 | 9 | { |
10 | - public function __construct(ExceptionItemRepository $exception) |
|
11 | - { |
|
12 | - $this->repo = $exception; |
|
13 | - } |
|
10 | + public function __construct(ExceptionItemRepository $exception) |
|
11 | + { |
|
12 | + $this->repo = $exception; |
|
13 | + } |
|
14 | 14 | } |
15 | 15 | \ No newline at end of file |