hideyo / ecommerce-framework

src/Services/Cart/Helpers/Helpers.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
      */
     public static function isMultiArray($array, $recursive = false)
     {
-        if( $recursive )
+        if ($recursive)
         {
             return (count($array) == count($array, COUNT_RECURSIVE)) ? false : true;
         }
@@ -55,7 +55,7 @@ 
      */
     public static function issetAndHasValueOrAssignDefault(&$var, $default = false)
     {
-        if( (isset($var)) && ($var!='') ) return $var;
+        if ((isset($var)) && ($var != '')) return $var;
 
         return $default;
     }
@@ -63,7 +63,7 @@ 
     public static function formatValue($value, $format_numbers, $config)
     {
        
-        if($format_numbers && $config['format_numbers']) {
+        if ($format_numbers && $config['format_numbers']) {
 
 
             return number_format($value, $config['decimals'], $config['dec_point'], $config['thousands_sep']);

Braces +5 added lines, -5 removed lines

@@ -28,16 +28,14 @@ 
         if( $recursive )
         {
             return (count($array) == count($array, COUNT_RECURSIVE)) ? false : true;
-        }
-        else
+        } else
         {
             foreach ($array as $k => $v)
             {
                 if (is_array($v))
                 {
                     return true;
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -55,7 +53,9 @@ 
      */
     public static function issetAndHasValueOrAssignDefault(&$var, $default = false)
     {
-        if( (isset($var)) && ($var!='') ) return $var;
+        if( (isset($var)) && ($var!='') ) {
+            return $var;
+        }
 
         return $default;
     }

src/Services/Cart/CartCondition.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
     {
         $this->args = $args;
 
-        if( Helpers::isMultiArray($args) )
+        if (Helpers::isMultiArray($args))
         {
             Throw new InvalidConditionException('Multi dimensional array is not supported.');
         }
@@ -127,7 +127,7 @@ 
      */
     public function applyConditionWithoutTax($totalOrSubTotalOrPrice)
     {
-        if(isset($this->getAttributes()['data']['value_ex_tax']) AND $this->args['value']) {
+        if (isset($this->getAttributes()['data']['value_ex_tax']) AND $this->args['value']) {
             return $this->apply($totalOrSubTotalOrPrice, $this->getAttributes()['data']['value_ex_tax']);            
         }
 
@@ -173,19 +173,19 @@ 
         // has a minus or plus sign so we can decide what to do with the
         // percentage, whether to add or subtract it to the total/subtotal/price
         // if we can't find any plus/minus sign, we will assume it as plus sign
-        if( $this->valueIsPercentage($conditionValue) )
+        if ($this->valueIsPercentage($conditionValue))
         {
-            if( $this->valueIsToBeSubtracted($conditionValue) )
+            if ($this->valueIsToBeSubtracted($conditionValue))
             {
-                $value = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $value = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
             }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            else if ($this->valueIsToBeAdded($conditionValue))
             {
-                $value = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $value = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
@@ -205,15 +205,15 @@ 
         // next is we will check if it has a minus/plus sign so then we can just deduct it to total/subtotal/price
         else
         {
-            if( $this->valueIsToBeSubtracted($conditionValue) )
+            if ($this->valueIsToBeSubtracted($conditionValue))
             {
-                $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $this->parsedRawValue = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
             }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            else if ($this->valueIsToBeAdded($conditionValue))
             {
-                $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $this->parsedRawValue = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $result = floatval($totalOrSubTotalOrPrice + $this->parsedRawValue);
             }
@@ -270,7 +270,7 @@ 
      */
     protected function cleanValue($value)
     {
-        return str_replace(array('%','-','+'),'',$value);
+        return str_replace(array('%', '-', '+'), '', $value);
     }
 
     /**

Braces +5 added lines, -10 removed lines

@@ -29,8 +29,7 @@ 
         if( Helpers::isMultiArray($args) )
         {
             Throw new InvalidConditionException('Multi dimensional array is not supported.');
-        }
-        else
+        } else
         {
             $this->validate($this->args);
         }
@@ -182,16 +181,14 @@ 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
-            }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            } else if ( $this->valueIsToBeAdded($conditionValue) )
             {
                 $value = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
                 $result = floatval($totalOrSubTotalOrPrice + $this->parsedRawValue);
-            }
-            else
+            } else
             {
                 $value = Helpers::normalizePrice($conditionValue);
 
@@ -210,14 +207,12 @@ 
                 $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
-            }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            } else if ( $this->valueIsToBeAdded($conditionValue) )
             {
                 $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
 
                 $result = floatval($totalOrSubTotalOrPrice + $this->parsedRawValue);
-            }
-            else
+            } else
             {
                 $this->parsedRawValue = Helpers::normalizePrice($conditionValue);
 

src/Services/Cart/ItemCollection.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     protected $config;
 
-   /**
+    /**
      * ItemCollection constructor.
      * @param array|mixed $items
      */

Spacing +17 added lines, -17 removed lines

@@ -68,15 +68,15 @@ 
         $newPrice = 0.00;
         $processed = 0;
 
-        if( $this->hasConditions() )
+        if ($this->hasConditions())
         {
-            if( is_array($this->conditions) )
+            if (is_array($this->conditions))
             {
-                foreach($this->conditions as $condition)
+                foreach ($this->conditions as $condition)
                 {
-                    if( $condition->getTarget() === 'item' )
+                    if ($condition->getTarget() === 'item')
                     {
-                        ( $processed > 0 ) ? $toBeCalculated = $newPrice : $toBeCalculated = $originalPrice;
+                        ($processed > 0) ? $toBeCalculated = $newPrice : $toBeCalculated = $originalPrice;
                         $newPrice = $condition->applyCondition($toBeCalculated);
                         $processed++;
                     }
@@ -84,7 +84,7 @@ 
             }
             else
             {
-                if( $this['conditions']->getTarget() === 'item' )
+                if ($this['conditions']->getTarget() === 'item')
                 {
                     $newPrice = $this['conditions']->applyCondition($originalPrice);
                 }
@@ -107,15 +107,15 @@ 
         $newPrice = 0.00;
         $processed = 0;
 
-        if( $this->hasConditions() )
+        if ($this->hasConditions())
         {
-            if( is_array($this->conditions) )
+            if (is_array($this->conditions))
             {
-                foreach($this->conditions as $condition)
+                foreach ($this->conditions as $condition)
                 {
-                    if( $condition->getTarget() === 'item' )
+                    if ($condition->getTarget() === 'item')
                     {
-                        ( $processed > 0 ) ? $toBeCalculated = $newPrice : $toBeCalculated = $originalPrice;
+                        ($processed > 0) ? $toBeCalculated = $newPrice : $toBeCalculated = $originalPrice;
                         $newPrice = $condition->applyCondition($toBeCalculated);
                         $processed++;
                     }
@@ -123,7 +123,7 @@ 
             }
             else
             {
-                if( $this['conditions']->getTarget() === 'item' )
+                if ($this['conditions']->getTarget() === 'item')
                 {
                     $newPrice = $this['conditions']->applyCondition($originalPrice);
                 }
@@ -159,7 +159,7 @@ 
 
     public function __get($name)
     {
-        if( $this->has($name) ) return $this->get($name);
+        if ($this->has($name)) return $this->get($name);
         return null;
     }
 
@@ -170,13 +170,13 @@ 
      */
     public function hasConditions()
     {
-        if( ! isset($this['conditions']) ) return false;
-        if( is_array($this['conditions']) )
+        if (!isset($this['conditions'])) return false;
+        if (is_array($this['conditions']))
         {
             return count($this['conditions']) > 0;
         }
         $conditionInstance = "Hideyo\\Services\\Cart\\CartCondition";
-        if( $this['conditions'] instanceof $conditionInstance ) return true;
+        if ($this['conditions'] instanceof $conditionInstance) return true;
         return false;
     }
     
@@ -187,7 +187,7 @@ 
      */
     public function getConditions()
     {
-        if(! $this->hasConditions() ) return [];
+        if (!$this->hasConditions()) return [];
         return $this['conditions'];
     }
 }
\ No newline at end of file

Braces +14 added lines, -8 removed lines

@@ -81,8 +81,7 @@ 
                         $processed++;
                     }
                 }
-            }
-            else
+            } else
             {
                 if( $this['conditions']->getTarget() === 'item' )
                 {
@@ -120,8 +119,7 @@ 
                         $processed++;
                     }
                 }
-            }
-            else
+            } else
             {
                 if( $this['conditions']->getTarget() === 'item' )
                 {
@@ -159,7 +157,9 @@ 
 
     public function __get($name)
     {
-        if( $this->has($name) ) return $this->get($name);
+        if( $this->has($name) ) {
+            return $this->get($name);
+        }
         return null;
     }
 
@@ -170,13 +170,17 @@ 
      */
     public function hasConditions()
     {
-        if( ! isset($this['conditions']) ) return false;
+        if( ! isset($this['conditions']) ) {
+            return false;
+        }
         if( is_array($this['conditions']) )
         {
             return count($this['conditions']) > 0;
         }
         $conditionInstance = "Hideyo\\Services\\Cart\\CartCondition";
-        if( $this['conditions'] instanceof $conditionInstance ) return true;
+        if( $this['conditions'] instanceof $conditionInstance ) {
+            return true;
+        }
         return false;
     }
     
@@ -187,7 +191,9 @@ 
      */
     public function getConditions()
     {
-        if(! $this->hasConditions() ) return [];
+        if(! $this->hasConditions() ) {
+            return [];
+        }
         return $this['conditions'];
     }
 }
\ No newline at end of file

src/Services/News/NewsService.php

Indentation +8 added lines, -8 removed lines

@@ -9,24 +9,24 @@ 
  
 class NewsService extends BaseService
 {
-	public function __construct(NewsRepository $news)
-	{
-		$this->repo = $news;
-	} 
+    public function __construct(NewsRepository $news)
+    {
+        $this->repo = $news;
+    } 
 
     public function selectByLimitAndOrderBy($shopId, $limit, $orderBy)
     {
-    	return $this->repo->selectByLimitAndOrderBy($shopId, $limit, $orderBy);
+        return $this->repo->selectByLimitAndOrderBy($shopId, $limit, $orderBy);
     }
 
     public function selectOneBySlug($shopId, $slug)
     {
-    	return $this->repo->selectOneBySlug($shopId, $slug);
+        return $this->repo->selectOneBySlug($shopId, $slug);
     }
 
     public function selectAllActiveGroupsByShopId($shopId)
     {
-    	return $this->repo->selectAllActiveGroupsByShopId($shopId);
+        return $this->repo->selectAllActiveGroupsByShopId($shopId);
     }
 
     public function findGroup($groupId)
@@ -51,7 +51,7 @@ 
 
     public function selectAllGroups()
     {
-       return $this->repo->selectAllGroups();
+        return $this->repo->selectAllGroups();
     }
 
 

src/Services/News/Entity/NewsImage.php

Spacing +1 added lines, -1 removed lines

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

src/Services/ExtraField/ExtraFieldService.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         );
         
         if ($extraFieldId) {
-            $rules['title'] =   'required|between:4,65|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$extraFieldId.' = id';
+            $rules['title'] = 'required|between:4,65|unique_with:'.$this->repo->getModel()->getTable().', shop_id, '.$extraFieldId.' = id';
         }
 
         return $rules;

Indentation +4 added lines, -4 removed lines

@@ -8,10 +8,10 @@
  
 class ExtraFieldService extends BaseService
 {
-	public function __construct(ExtraFieldRepository $extraField)
-	{
-		$this->repo = $extraField;
-	}
+    public function __construct(ExtraFieldRepository $extraField)
+    {
+        $this->repo = $extraField;
+    }
 
     private function rulesValue($defaultValueId = false)
     {

src/Services/SendingMethod/SendingMethodService.php

Indentation +8 added lines, -8 removed lines

@@ -8,10 +8,10 @@ 
  
 class SendingMethodService extends BaseService
 {
-	public function __construct(SendingMethodRepository $sendingMethod)
-	{
-		$this->repo = $sendingMethod;
-	} 
+    public function __construct(SendingMethodRepository $sendingMethod)
+    {
+        $this->repo = $sendingMethod;
+    } 
 
     /**
      * The validation rules for the model.
@@ -125,14 +125,14 @@ 
         return $model;
     }
 
-	public function selectAllActiveByShopId($shopId)
+    public function selectAllActiveByShopId($shopId)
     {
-    	return $this->repo->selectAllActiveByShopId($shopId);
+        return $this->repo->selectAllActiveByShopId($shopId);
     }
 
-	public function selectOneByShopIdAndId($shopId, $sendingMethodId)
+    public function selectOneByShopIdAndId($shopId, $sendingMethodId)
     {
-    	$result = $this->repo->selectOneByShopIdAndId($shopId, $sendingMethodId);
+        $result = $this->repo->selectOneByShopIdAndId($shopId, $sendingMethodId);
 
         if ($result->isEmpty()) {
             return false;

Spacing +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@ 
             'maximal_weight'    => 'numeric|nullable'
         );
         
-        if($sendingMethodId) {
-            $rules['title'] =   $rules['title'].','.$sendingMethodId.' = id';
+        if ($sendingMethodId) {
+            $rules['title'] = $rules['title'].','.$sendingMethodId.' = id';
         }
 
         return $rules;
@@ -44,8 +44,8 @@ 
             'name' => 'required|between:4,65|unique_with:sending_method_country_price, sending_method_id'
         );
         
-        if($id) {
-            $rules['name'] =   'required|between:4,65|unique_with:sending_method_country_price, sending_method_id, '.$id.' = id';
+        if ($id) {
+            $rules['name'] = 'required|between:4,65|unique_with:sending_method_country_price, sending_method_id, '.$id.' = id';
         }
 
         return $rules;

src/Services/Brand/Entity/BrandImage.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
      */
     protected $table = 'brand_image';
 
-    protected $guarded =  array('file');
+    protected $guarded = array('file');
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['brand_id', 'file', 'extension', 'size', 'path', 'rank', 'tag', 'modified_by_user_id',];
+    protected $fillable = ['brand_id', 'file', 'extension', 'size', 'path', 'rank', 'tag', 'modified_by_user_id', ];
 }
\ No newline at end of file

src/Services/Brand/Entity/Brand.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     protected $scoped = array('shop_id');
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['active',  'title', 'short_description', 'description', 'rank', 'meta_title', 'meta_description', 'meta_keywords', 'shop_id', 'modified_by_user_id'];
+    protected $fillable = ['active', 'title', 'short_description', 'description', 'rank', 'meta_title', 'meta_description', 'meta_keywords', 'shop_id', 'modified_by_user_id'];
 
     public function sluggable()
     {