@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | *-----SHOP------* |
| 32 | 32 | *****************/ |
| 33 | 33 | |
| 34 | - /* |
|
| 34 | + /* |
|
| 35 | 35 | AUTH |
| 36 | 36 | */ |
| 37 | 37 | Route::get('/page/register', [ShopRegisterController::class, 'create'])->name('shop.register'); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | //orders |
| 91 | 91 | Route::get('/admin/ordini',[AdminOrdersController::class,'page'])->name('admin.orders.list'); |
| 92 | 92 | Route::get('/admin/ordine/{order_id}',[AdminOrderDetailsController::class,'page'])->name('admin.order'); |
| 93 | - Route::get('/admin/clienti',[AdminClientsController::class,'page'])->name('admin.clients'); |
|
| 93 | + Route::get('/admin/clienti',[AdminClientsController::class,'page'])->name('admin.clients'); |
|
| 94 | 94 | |
| 95 | 95 | |
| 96 | 96 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | use Mongi\Mongicommerce\Http\Controllers\shop\ShopShowVariationProductController; |
| 27 | 27 | use Mongi\Mongicommerce\Http\Controllers\admin\AdminNewProductVariationController; |
| 28 | 28 | |
| 29 | -Route::group(['middleware' => ['web']], function () { |
|
| 29 | +Route::group(['middleware' => ['web']], function() { |
|
| 30 | 30 | /***************** |
| 31 | 31 | *-----SHOP------* |
| 32 | 32 | *****************/ |
@@ -48,27 +48,27 @@ discard block |
||
| 48 | 48 | Route::get('/page/shop/user/settings', [ShopUserController::class, 'page'])->name('shop.user.settings'); |
| 49 | 49 | |
| 50 | 50 | |
| 51 | - Route::get('/shop/{id?}',[ShopController::class,'page'])->name('shop'); |
|
| 52 | - Route::get('/prodotto/{id}/{item_id?}',[ShopSingleProductController::class,'page'])->name('shop.single.product'); |
|
| 53 | - Route::get('page/shop/cart/',[ShopCartController::class,'page'])->name('shop.cart'); |
|
| 54 | - Route::get('page/shop/summary/',[ShopSummaryController::class,'page'])->name('shop.summary'); |
|
| 55 | - Route::get('page/shop/shipment/',[ShopShipmentController::class,'page'])->name('shop.shipment'); |
|
| 56 | - Route::get('page/shop/checkout/',[ShopCheckoutController::class,'page'])->name('shop.checkout'); |
|
| 57 | - Route::get('page/shop/payment/',[ShopPaymentController::class,'page'])->name('shop.payment'); |
|
| 51 | + Route::get('/shop/{id?}', [ShopController::class, 'page'])->name('shop'); |
|
| 52 | + Route::get('/prodotto/{id}/{item_id?}', [ShopSingleProductController::class, 'page'])->name('shop.single.product'); |
|
| 53 | + Route::get('page/shop/cart/', [ShopCartController::class, 'page'])->name('shop.cart'); |
|
| 54 | + Route::get('page/shop/summary/', [ShopSummaryController::class, 'page'])->name('shop.summary'); |
|
| 55 | + Route::get('page/shop/shipment/', [ShopShipmentController::class, 'page'])->name('shop.shipment'); |
|
| 56 | + Route::get('page/shop/checkout/', [ShopCheckoutController::class, 'page'])->name('shop.checkout'); |
|
| 57 | + Route::get('page/shop/payment/', [ShopPaymentController::class, 'page'])->name('shop.payment'); |
|
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | |
| 61 | - Route::post('/shop/get/product-information',[ShopShowVariationProductController::class,'getData'])->name('shop.get.product.information'); |
|
| 62 | - Route::post('/shop/addtocart',[ShopCartController::class,'addToCart'])->name('shop.addtocart'); |
|
| 63 | - Route::post('/shop/getcartelements',[ShopCartController::class,'getCartElements'])->name('shop.getcartelements'); |
|
| 61 | + Route::post('/shop/get/product-information', [ShopShowVariationProductController::class, 'getData'])->name('shop.get.product.information'); |
|
| 62 | + Route::post('/shop/addtocart', [ShopCartController::class, 'addToCart'])->name('shop.addtocart'); |
|
| 63 | + Route::post('/shop/getcartelements', [ShopCartController::class, 'getCartElements'])->name('shop.getcartelements'); |
|
| 64 | 64 | |
| 65 | - Route::post('/shop/getcartproducts/',[ShopCartController::class,'getCartProducts'])->name('getcartproducts'); |
|
| 66 | - Route::post('/shop/increment_number_product_in_cart/',[ShopCartController::class,'incrementOrDecrementElementInCart'])->name('increment_number_product_in_cart'); |
|
| 67 | - Route::post('/shop/delete_from_cart',[ShopCartController::class,'deleteFromCart'])->name('delete_from_cart'); |
|
| 68 | - Route::post('/shop/save_cache_details_order',[ShopCheckoutController::class,'saveDetailsInSession'])->name('save_cache_details_order'); |
|
| 69 | - Route::post('/shop/gotocheckout',[ShopShipmentController::class,'goToCheckout'])->name('shop.gotocheckout'); |
|
| 70 | - Route::post('/shop/pay',[ShopPaymentController::class,'pay'])->name('shop.pay'); |
|
| 71 | - Route::post('/shop/normalpayment',[ShopPaymentController::class,'normalPayment'])->name('shop.normalpayment'); |
|
| 65 | + Route::post('/shop/getcartproducts/', [ShopCartController::class, 'getCartProducts'])->name('getcartproducts'); |
|
| 66 | + Route::post('/shop/increment_number_product_in_cart/', [ShopCartController::class, 'incrementOrDecrementElementInCart'])->name('increment_number_product_in_cart'); |
|
| 67 | + Route::post('/shop/delete_from_cart', [ShopCartController::class, 'deleteFromCart'])->name('delete_from_cart'); |
|
| 68 | + Route::post('/shop/save_cache_details_order', [ShopCheckoutController::class, 'saveDetailsInSession'])->name('save_cache_details_order'); |
|
| 69 | + Route::post('/shop/gotocheckout', [ShopShipmentController::class, 'goToCheckout'])->name('shop.gotocheckout'); |
|
| 70 | + Route::post('/shop/pay', [ShopPaymentController::class, 'pay'])->name('shop.pay'); |
|
| 71 | + Route::post('/shop/normalpayment', [ShopPaymentController::class, 'normalPayment'])->name('shop.normalpayment'); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | |
@@ -78,44 +78,44 @@ discard block |
||
| 78 | 78 | /***************** |
| 79 | 79 | *------GET------* |
| 80 | 80 | *****************/ |
| 81 | - Route::get('/admin/dashboard',[DashboardController::class,'page'])->name('admin.dashboard'); |
|
| 82 | - Route::get('/admin/categorie/',[AdminCategoryController::class,'page'])->name('admin.category.new'); |
|
| 83 | - Route::get('/admin/dettagli',[AdminDetailController::class,'page'])->name('admin.details'); |
|
| 84 | - Route::get('/admin/settings',[AdminSettingsController::class,'page'])->name('admin.settings'); |
|
| 81 | + Route::get('/admin/dashboard', [DashboardController::class, 'page'])->name('admin.dashboard'); |
|
| 82 | + Route::get('/admin/categorie/', [AdminCategoryController::class, 'page'])->name('admin.category.new'); |
|
| 83 | + Route::get('/admin/dettagli', [AdminDetailController::class, 'page'])->name('admin.details'); |
|
| 84 | + Route::get('/admin/settings', [AdminSettingsController::class, 'page'])->name('admin.settings'); |
|
| 85 | 85 | //products |
| 86 | - Route::get('/admin/prodotto/crea-prodotto',[AdminNewProductController::class,'page'])->name('admin.product.new'); |
|
| 87 | - Route::get('/admin/prodotti',[AdminProductsListController::class,'page'])->name('admin.product.list'); |
|
| 88 | - Route::get('/admin/prodotto/crea-singolo-prodotto',[AdminNewSingleProductController::class,'page'])->name('admin.new.single.product'); |
|
| 89 | - Route::get('/admin/prodotto-variante/{id_product}',[AdminNewProductVariationController::class,'page'])->name('admin.product.new.variante'); |
|
| 86 | + Route::get('/admin/prodotto/crea-prodotto', [AdminNewProductController::class, 'page'])->name('admin.product.new'); |
|
| 87 | + Route::get('/admin/prodotti', [AdminProductsListController::class, 'page'])->name('admin.product.list'); |
|
| 88 | + Route::get('/admin/prodotto/crea-singolo-prodotto', [AdminNewSingleProductController::class, 'page'])->name('admin.new.single.product'); |
|
| 89 | + Route::get('/admin/prodotto-variante/{id_product}', [AdminNewProductVariationController::class, 'page'])->name('admin.product.new.variante'); |
|
| 90 | 90 | //orders |
| 91 | - Route::get('/admin/ordini',[AdminOrdersController::class,'page'])->name('admin.orders.list'); |
|
| 92 | - Route::get('/admin/ordine/{order_id}',[AdminOrderDetailsController::class,'page'])->name('admin.order'); |
|
| 93 | - Route::get('/admin/clienti',[AdminClientsController::class,'page'])->name('admin.clients'); |
|
| 91 | + Route::get('/admin/ordini', [AdminOrdersController::class, 'page'])->name('admin.orders.list'); |
|
| 92 | + Route::get('/admin/ordine/{order_id}', [AdminOrderDetailsController::class, 'page'])->name('admin.order'); |
|
| 93 | + Route::get('/admin/clienti', [AdminClientsController::class, 'page'])->name('admin.clients'); |
|
| 94 | 94 | |
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | /***************** |
| 98 | 98 | *-----POST------* |
| 99 | 99 | *****************/ |
| 100 | - Route::post('/admin/post/get/categories/tree',[AdminCategoryController::class,'getStructureCategories'])->name('admin.post.get.categories.tree'); |
|
| 101 | - Route::post('/admin/post/get/categories',[AdminCategoryController::class,'getCategories'])->name('admin.post.get.categories'); |
|
| 102 | - Route::post('/admin/post/create-new-category',[AdminCategoryController::class,'setNewCategory'])->name('admin.post.create.new.category'); |
|
| 100 | + Route::post('/admin/post/get/categories/tree', [AdminCategoryController::class, 'getStructureCategories'])->name('admin.post.get.categories.tree'); |
|
| 101 | + Route::post('/admin/post/get/categories', [AdminCategoryController::class, 'getCategories'])->name('admin.post.get.categories'); |
|
| 102 | + Route::post('/admin/post/create-new-category', [AdminCategoryController::class, 'setNewCategory'])->name('admin.post.create.new.category'); |
|
| 103 | 103 | |
| 104 | 104 | //details |
| 105 | - Route::post('/admin/post/create/detail',[AdminDetailController::class,'setNewDetail'])->name('admin.post.create.detail'); |
|
| 106 | - Route::post('/admin/post/get/details',[AdminDetailController::class,'getDetails'])->name('admin.post.get.details'); |
|
| 105 | + Route::post('/admin/post/create/detail', [AdminDetailController::class, 'setNewDetail'])->name('admin.post.create.detail'); |
|
| 106 | + Route::post('/admin/post/get/details', [AdminDetailController::class, 'getDetails'])->name('admin.post.get.details'); |
|
| 107 | 107 | |
| 108 | 108 | //configuration |
| 109 | - Route::post('/admin/post/create/configuration',[AdminConfigurationFieldController::class,'setNewConfiguration'])->name('admin.post.create.configuration'); |
|
| 110 | - Route::post('/admin/post/get/configuration',[AdminConfigurationFieldController::class,'getConfigurationFields'])->name('admin.post.get.configuration'); |
|
| 109 | + Route::post('/admin/post/create/configuration', [AdminConfigurationFieldController::class, 'setNewConfiguration'])->name('admin.post.create.configuration'); |
|
| 110 | + Route::post('/admin/post/get/configuration', [AdminConfigurationFieldController::class, 'getConfigurationFields'])->name('admin.post.get.configuration'); |
|
| 111 | 111 | |
| 112 | 112 | //product |
| 113 | - Route::post('/admin/prodotto/crea-prodotto',[AdminNewProductController::class,'createNewProduct'])->name('admin.post.product.new'); |
|
| 114 | - Route::post('/admin/prodotto/crea-variante-prodotto',[AdminNewProductVariationController::class,'createNewVariation'])->name('admin.post.product.variation.new'); |
|
| 115 | - Route::post('/admin/prodotto/crea-singolo-prodotto',[AdminNewSingleProductController::class,'createNewSingleProduct'])->name('admin.post.new.single.product'); |
|
| 113 | + Route::post('/admin/prodotto/crea-prodotto', [AdminNewProductController::class, 'createNewProduct'])->name('admin.post.product.new'); |
|
| 114 | + Route::post('/admin/prodotto/crea-variante-prodotto', [AdminNewProductVariationController::class, 'createNewVariation'])->name('admin.post.product.variation.new'); |
|
| 115 | + Route::post('/admin/prodotto/crea-singolo-prodotto', [AdminNewSingleProductController::class, 'createNewSingleProduct'])->name('admin.post.new.single.product'); |
|
| 116 | 116 | |
| 117 | 117 | |
| 118 | 118 | //refresh |
| 119 | - Route::get('/admin/update',[AdminUpdatePackageController::class,'update'])->name('admin.updatepackage'); |
|
| 119 | + Route::get('/admin/update', [AdminUpdatePackageController::class, 'update'])->name('admin.updatepackage'); |
|
| 120 | 120 | |
| 121 | 121 | }); |
@@ -7,8 +7,8 @@ |
||
| 7 | 7 | |
| 8 | 8 | class AdminClientsController extends Controller |
| 9 | 9 | { |
| 10 | - public function page(){ |
|
| 11 | - $clients = User::where('admin',false)->get(); |
|
| 12 | - return view('mongicommerce::admin.pages.clients',compact('clients')); |
|
| 10 | + public function page() { |
|
| 11 | + $clients = User::where('admin', false)->get(); |
|
| 12 | + return view('mongicommerce::admin.pages.clients', compact('clients')); |
|
| 13 | 13 | } |
| 14 | 14 | } |
@@ -8,11 +8,11 @@ |
||
| 8 | 8 | |
| 9 | 9 | class AdminOrderDetailsController |
| 10 | 10 | { |
| 11 | - public function page($order_id){ |
|
| 11 | + public function page($order_id) { |
|
| 12 | 12 | $order = Order::find($order_id); |
| 13 | 13 | $cliente = $order->user; |
| 14 | 14 | $products = $order->products; |
| 15 | 15 | $statuses = OrderStatus::all(); |
| 16 | - return view('mongicommerce::admin.pages.orders.order_details',compact('cliente','products','order','statuses')); |
|
| 16 | + return view('mongicommerce::admin.pages.orders.order_details', compact('cliente', 'products', 'order', 'statuses')); |
|
| 17 | 17 | } |
| 18 | 18 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | |
| 6 | 6 | class DashboardController extends Controller |
| 7 | 7 | { |
| 8 | - public function page(){ |
|
| 8 | + public function page() { |
|
| 9 | 9 | return view('mongicommerce::admin.pages.dashboard'); |
| 10 | 10 | } |
| 11 | 11 | } |
@@ -8,9 +8,9 @@ |
||
| 8 | 8 | |
| 9 | 9 | class AdminOrdersController |
| 10 | 10 | { |
| 11 | - public function page(){ |
|
| 11 | + public function page() { |
|
| 12 | 12 | $orders = Order::all(); |
| 13 | 13 | $statuses = OrderStatus::all(); |
| 14 | - return view('mongicommerce::admin.pages.orders.orders_list',['orders' => $orders,'statuses'=> $statuses]); |
|
| 14 | + return view('mongicommerce::admin.pages.orders.orders_list', ['orders' => $orders, 'statuses'=> $statuses]); |
|
| 15 | 15 | } |
| 16 | 16 | } |
@@ -6,9 +6,9 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ShopOrdersController extends Controller |
| 8 | 8 | { |
| 9 | - public function page(){ |
|
| 9 | + public function page() { |
|
| 10 | 10 | $user = Auth::user(); |
| 11 | - $orders = Order::where('user_id',$user->id)->get(); |
|
| 12 | - return view('mongicommerce.pages.user_orders',compact('user','orders')); |
|
| 11 | + $orders = Order::where('user_id', $user->id)->get(); |
|
| 12 | + return view('mongicommerce.pages.user_orders', compact('user', 'orders')); |
|
| 13 | 13 | } |
| 14 | 14 | } |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | class ShopUserController extends Controller |
| 7 | 7 | { |
| 8 | - public function page(){ |
|
| 8 | + public function page() { |
|
| 9 | 9 | $user = Auth::user(); |
| 10 | 10 | $piva = $user->piva; |
| 11 | 11 | $rag_soc = $user->company; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $province = $user->province; |
| 19 | 19 | $city = $user->city; |
| 20 | 20 | $cap = $user->cap; |
| 21 | - return view('mongicommerce.pages.user_settings',compact('piva', |
|
| 21 | + return view('mongicommerce.pages.user_settings', compact('piva', |
|
| 22 | 22 | 'rag_soc', |
| 23 | 23 | 'first_name', |
| 24 | 24 | 'last_name', |
@@ -135,7 +135,7 @@ |
||
| 135 | 135 | |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public function normalPayment(Request $r){ |
|
| 138 | + public function normalPayment(Request $r){ |
|
| 139 | 139 | $type = $r->get('type_payment'); |
| 140 | 140 | switch ($type){ |
| 141 | 141 | case 'iban': |
@@ -23,14 +23,14 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | class ShopPaymentController extends Controller |
| 25 | 25 | { |
| 26 | - public function page(){ |
|
| 26 | + public function page() { |
|
| 27 | 27 | $total = session('checkout.total'); |
| 28 | 28 | $api_stripe_key = AdminSetting::getStripeApiKey(); |
| 29 | 29 | $iban = AdminSetting::getIban(); |
| 30 | - return view('mongicommerce.pages.payment',compact('total','api_stripe_key','iban')); |
|
| 30 | + return view('mongicommerce.pages.payment', compact('total', 'api_stripe_key', 'iban')); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function pay(Request $request){ |
|
| 33 | + public function pay(Request $request) { |
|
| 34 | 34 | |
| 35 | 35 | try { |
| 36 | 36 | $total = session('checkout.total'); |
@@ -38,16 +38,16 @@ discard block |
||
| 38 | 38 | $order_weight = session('checkout.total_weight'); |
| 39 | 39 | |
| 40 | 40 | $order_id = 0; |
| 41 | - $check_order = Order::orderBy('created_at','desc')->first(); |
|
| 42 | - if(is_null($check_order)){ |
|
| 41 | + $check_order = Order::orderBy('created_at', 'desc')->first(); |
|
| 42 | + if (is_null($check_order)) { |
|
| 43 | 43 | $order_id = 1; |
| 44 | - }else{ |
|
| 44 | + } else { |
|
| 45 | 45 | $order_id = $check_order->id + 1; |
| 46 | 46 | } |
| 47 | 47 | Stripe::setApiKey(AdminSetting::getStripeApiSecretKey()); |
| 48 | 48 | // Use Stripe's library to make requests... |
| 49 | - Charge::create ([ |
|
| 50 | - "amount" => number_format(($total*100) , 0, '', ''), |
|
| 49 | + Charge::create([ |
|
| 50 | + "amount" => number_format(($total * 100), 0, '', ''), |
|
| 51 | 51 | "currency" => "eur", |
| 52 | 52 | "source" => $request->stripeToken, |
| 53 | 53 | "description" => "Pagamento ordine N.".$order_id |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | $order->save(); |
| 69 | 69 | //save into order_products |
| 70 | 70 | |
| 71 | - $products = Cart::where('user_id',Auth::user()->id)->get(); |
|
| 72 | - foreach ($products as $product){ |
|
| 71 | + $products = Cart::where('user_id', Auth::user()->id)->get(); |
|
| 72 | + foreach ($products as $product) { |
|
| 73 | 73 | $order_products = new ProductsOrder(); |
| 74 | 74 | $order_products->order_id = $order->id; |
| 75 | 75 | $order_products->product_item_id = $product->product_item_id; |
@@ -87,15 +87,15 @@ discard block |
||
| 87 | 87 | Session::flash('success', 'Pagamento avvenuto con successo'); |
| 88 | 88 | return redirect(route('shop.user.orders')); |
| 89 | 89 | |
| 90 | - } catch(CardException $e) { |
|
| 90 | + } catch (CardException $e) { |
|
| 91 | 91 | |
| 92 | 92 | // Since it's a decline, \Stripe\Exception\CardException will be caught |
| 93 | - $error = '<h4>'.$e->getError()->message.'</h4><br>'; |
|
| 94 | - $error .= 'Status: ' . $e->getHttpStatus() . '<br>'; |
|
| 95 | - $error .= 'Type is:' . $e->getError()->type . '<br>'; |
|
| 96 | - $error .= 'Code is:' . $e->getError()->code . '<br>'; |
|
| 93 | + $error = '<h4>'.$e->getError()->message.'</h4><br>'; |
|
| 94 | + $error .= 'Status: '.$e->getHttpStatus().'<br>'; |
|
| 95 | + $error .= 'Type is:'.$e->getError()->type.'<br>'; |
|
| 96 | + $error .= 'Code is:'.$e->getError()->code.'<br>'; |
|
| 97 | 97 | // param is '' in this case |
| 98 | - $error .= 'Param is:' . $e->getError()->param . '<br>'; |
|
| 98 | + $error .= 'Param is:'.$e->getError()->param.'<br>'; |
|
| 99 | 99 | |
| 100 | 100 | Session::flash('error', $error); |
| 101 | 101 | return back(); |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public function normalPayment(Request $r){ |
|
| 138 | + public function normalPayment(Request $r) { |
|
| 139 | 139 | $type = $r->get('type_payment'); |
| 140 | - switch ($type){ |
|
| 140 | + switch ($type) { |
|
| 141 | 141 | case 'iban': |
| 142 | 142 | $typePayment = TypePayment::BONIFICO; |
| 143 | 143 | $orderStatus = OrderStatus::ATTESA_PAGAMENTO; |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | //save into order_products |
| 171 | 171 | |
| 172 | - $products = Cart::where('user_id',Auth::user()->id)->get(); |
|
| 173 | - foreach ($products as $product){ |
|
| 172 | + $products = Cart::where('user_id', Auth::user()->id)->get(); |
|
| 173 | + foreach ($products as $product) { |
|
| 174 | 174 | $order_products = new ProductsOrder(); |
| 175 | 175 | $order_products->order_id = $order->id; |
| 176 | 176 | $order_products->product_item_id = $product->product_item_id; |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | $check_order = Order::orderBy('created_at','desc')->first(); |
| 42 | 42 | if(is_null($check_order)){ |
| 43 | 43 | $order_id = 1; |
| 44 | - }else{ |
|
| 44 | + } else{ |
|
| 45 | 45 | $order_id = $check_order->id + 1; |
| 46 | 46 | } |
| 47 | 47 | Stripe::setApiKey(AdminSetting::getStripeApiSecretKey()); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | 'email_verified_at' => 'datetime', |
| 44 | 44 | ]; |
| 45 | 45 | |
| 46 | - public function orders(){ |
|
| 47 | - return $this->hasMany(Order::class,'user_id'); |
|
| 46 | + public function orders() { |
|
| 47 | + return $this->hasMany(Order::class, 'user_id'); |
|
| 48 | 48 | } |
| 49 | 49 | } |