hideyo / ecommerce-framework

src/Services/Cart/ItemAttributeCollection.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
     public function __get($name)
     {
-        if( $this->has($name) ) return $this->get($name);
+        if ($this->has($name)) return $this->get($name);
         return null;
     }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
     public function __get($name)
     {
-        if( $this->has($name) ) return $this->get($name);
+        if( $this->has($name) ) {
+            return $this->get($name);
+        }
         return null;
     }
 }
\ No newline at end of file

src/Services/Cart/Cart.php

Indentation -1 removed lines

@@ -594,7 +594,6 @@
     /**
      * get the cart voucher
      *
-
      */
     public function getVoucher()
     {

Spacing +25 added lines, -25 removed lines

@@ -64,9 +64,9 @@ 
         $this->events = $events;
         $this->session = $session;
         $this->instanceName = $instanceName;
-        $this->sessionKeyCartItems = $session_key . '_cart_items';
-        $this->sessionKeyCartConditions = $session_key . '_cart_conditions';
-        $this->sessionKeyCartVoucher = $session_key . '_voucher';
+        $this->sessionKeyCartItems = $session_key.'_cart_items';
+        $this->sessionKeyCartConditions = $session_key.'_cart_conditions';
+        $this->sessionKeyCartVoucher = $session_key.'_voucher';
         $this->fireEvent('created');
         $this->config = $config;
     }
