@@ -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(); |
@@ -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 | |
@@ -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 | } |
@@ -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 | |
@@ -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 | ); |
@@ -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>'; |
@@ -95,8 +95,8 @@ |
||
| 95 | 95 | foreach ($newProductAttributes as $key => $productAttribute) { |
| 96 | 96 | $newArray = array(); |
| 97 | 97 | foreach ($productAttribute as $keyNew => $valueNew) { |
| 98 | - $newArray[] = $keyNew.': '.$valueNew['value']; |
|
| 99 | - $attributesList[$valueNew['id']] = $valueNew['value']; |
|
| 98 | + $newArray[] = $keyNew.': '.$valueNew['value']; |
|
| 99 | + $attributesList[$valueNew['id']] = $valueNew['value']; |
|
| 100 | 100 | } |
| 101 | 101 | $productAttributesList[$key] = implode(', ', $newArray); |
| 102 | 102 | } |