hideyo / ecommerce-framework

src/Services/Order/Entity/OrderAddressRepository.php

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     
     function selectAllByOrderId($orderId)
     {
-         return $this->model->where('order_id', '=', $orderId)->get();
+            return $this->model->where('order_id', '=', $orderId)->get();
     }
     
 

src/Services/Order/Entity/Order.php

Indentation +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             }
         });
 
-          parent::boot();
+            parent::boot();
     }
 
     public function products()

Spacing +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
     protected $table = 'order';
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['id', 'validated', 'client_id', 'shop_id', 'price_with_tax', 'price_without_tax', 'total_discount', 'coupon_id', 'coupon_title',  'coupon_discount_way', 'coupon_type', 'coupon_value', 'coupon_code', 'coupon_group_title', 'bill_order_address_id', 'delivery_order_address_id', 'order_status_id', 'mollie_payment_id', 'comments', 'present_gender', 'present_occassion', 'present_message', 'browser_detect'];
+    protected $fillable = ['id', 'validated', 'client_id', 'shop_id', 'price_with_tax', 'price_without_tax', 'total_discount', 'coupon_id', 'coupon_title', 'coupon_discount_way', 'coupon_type', 'coupon_value', 'coupon_code', 'coupon_group_title', 'bill_order_address_id', 'delivery_order_address_id', 'order_status_id', 'mollie_payment_id', 'comments', 'present_gender', 'present_occassion', 'present_message', 'browser_detect'];
 
     public static function boot()
     {
-        static::creating(function ($model) {
+        static::creating(function($model) {
 
             if ($model->created_at) {
                 $order = Order::where('shop_id', '=', $model->shop_id)->where('created_at', '>=', Carbon::createFromFormat('Y-m-d H:i:s', $model->created_at)->year)->orderBy('id', 'desc')->first();

src/Services/Order/Entity/OrderRepository.php

Indentation +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 
         if (Cart::getConditionsByType('payment_method')->count()) {
 
-           $attributes = Cart::getConditionsByType('payment_method')->first()->getAttributes();
+            $attributes = Cart::getConditionsByType('payment_method')->first()->getAttributes();
             $paymentMethod = PaymentMethodService::find($attributes['data']['id']);
             $price = $paymentMethod->getPriceDetails();
 

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
     {
         $attributes['shop_id'] = $shopId;
         $attributes['client_id'] = $attributes['user_id'];
-        $client  = $this->client->selectOneByShopIdAndId($shopId, $attributes['user_id']);
+        $client = $this->client->selectOneByShopIdAndId($shopId, $attributes['user_id']);
 
         $this->model->fill($attributes);
         $this->model->save();
@@ -219,7 +219,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/Order/Entity/OrderStatusEmailTemplateRepository.php

Spacing +3 added lines, -3 removed lines

@@ -18,10 +18,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/OrderPaymentLogRepository.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
     function selectAllByOrderId($orderId)
     {
-         return $this->model->where('order_id', '=', $orderId)->get();
+            return $this->model->where('order_id', '=', $orderId)->get();
     }
 
 }

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);