@@ -151,7 +151,7 @@ 
      */
     public function update($id, $data)
     {
-        if($this->fireEvent('updating', $data) === false) {
+        if ($this->fireEvent('updating', $data) === false) {
             return false;
         }
         $cart = $this->getContent();
@@ -247,7 +247,7 @@ 
      */
     protected function addRow($id, $item)
     {
-        if($this->fireEvent('adding', $item) === false) {
+        if ($this->fireEvent('adding', $item) === false) {
             return false;
         }
         $cart = $this->getContent();
@@ -280,7 +280,7 @@ 
             $condition->setOrder(!is_null($last) ? $last->getOrder() + 1 : 1);
         }
         $conditions->put($condition->getName(), $condition);
-        $conditions = $conditions->sortBy(function ($condition, $key) {
+        $conditions = $conditions->sortBy(function($condition, $key) {
             return $condition->getOrder();
         });
         $this->saveConditions($conditions);
@@ -318,7 +318,7 @@ 
      */
     public function getConditionsByType($type)
     {
-        return $this->getConditions()->filter(function (CartCondition $condition) use ($type) {
+        return $this->getConditions()->filter(function(CartCondition $condition) use ($type) {
             return $condition->getType() == $type;
         });
     }
@@ -333,7 +333,7 @@ 
      */
     public function removeConditionsByType($type)
     {
-        $this->getConditionsByType($type)->each(function ($condition) {
+        $this->getConditionsByType($type)->each(function($condition) {
             $this->removeCartCondition($condition->getName());
         });
     }
@@ -444,7 +444,7 @@ 
     public function getSubTotalWithoutConditions($formatted = true)
     {
         $cart = $this->getContent();
-        $sum = $cart->sum(function ($item) {
+        $sum = $cart->sum(function($item) {
             return $item->getOriginalPriceWithTaxSum();
         });
 
@@ -459,7 +459,7 @@ 
     public function getSubTotalWithTax($formatted = true)
     {
         $cart = $this->getContent();
-        $sum = $cart->sum(function ($item) {
+        $sum = $cart->sum(function($item) {
             return $item->getOriginalPriceWithTaxSum(false);
         });
 
@@ -475,7 +475,7 @@ 
     public function getSubTotalWithoutTax($formatted = true)
     {
         $cart = $this->getContent();
-        $sum = $cart->sum(function ($item) {
+        $sum = $cart->sum(function($item) {
             return $item->getOriginalPriceWithoutTaxSum(false);
         });
 
@@ -495,7 +495,7 @@ 
         $process = 0;
         $conditions = $this
             ->getConditions()
-            ->filter(function ($cond) {
+            ->filter(function($cond) {
                 return $cond->getTarget() === 'subtotal';
             });
         // if no conditions were added, just return the sub total
@@ -503,7 +503,7 @@ 
             return Helpers::formatValue(floatval($subTotal), $formatted, $this->config);
         }
         $conditions
-            ->each(function ($cond) use ($subTotal, &$newTotal, &$process) {
+            ->each(function($cond) use ($subTotal, &$newTotal, &$process) {
                 $toBeCalculated = ($process > 0) ? $newTotal : $subTotal;
                 $newTotal = $cond->applyCondition($toBeCalculated);
                 $process++;
@@ -526,7 +526,7 @@ 
         $process = 0;
         $conditions = $this
             ->getConditions()
-            ->filter(function ($cond) {
+            ->filter(function($cond) {
                 return $cond->getTarget() === 'subtotal';
             });
         // if no conditions were added, just return the sub total
@@ -534,7 +534,7 @@ 
             return $subTotal;
         }
         $conditions
-            ->each(function ($cond) use ($subTotal, &$newTotal, &$process) {
+            ->each(function($cond) use ($subTotal, &$newTotal, &$process) {
                 $toBeCalculated = ($process > 0) ? $newTotal : $subTotal;
                 $newTotal = $cond->applyConditionWithoutTax($toBeCalculated);
                 $process++;
@@ -552,7 +552,7 @@ 
     public function remove($id)
     {
         $cart = $this->getContent();
-        if($this->fireEvent('removing', $id) === false) {
+        if ($this->fireEvent('removing', $id) === false) {
             return false;
         }
         $cart->forget($id);
@@ -599,18 +599,18 @@ 
     public function getVoucher()
     {
         $voucher = $this->session->get($this->sessionKeyCartVoucher);
-        if($voucher){
+        if ($voucher) {
 
         $totalWithTax = self::getTotalWithTax();
         $totalWithoutTax = self::getTotalWithoutTax();
-        $voucher['used_value_with_tax']  = $voucher['value'];
-        $voucher['used_value_without_tax']  = $voucher['value'];
-        if($totalWithTax <= $voucher['value']) {
-            $voucher['used_value_with_tax']  = $voucher['value'] - ($voucher['value'] - $totalWithTax);
+        $voucher['used_value_with_tax'] = $voucher['value'];
+        $voucher['used_value_without_tax'] = $voucher['value'];
+        if ($totalWithTax <= $voucher['value']) {
+            $voucher['used_value_with_tax'] = $voucher['value'] - ($voucher['value'] - $totalWithTax);
         }
 
-        if($totalWithTax <= $voucher['value']) {
-            $voucher['used_value_without_tax']  = $voucher['value'] - ($voucher['value'] - $totalWithoutTax);
+        if ($totalWithTax <= $voucher['value']) {
+            $voucher['used_value_without_tax'] = $voucher['value'] - ($voucher['value'] - $totalWithoutTax);
         }
 
         $this->session->put($this->sessionKeyCartVoucher, $voucher);
@@ -651,7 +651,7 @@ 
      */
     public function clear()
     {
-        if($this->fireEvent('clearing') === false) {
+        if ($this->fireEvent('clearing') === false) {
             return false;
         }
         $this->session->put(
@@ -669,6 +669,6 @@ 
      */
     protected function fireEvent($name, $value = [])
     {
-        return $this->events->fire($this->getInstanceName() . '.' . $name, array_values([$value, $this]));
+        return $this->events->fire($this->getInstanceName().'.'.$name, array_values([$value, $this]));
     }  
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -272,7 +272,9 @@
             }
             return $this;
         }
-        if (!$condition instanceof CartCondition) throw new InvalidConditionException('Argument 1 must be an instance of \'Darryldecode\Cart\CartCondition\'');
+        if (!$condition instanceof CartCondition) {
+            throw new InvalidConditionException('Argument 1 must be an instance of \'Darryldecode\Cart\CartCondition\'');
+        }
         $conditions = $this->getConditions();
         // Check if order has been applied
         if ($condition->getOrder() == 0) {

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/Cart/Entity/CartRepository.php

Indentation +5 added lines, -5 removed lines

@@ -75,10 +75,10 @@ 
                 }
 
                 Cart::update($productId, array(
-                  'quantity' => array(
-                      'relative' => false,
-                      'value' => $amount
-                  ),
+                    'quantity' => array(
+                        'relative' => false,
+                        'value' => $amount
+                    ),
                 ));
             } else {
                 Cart::remove($productId);
@@ -144,7 +144,7 @@ 
 
                     if ($preSaleDiscount['discount_way'] == 'amount') {
                         $discountValue = "-".$preSaleDiscount->value;
-                      } elseif ($preSaleDiscount['discount_way'] == 'percent') {          
+                        } elseif ($preSaleDiscount['discount_way'] == 'percent') {          
                         $discountValue = "-".$preSaleDiscount['value']."%";                    
                     }                     
                 }

Spacing +38 added lines, -38 removed lines

@@ -48,7 +48,7 @@ 
                     $productArray['reference_code'] = $productCombination->reference_code;
                 }
 
-                $productArray['product_images'] =     ProductService::ajaxProductImages($product, array($leadingAttributeId), $productAttributeId);
+                $productArray['product_images'] = ProductService::ajaxProductImages($product, array($leadingAttributeId), $productAttributeId);
             }
 
             if ($product->amountSeries()->where('active', '=', '1')->count()) {
@@ -56,9 +56,9 @@ 
                 $productArray['product_amount_series_range'] = $product->amountSeries()->where('active', '=', '1')->first()->range();
             }
 
-            if($productArray['price_details']['amount'] > 0) {
+            if ($productArray['price_details']['amount'] > 0) {
 
-                if($amount >= $productArray['price_details']['amount']) {
+                if ($amount >= $productArray['price_details']['amount']) {
                     $amount = $productArray['price_details']['amount'];
                 }
 
@@ -72,7 +72,7 @@ 
                 Cart::remove($productId);
             }
 
-            if(Cart::getConditionsByType('sending_method_country_price')->count()) {
+            if (Cart::getConditionsByType('sending_method_country_price')->count()) {
                 $this->updateSendingMethodCountryPrice(Cart::getConditionsByType('sending_method_country_price')->first()->getAttributes()['data']['sending_method_country_price_id']);  
             }
         }
@@ -112,7 +112,7 @@ 
                     $productArray['reference_code'] = $productCombination->reference_code;
                 }
 
-                $productArray['product_images'] =     ProductService::ajaxProductImages($product, array($leadingAttributeId, $productAttributeId));
+                $productArray['product_images'] = ProductService::ajaxProductImages($product, array($leadingAttributeId, $productAttributeId));
             }
 
             $productId = $productArray['id'];
@@ -123,7 +123,7 @@ 
 
             $discountValue = false;
 
-            if(session()->get('preSaleDiscount')) {
+            if (session()->get('preSaleDiscount')) {
                 $preSaleDiscount = session()->get('preSaleDiscount');             
 
 
@@ -137,7 +137,7 @@ 
                     }                     
                 }
 
-                if($preSaleDiscount['products']) {
+                if ($preSaleDiscount['products']) {
 
                     $productIds = array_column($preSaleDiscount['products'], 'id');
 
@@ -163,7 +163,7 @@ 
             }
 
             $discountCondition = array();
-            if($discountValue) {
+            if ($discountValue) {
 
                 $discountCondition = new \Hideyo\Ecommerce\Framework\Services\Cart\CartCondition(array(
                     'name' => 'Discount',
@@ -173,7 +173,7 @@ 
                 ));
             }
 
-            return Cart::add($productId, $productArray,  $amount, $discountCondition);
+            return Cart::add($productId, $productArray, $amount, $discountCondition);
         }
 
         return false;
@@ -186,7 +186,7 @@ 
         if (isset($sendingMethod->id)) {
             $sendingMethodArray = $sendingMethod->toArray();          
             $sendingMethodArray['price_details'] = $sendingMethod->getPriceDetails();
-            if($sendingMethod->relatedPaymentMethodsActive) {
+            if ($sendingMethod->relatedPaymentMethodsActive) {
                 $sendingMethodArray['related_payment_methods_list'] = $sendingMethod->relatedPaymentMethodsActive->pluck('title', 'id');                
             }
 
@@ -226,7 +226,7 @@ 
         $valueIncTax = $paymentMethodArray['price_details']['original_price_inc_tax'];
         $shop = ShopService::find(config()->get('app.shop_id'));
         $value = $valueIncTax;
-        $freeSending = ( $paymentMethodArray['no_price_from'] - Cart::getSubTotalWithTax());
+        $freeSending = ($paymentMethodArray['no_price_from'] - Cart::getSubTotalWithTax());
 
 
         if ($freeSending < 0) {
@@ -279,7 +279,7 @@ 
             $valueExTax = $sendingMethodArray['price_details']['original_price_ex_tax'];
             $valueIncTax = $sendingMethodArray['price_details']['original_price_inc_tax'];
             $value = $valueIncTax;
-            $freeSending = ( $sendingMethodArray['no_price_from'] - Cart::getSubTotalWithTax());
+            $freeSending = ($sendingMethodArray['no_price_from'] - Cart::getSubTotalWithTax());
       
             if ($freeSending < 0) {
                 $value = 0;
@@ -352,12 +352,12 @@ 
         $couponData = array();
         $discountValue = 0;
 
-        if($coupon) {
+        if ($coupon) {
 
             $couponData = $coupon->toArray();
-            if($coupon->type == 'total_price') {
+            if ($coupon->type == 'total_price') {
 
-                if($coupon->discount_way == 'total') {
+                if ($coupon->discount_way == 'total') {
                     $discountValue = $coupon->value;
                 } elseif ($coupon->discount_way == 'percent') {
                     $discountValue = $coupon->value.'%';
@@ -366,9 +366,9 @@ 
                 $this->setCouponCode($discountValue, $couponData, $couponCode);
             }
 
-            if($coupon->type == 'product') {
+            if ($coupon->type == 'product') {
 
-                if($coupon->products()->count()) {
+                if ($coupon->products()->count()) {
                     
                     foreach (Cart::getContent() as $row) {
 
@@ -376,9 +376,9 @@ 
                         $explode = explode('-', $id);
                         $contains = $coupon->products->contains($explode[0]);
 
-                        if($contains) {
+                        if ($contains) {
 
-                            if($coupon->discount_way == 'total') {
+                            if ($coupon->discount_way == 'total') {
                                 $discountValue += $coupon->value;
                             } elseif ($coupon->discount_way == 'percent') {
                                 $value = $coupon->value / 100;                      
@@ -391,17 +391,17 @@ 
                 }
             }
 
-            if($coupon->type == 'product_category') {
+            if ($coupon->type == 'product_category') {
 
-                if($coupon->productCategories()->count()) {
+                if ($coupon->productCategories()->count()) {
 
                     foreach (Cart::getContent()->sortBy('id')  as $row) {
 
                         $contains = $coupon->productCategories->contains($row['attributes']['product_category_id']);
 
-                        if($contains) {
+                        if ($contains) {
 
-                            if($coupon->discount_way == 'total') {
+                            if ($coupon->discount_way == 'total') {
                                 $discountValue += $coupon->value;
                             } elseif ($coupon->discount_way == 'percent') {
                                 $value = $coupon->value / 100;                      
@@ -415,16 +415,16 @@ 
                 }
             }
 
-            if($coupon->type == 'sending_method') {
+            if ($coupon->type == 'sending_method') {
 
-                if($coupon->sendingMethodCountries()->count()) {
+                if ($coupon->sendingMethodCountries()->count()) {
 
                     foreach ($coupon->sendingMethodCountries as $country) {
 
-                        if(Cart::getConditionsByType('sending_method_country_price')){
-                            if($country->name == Cart::getConditionsByType('sending_method_country_price')->first()->getAttributes()['data']['sending_method_country_price']['name']) {
+                        if (Cart::getConditionsByType('sending_method_country_price')) {
+                            if ($country->name == Cart::getConditionsByType('sending_method_country_price')->first()->getAttributes()['data']['sending_method_country_price']['name']) {
 
-                                if($coupon->discount_way == 'total') {
+                                if ($coupon->discount_way == 'total') {
                                     $discountValue += $coupon->value;
                                 } elseif ($coupon->discount_way == 'percent') {
                                     $value = $coupon->value / 100; 
@@ -436,15 +436,15 @@ 
 
                     $this->setCouponCode($discountValue, $couponData, $couponCode);
 
-                } elseif($coupon->sendingMethods()->count()) {
+                } elseif ($coupon->sendingMethods()->count()) {
 
                     foreach ($coupon->sendingMethods as $sendingMethod) {
 
-                        if(Cart::getConditionsByType('sending_cost')){
+                        if (Cart::getConditionsByType('sending_cost')) {
 
-                            if($sendingMethod->id == Cart::getConditionsByType('sending_cost')->first()->getAttributes()['data']['sending_method']['id']) {
+                            if ($sendingMethod->id == Cart::getConditionsByType('sending_cost')->first()->getAttributes()['data']['sending_method']['id']) {
 
-                                if($coupon->discount_way == 'total') {
+                                if ($coupon->discount_way == 'total') {
                                     $discountValue += $coupon->value;
                                 } elseif ($coupon->discount_way == 'percent') {
                                     $value = $coupon->value / 100; 
@@ -458,17 +458,17 @@ 
                 }
             }
 
-            if($coupon->type == 'payment_method') {
+            if ($coupon->type == 'payment_method') {
 
-                if($coupon->paymentMethods()->count()) {
+                if ($coupon->paymentMethods()->count()) {
 
                     foreach ($coupon->paymentMethods as $paymentMethod) {
 
-                        if(Cart::getConditionsByType('payment_method')){
+                        if (Cart::getConditionsByType('payment_method')) {
 
-                            if($paymentMethod->id == Cart::getConditionsByType('payment_method')->first()->getAttributes()['data']['id']) {
+                            if ($paymentMethod->id == Cart::getConditionsByType('payment_method')->first()->getAttributes()['data']['id']) {
 
-                                if($coupon->discount_way == 'total') {
+                                if ($coupon->discount_way == 'total') {
                                     $discountValue += $coupon->value;
                                 } elseif ($coupon->discount_way == 'percent') {
                                     $value = $coupon->value / 100; 
@@ -520,7 +520,7 @@ 
         );
 
         foreach ($replace as $key => $val) {
-            $content = str_replace("[" . $key . "]", $val, $content);
+            $content = str_replace("[".$key."]", $val, $content);
         }
         $content = nl2br($content);
         return $content;

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/News/Entity/NewsRepository.php

Indentation +14 added lines, -14 removed lines

@@ -294,7 +294,7 @@ 
 
     public function selectAllGroups()
     {
-       return $this->model->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id)->get();
+        return $this->model->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id)->get();
     }
 
     public function findGroup($groupId)
@@ -325,12 +325,12 @@ 
 
     function selectAllByBlogCategoryId($newsCategoryId)
     {
-           return $this->model->with(array('extraFields' => function ($query) {
-           }, 'taxRate', 'newsCategory',  'relatedBlogs' => function ($query) {
+            return $this->model->with(array('extraFields' => function ($query) {
+            }, 'taxRate', 'newsCategory',  'relatedBlogs' => function ($query) {
             $query->with('newsImages')->orderBy('rank', 'asc');
-           }, 'newsImages' => function ($query) {
+            }, 'newsImages' => function ($query) {
             $query->orderBy('rank', 'asc');
-           }))->where('active', '=', 1)->where('news_category_id', '=', $newsCategoryId)->get();
+            }))->where('active', '=', 1)->where('news_category_id', '=', $newsCategoryId)->get();
     }
 
     function selectOneById($shopId, $slug)
@@ -344,7 +344,7 @@ 
 
     function selectAllActiveGroupsByShopId($shopId)
     {
-         return $this->modelGroup->where('shop_id', '=', $shopId)->where('active', '=', 1)->get();
+            return $this->modelGroup->where('shop_id', '=', $shopId)->where('active', '=', 1)->get();
     }
 
     function selectOneGroupByShopIdAndSlug($shopId, $slug)
@@ -376,9 +376,9 @@ 
     {
         $dt = Carbon::now('Europe/Amsterdam');
 
-           $result = $this->model
-           ->where('shop_id', '=', $shopId)
-           ->where('published_at', '<=', $dt->toDateString('Y-m-d'));
+            $result = $this->model
+            ->where('shop_id', '=', $shopId)
+            ->where('published_at', '<=', $dt->toDateString('Y-m-d'));
 
             return array(
                 'totals' => $result->get()->count(),
@@ -392,12 +392,12 @@ 
     {
         $dt = Carbon::now('Europe/Amsterdam');
 
-           $result = $this->model
-           ->where('shop_id', '=', $shopId)
-           ->where('published_at', '<=', $dt->toDateString('Y-m-d'))
-           ->whereHas('newsGroup', function ($query) use ($newsGroupSlug) {
+            $result = $this->model
+            ->where('shop_id', '=', $shopId)
+            ->where('published_at', '<=', $dt->toDateString('Y-m-d'))
+            ->whereHas('newsGroup', function ($query) use ($newsGroupSlug) {
             $query->where('slug', '=', $newsGroupSlug);
-           });
+            });
 
             return array(
                 'totals' => $result->get()->count(),

Spacing +14 added lines, -14 removed lines

@@ -28,8 +28,8 @@ 
         $this->model = $model;
         $this->modelImage = $modelImage;
         $this->modelGroup = $modelGroup;
-        $this->storageImagePath = storage_path() .config('hideyo.storage_path'). "/news/";
-        $this->publicImagePath = public_path() .config('hideyo.public_path'). "/news/";
+        $this->storageImagePath = storage_path().config('hideyo.storage_path')."/news/";
+        $this->publicImagePath = public_path().config('hideyo.public_path')."/news/";
     }
   
     /**
@@ -50,7 +50,7 @@ 
             );
             
             if ($newsId) {
-                $rules['title'] =   'required|between:4,65|unique:'.$this->model->getTable().',title,'.$newsId;
+                $rules['title'] = 'required|between:4,65|unique:'.$this->model->getTable().',title,'.$newsId;
             }
         }
 
@@ -69,7 +69,7 @@ 
             );
             
             if ($newsGroupId) {
-                $rules['title'] =   'required|between:4,65|unique:'.$this->modelGroup->getTable().',title,'.$newsGroupId;
+                $rules['title'] = 'required|between:4,65|unique:'.$this->modelGroup->getTable().',title,'.$newsGroupId;
             }
         }
 
@@ -127,7 +127,7 @@ 
             return $validator;
         } 
 
-        $filename =  str_replace(" ", "_", strtolower($attributes['file']->getClientOriginalName()));
+        $filename = str_replace(" ", "_", strtolower($attributes['file']->getClientOriginalName()));
         $uploadSuccess = $attributes['file']->move($destinationPath, $filename);
 
         if ($uploadSuccess) {
@@ -192,13 +192,13 @@ 
 
                         if (!File::exists($this->publicImagePath.$valueImage."/".$productImage->news_id."/".$productImage->file)) {
                             if (File::exists($this->storageImagePath.$productImage->news_id."/".$productImage->file)) {
-                                $image = Image::make(storage_path() .config('hideyo.storage_path'). "//news/".$productImage->news_id."/".$productImage->file);
+                                $image = Image::make(storage_path().config('hideyo.storage_path')."//news/".$productImage->news_id."/".$productImage->file);
                                 $explode = explode('x', $valueImage);
                                 $image->fit($explode[0], $explode[1]);
                             
                                 $image->interlace();
 
-                                $image->save(public_path() .config('hideyo.storage_path'). "/news/".$valueImage."/".$productImage->news_id."/".$productImage->file);
+                                $image->save(public_path().config('hideyo.storage_path')."/news/".$valueImage."/".$productImage->news_id."/".$productImage->file);
                             }
                         }
                     }
@@ -257,7 +257,7 @@ 
             }
         }
 
-        $directory = app_path() . "/storage/files/news/".$this->model->id;
+        $directory = app_path()."/storage/files/news/".$this->model->id;
         File::deleteDirectory($directory);
 
         return $this->model->delete();
@@ -325,10 +325,10 @@ 
 
     function selectAllByBlogCategoryId($newsCategoryId)
     {
-           return $this->model->with(array('extraFields' => function ($query) {
-           }, 'taxRate', 'newsCategory',  'relatedBlogs' => function ($query) {
+           return $this->model->with(array('extraFields' => function($query) {
+           }, 'taxRate', 'newsCategory', 'relatedBlogs' => function($query) {
             $query->with('newsImages')->orderBy('rank', 'asc');
-           }, 'newsImages' => function ($query) {
+           }, 'newsImages' => function($query) {
             $query->orderBy('rank', 'asc');
            }))->where('active', '=', 1)->where('news_category_id', '=', $newsCategoryId)->get();
     }
@@ -336,7 +336,7 @@ 
     function selectOneById($shopId, $slug)
     {
         $dt = Carbon::now('Europe/Amsterdam');
-        $result = $this->model->with(array('newsCategory', 'relatedBlogs', 'newsImages' => function ($query) {
+        $result = $this->model->with(array('newsCategory', 'relatedBlogs', 'newsImages' => function($query) {
             $query->orderBy('rank', 'asc');
         }))->where('published_at', '<=', $dt->toDateString('Y-m-d'))->where('active', '=', 1)->where('id', '=', $id)->get()->first();
         return $result;
@@ -362,7 +362,7 @@ 
         $dt = Carbon::now('Europe/Amsterdam');
 
         return $this->model->with(
-            array('newsImages' => function ($query) {
+            array('newsImages' => function($query) {
                 $query->orderBy('rank', 'asc');
             })
         )
@@ -395,7 +395,7 @@ 
            $result = $this->model
            ->where('shop_id', '=', $shopId)
            ->where('published_at', '<=', $dt->toDateString('Y-m-d'))
-           ->whereHas('newsGroup', function ($query) use ($newsGroupSlug) {
+           ->whereHas('newsGroup', function($query) use ($newsGroupSlug) {
             $query->where('slug', '=', $newsGroupSlug);
            });