hideyo / ecommerce-framework

src/Services/Product/Entity/Product.php

Indentation +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
             if ($this->discount_value) {
                 if ($this->discount_type == 'amount') {
                     $discountPriceInc = $priceInc - $this->discount_value;
-                     $discountPriceEx = $discountPriceInc / 1.21;
+                        $discountPriceEx = $discountPriceInc / 1.21;
                 } elseif ($this->discount_type == 'percent') {
                     $tax = ($this->discount_value / 100) * $priceInc;
                     $discountPriceInc = $priceInc - $tax;

Spacing +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 
     public function relatedProductsActive()
     {
-        return $this->belongsToMany('Hideyo\Ecommerce\Framework\Services\Product\Entity\Product', 'product_related_product', 'product_id', 'related_product_id')->whereHas('productCategory', function ($query) {
+        return $this->belongsToMany('Hideyo\Ecommerce\Framework\Services\Product\Entity\Product', 'product_related_product', 'product_id', 'related_product_id')->whereHas('productCategory', function($query) {
             $query->where('active', '=', '1');
         })->where('product.active', '=', '1');
     }

src/Services/Product/Entity/ProductRepository.php

Indentation +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 
     function selectAllByShopId($shopId)
     {
-         return $this->model->where('shop_id', '=', $shopId)->get();
+            return $this->model->where('shop_id', '=', $shopId)->get();
     }
     
     public function selectAllExport()
@@ -117,8 +117,8 @@ 
 
     public function selectOneByShopIdAndId($shopId, $productId = false, $attributeId = false)
     {
-           return $this->model->with(
-               array(
+            return $this->model->with(
+                array(
                 'attributeGroup',
                 'attributes' => function ($query) {
                     $query->with(
@@ -167,7 +167,7 @@ 
                     )->with(array('relatedProductAttributes',
                     'relatedAttributes'));
                 })
-           )->where('shop_id', '=', $shopId)->where('active', '=', 1)->whereNotNull('product_category_id')->where('id', '=', $productId)->get()->first();
+            )->where('shop_id', '=', $shopId)->where('active', '=', 1)->whereNotNull('product_category_id')->where('id', '=', $productId)->get()->first();
     }
 
     public function ajaxProductImages($product, $combinationsIds, $productAttributeId = false) 

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/ProductAmountSeries.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     protected $table = 'product_amount_series';
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['active', 'product_id',  'series_value', 'series_start', 'series_max', 'modified_by_user_id'];
+    protected $fillable = ['active', 'product_id', 'series_value', 'series_start', 'series_max', 'modified_by_user_id'];
 
     public function product()
     {

src/Services/Product/Entity/ProductRelatedProductRepository.php

Indentation +1 added lines, -1 removed lines

@@ -19,6 +19,6 @@
   
     function selectAllByProductId($productId)
     {
-         return $this->model->where('product_id', '=', $productId)->get();
+            return $this->model->where('product_id', '=', $productId)->get();
     }   
 }
\ No newline at end of file

src/Services/Product/Entity/ProductAmountOptionRepository.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
         );
         
         if ($AmountOptionId) {
-            $rules['amount'] =   'required';
+            $rules['amount'] = 'required';
         }
 
         return $rules;
@@ -82,7 +82,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();
         

src/Services/Product/Entity/ProductCombinationRepository.php

Indentation +7 added lines, -7 removed lines

@@ -39,12 +39,12 @@ 
 
     function selectOneByShopIdAndSlug($shopId, $slug)
     {
-           return $this->model->with(array('productCategory', 'productImages'))->get()->first();
+            return $this->model->with(array('productCategory', 'productImages'))->get()->first();
     }
 
     function selectOneByShopIdAndId($shopId, $productAttributeId)
     {
-           return $this->model->with(array('productCategory', 'productImages'))->where('id', '=', $productAttributeId)->get()->first();
+            return $this->model->with(array('productCategory', 'productImages'))->where('id', '=', $productAttributeId)->get()->first();
     }
     
 
@@ -67,16 +67,16 @@ 
 
     public function selectAllByProductCategoryId($productCategoryId, $shopId)
     {
-         return $this->model->
-         whereHas('product', function ($query) use ($productCategoryId, $shopId) {
+            return $this->model->
+            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) {
+            })->with(array('combinations' => function ($q) {
             $q->with(array('attribute' => function ($q) {
                 $q->with(array('attributeGroup'));
             }));
-         }))->get();
+            }))->get();
     }
 
     public function increaseAmounts($products)
@@ -114,7 +114,7 @@ 
     }
 
     function getProductAttribute($product, $productAttributeId, $secondAttributeId = false) {   
-       $productAttribute = $this->model->where('product_id', '=', $product->id)
+        $productAttribute = $this->model->where('product_id', '=', $product->id)
         ->whereHas('combinations', function ($query) use ($productAttributeId, $secondAttributeId) {
             if ($productAttributeId) {
                 $query->where('attribute_id', '=', $productAttributeId);

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/ProductAmountOption.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     protected $table = 'product_amount_option';
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['product_id',  'amount', 'discount_type', 'discount_value', 'discount_start_date', 'discount_end_date', 'modified_by_user_id'];
+    protected $fillable = ['product_id', 'amount', 'discount_type', 'discount_value', 'discount_start_date', 'discount_end_date', 'modified_by_user_id'];
 
 
 

src/Services/Product/Entity/ProductImage.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     protected $table = 'product_image';
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['product_id', 'product_variation_id', 'file', 'extension', 'size', 'path', 'rank', 'tag', 'shop_id', 'modified_by_user_id',];
+    protected $fillable = ['product_id', 'product_variation_id', 'file', 'extension', 'size', 'path', 'rank', 'tag', 'shop_id', 'modified_by_user_id', ];
 
     public function product()
     {

src/Services/BaseService.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
         if (isset($result->id)) {
             Notification::success($successMsg);
-            if(is_array($routeName)) {
+            if (is_array($routeName)) {
                 return redirect()->route($routeName[0], $routeName[1]);
             }
             return redirect()->route($routeName);