@@ -13,8 +13,8 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | protected $table = 'brand_image'; |
| 15 | 15 | |
| 16 | - protected $guarded = array('file'); |
|
| 16 | + protected $guarded = array('file'); |
|
| 17 | 17 | |
| 18 | 18 | // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model. |
| 19 | - protected $fillable = ['brand_id', 'file', 'extension', 'size', 'path', 'rank', 'tag', 'modified_by_user_id',]; |
|
| 19 | + protected $fillable = ['brand_id', 'file', 'extension', 'size', 'path', 'rank', 'tag', 'modified_by_user_id', ]; |
|
| 20 | 20 | } |
| 21 | 21 | \ No newline at end of file |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | protected $scoped = array('shop_id'); |
| 21 | 21 | |
| 22 | 22 | // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model. |
| 23 | - protected $fillable = ['active', 'title', 'short_description', 'description', 'rank', 'meta_title', 'meta_description', 'meta_keywords', 'shop_id', 'modified_by_user_id']; |
|
| 23 | + protected $fillable = ['active', 'title', 'short_description', 'description', 'rank', 'meta_title', 'meta_description', 'meta_keywords', 'shop_id', 'modified_by_user_id']; |
|
| 24 | 24 | |
| 25 | 25 | public function sluggable() |
| 26 | 26 | { |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | ); |
| 33 | 33 | |
| 34 | 34 | if ($faqItemId) { |
| 35 | - $rules['question'] = 'required|between:4,65|unique:'.$this->repo->getModel()->getTable().',question,'.$faqItemId; |
|
| 35 | + $rules['question'] = 'required|between:4,65|unique:'.$this->repo->getModel()->getTable().',question,'.$faqItemId; |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
@@ -9,10 +9,10 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | class FaqService extends BaseService |
| 11 | 11 | { |
| 12 | - public function __construct(FaqItemRepository $faq) |
|
| 13 | - { |
|
| 14 | - $this->repo = $faq; |
|
| 15 | - } |
|
| 12 | + public function __construct(FaqItemRepository $faq) |
|
| 13 | + { |
|
| 14 | + $this->repo = $faq; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * The validation rules for the model. |
@@ -67,6 +67,6 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function selectAllGroups() |
| 69 | 69 | { |
| 70 | - return $this->repo->selectAllGroups(); |
|
| 70 | + return $this->repo->selectAllGroups(); |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | \ No newline at end of file |
@@ -9,10 +9,10 @@ |
||
| 9 | 9 | |
| 10 | 10 | class UserService extends BaseService |
| 11 | 11 | { |
| 12 | - public function __construct(UserRepository $user) |
|
| 13 | - { |
|
| 14 | - $this->repo = $user; |
|
| 15 | - } |
|
| 12 | + public function __construct(UserRepository $user) |
|
| 13 | + { |
|
| 14 | + $this->repo = $user; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * The validation rules for the model. |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | ); |
| 29 | 29 | |
| 30 | 30 | if ($userId) { |
| 31 | - $rules['email'] = $rules['email'].', '.$userId.' = id'; |
|
| 32 | - $rules['username'] = $rules['email'].', '.$userId.' = id'; |
|
| 31 | + $rules['email'] = $rules['email'].', '.$userId.' = id'; |
|
| 32 | + $rules['username'] = $rules['email'].', '.$userId.' = id'; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | return $rules; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $model = $this->find($userId); |
| 49 | - $attributes['password']= Hash::make(array_get($attributes, 'password')); |
|
| 49 | + $attributes['password'] = Hash::make(array_get($attributes, 'password')); |
|
| 50 | 50 | return $this->updateOrAddModel($model, $attributes); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | $attributes['password'] = Hash::make(array_get($attributes, 'password')); |
| 72 | 72 | $attributes['confirmed'] = 0; |
| 73 | 73 | |
| 74 | - $attributes['confirmation_code'] = md5(uniqid(mt_rand(), true)); |
|
| 74 | + $attributes['confirmation_code'] = md5(uniqid(mt_rand(), true)); |
|
| 75 | 75 | |
| 76 | - $model = $this->updateOrAddModel($this->repo->getModel(), $attributes); |
|
| 76 | + $model = $this->updateOrAddModel($this->repo->getModel(), $attributes); |
|
| 77 | 77 | |
| 78 | 78 | if ($model) { |
| 79 | 79 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | config()->get('confide::email_queue'), |
| 84 | 84 | config()->get('confide::email_account_confirmation'), |
| 85 | 85 | compact('user'), |
| 86 | - function ($message) use ($user) { |
|
| 86 | + function($message) use ($user) { |
|
| 87 | 87 | $message |
| 88 | 88 | ->to($user->email, $user->username) |
| 89 | 89 | ->subject(Lang::get('confide::confide.email.account_confirmation.subject')); |
@@ -122,9 +122,9 @@ discard block |
||
| 122 | 122 | if (count($attributes) > 0) { |
| 123 | 123 | $this->model->username = array_get($attributes, 'username'); |
| 124 | 124 | |
| 125 | - $this->model->selected_shop_id = array_get($attributes, 'selected_shop_id'); |
|
| 125 | + $this->model->selected_shop_id = array_get($attributes, 'selected_shop_id'); |
|
| 126 | 126 | $this->model->email = array_get($attributes, 'email'); |
| 127 | - $this->model->language_id = array_get($attributes, 'language_id'); |
|
| 127 | + $this->model->language_id = array_get($attributes, 'language_id'); |
|
| 128 | 128 | $this->model->save(); |
| 129 | 129 | |
| 130 | 130 | return $this->model; |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | */ |
| 141 | 141 | public function login($input) |
| 142 | 142 | { |
| 143 | - if (! isset($input['password'])) { |
|
| 143 | + if (!isset($input['password'])) { |
|
| 144 | 144 | $input['password'] = null; |
| 145 | 145 | } |
| 146 | 146 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $user->password |
| 179 | 179 | ); |
| 180 | 180 | |
| 181 | - return (! $user->confirmed && $correctPassword); |
|
| 181 | + return (!$user->confirmed && $correctPassword); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
@@ -12,11 +12,11 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | class ClientService extends BaseService |
| 14 | 14 | { |
| 15 | - public function __construct(ClientRepository $client, ClientAddressRepository $clientAddress) |
|
| 16 | - { |
|
| 17 | - $this->repo = $client; |
|
| 18 | - $this->repoAddress = $clientAddress; |
|
| 19 | - } |
|
| 15 | + public function __construct(ClientRepository $client, ClientAddressRepository $clientAddress) |
|
| 16 | + { |
|
| 17 | + $this->repo = $client; |
|
| 18 | + $this->repoAddress = $clientAddress; |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * The validation rules for the model. |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | public function validateConfirmationCode($confirmationCode, $email, $shopId) |
| 99 | 99 | { |
| 100 | - return $this->repo->validateConfirmationCodeByConfirmationCodeAndEmail($confirmationCode, $email, $shopId); |
|
| 101 | - } |
|
| 100 | + return $this->repo->validateConfirmationCodeByConfirmationCodeAndEmail($confirmationCode, $email, $shopId); |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | public function validateLogin($attributes) |
| 104 | 104 | { |
@@ -166,13 +166,13 @@ discard block |
||
| 166 | 166 | $client = $this->repo->checkEmailByShopId($attributes['email'], $shopId); |
| 167 | 167 | |
| 168 | 168 | if($client AND $client->account_created) { |
| 169 | - return false; |
|
| 169 | + return false; |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | if($client) { |
| 173 | - $model = $client; |
|
| 173 | + $model = $client; |
|
| 174 | 174 | } else { |
| 175 | - $model = $this->repo->getModel(); |
|
| 175 | + $model = $this->repo->getModel(); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | $attributes['shop_id'] = $shopId; |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | public function createAddress($attributes, $clientId) |
| 206 | 206 | { |
| 207 | 207 | $attributes['client_id'] = $clientId; |
| 208 | - $model = $this->repoAddress->getModel(); |
|
| 208 | + $model = $this->repoAddress->getModel(); |
|
| 209 | 209 | $model->fill($attributes); |
| 210 | 210 | $model->save(); |
| 211 | 211 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | if ($clientId) { |
| 48 | - $rules['email'] = 'required|email|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$clientId.' = id'; |
|
| 48 | + $rules['email'] = 'required|email|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$clientId.' = id'; |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | return $rules; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | { |
| 161 | 161 | // create the validation rules ------------------------ |
| 162 | 162 | $rules = array( |
| 163 | - 'email' => 'required|email', // required and must be unique in the ducks table |
|
| 163 | + 'email' => 'required|email', // required and must be unique in the ducks table |
|
| 164 | 164 | 'password' => 'required', |
| 165 | 165 | 'firstname' => 'required', |
| 166 | 166 | 'lastname' => 'required', |
@@ -179,11 +179,11 @@ discard block |
||
| 179 | 179 | { |
| 180 | 180 | $client = $this->repo->checkEmailByShopId($attributes['email'], $shopId); |
| 181 | 181 | |
| 182 | - if($client AND $client->account_created) { |
|
| 182 | + if ($client AND $client->account_created) { |
|
| 183 | 183 | return false; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - if($client) { |
|
| 186 | + if ($client) { |
|
| 187 | 187 | $model = $client; |
| 188 | 188 | } else { |
| 189 | 189 | $model = $this->repo->getModel(); |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | $attributes['active'] = 0; |
| 195 | 195 | $attributes['confirmed'] = 0; |
| 196 | 196 | $attributes['confirmation_code'] = md5(uniqid(mt_rand(), true)); |
| 197 | - if($accountConfirmed) { |
|
| 197 | + if ($accountConfirmed) { |
|
| 198 | 198 | $attributes['active'] = 1; |
| 199 | 199 | $attributes['confirmed'] = 1; |
| 200 | 200 | $attributes['confirmation_code'] = null; |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | { |
| 231 | 231 | $clientAddress = $this->repoAddress->find($addressId); |
| 232 | 232 | |
| 233 | - if($clientAddress) { |
|
| 233 | + if ($clientAddress) { |
|
| 234 | 234 | $clientAddress->fill($attributes); |
| 235 | 235 | $clientAddress->save(); |
| 236 | 236 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | public function selectAllByClientId($clientId) |
| 20 | 20 | { |
| 21 | - return $this->model->where('client_id', '=', $clientId)->get(); |
|
| 21 | + return $this->model->where('client_id', '=', $clientId)->get(); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public function selectOneByClientIdAndId($clientId, $id) |
@@ -10,11 +10,11 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | class AttributeService extends BaseService |
| 12 | 12 | { |
| 13 | - public function __construct(AttributeRepository $attribute, AttributeGroupRepository $attributeGroup) |
|
| 14 | - { |
|
| 15 | - $this->repo = $attribute; |
|
| 16 | - $this->repoGroup = $attributeGroup; |
|
| 17 | - } |
|
| 13 | + public function __construct(AttributeRepository $attribute, AttributeGroupRepository $attributeGroup) |
|
| 14 | + { |
|
| 15 | + $this->repo = $attribute; |
|
| 16 | + $this->repoGroup = $attributeGroup; |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | 19 | private function rules($id = false) |
| 20 | 20 | { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | $attributes['shop_id'] = auth('hideyobackend')->user()->selected_shop_id; |
| 48 | 48 | $attributes['modified_by_user_id'] = auth('hideyobackend')->user()->id; |
| 49 | - $attributes['attribute_group_id'] = $attributeGroupId; |
|
| 49 | + $attributes['attribute_group_id'] = $attributeGroupId; |
|
| 50 | 50 | |
| 51 | 51 | $validator = Validator::make($attributes, $this->rules()); |
| 52 | 52 | |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | ); |
| 37 | 37 | |
| 38 | 38 | if ($id) { |
| 39 | - $rules['title'] = $rules['title'].','.$id.' = id'; |
|
| 39 | + $rules['title'] = $rules['title'].','.$id.' = id'; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | return $rules; |
@@ -11,13 +11,13 @@ |
||
| 11 | 11 | |
| 12 | 12 | class BrandService extends BaseService |
| 13 | 13 | { |
| 14 | - public function __construct(BrandRepository $brand) |
|
| 15 | - { |
|
| 16 | - $this->repo = $brand; |
|
| 14 | + public function __construct(BrandRepository $brand) |
|
| 15 | + { |
|
| 16 | + $this->repo = $brand; |
|
| 17 | 17 | $this->storageImagePath = storage_path() .config('hideyo.storage_path'). "/brand/"; |
| 18 | 18 | $this->publicImagePath = public_path() .config('hideyo.public_path'). "/brand/"; |
| 19 | 19 | |
| 20 | - } |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * The validation rules for the model. |
@@ -14,8 +14,8 @@ discard block |
||
| 14 | 14 | public function __construct(BrandRepository $brand) |
| 15 | 15 | { |
| 16 | 16 | $this->repo = $brand; |
| 17 | - $this->storageImagePath = storage_path() .config('hideyo.storage_path'). "/brand/"; |
|
| 18 | - $this->publicImagePath = public_path() .config('hideyo.public_path'). "/brand/"; |
|
| 17 | + $this->storageImagePath = storage_path().config('hideyo.storage_path')."/brand/"; |
|
| 18 | + $this->publicImagePath = public_path().config('hideyo.public_path')."/brand/"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | /** |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | ); |
| 41 | 41 | |
| 42 | 42 | if ($brandId) { |
| 43 | - $rules['title'] = $rules['title'].', '.$brandId.' = id'; |
|
| 43 | + $rules['title'] = $rules['title'].', '.$brandId.' = id'; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | return $rules; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $attributes['extension'] = $attributes['file']->getClientOriginalExtension(); |
| 89 | 89 | $attributes['size'] = $attributes['file']->getSize(); |
| 90 | 90 | |
| 91 | - $filename = str_replace(" ", "_", strtolower($attributes['file']->getClientOriginalName())); |
|
| 91 | + $filename = str_replace(" ", "_", strtolower($attributes['file']->getClientOriginalName())); |
|
| 92 | 92 | $uploadSuccess = $attributes['file']->move($destinationPath, $filename); |
| 93 | 93 | |
| 94 | 94 | if ($uploadSuccess) { |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | { |
| 139 | 139 | $this->model = $this->find($brandId); |
| 140 | 140 | |
| 141 | - if($this->model) { |
|
| 141 | + if ($this->model) { |
|
| 142 | 142 | $attributes['modified_by_user_id'] = auth('hideyobackend')->user()->id; |
| 143 | 143 | $image = $this->findImage($imageId); |
| 144 | 144 | $image->fill($attributes); |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | { |
| 201 | 201 | $result = $this->repo->getModelImage()->get(); |
| 202 | 202 | $shop = ShopService::find($shopId); |
| 203 | - if($result AND $shop->thumbnail_square_sizes) { |
|
| 203 | + if ($result AND $shop->thumbnail_square_sizes) { |
|
| 204 | 204 | foreach ($result as $productImage) { |
| 205 | 205 | if ($shop->thumbnail_square_sizes) { |
| 206 | 206 | $sizes = explode(',', $shop->thumbnail_square_sizes); |
@@ -10,13 +10,13 @@ |
||
| 10 | 10 | |
| 11 | 11 | class ProductAmountSeriesService extends BaseService |
| 12 | 12 | { |
| 13 | - public function __construct(ProductAmountSeriesRepository $productAmountSeries) |
|
| 14 | - { |
|
| 15 | - $this->repo = $productAmountSeries; |
|
| 16 | - } |
|
| 13 | + public function __construct(ProductAmountSeriesRepository $productAmountSeries) |
|
| 14 | + { |
|
| 15 | + $this->repo = $productAmountSeries; |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | 18 | |
| 19 | - /** |
|
| 19 | + /** |
|
| 20 | 20 | * The validation rules for the model. |
| 21 | 21 | * |
| 22 | 22 | * @param integer $id id attribute model |