hideyo / ecommerce-framework

src/Services/Invoice/Entity/InvoiceAddressRepository.php

Indentation +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
 
     function selectAllByInvoiceId($orderId)
     {
-         return $this->model->where('order_id', '=', $orderId)->get();
+            return $this->model->where('order_id', '=', $orderId)->get();
     }  
 }
\ No newline at end of file

src/Services/Invoice/Entity/Invoice.php

Spacing +2 added lines, -2 removed lines

@@ -15,11 +15,11 @@
     protected $table = 'invoice';
 
     // Add the 'avatar' attachment to the fillable array so that it's mass-assignable on this model.
-    protected $fillable = ['order_id', 'type', 'client_id', 'shop_id', 'price_with_tax', 'price_without_tax', 'bill_invoice_address_id', 'delivery_invoice_address_id',];
+    protected $fillable = ['order_id', 'type', 'client_id', 'shop_id', 'price_with_tax', 'price_without_tax', 'bill_invoice_address_id', 'delivery_invoice_address_id', ];
 
     public static function boot()
     {
-        static::creating(function ($model) {
+        static::creating(function($model) {
 
             $order = Invoice::whereNotNull('client_id')->where('shop_id', '=', $model->shop_id)->where('created_at', '>=', Carbon::now()->year)->orderBy('created_at', 'desc')->first();
             $shop = Shop::find($model->shop_id);

src/Services/Order/Events/Handlers/HandleOrderStatusEmail.php

Spacing +10 added lines, -10 removed lines

@@ -33,13 +33,13 @@ 
      */
     public function handle(OrderChangeStatus $event)
     {
-        if($event->order->shop->wholesale) {
+        if ($event->order->shop->wholesale) {
 
             if ($event->status->send_email_to_customer) {
     
                 if ($event->status->orderStatusEmailTemplate) {
 
-                    $destinationPath = storage_path() . "/app";
+                    $destinationPath = storage_path()."/app";
                     $orderStatusEmailFromResult = GeneralSettingService::selectOneByShopIdAndName($event->order->shop_id, 'order-status-email-from');
                     
                     $orderStatusEmailFrom = 'wholesale@philandphae.com';
@@ -57,12 +57,12 @@ 
 
                     $orderStatusEmailBcc = 'wholesale@philandphae.com';
                     $language = 'en';
-                    if(strtoupper($event->order->orderBillAddress->country) == 'NL') {
+                    if (strtoupper($event->order->orderBillAddress->country) == 'NL') {
                         $language = 'nl';
                     }    
             
 
-                    Mail::send('frontend.email.order-status', ['content' => $this->cart->replaceTags($event->status->orderStatusEmailTemplate->translate($language)->content, $event->order)], function ($message) use ($event, $destinationPath, $orderStatusEmailFrom, $orderStatusEmailName, $orderStatusEmailBcc, $language) {
+                    Mail::send('frontend.email.order-status', ['content' => $this->cart->replaceTags($event->status->orderStatusEmailTemplate->translate($language)->content, $event->order)], function($message) use ($event, $destinationPath, $orderStatusEmailFrom, $orderStatusEmailName, $orderStatusEmailBcc, $language) {
                         $message->from($orderStatusEmailFrom, $orderStatusEmailName);
                         $message->to($event->order->client->email, $event->order->orderBillAddress->firstname)->subject($this->cart->replaceTags($event->status->orderStatusEmailTemplate->translate($language)->subject, $event->order));
 
@@ -73,7 +73,7 @@ 
                         if ($event->order and $event->status->attach_order_to_email) {
                             $pdfText = "";
                             $sign = '€';
-                            if($event->order->client->usd) {
+                            if ($event->order->client->usd) {
                                 $sign = '$';
                             }
 
@@ -96,9 +96,9 @@ 
                     }
                 }
 
-                if($event->order->type == 'pre_order') {
+                if ($event->order->type == 'pre_order') {
 
-                }elseif($event->order->type == 'from_stock') {
+                }elseif ($event->order->type == 'from_stock') {
 
                 }
 
@@ -107,7 +107,7 @@ 
         } else {
             if ($event->status->send_email_to_customer) {
                 if ($event->status->orderStatusEmailTemplate) {
-                    $destinationPath = storage_path() . "/app";
+                    $destinationPath = storage_path()."/app";
                     $orderStatusEmailFromResult = GeneralSettingService::selectOneByShopIdAndName($event->order->shop_id, 'order-status-email-from');
                     
                     $orderStatusEmailFrom = 'info@philandphae.com';
@@ -130,11 +130,11 @@ 
                     }
 
                     $language = 'en';
-                    if(strtoupper($event->order->orderBillAddress->country) == 'NL') {
+                    if (strtoupper($event->order->orderBillAddress->country) == 'NL') {
                         $language = 'nl';
                     }    
 
-                    Mail::send('frontend.email.order-status', ['content' => $this->cart->replaceTags($event->status->orderStatusEmailTemplate->translate($language)->content, $event->order)], function ($message) use ($event, $destinationPath, $orderStatusEmailFrom, $orderStatusEmailName, $orderStatusEmailBcc, $language) {
+                    Mail::send('frontend.email.order-status', ['content' => $this->cart->replaceTags($event->status->orderStatusEmailTemplate->translate($language)->content, $event->order)], function($message) use ($event, $destinationPath, $orderStatusEmailFrom, $orderStatusEmailName, $orderStatusEmailBcc, $language) {
                         $message->from($orderStatusEmailFrom, $orderStatusEmailName);
                         $message->to($event->order->client->email, $event->order->orderBillAddress->firstname)->subject($this->cart->replaceTags($event->status->orderStatusEmailTemplate->translate($language)->subject, $event->order));
 

Braces +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
                 if($event->order->type == 'pre_order') {
 
-                }elseif($event->order->type == 'from_stock') {
+                } elseif($event->order->type == 'from_stock') {
 
                 }
 

src/Services/Order/OrderStatusEmailTemplateService.php

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
 
 class OrderStatusEmailTemplateService extends BaseService
 {
-	public function __construct(OrderStatusEmailTemplateRepository $orderStatusEmailTemplate)
-	{
-		$this->repo = $orderStatusEmailTemplate;
-	} 
+    public function __construct(OrderStatusEmailTemplateRepository $orderStatusEmailTemplate)
+    {
+        $this->repo = $orderStatusEmailTemplate;
+    } 
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         );
         
         if ($id) {
-            $rules['title'] =   'required|unique_with:order_status_email_template, shop_id,'.$id;
+            $rules['title'] = 'required|unique_with:order_status_email_template, shop_id,'.$id;
         }
 
         return $rules;

src/Services/Order/OrderStatusService.php

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
 
 class OrderStatusService extends BaseService
 {
-	public function __construct(OrderStatusRepository $orderStatus)
-	{
-		$this->repo = $orderStatus;
-	} 
+    public function __construct(OrderStatusRepository $orderStatus)
+    {
+        $this->repo = $orderStatus;
+    } 
 
     /**
      * The validation rules for the model.

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         );
         
         if ($id) {
-            $rules['title'] =   'required|between:4,65|unique_with:order_status, shop_id, '.$id.' = id';
+            $rules['title'] = 'required|between:4,65|unique_with:order_status, shop_id, '.$id.' = id';
         }
 
         return $rules;

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/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/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) {