@@ -17,13 +17,13 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | public function boot() |
| 19 | 19 | { |
| 20 | - $this->publishes([ |
|
| 21 | - __DIR__.'/../database/migrations/' => database_path('migrations') |
|
| 22 | - ], 'migrations'); |
|
| 20 | + $this->publishes([ |
|
| 21 | + __DIR__.'/../database/migrations/' => database_path('migrations') |
|
| 22 | + ], 'migrations'); |
|
| 23 | 23 | |
| 24 | - $this->publishes([ |
|
| 25 | - __DIR__.'/../database/seeds/' => database_path('seeds') |
|
| 26 | - ], 'seeds'); |
|
| 24 | + $this->publishes([ |
|
| 25 | + __DIR__.'/../database/seeds/' => database_path('seeds') |
|
| 26 | + ], 'seeds'); |
|
| 27 | 27 | |
| 28 | 28 | } |
| 29 | 29 | |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | $html = array(); |
| 58 | 58 | if (is_array($selected)) { |
| 59 | 59 | foreach ($selected as $key => $value) { |
| 60 | - $selected[$value] = $value; |
|
| 60 | + $selected[$value] = $value; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | $sendingMethod->save(); |
| 25 | 25 | |
| 26 | 26 | $sendingMethod2 = new SendingMethod; |
| 27 | - $sendingMethod2->active = 1; |
|
| 27 | + $sendingMethod2->active = 1; |
|
| 28 | 28 | $sendingMethod2->title = 'Netherlands'; |
| 29 | 29 | $sendingMethod2->tax_rate_id = $taxRate->id; |
| 30 | 30 | $sendingMethod2->price = '30'; |
@@ -14,31 +14,31 @@ |
||
| 14 | 14 | DB::table($productRelatedProduct->getTable())->delete(); |
| 15 | 15 | |
| 16 | 16 | for ($x = 1; $x <= 10; $x++) { |
| 17 | - $productRelatedProduct = new ProductRelatedProduct; |
|
| 18 | - $productRelatedProduct->product_id = $x; |
|
| 19 | - $productRelatedProduct->related_product_id = $x + 1; |
|
| 20 | - $productRelatedProduct->save(); |
|
| 21 | - } |
|
| 17 | + $productRelatedProduct = new ProductRelatedProduct; |
|
| 18 | + $productRelatedProduct->product_id = $x; |
|
| 19 | + $productRelatedProduct->related_product_id = $x + 1; |
|
| 20 | + $productRelatedProduct->save(); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | 23 | for ($x = 2; $x <= 10; $x++) { |
| 24 | - $productRelatedProduct = new ProductRelatedProduct; |
|
| 25 | - $productRelatedProduct->product_id = $x; |
|
| 26 | - $productRelatedProduct->related_product_id = $x + 1; |
|
| 27 | - $productRelatedProduct->save(); |
|
| 28 | - } |
|
| 24 | + $productRelatedProduct = new ProductRelatedProduct; |
|
| 25 | + $productRelatedProduct->product_id = $x; |
|
| 26 | + $productRelatedProduct->related_product_id = $x + 1; |
|
| 27 | + $productRelatedProduct->save(); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | 30 | for ($x = 3; $x <= 10; $x++) { |
| 31 | - $productRelatedProduct = new ProductRelatedProduct; |
|
| 32 | - $productRelatedProduct->product_id = $x; |
|
| 33 | - $productRelatedProduct->related_product_id = $x + 1; |
|
| 34 | - $productRelatedProduct->save(); |
|
| 35 | - } |
|
| 31 | + $productRelatedProduct = new ProductRelatedProduct; |
|
| 32 | + $productRelatedProduct->product_id = $x; |
|
| 33 | + $productRelatedProduct->related_product_id = $x + 1; |
|
| 34 | + $productRelatedProduct->save(); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | 37 | for ($x = 4; $x <= 10; $x++) { |
| 38 | - $productRelatedProduct = new ProductRelatedProduct; |
|
| 39 | - $productRelatedProduct->product_id = $x; |
|
| 40 | - $productRelatedProduct->related_product_id = $x + 1; |
|
| 41 | - $productRelatedProduct->save(); |
|
| 42 | - } |
|
| 38 | + $productRelatedProduct = new ProductRelatedProduct; |
|
| 39 | + $productRelatedProduct->product_id = $x; |
|
| 40 | + $productRelatedProduct->related_product_id = $x + 1; |
|
| 41 | + $productRelatedProduct->save(); |
|
| 42 | + } |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -34,6 +34,6 @@ |
||
| 34 | 34 | */ |
| 35 | 35 | public function down() |
| 36 | 36 | { |
| 37 | - // |
|
| 37 | + // |
|
| 38 | 38 | } |
| 39 | 39 | } |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | class HtmlBlockService extends BaseService |
| 13 | 13 | { |
| 14 | - public function __construct(HtmlBlockRepository $htmlBlock) |
|
| 15 | - { |
|
| 16 | - $this->repo = $htmlBlock; |
|
| 14 | + public function __construct(HtmlBlockRepository $htmlBlock) |
|
| 15 | + { |
|
| 16 | + $this->repo = $htmlBlock; |
|
| 17 | 17 | $this->storageImagePath = storage_path() .config('hideyo.storage_path'). "/html_block/"; |
| 18 | 18 | $this->publicImagePath = public_path() .config('hideyo.public_path'). "/html_block/"; |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - /** |
|
| 21 | + /** |
|
| 22 | 22 | * The validation rules for the model. |
| 23 | 23 | * |
| 24 | 24 | * @param integer $htmlBlockId id attribute model |
@@ -250,17 +250,17 @@ discard block |
||
| 250 | 250 | |
| 251 | 251 | public function selectByLimitAndOrderBy($shopId, $limit, $orderBy) |
| 252 | 252 | { |
| 253 | - return $this->repo->selectByLimitAndOrderBy($shopId, $limit, $orderBy); |
|
| 253 | + return $this->repo->selectByLimitAndOrderBy($shopId, $limit, $orderBy); |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | public function selectOneBySlug($shopId, $slug) |
| 257 | 257 | { |
| 258 | - return $this->repo->selectOneBySlug($shopId, $slug); |
|
| 258 | + return $this->repo->selectOneBySlug($shopId, $slug); |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | public function selectAllActiveGroupsByShopId($shopId) |
| 262 | 262 | { |
| 263 | - return $this->repo->selectAllActiveGroupsByShopId($shopId); |
|
| 263 | + return $this->repo->selectAllActiveGroupsByShopId($shopId); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | public function selectOneByShopIdAndPosition($position, $shopId) { |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | function selectAllActiveByShopId($shopId) |
| 22 | 22 | { |
| 23 | - return $this->model->where('shop_id', '=', $shopId)->get(); |
|
| 23 | + return $this->model->where('shop_id', '=', $shopId)->get(); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | function selectOneByShopIdAndSlug($shopId, $slug) |
@@ -9,10 +9,10 @@ |
||
| 9 | 9 | |
| 10 | 10 | class ContentService extends BaseService |
| 11 | 11 | { |
| 12 | - public function __construct(ContentRepository $taxRate) |
|
| 13 | - { |
|
| 14 | - $this->repo = $taxRate; |
|
| 15 | - } |
|
| 12 | + public function __construct(ContentRepository $taxRate) |
|
| 13 | + { |
|
| 14 | + $this->repo = $taxRate; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * The validation rules for the model. |
@@ -9,14 +9,14 @@ |
||
| 9 | 9 | |
| 10 | 10 | class PaymentMethodService extends BaseService |
| 11 | 11 | { |
| 12 | - public function __construct(PaymentMethodRepository $paymentMethod) |
|
| 13 | - { |
|
| 14 | - $this->repo = $paymentMethod; |
|
| 15 | - } |
|
| 12 | + public function __construct(PaymentMethodRepository $paymentMethod) |
|
| 13 | + { |
|
| 14 | + $this->repo = $paymentMethod; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | 17 | public function selectOneByShopIdAndId($shopId, $paymentMethodId) |
| 18 | 18 | { |
| 19 | - $result = $this->repo->selectOneByShopIdAndId($shopId, $paymentMethodId); |
|
| 19 | + $result = $this->repo->selectOneByShopIdAndId($shopId, $paymentMethodId); |
|
| 20 | 20 | |
| 21 | 21 | if ($result->isEmpty()) { |
| 22 | 22 | return false; |