jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coding style

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-09-13 22:53:37 +02:00
parent da48f41ec0
commit 5f215cef81
52 changed files with 122 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Admin/Core/Controller.php
View File

@@ -1,4 +1,5 @@
<?php
namespace App\Http\Controllers\Admin\Core;
use App\Http\Controllers\Controller as ParentController;

1
app/Http/Controllers/Admin/HomeController.php
View File

@@ -19,6 +19,7 @@ class HomeController extends Controller
$start = $request->input('start');
$end = $request->input('end');
$data = Dashboards::getStats($start, $end);
// dump($data);
return view('Admin.Shop.Dashboard.index', $data);
}

1
app/Http/Controllers/Admin/Shop/DeliveryPackageController.php
View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\DeliveryPackagesDataTable;
use App\Repositories\Shop\DeliveryPackages;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryPackageController extends Controller

2
app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php
View File

@@ -36,7 +36,7 @@ class DeliveryTypeCalculationController extends Controller
'calcul' => DeliveryTypeCalculations::get($id)->toArray(),
'delivery_types' => DeliveryTypes::getOptions(),
];
return view('Admin.Shop.DeliveryTypeCalculations.edit', $data);
}

1
app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\DeliveryTypesDataTable;
use App\Repositories\Shop\DeliveryTypes;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryTypeController extends Controller

2
app/Http/Controllers/Admin/Shop/OrderController.php
View File

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\OrdersDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\OrderMails;
use App\Repositories\Shop\Orders;
use Illuminate\Http\Request;
class OrderController extends Controller

1
app/Http/Controllers/Shop/ArticleController.php
View File

@@ -13,6 +13,7 @@ class ArticleController extends Controller
$data['article'] = Articles::getArticleToSell($id);
// $data['breadcrumb'] = Categories::getAncestorsByCategory($category_id);
$data['offers2'] = Articles::getSiblings($id)->toArray();
// dump($data);
// exit;
return view('Shop.Articles.show', $data);

1
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Shop\RegisterCustomer;
use App\Repositories\Shop\CustomerAddresses;
use App\Repositories\Shop\Customers;
use Illuminate\Auth\Events\Registered;

14
app/Http/Controllers/Shop/BasketController.php
View File

@@ -2,14 +2,13 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Orders;
use App\Repositories\Users;
use Illuminate\Http\Request;
class BasketController extends Controller
{
@@ -18,6 +17,7 @@ class BasketController extends Controller
$offerId = $request->input('offer_id');
$quantity = $request->input('quantity') ?? 1;
$price = Offers::getPrice($offerId, $quantity)->price_taxed;
return number_format($quantity * $price, 2);
}
@@ -26,15 +26,17 @@ class BasketController extends Controller
$offerId = $request->input('offer_id');
$quantity = $request->input('quantity') ?? 1;
$update = $request->input('update') ?? false;
return Baskets::addBasket($offerId, $quantity, $update);
}
public function modalBasket($offerId, $quantity)
{
$data = [
'offer' => Offers::getFull($offerId)->toArray(),
'basket' => Baskets::addBasket($offerId, $quantity),
];
return view('Shop.Baskets.partials.modalBasket', $data);
}
@@ -43,12 +45,14 @@ class BasketController extends Controller
$data = [
'basket' => Baskets::getBasket(),
];
return view('Shop.Baskets.basket', $data);
}
public function getBasket()
{
$data = ShopCart::getContent();
return response()->json(['data' => $data, 'code' => '200']);
}
@@ -60,6 +64,7 @@ class BasketController extends Controller
public function getSummary()
{
$data = ShopCart::getSummary();
return response()->json(['data' => $data, 'code' => '200']);
}
@@ -70,6 +75,7 @@ class BasketController extends Controller
unset($data['_token']);
$data['user_id'] = Users::getId();
Orders::saveOrder($data);
return response()->json(['code' => '200']);
}

9
app/Http/Controllers/Shop/CategoryController.php
View File

