@@ -62,7 +62,7 @@ |
||
| 62 | 62 | 'paymentMethodsList' => $paymentMethodsList)); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
| 65 | + return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $user = auth('web')->user(); |
@@ -26,12 +26,12 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $paymentMethodsList = Cart::getConditionsByType('sending_method')->first()->getAttributes()['data']['related_payment_methods_list']; |
| 28 | 28 | |
| 29 | - if(!Cart::getConditionsByType('sending_method')->count()) { |
|
| 29 | + if (!Cart::getConditionsByType('sending_method')->count()) { |
|
| 30 | 30 | Notification::error('Selecteer een verzendwijze'); |
| 31 | 31 | return redirect()->to('cart'); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - if(!Cart::getConditionsByType('payment_method')->count()) { |
|
| 34 | + if (!Cart::getConditionsByType('payment_method')->count()) { |
|
| 35 | 35 | Notification::error('Selecteer een betaalwijze'); |
| 36 | 36 | return redirect()->to('cart'); |
| 37 | 37 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | 'paymentMethodsList' => $paymentMethodsList)); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
| 53 | + return view('frontend.checkout.login')->with(array('sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $user = auth('web')->user(); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $userdata = $request->all(); |
| 106 | 106 | |
| 107 | 107 | $rules = array( |
| 108 | - 'email' => 'required|email', // required and must be unique in the ducks table |
|
| 108 | + 'email' => 'required|email', // required and must be unique in the ducks table |
|
| 109 | 109 | 'password' => 'required', |
| 110 | 110 | 'firstname' => 'required', |
| 111 | 111 | 'lastname' => 'required', |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $data = $register; |
| 153 | 153 | $data['shop'] = app('shop'); |
| 154 | 154 | |
| 155 | - Mail::send('frontend.email.register-mail', array('password' => $userdata['password'], 'user' => $data->toArray(), 'billAddress' => $data->clientBillAddress->toArray()), function ($message) use ($data) { |
|
| 155 | + Mail::send('frontend.email.register-mail', array('password' => $userdata['password'], 'user' => $data->toArray(), 'billAddress' => $data->clientBillAddress->toArray()), function($message) use ($data) { |
|
| 156 | 156 | |
| 157 | 157 | $message->to($data['email'])->from($data['shop']->email, $data['shop']->title)->subject('Je bent geregistreerd.'); |
| 158 | 158 | }); |
@@ -216,15 +216,15 @@ discard block |
||
| 216 | 216 | $data['user_id'] = $noAccountUser['client_id']; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - if(Cart::getConditionsByType('sending_method')->count()) { |
|
| 219 | + if (Cart::getConditionsByType('sending_method')->count()) { |
|
| 220 | 220 | $data['sending_method'] = Cart::getConditionsByType('sending_method'); |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | - if(Cart::getConditionsByType('sending_method_country_price')->count()) { |
|
| 223 | + if (Cart::getConditionsByType('sending_method_country_price')->count()) { |
|
| 224 | 224 | $data['sending_method_country_price'] = Cart::getConditionsByType('sending_method_country_price'); |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - if(Cart::getConditionsByType('payment_method')->count()) { |
|
| 227 | + if (Cart::getConditionsByType('payment_method')->count()) { |
|
| 228 | 228 | $data['payment_method'] = Cart::getConditionsByType('payment_method'); |
| 229 | 229 | } |
| 230 | 230 | |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $template = 'frontend.product.combinations'; |
| 44 | 44 | |
| 45 | 45 | $leadingAttributeId = key(reset($newPullDowns)); |
| 46 | - if($productAttributeId) { |
|
| 46 | + if ($productAttributeId) { |
|
| 47 | 47 | $leadingAttributeId = $productAttributeId; |
| 48 | 48 | } else { |
| 49 | 49 | $productAttributeId = $pullDowns['productAttribute']->first()->id; |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | ->addColumn('status', function ($order) { |
| 48 | 48 | if ($order->orderStatus) { |
| 49 | - return $order->orderStatus->title; |
|
| 49 | + return $order->orderStatus->title; |
|
| 50 | 50 | } |
| 51 | 51 | }) |
| 52 | 52 | |
@@ -44,16 +44,16 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | $datatables = DataTables::of($order) |
| 46 | 46 | |
| 47 | - ->addColumn('status', function ($order) { |
|
| 47 | + ->addColumn('status', function($order) { |
|
| 48 | 48 | if ($order->orderStatus) { |
| 49 | 49 | return $order->orderStatus->title; |
| 50 | 50 | } |
| 51 | 51 | }) |
| 52 | 52 | |
| 53 | - ->addColumn('created_at', function ($order) { |
|
| 53 | + ->addColumn('created_at', function($order) { |
|
| 54 | 54 | return date('d F H:i', strtotime($order->created_at)); |
| 55 | 55 | }) |
| 56 | - ->addColumn('status', function ($order) { |
|
| 56 | + ->addColumn('status', function($order) { |
|
| 57 | 57 | if ($order->orderStatus) { |
| 58 | 58 | if ($order->orderStatus->color) { |
| 59 | 59 | 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>'; |
@@ -61,33 +61,33 @@ discard block |
||
| 61 | 61 | return $order->orderStatus->title; |
| 62 | 62 | } |
| 63 | 63 | }) |
| 64 | - ->addColumn('client', function ($order) { |
|
| 64 | + ->addColumn('client', function($order) { |
|
| 65 | 65 | if ($order->client) { |
| 66 | 66 | if ($order->orderBillAddress) { |
| 67 | 67 | return $order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname; |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | }) |
| 71 | - ->addColumn('products', function ($order) { |
|
| 71 | + ->addColumn('products', function($order) { |
|
| 72 | 72 | if ($order->products) { |
| 73 | 73 | return $order->products->count(); |
| 74 | 74 | } |
| 75 | 75 | }) |
| 76 | - ->addColumn('price_with_tax', function ($order) { |
|
| 76 | + ->addColumn('price_with_tax', function($order) { |
|
| 77 | 77 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
| 78 | 78 | return $money; |
| 79 | 79 | }) |
| 80 | - ->addColumn('paymentMethod', function ($order) { |
|
| 80 | + ->addColumn('paymentMethod', function($order) { |
|
| 81 | 81 | if ($order->orderPaymentMethod) { |
| 82 | 82 | return $order->orderPaymentMethod->title; |
| 83 | 83 | } |
| 84 | 84 | }) |
| 85 | - ->addColumn('sendingMethod', function ($order) { |
|
| 85 | + ->addColumn('sendingMethod', function($order) { |
|
| 86 | 86 | if ($order->orderSendingMethod) { |
| 87 | 87 | return $order->orderSendingMethod->title; |
| 88 | 88 | } |
| 89 | 89 | }) |
| 90 | - ->addColumn('action', function ($order) { |
|
| 90 | + ->addColumn('action', function($order) { |
|
| 91 | 91 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
| 92 | 92 | $links = '<a href="/admin/order/'.$order->id.'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Show</a> '.$download; |
| 93 | 93 | |
@@ -47,6 +47,6 @@ |
||
| 47 | 47 | public function store($productId, Request $request) |
| 48 | 48 | { |
| 49 | 49 | $result = ProductExtraFieldValueService::create($request->all(), $productId); |
| 50 | - return ProductExtraFieldValueService::notificationRedirect(array('product.product-extra-field-value.index', $productId), $result, 'The product extra fields are updated.'); |
|
| 50 | + return ProductExtraFieldValueService::notificationRedirect(array('product.product-extra-field-value.index', $productId), $result, 'The product extra fields are updated.'); |
|
| 51 | 51 | } |
| 52 | 52 | } |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | |
| 47 | 47 | public function store($productId, Request $request) |
| 48 | 48 | { |
| 49 | - $result = ProductExtraFieldValueService::create($request->all(), $productId); |
|
| 49 | + $result = ProductExtraFieldValueService::create($request->all(), $productId); |
|
| 50 | 50 | return ProductExtraFieldValueService::notificationRedirect(array('product.product-extra-field-value.index', $productId), $result, 'The product extra fields are updated.'); |
| 51 | 51 | } |
| 52 | 52 | } |
@@ -259,9 +259,9 @@ |
||
| 259 | 259 | { |
| 260 | 260 | $order = OrderService::find($orderId); |
| 261 | 261 | if($order->orderLabel()->count()) { |
| 262 | - header("Content-type: application/octet-stream"); |
|
| 263 | - header("Content-disposition: attachment;filename=label.pdf"); |
|
| 264 | - echo $order->orderLabel->data; |
|
| 262 | + header("Content-type: application/octet-stream"); |
|
| 263 | + header("Content-disposition: attachment;filename=label.pdf"); |
|
| 264 | + echo $order->orderLabel->data; |
|
| 265 | 265 | } |
| 266 | 266 | } |
| 267 | 267 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | use Hideyo\Ecommerce\Framework\Services\Order\OrderFacade as OrderService; |
| 15 | 15 | use Hideyo\Ecommerce\Framework\Services\Order\OrderStatusFacade as OrderStatusService; |
| 16 | 16 | use Hideyo\Ecommerce\Framework\Services\PaymentMethod\PaymentMethodFacade as PaymentMethodService; |
| 17 | -use Hideyo\Ecommerce\Framework\Services\SendingMethod\SendingMethodFacade as SendingMethodService;use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService; |
|
| 17 | +use Hideyo\Ecommerce\Framework\Services\SendingMethod\SendingMethodFacade as SendingMethodService; use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService; |
|
| 18 | 18 | |
| 19 | 19 | use Carbon\Carbon; |
| 20 | 20 | use Request; |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | { |
| 29 | 29 | public function index() |
| 30 | 30 | { |
| 31 | - $shop = auth('hideyobackend')->user()->shop; |
|
| 31 | + $shop = auth('hideyobackend')->user()->shop; |
|
| 32 | 32 | $now = Carbon::now(); |
| 33 | 33 | |
| 34 | 34 | $revenueThisMonth = null; |
@@ -58,15 +58,15 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | $datatables = \DataTables::of($order) |
| 60 | 60 | |
| 61 | - ->addColumn('generated_custom_order_id', function ($order) { |
|
| 61 | + ->addColumn('generated_custom_order_id', function($order) { |
|
| 62 | 62 | return $order->generated_custom_order_id; |
| 63 | 63 | }) |
| 64 | 64 | |
| 65 | - ->addColumn('created_at', function ($order) { |
|
| 65 | + ->addColumn('created_at', function($order) { |
|
| 66 | 66 | return date('d F H:i', strtotime($order->created_at)); |
| 67 | 67 | }) |
| 68 | 68 | |
| 69 | - ->addColumn('status', function ($order) { |
|
| 69 | + ->addColumn('status', function($order) { |
|
| 70 | 70 | if ($order->orderStatus) { |
| 71 | 71 | if ($order->orderStatus->color) { |
| 72 | 72 | 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 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | }) |
| 77 | 77 | |
| 78 | - ->filterColumn('client', function ($query, $keyword) { |
|
| 78 | + ->filterColumn('client', function($query, $keyword) { |
|
| 79 | 79 | |
| 80 | 80 | $query->where( |
| 81 | - function ($query) use ($keyword) { |
|
| 81 | + function($query) use ($keyword) { |
|
| 82 | 82 | $query->whereRaw("order_address.firstname like ?", ["%{$keyword}%"]); |
| 83 | 83 | $query->orWhereRaw("order_address.lastname like ?", ["%{$keyword}%"]); |
| 84 | 84 | ; |
| 85 | 85 | } |
| 86 | 86 | ); |
| 87 | 87 | }) |
| 88 | - ->addColumn('client', function ($order) { |
|
| 88 | + ->addColumn('client', function($order) { |
|
| 89 | 89 | if ($order->client) { |
| 90 | 90 | if ($order->orderBillAddress) { |
| 91 | - return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count() .')</a>'; |
|
| 91 | + return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count().')</a>'; |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | }) |
| 95 | - ->addColumn('products', function ($order) { |
|
| 95 | + ->addColumn('products', function($order) { |
|
| 96 | 96 | if ($order->products) { |
| 97 | 97 | return $order->products->count(); |
| 98 | 98 | } |
| 99 | 99 | }) |
| 100 | - ->addColumn('price_with_tax', function ($order) { |
|
| 100 | + ->addColumn('price_with_tax', function($order) { |
|
| 101 | 101 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
| 102 | 102 | return $money; |
| 103 | 103 | }) |
| 104 | 104 | |
| 105 | 105 | |
| 106 | - ->addColumn('paymentMethod', function ($order) { |
|
| 106 | + ->addColumn('paymentMethod', function($order) { |
|
| 107 | 107 | if ($order->orderPaymentMethod) { |
| 108 | 108 | return $order->orderPaymentMethod->title; |
| 109 | 109 | } |
| 110 | 110 | }) |
| 111 | - ->addColumn('sendingMethod', function ($order) { |
|
| 111 | + ->addColumn('sendingMethod', function($order) { |
|
| 112 | 112 | if ($order->orderSendingMethod) { |
| 113 | 113 | return $order->orderSendingMethod->title; |
| 114 | 114 | } |
| 115 | 115 | }) |
| 116 | - ->addColumn('action', function ($order) { |
|
| 117 | - $deleteLink = \Form::deleteajax('/admin/order/'. $order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 116 | + ->addColumn('action', function($order) { |
|
| 117 | + $deleteLink = \Form::deleteajax('/admin/order/'.$order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 118 | 118 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
| 119 | 119 | |
| 120 | 120 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | if ($data and $data['order']) { |
| 149 | 149 | |
| 150 | - if($data['type'] == 'one-pdf') { |
|
| 150 | + if ($data['type'] == 'one-pdf') { |
|
| 151 | 151 | $pdfHtml = ""; |
| 152 | 152 | $countOrders = count($data['order']); |
| 153 | 153 | $i = 0; |
@@ -173,15 +173,15 @@ discard block |
||
| 173 | 173 | $pdf = PDF::loadHTML($pdfHtmlBody); |
| 174 | 174 | |
| 175 | 175 | return $pdf->download('order-'.$order->generated_custom_order_id.'.pdf'); |
| 176 | - } elseif($data['type'] == 'product-list') { |
|
| 176 | + } elseif ($data['type'] == 'product-list') { |
|
| 177 | 177 | $products = OrderService::productsByOrderIds($data['order']); |
| 178 | 178 | |
| 179 | - if($products) { |
|
| 179 | + if ($products) { |
|
| 180 | 180 | |
| 181 | 181 | |
| 182 | - Excel::create('products', function ($excel) use ($products) { |
|
| 182 | + Excel::create('products', function($excel) use ($products) { |
|
| 183 | 183 | |
| 184 | - $excel->sheet('Products', function ($sheet) use ($products) { |
|
| 184 | + $excel->sheet('Products', function($sheet) use ($products) { |
|
| 185 | 185 | $newArray = array(); |
| 186 | 186 | foreach ($products as $key => $row) { |
| 187 | 187 | |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | |
| 213 | 213 | if ($orders) { |
| 214 | 214 | Request::session()->put('print_orders', $orders->toArray()); |
| 215 | - return response()->json(array('orders' => $orders->toArray() )); |
|
| 215 | + return response()->json(array('orders' => $orders->toArray())); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | Request::session()->destroy('print_orders'); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | public function downloadLabel($orderId) |
| 256 | 256 | { |
| 257 | 257 | $order = OrderService::find($orderId); |
| 258 | - if($order->orderLabel()->count()) { |
|
| 258 | + if ($order->orderLabel()->count()) { |
|
| 259 | 259 | header("Content-type: application/octet-stream"); |
| 260 | 260 | header("Content-disposition: attachment;filename=label.pdf"); |
| 261 | 261 | echo $order->orderLabel->data; |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | ); |
| 289 | 289 | foreach ($replace as $key => $val) { |
| 290 | - $content = str_replace("[" . $key . "]", $val, $content); |
|
| 290 | + $content = str_replace("[".$key."]", $val, $content); |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | return $content; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | |
| 301 | 301 | public function update($orderId) |
| 302 | 302 | { |
| 303 | - $result = OrderService::updateById(Request::all(), $orderId); |
|
| 303 | + $result = OrderService::updateById(Request::all(), $orderId); |
|
| 304 | 304 | |
| 305 | 305 | if ($result->errors()->all()) { |
| 306 | 306 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | function ($query) use ($keyword) { |
| 69 | 69 | $query->whereRaw("product.title like ?", ["%{$keyword}%"]); |
| 70 | 70 | $query->orWhereRaw("product.reference_code like ?", ["%{$keyword}%"]); |
| 71 | - $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]); |
|
| 71 | + $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]); |
|
| 72 | 72 | ; |
| 73 | 73 | } |
| 74 | 74 | ); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | ['product.*', |
| 30 | 30 | 'brand.title as brandtitle', |
| 31 | 31 | 'product_category.title as categorytitle'] |
| 32 | - )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages','taxRate')) |
|
| 32 | + )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages', 'taxRate')) |
|
| 33 | 33 | |
| 34 | 34 | ->leftJoin('product_category as product_category', 'product_category.id', '=', 'product.product_category_id') |
| 35 | 35 | |
@@ -38,23 +38,23 @@ discard block |
||
| 38 | 38 | ->where('product.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 39 | 39 | |
| 40 | 40 | $datatables = \DataTables::of($product) |
| 41 | - ->filterColumn('reference_code', function ($query, $keyword) { |
|
| 41 | + ->filterColumn('reference_code', function($query, $keyword) { |
|
| 42 | 42 | $query->whereRaw("product.reference_code like ?", ["%{$keyword}%"]); |
| 43 | 43 | }) |
| 44 | - ->filterColumn('active', function ($query, $keyword) { |
|
| 44 | + ->filterColumn('active', function($query, $keyword) { |
|
| 45 | 45 | $query->whereRaw("product.active like ?", ["%{$keyword}%"]); |
| 46 | 46 | ; |
| 47 | 47 | }) |
| 48 | 48 | |
| 49 | - ->addColumn('rank', function ($product) { |
|
| 49 | + ->addColumn('rank', function($product) { |
|
| 50 | 50 | return '<input type="text" class="change-rank" value="'.$product->rank.'" style="width:50px;" data-url="/admin/product/change-rank/'.$product->id.'">'; |
| 51 | 51 | |
| 52 | 52 | }) |
| 53 | 53 | |
| 54 | - ->filterColumn('title', function ($query, $keyword) { |
|
| 54 | + ->filterColumn('title', function($query, $keyword) { |
|
| 55 | 55 | |
| 56 | 56 | $query->where( |
| 57 | - function ($query) use ($keyword) { |
|
| 57 | + function($query) use ($keyword) { |
|
| 58 | 58 | $query->whereRaw("product.title like ?", ["%{$keyword}%"]); |
| 59 | 59 | $query->orWhereRaw("product.reference_code like ?", ["%{$keyword}%"]); |
| 60 | 60 | $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]); |
@@ -63,11 +63,11 @@ discard block |
||
| 63 | 63 | ); |
| 64 | 64 | }) |
| 65 | 65 | |
| 66 | - ->filterColumn('categorytitle', function ($query, $keyword) { |
|
| 66 | + ->filterColumn('categorytitle', function($query, $keyword) { |
|
| 67 | 67 | $query->whereRaw("product_category.title like ?", ["%{$keyword}%"]); |
| 68 | 68 | }) |
| 69 | 69 | |
| 70 | - ->addColumn('active', function ($product) { |
|
| 70 | + ->addColumn('active', function($product) { |
|
| 71 | 71 | if ($product->active) { |
| 72 | 72 | return '<a href="#" class="change-active" data-url="'.url()->route('product.change-active', array('productId' => $product->id)).'"><span class="glyphicon glyphicon-ok icon-green"></span></a>'; |
| 73 | 73 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | return '<a href="#" class="change-active" data-url="'.url()->route('product.change-active', array('productId' => $product->id)).'"><span class="glyphicon glyphicon-remove icon-red"></span></a>'; |
| 76 | 76 | }) |
| 77 | 77 | |
| 78 | - ->addColumn('title', function ($product) { |
|
| 78 | + ->addColumn('title', function($product) { |
|
| 79 | 79 | if ($product->brand) { |
| 80 | 80 | return $product->brand->title.' | '.$product->title; |
| 81 | 81 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | }) |
| 85 | 85 | |
| 86 | 86 | |
| 87 | - ->addColumn('amount', function ($product) { |
|
| 87 | + ->addColumn('amount', function($product) { |
|
| 88 | 88 | if ($product->attributes->count()) { |
| 89 | 89 | return '<a href="/admin/product/'.$product->id.'/product-combination">combinations</a>'; |
| 90 | 90 | } |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | return '<input type="text" class="change-amount" value="'.$product->amount.'" style="width:50px;" data-url="'.url()->route('product.change-amount', array('productId' => $product->id)).'">'; |
| 93 | 93 | }) |
| 94 | 94 | |
| 95 | - ->addColumn('image', function ($product) { |
|
| 95 | + ->addColumn('image', function($product) { |
|
| 96 | 96 | if ($product->productImages->count()) { |
| 97 | 97 | return '<img src="/files/product/100x100/'.$product->id.'/'.$product->productImages->first()->file.'" />'; |
| 98 | 98 | } |
| 99 | 99 | }) |
| 100 | - ->addColumn('price', function ($product) { |
|
| 100 | + ->addColumn('price', function($product) { |
|
| 101 | 101 | |
| 102 | 102 | $result = ""; |
| 103 | 103 | if ($product->price) { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | 'amount' => $product->amount |
| 148 | 148 | ); |
| 149 | 149 | |
| 150 | - $result = '€ '.$output['orginal_price_ex_tax_number_format'].' / € '.$output['orginal_price_inc_tax_number_format']; |
|
| 150 | + $result = '€ '.$output['orginal_price_ex_tax_number_format'].' / € '.$output['orginal_price_inc_tax_number_format']; |
|
| 151 | 151 | |
| 152 | 152 | |
| 153 | 153 | if ($product->discount_value) { |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | }) |
| 160 | 160 | |
| 161 | 161 | |
| 162 | - ->addColumn('categorytitle', function ($product) { |
|
| 162 | + ->addColumn('categorytitle', function($product) { |
|
| 163 | 163 | if ($product->subcategories()->count()) { |
| 164 | 164 | $subcategories = $product->subcategories()->pluck('title')->toArray(); |
| 165 | 165 | return $product->categorytitle.', <small> '.implode(', ', $subcategories).'</small>'; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | return $product->categorytitle; |
| 169 | 169 | }) |
| 170 | 170 | |
| 171 | - ->addColumn('action', function ($product) { |
|
| 171 | + ->addColumn('action', function($product) { |
|
| 172 | 172 | $deleteLink = \Form::deleteajax(url()->route('product.destroy', $product->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'), $product->title); |
| 173 | 173 | $copy = '<a href="'.url()->route('product.copy', $product->id).'" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Copy</a>'; |
| 174 | 174 | |
@@ -191,26 +191,26 @@ discard block |
||
| 191 | 191 | ['product.*', |
| 192 | 192 | 'brand.title as brandtitle', |
| 193 | 193 | 'product_category.title as categorytitle'] |
| 194 | - )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages','taxRate')) |
|
| 194 | + )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages', 'taxRate')) |
|
| 195 | 195 | ->leftJoin('product_category as product_category', 'product_category.id', '=', 'product.product_category_id') |
| 196 | 196 | ->leftJoin('brand as brand', 'brand.id', '=', 'product.brand_id') |
| 197 | 197 | ->where('product.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 198 | 198 | |
| 199 | 199 | $datatables = \DataTables::of($product) |
| 200 | - ->addColumn('rank', function ($product) { |
|
| 200 | + ->addColumn('rank', function($product) { |
|
| 201 | 201 | return '<input type="text" class="change-rank" value="'.$product->rank.'" style="width:50px;" data-url="'.url()->route('product.change-rank', array('productId' => $product->id)).'">'; |
| 202 | 202 | }) |
| 203 | - ->filterColumn('categorytitle', function ($query, $keyword) { |
|
| 203 | + ->filterColumn('categorytitle', function($query, $keyword) { |
|
| 204 | 204 | $query->whereRaw("product_category.title like ?", ["%{$keyword}%"]); |
| 205 | 205 | }) |
| 206 | - ->addColumn('title', function ($product) { |
|
| 206 | + ->addColumn('title', function($product) { |
|
| 207 | 207 | if ($product->brand) { |
| 208 | 208 | return $product->brand->title.' | '.$product->title; |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | return $product->title; |
| 212 | 212 | }) |
| 213 | - ->addColumn('categorytitle', function ($product) { |
|
| 213 | + ->addColumn('categorytitle', function($product) { |
|
| 214 | 214 | if ($product->subcategories()->count()) { |
| 215 | 215 | $subcategories = $product->subcategories()->pluck('title')->toArray(); |
| 216 | 216 | return $product->categorytitle.', <small> '.implode(', ', $subcategories).'</small>'; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | |
| 240 | 240 | public function store(Request $request) |
| 241 | 241 | { |
| 242 | - $result = ProductService::create($request->all()); |
|
| 242 | + $result = ProductService::create($request->all()); |
|
| 243 | 243 | return ProductService::notificationRedirect('product.index', $result, 'The product was inserted.'); |
| 244 | 244 | } |
| 245 | 245 | |
@@ -284,10 +284,10 @@ discard block |
||
| 284 | 284 | public function postExport() |
| 285 | 285 | { |
| 286 | 286 | |
| 287 | - $result = ProductService::selectAllExport(); |
|
| 288 | - Excel::create('export', function ($excel) use ($result) { |
|
| 287 | + $result = ProductService::selectAllExport(); |
|
| 288 | + Excel::create('export', function($excel) use ($result) { |
|
| 289 | 289 | |
| 290 | - $excel->sheet('Products', function ($sheet) use ($result) { |
|
| 290 | + $excel->sheet('Products', function($sheet) use ($result) { |
|
| 291 | 291 | $newArray = array(); |
| 292 | 292 | foreach ($result as $row) { |
| 293 | 293 | $category = ""; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $i = 0; |
| 317 | 317 | foreach ($row->productImages as $image) { |
| 318 | 318 | $i++; |
| 319 | - $newArray[$row->id]['image_'.$i] = url('/').'/files/product/800x800/'.$row->id.'/'.$image->file; |
|
| 319 | + $newArray[$row->id]['image_'.$i] = url('/').'/files/product/800x800/'.$row->id.'/'.$image->file; |
|
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | } |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | public function update(Request $request, $productId) |
| 387 | 387 | { |
| 388 | 388 | $input = $request->all(); |
| 389 | - $result = ProductService::updateById($input, $productId); |
|
| 389 | + $result = ProductService::updateById($input, $productId); |
|
| 390 | 390 | |
| 391 | 391 | $redirect = redirect()->route('product.index'); |
| 392 | 392 | |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | |
| 417 | 417 | public function destroy($id) |
| 418 | 418 | { |
| 419 | - $result = ProductService::destroy($id); |
|
| 419 | + $result = ProductService::destroy($id); |
|
| 420 | 420 | |
| 421 | 421 | if ($result) { |
| 422 | 422 | Notification::success('The product was deleted.'); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | public function index(Request $request, $productId) |
| 20 | 20 | { |
| 21 | - $product = ProductService::find($productId); |
|
| 21 | + $product = ProductService::find($productId); |
|
| 22 | 22 | if ($request->wantsJson()) { |
| 23 | 23 | |
| 24 | 24 | $query = ProductService::getImageModel()->where('product_id', '=', $productId); |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | foreach ($newProductAttributes as $key => $productAttribute) { |
| 97 | 97 | $newArray = array(); |
| 98 | 98 | foreach ($productAttribute as $keyNew => $valueNew) { |
| 99 | - $newArray[] = $keyNew.': '.$valueNew['value']; |
|
| 100 | - $attributesList[$valueNew['id']] = $valueNew['value']; |
|
| 99 | + $newArray[] = $keyNew.': '.$valueNew['value']; |
|
| 100 | + $attributesList[$valueNew['id']] = $valueNew['value']; |
|
| 101 | 101 | } |
| 102 | 102 | $productAttributesList[$key] = implode(', ', $newArray); |
| 103 | 103 | } |
@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | $query = ProductService::getImageModel()->where('product_id', '=', $productId); |
| 25 | 25 | |
| 26 | 26 | $datatables = \DataTables::of($query) |
| 27 | - ->addColumn('thumb', function ($query) use ($productId) { |
|
| 27 | + ->addColumn('thumb', function($query) use ($productId) { |
|
| 28 | 28 | return '<img src="/files/product/100x100/'.$query->product_id.'/'.$query->file.'" />'; |
| 29 | 29 | }) |
| 30 | 30 | |
| 31 | - ->addColumn('action', function ($query) use ($productId) { |
|
| 31 | + ->addColumn('action', function($query) use ($productId) { |
|
| 32 | 32 | $deleteLink = \Form::deleteajax(url()->route('product.images.destroy', array('productId' => $productId, 'id' => $query->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 33 | 33 | $links = '<a href="'.url()->route('product.images.edit', array('productId' => $productId, 'id' => $query->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
| 34 | 34 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | public function store(Request $request, $productId) |
| 52 | 52 | { |
| 53 | - $result = ProductService::createImage($request->all(), $productId); |
|
| 53 | + $result = ProductService::createImage($request->all(), $productId); |
|
| 54 | 54 | return ProductService::notificationRedirect(array('product.images.index', $productId), $result, 'The product image was inserted.'); |
| 55 | 55 | } |
| 56 | 56 | |
@@ -64,13 +64,13 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | if ($productImage->relatedProductAttributes->count()) { |
| 66 | 66 | foreach ($productImage->relatedProductAttributes as $row) { |
| 67 | - $selectedProductAttributes[] = $row->pivot->product_attribute_id; |
|
| 67 | + $selectedProductAttributes[] = $row->pivot->product_attribute_id; |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | if ($productImage->relatedAttributes->count()) { |
| 72 | 72 | foreach ($productImage->relatedAttributes as $row) { |
| 73 | - $selectedAttributes[] = $row->pivot->attribute_id; |
|
| 73 | + $selectedAttributes[] = $row->pivot->attribute_id; |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | public function generateAttributeLists($product) |
| 81 | 81 | { |
| 82 | - $productAttributes = $product->attributes; |
|
| 82 | + $productAttributes = $product->attributes; |
|
| 83 | 83 | $newProductAttributes = array(); |
| 84 | 84 | $attributesList = array(); |
| 85 | 85 | $productAttributesList = array(); |
@@ -109,13 +109,13 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | public function update(Request $request, $productId, $productImageId) |
| 111 | 111 | { |
| 112 | - $result = ProductService::updateImageById($request->all(), $productId, $productImageId); |
|
| 112 | + $result = ProductService::updateImageById($request->all(), $productId, $productImageId); |
|
| 113 | 113 | return ProductService::notificationRedirect(array('product.images.index', $productId), $result, 'The product image was update.'); |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | public function destroy($productId, $productImageId) |
| 117 | 117 | { |
| 118 | - $result = ProductService::destroyImage($productImageId); |
|
| 118 | + $result = ProductService::destroyImage($productImageId); |
|
| 119 | 119 | |
| 120 | 120 | if ($result) { |
| 121 | 121 | Notification::success('The product image is deleted.'); |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | }) |
| 49 | 49 | ->addColumn('bill', function ($addresses) { |
| 50 | 50 | if ($addresses->clientBillAddress()->count()) { |
| 51 | - return '<span class="glyphicon glyphicon-ok icon-green"></span>'; |
|
| 51 | + return '<span class="glyphicon glyphicon-ok icon-green"></span>'; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | return '<span class="glyphicon glyphicon-remove icon-red"></span>'; |
@@ -27,24 +27,24 @@ discard block |
||
| 27 | 27 | $addresses = ClientService::getAddressModel()->with(array('clientDeliveryAddress', 'clientBillAddress'))->where('client_id', '=', $clientId); |
| 28 | 28 | |
| 29 | 29 | $datatables = DataTables::of($addresses) |
| 30 | - ->addColumn('housenumber', function ($addresses) { |
|
| 30 | + ->addColumn('housenumber', function($addresses) { |
|
| 31 | 31 | return $addresses->housenumber.$addresses->housenumber_suffix; |
| 32 | 32 | }) |
| 33 | - ->addColumn('delivery', function ($addresses) { |
|
| 33 | + ->addColumn('delivery', function($addresses) { |
|
| 34 | 34 | if ($addresses->clientDeliveryAddress()->count()) { |
| 35 | 35 | return '<span class="glyphicon glyphicon-ok icon-green"></span>'; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | return '<span class="glyphicon glyphicon-remove icon-red"></span>'; |
| 39 | 39 | }) |
| 40 | - ->addColumn('bill', function ($addresses) { |
|
| 40 | + ->addColumn('bill', function($addresses) { |
|
| 41 | 41 | if ($addresses->clientBillAddress()->count()) { |
| 42 | 42 | return '<span class="glyphicon glyphicon-ok icon-green"></span>'; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | return '<span class="glyphicon glyphicon-remove icon-red"></span>'; |
| 46 | 46 | }) |
| 47 | - ->addColumn('action', function ($addresses) use ($clientId) { |
|
| 47 | + ->addColumn('action', function($addresses) use ($clientId) { |
|
| 48 | 48 | $deleteLink = Form::deleteajax(url()->route('client.addresses.destroy', array('clientId' => $clientId, 'clientAddressId' => $addresses->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 49 | 49 | $links = '<a href="'.url()->route('client.addresses.edit', array('clientId' => $clientId, 'clientAddressId' => $addresses->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
| 50 | 50 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | public function store(Request $request, $clientId) |
| 67 | 67 | { |
| 68 | - $result = ClientService::createAddress($request->all(), $clientId); |
|
| 68 | + $result = ClientService::createAddress($request->all(), $clientId); |
|
| 69 | 69 | return ClientService::notificationRedirect(array('client.addresses.index', $clientId), $result, 'The client adress is inserted.'); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -77,13 +77,13 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public function update(Request $request, $clientId, $id) |
| 79 | 79 | { |
| 80 | - $result = ClientService::editAddress($clientId, $id, $request->all()); |
|
| 80 | + $result = ClientService::editAddress($clientId, $id, $request->all()); |
|
| 81 | 81 | return ClientService::notificationRedirect(array('client.addresses.index', $clientId), $result, 'The client adress is updated.'); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | public function destroy($clientId, $id) |
| 85 | 85 | { |
| 86 | - $result = ClientService::destroyAddress($id); |
|
| 86 | + $result = ClientService::destroyAddress($id); |
|
| 87 | 87 | |
| 88 | 88 | if ($result) { |
| 89 | 89 | Notification::success('The client address is deleted.'); |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | $datatables = \DataTables::of($invoice) |
| 44 | - ->addColumn('price_with_tax', function ($order) { |
|
| 44 | + ->addColumn('price_with_tax', function($order) { |
|
| 45 | 45 | $money = '€ '.$order->price_with_tax; |
| 46 | 46 | return $money; |
| 47 | 47 | }) |
| 48 | - ->addColumn('action', function ($invoice) { |
|
| 49 | - $deleteLink = \Form::deleteajax('/invoice/'. $invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 48 | + ->addColumn('action', function($invoice) { |
|
| 49 | + $deleteLink = \Form::deleteajax('/invoice/'.$invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 50 | 50 | $download = '<a href="/invoice/'.$invoice->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
| 51 | 51 | $links = '<a href="/invoice/'.$invoice->id.'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Show</a> '.$download; |
| 52 | 52 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | public function store() |
| 84 | 84 | { |
| 85 | - $result = $this->invoice->create(Request::all()); |
|
| 85 | + $result = $this->invoice->create(Request::all()); |
|
| 86 | 86 | |
| 87 | 87 | if (isset($result->id)) { |
| 88 | 88 | \Notification::success('The invoice was inserted.'); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | public function update($invoiceId) |
| 106 | 106 | { |
| 107 | - $result = $this->invoice->updateById(Request::all(), $invoiceId); |
|
| 107 | + $result = $this->invoice->updateById(Request::all(), $invoiceId); |
|
| 108 | 108 | |
| 109 | 109 | if (isset($result->id)) { |
| 110 | 110 | \Notification::success('The invoice was updated.'); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | public function destroy($invoiceId) |
| 119 | 119 | { |
| 120 | - $result = $this->invoice->destroy($invoiceId); |
|
| 120 | + $result = $this->invoice->destroy($invoiceId); |
|
| 121 | 121 | |
| 122 | 122 | if ($result) { |
| 123 | 123 | Notification::success('The invoice was deleted.'); |