hideyo / ecommerce-framework

src/Services/SendingMethod/Entity/SendingMethodRepository.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function selectOneByShopIdAndId($shopId, $sendingMethodId)
     {
         return $this->model->with(
-            array('relatedPaymentMethods' => function ($query) {
+            array('relatedPaymentMethods' => function($query) {
                 $query->where('active', 1);
             })
         )->where('shop_id', $shopId)->where('active', 1)

src/Services/Order/Entity/OrderStatusEmailTemplateRepository.php

Spacing +3 added lines, -3 removed lines

@@ -20,10 +20,10 @@
 
     public function selectBySendingMethodIdAndPaymentMethodId($paymentMethodId, $sendingMethodId)
     {
-        $result = $this->model->with(array('sendingPaymentMethodRelated' => function ($query) use ($paymentMethodId, $sendingMethodId) {
-            $query->with(array('sendingMethod' => function ($query) use ($sendingMethodId) {
+        $result = $this->model->with(array('sendingPaymentMethodRelated' => function($query) use ($paymentMethodId, $sendingMethodId) {
+            $query->with(array('sendingMethod' => function($query) use ($sendingMethodId) {
                 $query->where('id', $sendingMethodId);
-            }, 'paymentMethod' => function ($query) use ($paymentMethodId) {
+            }, 'paymentMethod' => function($query) use ($paymentMethodId) {
                 $query->where('id', $paymentMethodId);
             }));
         } ))

src/Services/Order/Entity/OrderRepository.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 
     public function orderProductsByClientId($clientId, $shopId)
     {
-        return $this->modelOrderProduct->with(array('product'))->whereHas('Order', function ($query) use ($clientId, $shopId) {
+        return $this->modelOrderProduct->with(array('product'))->whereHas('Order', function($query) use ($clientId, $shopId) {
             $query->where('client_id', '=', $clientId)->where('shop_id', $shopId);
         });
     }

src/Services/ProductCategory/Entity/ProductCategoryRepository.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
     {
         $result = $this->model->where('id', '=', $parentId)->first()->children()
         ->with(
-            array('productCategoryImages' => function ($query) use ($imageTag) {
+            array('productCategoryImages' => function($query) use ($imageTag) {
                 if ($imageTag) {
                     $query->where('tag', '=', $imageTag);
                 }
@@ -80,7 +80,7 @@ 
     {
         $result = $this->model
         ->with(
-            array('productCategoryImages' => function ($query) use ($imageTag) {
+            array('productCategoryImages' => function($query) use ($imageTag) {
                 if ($imageTag) {
                     $query->where('tag', '=', $imageTag);
                 }
@@ -119,14 +119,14 @@ 
         $result = $this->model->
         with(
             array(
-                'products' => function ($query) {
+                'products' => function($query) {
                     $query->where('active', 1)->with(
-                        array('productImages' => function ($query) {
+                        array('productImages' => function($query) {
                             $query->orderBy('rank', 'asc');
                         })
                     );
                 },
-                'productCategoryImages' => function ($query) use ($imageTag) {
+                'productCategoryImages' => function($query) use ($imageTag) {
                     if ($imageTag) {
                         $query->where('tag', '=', $imageTag);
                     } $query->orderBy('rank', 'asc');

src/Services/ExtraField/Entity/ExtraFieldRepository.php

Spacing +2 added lines, -2 removed lines

@@ -32,10 +32,10 @@
         return $this->model->select('extra_field.*')
         ->leftJoin('product_category_related_extra_field', 'extra_field.id', '=', 'product_category_related_extra_field.extra_field_id')
         
-        ->where(function ($query) use ($productCategoryId) {
+        ->where(function($query) use ($productCategoryId) {
 
             $query->where('all_products', 1)
-            ->orWhereHas('categories', function ($query) use ($productCategoryId) {
+            ->orWhereHas('categories', function($query) use ($productCategoryId) {
 
                 $query->where('product_category_id', $productCategoryId);
             });

src/Services/Product/Entity/ProductTagGroupRepository.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 
     function selectAllByTagAndShopId($shopId, $tag)
     {
-        $result = $this->model->with(array('relatedProducts' => function ($query) {
-            $query->with(array('productCategory', 'productImages' => function ($query) {
+        $result = $this->model->with(array('relatedProducts' => function($query) {
+            $query->with(array('productCategory', 'productImages' => function($query) {
                 $query->orderBy('rank', 'asc');
             }))->where('active', 1);
         }))->where('shop_id', $shopId)->where('tag', '=', $tag)->get();

src/Services/Product/Entity/ProductRepository.php

Spacing +19 added lines, -19 removed lines

@@ -26,7 +26,7 @@ 
    
     public function selectByLimitAndOrderBy($shopId, $limit, $orderBy)
     {
-        return $this->model->with(array('productCategory', 'relatedProducts', 'productImages' => function ($query) {
+        return $this->model->with(array('productCategory', 'relatedProducts', 'productImages' => function($query) {
             $query->orderBy('rank', 'asc');
         }))->where('shop_id', $shopId)->where('active', 1)->limit($limit)->orderBy('id', $orderBy)->get();
     }
@@ -38,7 +38,7 @@ 
     
     public function selectAllExport()
     {
-        return $this->model->with(array('productImages' => function ($query) {
+        return $this->model->with(array('productImages' => function($query) {
             $query->orderBy('rank', 'asc');
         }))->where('active', 1)->where('shop_id', auth('hideyobackend')->user()->selected_shop_id)->get();
     }
@@ -72,7 +72,7 @@ 
 
     public function selectOneById($productId)
     {
-        $result = $this->model->with(array('productCategory', 'relatedProducts', 'productImages' => function ($query) {
+        $result = $this->model->with(array('productCategory', 'relatedProducts', 'productImages' => function($query) {
             $query->orderBy('rank', 'asc');
         }))->where('active', 1)->where('id', '=', $productId)->get()->first();
         return $result;
@@ -93,19 +93,19 @@ 
     function selectAllByShopIdAndProductCategoryId($shopId, $productCategoryId, $filters = false)
     {
         $result = $this->model
-        ->with(array('subcategories', 'extraFields' => function ($query) {
+        ->with(array('subcategories', 'extraFields' => function($query) {
             $query->with('extraField')->orderBy('id', 'desc');
-        }, 'taxRate', 'productCategory',  'relatedProducts' => function ($query) {
+        }, 'taxRate', 'productCategory', 'relatedProducts' => function($query) {
             $query->with('productImages')->orderBy('rank', 'asc');
-        }, 'productImages' => function ($query) {
+        }, 'productImages' => function($query) {
             $query->orderBy('rank', 'asc');
         }))
         ->where('shop_id', $shopId)
         ->where('active', 1)
                 ->whereNotNull('product.product_category_id')
-        ->where(function ($query) use ($productCategoryId) {
+        ->where(function($query) use ($productCategoryId) {
             $query->where('product_category_id', '=', $productCategoryId);
-            $query->orWhereHas('subcategories', function ($query) use ($productCategoryId) {
+            $query->orWhereHas('subcategories', function($query) use ($productCategoryId) {
                 $query->where('product_category_id', '=', $productCategoryId);
             });
         });
@@ -120,14 +120,14 @@ 
            return $this->model->with(
                array(
                 'attributeGroup',
-                'attributes' => function ($query) {
+                'attributes' => function($query) {
                     $query->with(
                         array(
-                            'combinations' => function ($query) {
+                            'combinations' => function($query) {
                                 $query->with(
                                     array(
                                         'productAttribute',
-                                        'attribute' => function ($query) {
+                                        'attribute' => function($query) {
                                             $query->with(
                                                 array(
                                                     'attributeGroup'
@@ -140,7 +140,7 @@ 
                             )
                     )->orderBy('default_on', 'desc');
                 },
-                'extraFields' => function ($query) {
+                'extraFields' => function($query) {
                     $query->where(
                         'value',
                         '!=',
@@ -151,7 +151,7 @@ 
                         'desc'
                     );
                 },
-                'relatedProducts' => function ($query) {
+                'relatedProducts' => function($query) {
                     $query->with(
                         'productImages',
                         'productCategory'
@@ -160,7 +160,7 @@ 
                         'asc'
                     );
                 },
-                'productImages' => function ($query) {
+                'productImages' => function($query) {
                     $query->orderBy(
                         'rank',
                         'asc'
@@ -174,31 +174,31 @@ 
     {
         $images = array();
 
-        if($product->productImages->count()) {  
+        if ($product->productImages->count()) {  
 
             $images = $product->productImages()->has('relatedAttributes', '=', 0)->has('relatedProductAttributes', '=', 0)->orderBy('rank', '=', 'asc')->get();
 
-            if($combinationsIds) {
+            if ($combinationsIds) {
 
                 $imagesRelatedAttributes = ProductImage::
                 whereHas('relatedAttributes', function($query) use ($combinationsIds, $product) { $query->with(array('productImage'))->whereIn('attribute_id', $combinationsIds); })
                 ->where('product_id', '=', $product->id)
                 ->get();
 
-                if($imagesRelatedAttributes) {
+                if ($imagesRelatedAttributes) {
                     $images = $images->merge($imagesRelatedAttributes)->sortBy('rank');
                 }
                 
             }
 
-            if($productAttributeId) {
+            if ($productAttributeId) {
 
                 $imagesRelatedProductAttributes = ProductImage::
                 whereHas('relatedProductAttributes', function($query) use ($productAttributeId, $product) { $query->where('product_attribute_id', '=', $productAttributeId); })
                 ->where('product_id', '=', $product->id)
                 ->get();
 
-                if($imagesRelatedProductAttributes) {
+                if ($imagesRelatedProductAttributes) {
                     $images = $images->merge($imagesRelatedProductAttributes)->sortBy('rank');
                 }   
 

src/Services/Product/Entity/ProductCombinationRepository.php

Spacing +9 added lines, -9 removed lines

@@ -30,8 +30,8 @@ 
 
     public function selectAllByShopIdAndProductId($shopId, $productId)
     {
-        return $this->model->select('id')->where('product_id', '=', $productId)->with(array('combinations' => function ($query) {
-            $query->with(array('attribute' => function ($query) {
+        return $this->model->select('id')->where('product_id', '=', $productId)->with(array('combinations' => function($query) {
+            $query->with(array('attribute' => function($query) {
                 $query->with(array('attributeGroup'));
             }));
         }))->get();
@@ -68,12 +68,12 @@ 
     public function selectAllByProductCategoryId($productCategoryId, $shopId)
     {
          return $this->model->
-         whereHas('product', function ($query) use ($productCategoryId, $shopId) {
+         whereHas('product', function($query) use ($productCategoryId, $shopId) {
             $query->where('product_category_id', '=', $productCategoryId);
             $query->where('active', 1);
             $query->where('shop_id', $shopId);
-         })->with(array('combinations' => function ($q) {
-            $q->with(array('attribute' => function ($q) {
+         })->with(array('combinations' => function($q) {
+            $q->with(array('attribute' => function($q) {
                 $q->with(array('attributeGroup'));
             }));
          }))->get();
@@ -115,18 +115,18 @@ 
 
     function getProductAttribute($product, $productAttributeId, $secondAttributeId = false) {   
        $productAttribute = $this->model->where('product_id', '=', $product->id)
-        ->whereHas('combinations', function ($query) use ($productAttributeId, $secondAttributeId) {
+        ->whereHas('combinations', function($query) use ($productAttributeId, $secondAttributeId) {
             if ($productAttributeId) {
                 $query->where('attribute_id', '=', $productAttributeId);
             }
         })
-        ->whereHas('combinations', function ($query) use ($secondAttributeId) {
+        ->whereHas('combinations', function($query) use ($secondAttributeId) {
             if ($secondAttributeId) {
                 $query->where('attribute_id', '=', $secondAttributeId);
             }
         })
-        ->with(array('combinations' => function ($query) {
-            $query->with(array('attribute' => function ($query) {
+        ->with(array('combinations' => function($query) {
+            $query->with(array('attribute' => function($query) {
                 $query->with(array('attributeGroup'));
             }));
         }))        

src/Services/Product/Entity/ProductAmountOptionRepository.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
         );
         
         if ($AmountOptionId) {
-            $rules['amount'] =   'required';
+            $rules['amount'] = 'required';
         }
 
         return $rules;
@@ -80,7 +80,7 @@ 
 
     function selectOneByShopIdAndId($shopId, $AmountOptionId)
     {
-        $result = $this->model->with(array('relatedPaymentMethods' => function ($query) {
+        $result = $this->model->with(array('relatedPaymentMethods' => function($query) {
             $query->where('active', 1);
         }))->where('shop_id', $shopId)->where('active', 1)->where('id', '=', $AmountOptionId)->get();