hideyo / ecommerce

app/Http/Controllers/Backend/OrderController.php

Spacing +24 added lines, -24 removed lines

@@ -14,7 +14,7 @@ 
 use Hideyo\Ecommerce\Framework\Services\Order\OrderFacade as OrderService;
 use Hideyo\Ecommerce\Framework\Services\Order\OrderStatusFacade as OrderStatusService;
 use Hideyo\Ecommerce\Framework\Services\PaymentMethod\PaymentMethodFacade as PaymentMethodService;
-use Hideyo\Ecommerce\Framework\Services\SendingMethod\SendingMethodFacade as SendingMethodService;use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService;
+use Hideyo\Ecommerce\Framework\Services\SendingMethod\SendingMethodFacade as SendingMethodService; use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService;
 
 use Carbon\Carbon;
 use Request;
@@ -28,7 +28,7 @@ 
 {
     public function index()
     {
-        $shop  = auth('hideyobackend')->user()->shop;
+        $shop = auth('hideyobackend')->user()->shop;
         $now = Carbon::now();
 
         $revenueThisMonth = null;
@@ -58,15 +58,15 @@ 
             
             $datatables = \Datatables::of($order)
 
-            ->addColumn('generated_custom_order_id', function ($order) {
+            ->addColumn('generated_custom_order_id', function($order) {
                 return $order->generated_custom_order_id;
             })
 
-            ->addColumn('created_at', function ($order) {
+            ->addColumn('created_at', function($order) {
                 return date('d F H:i', strtotime($order->created_at));
             })
 
-            ->addColumn('status', function ($order) {
+            ->addColumn('status', function($order) {
                 if ($order->orderStatus) {
                     if ($order->orderStatus->color) {
                         return '<a href="/admin/order/'.$order->id.'" style="text-decoration:none;"><span style="background-color:'.$order->orderStatus->color.'; padding: 10px; line-height:30px; text-align:center; color:white;">'.$order->orderStatus->title.'</span></a>';
@@ -75,46 +75,46 @@ 
                 }
             })
 
-            ->filterColumn('client', function ($query, $keyword) {
+            ->filterColumn('client', function($query, $keyword) {
 
                 $query->where(
-                    function ($query) use ($keyword) {
+                    function($query) use ($keyword) {
                         $query->whereRaw("order_address.firstname like ?", ["%{$keyword}%"]);
                         $query->orWhereRaw("order_address.lastname like ?", ["%{$keyword}%"]);
                         ;
                     }
                 );
             })
-            ->addColumn('client', function ($order) {
+            ->addColumn('client', function($order) {
                 if ($order->client) {
                     if ($order->orderBillAddress) {
-                        return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count() .')</a>';
+                        return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count().')</a>';
                     }
                 }
             })
-            ->addColumn('products', function ($order) {
+            ->addColumn('products', function($order) {
                 if ($order->products) {
                     return $order->products->count();
                 }
             })
-            ->addColumn('price_with_tax', function ($order) {
+            ->addColumn('price_with_tax', function($order) {
                 $money = '&euro; '.$order->getPriceWithTaxNumberFormat();
                 return $money;
             })
 
 
-            ->addColumn('paymentMethod', function ($order) {
+            ->addColumn('paymentMethod', function($order) {
                 if ($order->orderPaymentMethod) {
                     return $order->orderPaymentMethod->title;
                 }
             })
-            ->addColumn('sendingMethod', function ($order) {
+            ->addColumn('sendingMethod', function($order) {
                 if ($order->orderSendingMethod) {
                     return $order->orderSendingMethod->title;
                 }
             })
-            ->addColumn('action', function ($order) {
-                $deleteLink = \Form::deleteajax('/admin/order/'. $order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
+            ->addColumn('action', function($order) {
+                $deleteLink = \Form::deleteajax('/admin/order/'.$order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a>  ';
             
        
@@ -147,7 +147,7 @@ 
 
         if ($data and $data['order']) {
 
-            if($data['type'] == 'one-pdf') {
+            if ($data['type'] == 'one-pdf') {
                 $pdfHtml = "";
                 $countOrders = count($data['order']);
                 $i = 0;
@@ -173,15 +173,15 @@ 
                 $pdf = PDF::loadHTML($pdfHtmlBody);
 
                 return $pdf->download('order-'.$order->generated_custom_order_id.'.pdf');
-            } elseif($data['type'] == 'product-list') {
+            } elseif ($data['type'] == 'product-list') {
                 $products = OrderService::productsByOrderIds($data['order']);
 
-                if($products) {
+                if ($products) {
 
 
-                    Excel::create('products', function ($excel) use ($products) {
+                    Excel::create('products', function($excel) use ($products) {
 
-                        $excel->sheet('Products', function ($sheet) use ($products) {
+                        $excel->sheet('Products', function($sheet) use ($products) {
                             $newArray = array();
                             foreach ($products as $key => $row) {
                 
@@ -212,7 +212,7 @@ 
 
         if ($orders) {
             Request::session()->put('print_orders', $orders->toArray());
-            return response()->json(array('orders' => $orders->toArray() ));
+            return response()->json(array('orders' => $orders->toArray()));
         }
 
         Request::session()->destroy('print_orders');
@@ -255,7 +255,7 @@ 
     public function downloadLabel($orderId)
     {
         $order = OrderService::find($orderId);
-        if($order->orderLabel()->count()) {
+        if ($order->orderLabel()->count()) {
           header("Content-type: application/octet-stream");
           header("Content-disposition: attachment;filename=label.pdf");
           echo $order->orderLabel->data;
@@ -287,7 +287,7 @@ 
 
         );
         foreach ($replace as $key => $val) {
-            $content = str_replace("[" . $key . "]", $val, $content);
+            $content = str_replace("[".$key."]", $val, $content);
         }
 
         return $content;
@@ -300,7 +300,7 @@ 
 
     public function update($orderId)
     {
-        $result  = OrderService::updateById(Request::all(), $orderId);
+        $result = OrderService::updateById(Request::all(), $orderId);
 
         if ($result->errors()->all()) {
             return redirect()->back()->withInput()->withErrors($result->errors()->all());

app/Http/Controllers/Backend/OrderStatusController.php

Spacing +7 added lines, -7 removed lines

@@ -22,12 +22,12 @@ 
         if ($request->wantsJson()) {
 
             $query = OrderStatusService::getModel()->select(
-                ['id', 'color','title']
+                ['id', 'color', 'title']
             )->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
             
             $datatables = \Datatables::of($query)
 
-            ->addColumn('title', function ($query) {
+            ->addColumn('title', function($query) {
      
                 if ($query->color) {
                     return '<span style="background-color:'.$query->color.'; padding: 10px; line-height:30px; text-align:center; color:white;">'.$query->title.'</span>';
@@ -36,8 +36,8 @@ 
             })
 
 
-            ->addColumn('action', function ($query) {
-                $deleteLink = Form::deleteajax('/admin/order-status/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
+            ->addColumn('action', function($query) {
+                $deleteLink = Form::deleteajax('/admin/order-status/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $links = '<a href="/admin/order-status/'.$query->id.'/edit" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
             
                 return $links;
@@ -58,7 +58,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = OrderStatusService::create($request->all());
+        $result = OrderStatusService::create($request->all());
         return OrderStatusService::notificationRedirect('order-status.index', $result, 'The order status was inserted.');
     }
 
@@ -79,13 +79,13 @@ 
 
     public function update(Request $request, $orderStatusId)
     {
-        $result  = OrderStatusService::updateById($request->all(), $orderStatusId);
+        $result = OrderStatusService::updateById($request->all(), $orderStatusId);
         return OrderStatusService::notificationRedirect('order-status.index', $result, 'The order status was updated.');
     }
 
     public function destroy($orderStatusId)
     {
-        $result  = OrderStatusService::destroy($orderStatusId);
+        $result = OrderStatusService::destroy($orderStatusId);
 
         if ($result) {
             Notification::success('The order status was deleted.');