@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | |
32 | 32 | |
33 | 33 | $datatables = \DataTables::of($invoice) |
34 | - ->addColumn('price_with_tax', function ($order) { |
|
34 | + ->addColumn('price_with_tax', function($order) { |
|
35 | 35 | $money = '€ '.$order->price_with_tax; |
36 | 36 | return $money; |
37 | 37 | }) |
38 | - ->addColumn('action', function ($invoice) { |
|
39 | - $deleteLink = \Form::deleteajax('/invoice/'. $invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
38 | + ->addColumn('action', function($invoice) { |
|
39 | + $deleteLink = \Form::deleteajax('/invoice/'.$invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
40 | 40 | $download = '<a href="/invoice/'.$invoice->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
41 | 41 | $links = '<a href="/invoice/'.$invoice->id.'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Show</a> '.$download; |
42 | 42 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | public function store() |
73 | 73 | { |
74 | - $result = InvoiceService::create(Request::all()); |
|
74 | + $result = InvoiceService::create(Request::all()); |
|
75 | 75 | |
76 | 76 | if (isset($result->id)) { |
77 | 77 | \Notification::success('The invoice was inserted.'); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | public function update($invoiceId) |
95 | 95 | { |
96 | - $result = InvoiceService::updateById(Request::all(), $invoiceId); |
|
96 | + $result = InvoiceService::updateById(Request::all(), $invoiceId); |
|
97 | 97 | |
98 | 98 | if (isset($result->id)) { |
99 | 99 | \Notification::success('The invoice was updated.'); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | public function destroy($invoiceId) |
108 | 108 | { |
109 | - $result = InvoiceService::destroy($invoiceId); |
|
109 | + $result = InvoiceService::destroy($invoiceId); |
|
110 | 110 | |
111 | 111 | if ($result) { |
112 | 112 | Notification::success('The invoice was deleted.'); |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | public function index(Request $request) |
23 | 23 | { |
24 | 24 | if ($request->wantsJson()) { |
25 | - $query = UserService::getModel()->select(['id','email', 'username']); |
|
26 | - $datatables = DataTables::of($query)->addColumn('action', function ($query) { |
|
25 | + $query = UserService::getModel()->select(['id', 'email', 'username']); |
|
26 | + $datatables = DataTables::of($query)->addColumn('action', function($query) { |
|
27 | 27 | $deleteLink = Form::deleteajax(url()->route('user.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
28 | 28 | $links = '<a href="'.url()->route('user.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
29 | 29 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | public function store(Request $request) |
46 | 46 | { |
47 | - $result = UserService::signup($request->all()); |
|
47 | + $result = UserService::signup($request->all()); |
|
48 | 48 | return UserService::notificationRedirect('user.index', $result, 'The user was inserted.'); |
49 | 49 | } |
50 | 50 | |
@@ -61,20 +61,20 @@ discard block |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | $shop = ShopService::find($shopId); |
64 | - $result = UserService::updateShopProfileById($shop, $id); |
|
64 | + $result = UserService::updateShopProfileById($shop, $id); |
|
65 | 65 | Notification::success('The shop changed.'); |
66 | 66 | return redirect()->route('shop.index'); |
67 | 67 | } |
68 | 68 | |
69 | 69 | public function update(Request $request, $id) |
70 | 70 | { |
71 | - $result = UserService::updateById($request->all(), $request->file('avatar'), $id); |
|
71 | + $result = UserService::updateById($request->all(), $request->file('avatar'), $id); |
|
72 | 72 | return UserService::notificationRedirect('user.index', $result, 'The user was updated.'); |
73 | 73 | } |
74 | 74 | |
75 | 75 | public function destroy($id) |
76 | 76 | { |
77 | - $result = UserService::destroy($id); |
|
77 | + $result = UserService::destroy($id); |
|
78 | 78 | |
79 | 79 | if ($result) { |
80 | 80 | Notification::success('The user was deleted.'); |
@@ -24,11 +24,11 @@ discard block |
||
24 | 24 | $query = RedirectService::selectAll(); |
25 | 25 | $datatables = DataTables::of($query) |
26 | 26 | |
27 | - ->addColumn('url', function ($query) { |
|
27 | + ->addColumn('url', function($query) { |
|
28 | 28 | return '<a href="'.$query->url.'" target="_blank">'.$query->url.'</a>'; |
29 | 29 | }) |
30 | 30 | |
31 | - ->addColumn('action', function ($query) { |
|
31 | + ->addColumn('action', function($query) { |
|
32 | 32 | $deleteLink = \Form::deleteajax(url()->route('redirect.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
33 | 33 | $links = '<a href="'.url()->route('redirect.edit', $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() |
52 | 52 | { |
53 | - $result = RedirectService::create($request->all()); |
|
53 | + $result = RedirectService::create($request->all()); |
|
54 | 54 | return RedirectService::notificationRedirect('redirect.index', $result, 'The redirect was inserted.'); |
55 | 55 | } |
56 | 56 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | public function postImport() |
72 | 72 | { |
73 | 73 | $file = $request->file('file'); |
74 | - Excel::load($file, function ($reader) { |
|
74 | + Excel::load($file, function($reader) { |
|
75 | 75 | |
76 | 76 | $results = $reader->get(); |
77 | 77 | |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | |
91 | 91 | public function getExport() |
92 | 92 | { |
93 | - $result = RedirectService::selectAll(); |
|
93 | + $result = RedirectService::selectAll(); |
|
94 | 94 | |
95 | - Excel::create('redirects', function ($excel) use ($result) { |
|
95 | + Excel::create('redirects', function($excel) use ($result) { |
|
96 | 96 | |
97 | - $excel->sheet('Redirects', function ($sheet) use ($result) { |
|
97 | + $excel->sheet('Redirects', function($sheet) use ($result) { |
|
98 | 98 | $newArray = array(); |
99 | 99 | foreach ($result as $row) { |
100 | 100 | $newArray[$row->id] = array( |
@@ -111,13 +111,13 @@ discard block |
||
111 | 111 | |
112 | 112 | public function update($redirectId) |
113 | 113 | { |
114 | - $result = RedirectService::updateById($request->all(), $redirectId); |
|
114 | + $result = RedirectService::updateById($request->all(), $redirectId); |
|
115 | 115 | return RedirectService::notificationRedirect('redirect.index', $result, 'The redirect was updated.'); |
116 | 116 | } |
117 | 117 | |
118 | 118 | public function destroy($redirectId) |
119 | 119 | { |
120 | - $result = RedirectService::destroy($redirectId); |
|
120 | + $result = RedirectService::destroy($redirectId); |
|
121 | 121 | |
122 | 122 | if ($result) { |
123 | 123 | Notification::success('Redirect item is deleted.'); |
@@ -16,8 +16,8 @@ |
||
16 | 16 | |
17 | 17 | $query = ExceptionService::getModel(); |
18 | 18 | |
19 | - $datatables = \DataTables::of($query)->addColumn('action', function ($query) { |
|
20 | - $deleteLink = \Form::deleteajax('/admin/general-setting/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
19 | + $datatables = \DataTables::of($query)->addColumn('action', function($query) { |
|
20 | + $deleteLink = \Form::deleteajax('/admin/general-setting/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
21 | 21 | $links = '<a href="/admin/general-setting/'.$query->id.'/edit" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
22 | 22 | |
23 | 23 | return $links; |
@@ -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 | use Illuminate\Http\Request; |
19 | 19 | use Carbon\Carbon; |
20 | 20 | use Notification; |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | { |
28 | 28 | public function index(Request $request) |
29 | 29 | { |
30 | - $shop = auth('hideyobackend')->user()->shop; |
|
30 | + $shop = auth('hideyobackend')->user()->shop; |
|
31 | 31 | $now = Carbon::now(); |
32 | 32 | |
33 | 33 | $revenueThisMonth = null; |
@@ -55,15 +55,15 @@ discard block |
||
55 | 55 | |
56 | 56 | $datatables = \DataTables::of($order) |
57 | 57 | |
58 | - ->addColumn('generated_custom_order_id', function ($order) { |
|
58 | + ->addColumn('generated_custom_order_id', function($order) { |
|
59 | 59 | return $order->generated_custom_order_id; |
60 | 60 | }) |
61 | 61 | |
62 | - ->addColumn('created_at', function ($order) { |
|
62 | + ->addColumn('created_at', function($order) { |
|
63 | 63 | return date('d F H:i', strtotime($order->created_at)); |
64 | 64 | }) |
65 | 65 | |
66 | - ->addColumn('status', function ($order) { |
|
66 | + ->addColumn('status', function($order) { |
|
67 | 67 | if ($order->orderStatus) { |
68 | 68 | if ($order->orderStatus->color) { |
69 | 69 | 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>'; |
@@ -72,46 +72,46 @@ discard block |
||
72 | 72 | } |
73 | 73 | }) |
74 | 74 | |
75 | - ->filterColumn('client', function ($query, $keyword) { |
|
75 | + ->filterColumn('client', function($query, $keyword) { |
|
76 | 76 | |
77 | 77 | $query->where( |
78 | - function ($query) use ($keyword) { |
|
78 | + function($query) use ($keyword) { |
|
79 | 79 | $query->whereRaw("order_address.firstname like ?", ["%{$keyword}%"]); |
80 | 80 | $query->orWhereRaw("order_address.lastname like ?", ["%{$keyword}%"]); |
81 | 81 | ; |
82 | 82 | } |
83 | 83 | ); |
84 | 84 | }) |
85 | - ->addColumn('client', function ($order) { |
|
85 | + ->addColumn('client', function($order) { |
|
86 | 86 | if ($order->client) { |
87 | 87 | if ($order->orderBillAddress) { |
88 | - return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count() .')</a>'; |
|
88 | + return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count().')</a>'; |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | }) |
92 | - ->addColumn('products', function ($order) { |
|
92 | + ->addColumn('products', function($order) { |
|
93 | 93 | if ($order->products) { |
94 | 94 | return $order->products->count(); |
95 | 95 | } |
96 | 96 | }) |
97 | - ->addColumn('price_with_tax', function ($order) { |
|
97 | + ->addColumn('price_with_tax', function($order) { |
|
98 | 98 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
99 | 99 | return $money; |
100 | 100 | }) |
101 | 101 | |
102 | 102 | |
103 | - ->addColumn('paymentMethod', function ($order) { |
|
103 | + ->addColumn('paymentMethod', function($order) { |
|
104 | 104 | if ($order->orderPaymentMethod) { |
105 | 105 | return $order->orderPaymentMethod->title; |
106 | 106 | } |
107 | 107 | }) |
108 | - ->addColumn('sendingMethod', function ($order) { |
|
108 | + ->addColumn('sendingMethod', function($order) { |
|
109 | 109 | if ($order->orderSendingMethod) { |
110 | 110 | return $order->orderSendingMethod->title; |
111 | 111 | } |
112 | 112 | }) |
113 | - ->addColumn('action', function ($order) { |
|
114 | - $deleteLink = \Form::deleteajax('/admin/order/'. $order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
113 | + ->addColumn('action', function($order) { |
|
114 | + $deleteLink = \Form::deleteajax('/admin/order/'.$order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
115 | 115 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
116 | 116 | |
117 | 117 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | if ($data and $data['order']) { |
146 | 146 | |
147 | - if($data['type'] == 'one-pdf') { |
|
147 | + if ($data['type'] == 'one-pdf') { |
|
148 | 148 | $pdfHtml = ""; |
149 | 149 | $countOrders = count($data['order']); |
150 | 150 | $i = 0; |
@@ -170,15 +170,15 @@ discard block |
||
170 | 170 | $pdf = PDF::loadHTML($pdfHtmlBody); |
171 | 171 | |
172 | 172 | return $pdf->download('order-'.$order->generated_custom_order_id.'.pdf'); |
173 | - } elseif($data['type'] == 'product-list') { |
|
173 | + } elseif ($data['type'] == 'product-list') { |
|
174 | 174 | $products = OrderService::productsByOrderIds($data['order']); |
175 | 175 | |
176 | - if($products) { |
|
176 | + if ($products) { |
|
177 | 177 | |
178 | 178 | |
179 | - Excel::create('products', function ($excel) use ($products) { |
|
179 | + Excel::create('products', function($excel) use ($products) { |
|
180 | 180 | |
181 | - $excel->sheet('Products', function ($sheet) use ($products) { |
|
181 | + $excel->sheet('Products', function($sheet) use ($products) { |
|
182 | 182 | $newArray = array(); |
183 | 183 | foreach ($products as $key => $row) { |
184 | 184 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | |
210 | 210 | if ($orders) { |
211 | 211 | $request->session()->put('print_orders', $orders->toArray()); |
212 | - return response()->json(array('orders' => $orders->toArray() )); |
|
212 | + return response()->json(array('orders' => $orders->toArray())); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | $request->session()->destroy('print_orders'); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | public function downloadLabel($orderId) |
253 | 253 | { |
254 | 254 | $order = OrderService::find($orderId); |
255 | - if($order->orderLabel()->count()) { |
|
255 | + if ($order->orderLabel()->count()) { |
|
256 | 256 | header("Content-type: application/octet-stream"); |
257 | 257 | header("Content-disposition: attachment;filename=label.pdf"); |
258 | 258 | echo $order->orderLabel->data; |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | 'clientDeliveryCompany' => $order->orderDeliveryAddress->company |
283 | 283 | ); |
284 | 284 | foreach ($replace as $key => $val) { |
285 | - $content = str_replace("[" . $key . "]", $val, $content); |
|
285 | + $content = str_replace("[".$key."]", $val, $content); |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | return $content; |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | |
296 | 296 | public function update(Request $request, $orderId) |
297 | 297 | { |
298 | - $result = OrderService::updateById($request->all(), $orderId); |
|
298 | + $result = OrderService::updateById($request->all(), $orderId); |
|
299 | 299 | |
300 | 300 | if ($result->errors()->all()) { |
301 | 301 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService; |
16 | 16 | use Hideyo\Ecommerce\Framework\Services\ExtraField\ExtraFieldFacade as ExtraFieldService; |
17 | 17 | use Hideyo\Ecommerce\Framework\Services\Attribute\AttributeFacade as AttributeService; |
18 | -use Hideyo\Ecommerce\Framework\Services\TaxRate\TaxRateFacade as TaxRateService;; |
|
18 | +use Hideyo\Ecommerce\Framework\Services\TaxRate\TaxRateFacade as TaxRateService; ; |
|
19 | 19 | |
20 | 20 | use Request; |
21 | 21 | use Notification; |
@@ -26,14 +26,14 @@ discard block |
||
26 | 26 | { |
27 | 27 | public function index($productId) |
28 | 28 | { |
29 | - $datatable = new ProductAmountOptionDatatable(); |
|
29 | + $datatable = new ProductAmountOptionDatatable(); |
|
30 | 30 | $product = $this->product->find($productId); |
31 | 31 | if (Request::wantsJson()) { |
32 | 32 | |
33 | 33 | $query = $this->productAmountOption->getModel()->where('product_id', '=', $productId); |
34 | 34 | |
35 | - $datatables = DataTables::of($query)->addColumn('action', function ($query) use ($productId) { |
|
36 | - $deleteLink = Form::deleteajax('/admin/product/'.$productId.'/product-amount-option/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
35 | + $datatables = DataTables::of($query)->addColumn('action', function($query) use ($productId) { |
|
36 | + $deleteLink = Form::deleteajax('/admin/product/'.$productId.'/product-amount-option/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
37 | 37 | $links = '<a href="/admin/product/'.$productId.'/product-amount-option/'.$query->id.'/edit" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
38 | 38 | |
39 | 39 | return $links; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function store($productId) |
66 | 66 | { |
67 | 67 | |
68 | - $result = $this->productAmountOption->create(Request::all(), $productId); |
|
68 | + $result = $this->productAmountOption->create(Request::all(), $productId); |
|
69 | 69 | |
70 | 70 | if (isset($result->id)) { |
71 | 71 | Notification::success('The product amount option is updated.'); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | public function update($productId, $id) |
97 | 97 | { |
98 | - $result = $this->productAmountOption->updateById(Request::all(), $productId, $id); |
|
98 | + $result = $this->productAmountOption->updateById(Request::all(), $productId, $id); |
|
99 | 99 | |
100 | 100 | if (!$result->id) { |
101 | 101 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | public function destroy($productId, $id) |
109 | 109 | { |
110 | - $result = $this->productAmountOption->destroy($id); |
|
110 | + $result = $this->productAmountOption->destroy($id); |
|
111 | 111 | |
112 | 112 | if ($result) { |
113 | 113 | Notification::success('The product amount option is deleted.'); |