hideyo / ecommerce-framework

src/Services/Cart/Cart.php

Indentation +5 added lines, -5 removed lines

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

Spacing +63 added lines, -63 removed lines

@@ -72,9 +72,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;
     }
@@ -156,7 +156,7 @@ 
      */
     public function update($id, $data)
     {
-        if($this->fireEvent('updating', $data) === false) {
+        if ($this->fireEvent('updating', $data) === false) {
             return false;
         }
         $cart = $this->getContent();
@@ -252,7 +252,7 @@ 
      */
     protected function addRow($id, $item)
     {
-        if($this->fireEvent('adding', $item) === false) {
+        if ($this->fireEvent('adding', $item) === false) {
             return false;
         }
         $cart = $this->getContent();
@@ -285,7 +285,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);
@@ -323,7 +323,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;
         });
     }
@@ -338,7 +338,7 @@ 
      */
     public function removeConditionsByType($type)
     {
-        $this->getConditionsByType($type)->each(function ($condition) {
+        $this->getConditionsByType($type)->each(function($condition) {
             $this->removeCartCondition($condition->getName());
         });
     }
@@ -449,7 +449,7 @@ 
     public function getSubTotalWithoutConditions($formatted = true)
     {
         $cart = $this->getContent();
-        $sum = $cart->sum(function ($item) {
+        $sum = $cart->sum(function($item) {
             return $item->getOriginalPriceWithTaxSum();
         });
 
@@ -464,7 +464,7 @@ 
     public function getSubTotalWithTax($formatted = true)
     {
         $cart = $this->getContent();
-        $sum = $cart->sum(function ($item) {
+        $sum = $cart->sum(function($item) {
             return $item->getOriginalPriceWithTaxSum(false);
         });
 
@@ -480,7 +480,7 @@ 
     public function getSubTotalWithoutTax($formatted = true)
     {
         $cart = $this->getContent();
-        $sum = $cart->sum(function ($item) {
+        $sum = $cart->sum(function($item) {
             return $item->getOriginalPriceWithoutTaxSum(false);
         });
 
@@ -500,7 +500,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
@@ -508,7 +508,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++;
@@ -531,7 +531,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
@@ -539,7 +539,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++;
@@ -557,7 +557,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);
@@ -603,18 +603,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);
@@ -655,7 +655,7 @@ 
      */
     public function clear()
     {
-        if($this->fireEvent('clearing') === false) {
+        if ($this->fireEvent('clearing') === false) {
             return false;
         }
         $this->session->put(
@@ -673,7 +673,7 @@ 
      */
     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]));
     }  
 
     public function updateAmountProduct($productId, $amount, $leadingAttributeId, $productAttributeId)
@@ -712,7 +712,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()) {
@@ -720,9 +720,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'];
                 }
 
@@ -736,7 +736,7 @@ 
                 $this->remove($productId);
             }
 
-            if($this->getConditionsByType('sending_method_country_price')->count()) {
+            if ($this->getConditionsByType('sending_method_country_price')->count()) {
                 $this->updateSendingMethodCountryPrice($this->getConditionsByType('sending_method_country_price')->first()->getAttributes()['data']['sending_method_country_price_id']);  
             }
         }
@@ -776,7 +776,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'];
@@ -787,7 +787,7 @@ 
 
             $discountValue = false;
 
-            if(session()->get('preSaleDiscount')) {
+            if (session()->get('preSaleDiscount')) {
                 $preSaleDiscount = session()->get('preSaleDiscount');             
 
 
@@ -801,7 +801,7 @@ 
                     }                     
                 }
 
-                if($preSaleDiscount['products']) {
+                if ($preSaleDiscount['products']) {
 
                     $productIds = array_column($preSaleDiscount['products'], 'id');
 
@@ -827,7 +827,7 @@ 
             }
 
             $discountCondition = array();
-            if($discountValue) {
+            if ($discountValue) {
 
                 $discountCondition = new \Hideyo\Ecommerce\Framework\Services\Cart\CartCondition(array(
                     'name' => 'Discount',
@@ -837,7 +837,7 @@ 
                 ));
             }
 
-            return $this->add($productId, $productArray,  $amount, $discountCondition);
+            return $this->add($productId, $productArray, $amount, $discountCondition);
         }
 
         return false;
@@ -850,7 +850,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');                
             }
 
@@ -890,7 +890,7 @@ 
         $valueIncTax = $paymentMethodArray['price_details']['original_price_inc_tax'];
         $shop = ShopService::find(config()->get('app.shop_id'));
         $value = $valueIncTax;
-        $freeSending = ( $paymentMethodArray['no_price_from'] - $this->getSubTotalWithTax());
+        $freeSending = ($paymentMethodArray['no_price_from'] - $this->getSubTotalWithTax());
 
 
         if ($freeSending < 0) {
@@ -943,7 +943,7 @@ 
             $valueExTax = $sendingMethodArray['price_details']['original_price_ex_tax'];
             $valueIncTax = $sendingMethodArray['price_details']['original_price_inc_tax'];
             $value = $valueIncTax;
-            $freeSending = ( $sendingMethodArray['no_price_from'] - $this->getSubTotalWithTax());
+            $freeSending = ($sendingMethodArray['no_price_from'] - $this->getSubTotalWithTax());
       
             if ($freeSending < 0) {
                 $value = 0;
@@ -1016,12 +1016,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.'%';
@@ -1030,9 +1030,9 @@ 
                 $this->setCouponCode($discountValue, $couponData, $couponCode);
             }
 
-            if($coupon->type == 'product') {
+            if ($coupon->type == 'product') {
 
-                if($coupon->products()->count()) {
+                if ($coupon->products()->count()) {
                     
                     foreach ($this->getContent() as $row) {
 
@@ -1040,9 +1040,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;                      
@@ -1055,17 +1055,17 @@ 
                 }
             }
 
-            if($coupon->type == 'product_category') {
+            if ($coupon->type == 'product_category') {
 
-                if($coupon->productCategories()->count()) {
+                if ($coupon->productCategories()->count()) {
 
                     foreach ($this->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;                      
@@ -1079,16 +1079,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($this->getConditionsByType('sending_method_country_price')){
-                            if($country->name == $this->getConditionsByType('sending_method_country_price')->first()->getAttributes()['data']['sending_method_country_price']['name']) {
+                        if ($this->getConditionsByType('sending_method_country_price')) {
+                            if ($country->name == $this->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; 
@@ -1100,15 +1100,15 @@ 
 
                     $this->setCouponCode($discountValue, $couponData, $couponCode);
 
-                } elseif($coupon->sendingMethods()->count()) {
+                } elseif ($coupon->sendingMethods()->count()) {
 
                     foreach ($coupon->sendingMethods as $sendingMethod) {
 
-                        if($this->getConditionsByType('sending_cost')){
+                        if ($this->getConditionsByType('sending_cost')) {
 
-                            if($sendingMethod->id == $this->getConditionsByType('sending_cost')->first()->getAttributes()['data']['sending_method']['id']) {
+                            if ($sendingMethod->id == $this->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; 
@@ -1122,17 +1122,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($this->getConditionsByType('payment_method')){
+                        if ($this->getConditionsByType('payment_method')) {
 
-                            if($paymentMethod->id == $this->getConditionsByType('payment_method')->first()->getAttributes()['data']['id']) {
+                            if ($paymentMethod->id == $this->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; 
@@ -1183,7 +1183,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/Order/Events/Handlers/HandleOrderStatusEmail.php

Spacing +10 added lines, -10 removed lines

@@ -20,13 +20,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';
@@ -44,12 +44,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' => 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' => 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(Cart::replaceTags($event->status->orderStatusEmailTemplate->translate($language)->subject, $event->order));
 
@@ -60,7 +60,7 @@ 
                         if ($event->order and $event->status->attach_order_to_email) {
                             $pdfText = "";
                             $sign = '€';
-                            if($event->order->client->usd) {
+                            if ($event->order->client->usd) {
                                 $sign = '$';
                             }
 
@@ -83,9 +83,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') {
 
                 }
 
@@ -94,7 +94,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';
@@ -117,11 +117,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' => 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' => 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(Cart::replaceTags($event->status->orderStatusEmailTemplate->translate($language)->subject, $event->order));