@@ -2,15 +2,13 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\CategoriesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Shop\CategoriesDataTable;
use App\Repositories\Shop\ArticleNatures;
use Illuminate\Http\Request;
class CategoryController extends Controller
{
@@ -62,6 +60,7 @@ class CategoryController extends Controller
]),
'tags' => TagGroups::getWithTagsAndCountOffers($categoryId),
];
// dump($data);
// exit;
return view('Shop.Shelves.shelve', $data);

3
app/Http/Controllers/Shop/CustomerController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Customers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class CustomerController extends Controller

9
app/Http/Controllers/Shop/HomeController.php
View File

@@ -2,15 +2,11 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\TagGroups;
use App\Repositories\Shop\Homepages;
use App\Repositories\Config;
use App\Repositories\Core\Arrays;
use App\Repositories\Shop\TagGroups;
use Illuminate\Http\Request;
class HomeController extends Controller
{
@@ -23,6 +19,7 @@ class HomeController extends Controller
'tags' => TagGroups::getWithTagsAndCountOffers(),
'no_filter' => true,
];
return view('Shop.home', $data);
}
}

9
app/Http/Controllers/Shop/InvoiceController.php
View File

@@ -2,12 +2,9 @@
namespace App\Http\Controllers\Shop;
use App\Models\Shop\Invoice;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Invoices;
use App\Repositories\Core\PDF;
use App\Repositories\Shop\Invoices;
class InvoiceController extends Controller
{
@@ -19,6 +16,7 @@ class InvoiceController extends Controller
public function show($uuid)
{
$data = Invoices::getByUUID($uuid);
return view('Shop.Invoices.show', $data);
}
@@ -26,8 +24,9 @@ class InvoiceController extends Controller
{
\Debugbar::disable();
$data['invoice'] = Invoices::getByUUID($uuid);
$filename = 'invoice-' . $uuid . '.pdf';
$filename = 'invoice-'.$uuid.'.pdf';
$html = view('Shop.Invoices.pdf', $data)->toHtml();
// $html = '<h1>Hello world!</h1>';
// return PDF::convertHTML($html);
// return view('Shop.Invoices.pdf', $data);

2
app/Http/Controllers/Shop/OfferController.php
View File

@@ -2,9 +2,7 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Offers;
class OfferController extends Controller

12
app/Http/Controllers/Shop/OrderController.php
View File

@@ -2,18 +2,17 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\OrdersDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\OrderMails;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Paybox;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
use App\Datatables\Shop\OrdersDataTable;
use Illuminate\Http\Request;
class OrderController extends Controller
{
@@ -30,6 +29,7 @@ class OrderController extends Controller
public function pdf($uuid)
{
$data = Orders::getByUUID($uuid);
return view('Shop.Orders.pdf', $data);
}
@@ -43,6 +43,7 @@ class OrderController extends Controller
'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'sale_channel' => SaleChannels::getDefault()->toArray(),
];
return view('Shop.Orders.order', $data);
} else {
return redirect()->route('home');
@@ -72,6 +73,7 @@ class OrderController extends Controller
public function confirmed()
{
ShopCart::clear();
return view('Shop.Orders.confirmed');
}
}

9
app/Http/Controllers/Shop/OrderPaymentController.php
View File

@@ -2,17 +2,8 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Paybox;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
class OrderPaymentController extends Controller
{
}

4
app/Http/Controllers/Shop/PayboxController.php
View File

@@ -2,9 +2,8 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class PayboxController extends Controller
{
@@ -32,6 +31,7 @@ class PayboxController extends Controller
{
dump($request);
exit;
return view('paybox.send');
}
}

4
app/Http/Controllers/Shop/SearchController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Searches;
use Illuminate\Http\Request;
class SearchController extends Controller
{
@@ -20,6 +19,7 @@ class SearchController extends Controller
'search' => $data,
'product_type' => $data['product_type'],
];
// dump($data);
// exit;
return view('Shop.Search.results', $data);