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

fixing styles

Browse Source
This commit is contained in:
ludo
2024-01-07 20:42:37 +01:00
parent 5144c1f7fd
commit 4df8628a3e
39 changed files with 149 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Datatables/Shop/InvoicesDataTable.php
View File

@@ -28,7 +28,8 @@ class InvoicesDataTable extends DataTable
return $invoice->created_at->toDateTimeString(); return $invoice->created_at->toDateTimeString();
}) })
->editColumn('customer.last_name', function (Invoice $invoice) { ->editColumn('customer.last_name', function (Invoice $invoice) {
return ($invoice->customer ?? false) ? $invoice->customer->last_name.' '.$invoice->customer->first_name : ''; $customer = $invoice->customer ?? false;
return $customer ? $customer->last_name.' '.$customer->first_name : '';
}) })
->rawColumns(['action']); ->rawColumns(['action']);

2
app/Http/Controllers/Admin/Core/Auth/RoleController.php
View File

@@ -92,7 +92,7 @@ class RoleController extends Controller
public function toggleActive(Request $request) public function toggleActive(Request $request)
{ {
$data = Roles::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0); $data = Roles::toggleActive($request->input('id'), $request->input('active') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

4
app/Http/Controllers/Admin/Core/Auth/UserController.php
View File

@@ -59,7 +59,7 @@ class UserController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$input = $request->all(); $input = $request->all();
if (empty($input['password'])) { if ($input['password'] ?? false) {
unset($input['password']); unset($input['password']);
} }
$user = Users::store($input); $user = Users::store($input);
@@ -174,7 +174,7 @@ class UserController extends Controller
public function toggleActive(Request $request) public function toggleActive(Request $request)
{ {
$data = Users::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0); $data = Users::toggleActive($request->input('id'), $request->input('active') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

4
app/Http/Controllers/Admin/Shop/ArticleController.php
View File

@@ -117,14 +117,14 @@ class ArticleController extends Controller
public function toggleVisible(Request $request) public function toggleVisible(Request $request)
{ {
$data = Articles::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0); $data = Articles::toggleVisible($request->input('id'), $request->input('visible') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }
public function toggleHomepage(Request $request) public function toggleHomepage(Request $request)
{ {
$data = Articles::toggleHomepage($request->input('id'), ($request->input('homepage') === 'true') ? 1 : 0); $data = Articles::toggleHomepage($request->input('id'), $request->input('homepage') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

4
app/Http/Controllers/Admin/Shop/CategoryController.php
View File

@@ -80,14 +80,14 @@ class CategoryController extends Controller
public function toggleVisible(Request $request) public function toggleVisible(Request $request)
{ {
$data = Categories::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0); $data = Categories::toggleVisible($request->input('id'), $request->input('visible') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }
public function toggleHomepage(Request $request) public function toggleHomepage(Request $request)
{ {
$data = Categories::toggleHomepage($request->input('id'), ($request->input('homepage') === 'true') ? 1 : 0); $data = Categories::toggleHomepage($request->input('id'), $request->input('homepage') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

13
app/Http/Controllers/Admin/Shop/ContentController.php
View File

@@ -10,12 +10,12 @@ class ContentController extends Controller
{ {
public function index(ContentsDataTable $dataTable) public function index(ContentsDataTable $dataTable)
{ {
return $dataTable->render('Admin.Shop.Contents.list', $data ?? []); return $dataTable->render('Admin.Shop.Contents.list');
} }
public function create() public function create()
{ {
return view('Admin.Shop.Contents.create', $data ?? []); return view('Admin.Shop.Contents.create');
} }
public function store(Request $request) public function store(Request $request)
@@ -25,14 +25,11 @@ class ContentController extends Controller
return redirect()->route('Admin.Shop.Contents.index'); return redirect()->route('Admin.Shop.Contents.index');
} }
public function show($id)
{
return view('Admin.Shop.Contents.view', $data ?? []);
}
public function edit($id) public function edit($id)
{ {
$data['homepage'] = Contents::get($id); $data = [
'homepage' => Contents::get($id),
];
return view('Admin.Shop.Contents.edit', $data); return view('Admin.Shop.Contents.edit', $data);
} }

4
app/Http/Controllers/Admin/Shop/DeliveryController.php
View File

@@ -32,7 +32,7 @@ class DeliveryController extends Controller
public function show($id) public function show($id)
{ {
$data = [ $data = [
'delivery' => Deliveries::get($id), 'delivery' => Deliveries::getArray($id),
]; ];
return view('Admin.Shop.Deliveries.view', $data); return view('Admin.Shop.Deliveries.view', $data);
@@ -53,7 +53,7 @@ class DeliveryController extends Controller
public function toggleActive(Request $request) public function toggleActive(Request $request)
{ {
$data = Deliveries::toggle_active($request->input('id'), ($request->input('active') === 'true') ? 1 : 0); $data = Deliveries::toggleActive($request->input('id'), $request->input('active') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

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

@@ -27,6 +27,7 @@ class DeliveryTypeController extends Controller
public function edit($id) public function edit($id)
{ {
$data = [];
$data['delivery'] = DeliveryTypes::get($id)->toArray(); $data['delivery'] = DeliveryTypes::get($id)->toArray();
return view('Admin.Shop.DeliveryTypes.edit', $data); return view('Admin.Shop.DeliveryTypes.edit', $data);

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

@@ -29,6 +29,7 @@ class InvoiceController extends Controller
public function show($id) public function show($id)
{ {
$data = [];
$data['invoice'] = Invoices::getFull($id)->toArray(); $data['invoice'] = Invoices::getFull($id)->toArray();
return view('Admin.Shop.Invoices.view', $data); return view('Admin.Shop.Invoices.view', $data);

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

@@ -30,6 +30,7 @@ class InvoicePaymentController extends Controller
public function show($id) public function show($id)
{ {
$data = [];
$data['invoice_payment'] = InvoicePayments::getArray($id); $data['invoice_payment'] = InvoicePayments::getArray($id);
return view('Admin.Shop.InvoicePayments.view', $data); return view('Admin.Shop.InvoicePayments.view', $data);

6
app/Http/Controllers/Admin/Shop/MerchandiseController.php
View File

@@ -52,8 +52,10 @@ class MerchandiseController extends Controller
public function getImages(Request $request, $id = false, $can_edit = true) public function getImages(Request $request, $id = false, $can_edit = true)
{ {
$id = $id ? $id : $request->input('id'); $id = $id ? $id : $request->input('id');
$data['images'] = Merchandises::getImages($id); $data = [
$data['can_edit'] = $can_edit; 'images' => Merchandises::getImages($id),
'can_edit' => $can_edit,
];
return view('components.uploader.mini-gallery-items', $data); return view('components.uploader.mini-gallery-items', $data);
} }

18
app/Http/Controllers/Admin/Shop/OfferController.php
View File

@@ -50,7 +50,9 @@ class OfferController extends Controller
public function show($id) public function show($id)
{ {
$data['offer'] = Offers::getArray($id); $data = [
'offer' => Offers::getArray($id),
];
return view('Admin.Shop.Offers.view', $data); return view('Admin.Shop.Offers.view', $data);
} }
@@ -62,28 +64,34 @@ class OfferController extends Controller
public function previewArticle($id) public function previewArticle($id)
{ {
$data['article'] = Articles::getArticle($id); $data = [
'article' => Articles::getArticle($id),
];
return view('Admin.Shop.Offers.partials.article', $data); return view('Admin.Shop.Offers.partials.article', $data);
} }
public function previewVariation($id) public function previewVariation($id)
{ {
$data['variation'] = Variations::getArray($id); $data = [
'variation' => Variations::getArray($id),
];
return view('Admin.Shop.Offers.partials.variation', $data); return view('Admin.Shop.Offers.partials.variation', $data);
} }
public function previewTariff($id) public function previewTariff($id)
{ {
$data['tariff'] = Tariffs::getPrices($id); $data = [
'tariff' => Tariffs::getPrices($id),
];
return view('Admin.Shop.Offers.partials.tariff', $data); return view('Admin.Shop.Offers.partials.tariff', $data);
} }
public function toggleActive(Request $request) public function toggleActive(Request $request)
{ {
$data = Offers::toggle_active($request->input('id'), ($request->input('status_id') === 'true') ? 1 : 0); $data = Offers::toggleActive($request->input('id'), $request->input('status_id') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

7
app/Http/Controllers/Admin/Shop/PackageController.php
View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\PackagesDataTable; use App\Datatables\Admin\Shop\PackagesDataTable;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Packages; use App\Repositories\Shop\Packages;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -12,7 +11,7 @@ class PackageController extends Controller
{ {
public function index(PackagesDataTable $dataTable) public function index(PackagesDataTable $dataTable)
{ {
$data['families'] = ArticleNatures::getOptions(); $data = Packages::init();
return $dataTable->render('Admin.Shop.Packages.list', $data); return $dataTable->render('Admin.Shop.Packages.list', $data);
} }
@@ -26,7 +25,7 @@ class PackageController extends Controller
public function create() public function create()
{ {
$data['families'] = ArticleNatures::getOptions(); $data = Packages::init();
return view('Admin.Shop.Packages.create', $data); return view('Admin.Shop.Packages.create', $data);
} }
@@ -47,8 +46,8 @@ class PackageController extends Controller
public function edit($id) public function edit($id)
{ {
$data = Packages::init();
$data['package'] = Packages::get($id); $data['package'] = Packages::get($id);
$data['families'] = ArticleNatures::getOptions();
return view('Admin.Shop.Packages.edit', $data); return view('Admin.Shop.Packages.edit', $data);
} }

51
app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
View File

@@ -1,51 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\PriceGenericCategoriesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\PriceGenericCategories;
use Illuminate\Http\Request;
class PriceGenericCategoryController extends Controller
{
public function index(PriceGenericCategoriesDataTable $dataTable)
{
return $dataTable->render('Admin.Shop.PriceGenericCategories.list');
}
public function create()
{
$data['families'] = ArticleNatures::getOptions();
return view('Admin.Shop.PriceGenericCategories.create', $data);
}
public function edit($id)
{
$data['families'] = ArticleNatures::getOptions();
$data['generic_category'] = PriceGenericCategories::get($id)->toArray();
return view('Admin.Shop.PriceGenericCategories.edit', $data);
}
public function store(Request $request)
{
$ret = PriceGenericCategories::store($request->all());
return redirect()->route('Admin.Shop.PriceGenericCategories.index');
}
public function show($id)
{
$data = PriceGenericCategories::get($id);
return view('Admin.Shop.PriceGenericCategories.view', $data);
}
public function destroy($id)
{
return PriceGenericCategories::destroy($id);
}
}

4
app/Http/Controllers/Admin/Shop/PriceListController.php
View File

@@ -58,7 +58,9 @@ class PriceListController extends Controller
public function getPrice($id) public function getPrice($id)
{ {
$data['generic'] = PriceLists::getFull($id); $data = [
'generic' => PriceLists::getFull($id),
];
return view('Admin.Shop.PriceLists.partials.table-prices', $data); return view('Admin.Shop.PriceLists.partials.table-prices', $data);
} }

75
app/Http/Controllers/Admin/Shop/PriceListValueController.php
View File

@@ -1,75 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Shop\PriceListValuesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\PriceListValueCategories;
use App\Repositories\Shop\PriceListValues;
use App\Repositories\Shop\Taxes;
use App\Repositories\Shop\Unities;
use Illuminate\Http\Request;
class PriceListValueController extends Controller
{
public function index(PriceListValuesDataTable $dataTable)
{
$data['categories'] = PriceListValueCategories::getOptions();
return $dataTable->render('Admin.Shop.PriceListValues.list', $data);
}
public function create()
{
$data['unities'] = Unities::getOptions();
$data['taxes_options'] = Taxes::getOptions();
$data['categories'] = PriceListValueCategories::getOptions();
return view('Admin.Shop.PriceListValues.create', $data);
}
public function edit($id)
{
$data['generic'] = PriceListValues::getFull($id)->toArray();
$data['packages'] = Packages::getSelectByFamily($data['generic']['category']['article_family_id']);
$data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
$data['taxes_options'] = Taxes::getOptions();
$data['categories'] = PriceListValueCategories::getOptions();
return view('Admin.Shop.PriceListValues.edit', $data);
}
public function store(Request $request)
{
$ret = PriceListValues::store($request->all());
return redirect()->route('Admin.Shop.PriceListValues.index');
}
public function show($id)
{
$data = PriceListValues::get($id);
return view('Admin.Shop.PriceListValues.view', $data);
}
public function destroy($id)
{
return PriceListValues::destroy($id);
}
public function getPrice($id)
{
$data['generic'] = PriceListValues::getFull($id);
return view('Admin.Shop.PriceListValues.partials.table-prices', $data);
}
public function addPrice($index)
{
$data['index'] = $index;
return view('Admin.Shop.PriceListValues.partials.row_price', $data);
}
}

6
app/Http/Controllers/Admin/Shop/ProducerController.php
View File

@@ -51,8 +51,10 @@ class ProducerController extends Controller
public function getImages(Request $request, $id = false, $can_edit = true) public function getImages(Request $request, $id = false, $can_edit = true)
{ {
$id = $id ? $id : $request->input('id'); $id = $id ? $id : $request->input('id');
$data['images'] = Producers::getImages($id); $data = [
$data['can_edit'] = $can_edit; 'images' => Producers::getImages($id),
'can_edit' => $can_edit,
];
return view('components.uploader.mini-gallery-items', $data); return view('components.uploader.mini-gallery-items', $data);
} }

8
app/Http/Controllers/Admin/Shop/SaleChannelController.php
View File

@@ -28,14 +28,18 @@ class SaleChannelController extends Controller
public function show($id) public function show($id)
{ {
$data['sale_channel'] = SaleChannels::get($id); $data = [
'sale_channel' => SaleChannels::get($id),
];
return view('Admin.Shop.SaleChannels.view', $data); return view('Admin.Shop.SaleChannels.view', $data);
} }
public function edit($id) public function edit($id)
{ {
$data['sale_channel'] = SaleChannels::get($id); $data = [
'sale_channel' => SaleChannels::get($id),
];
return view('Admin.Shop.SaleChannels.edit', $data); return view('Admin.Shop.SaleChannels.edit', $data);
} }

6
app/Http/Controllers/Admin/Shop/TagGroupController.php
View File

@@ -17,7 +17,9 @@ class TagGroupController extends Controller
public function create() public function create()
{ {
$data['article_families'] = ArticleNatures::getOptions(); $data = [
'article_families' => ArticleNatures::getOptions(),
];
return view('Admin.Shop.TagGroups.create', $data); return view('Admin.Shop.TagGroups.create', $data);
} }
@@ -51,7 +53,7 @@ class TagGroupController extends Controller
public function toggleVisible(Request $request) public function toggleVisible(Request $request)
{ {
$data = TagGroups::toggleVisible($request->input('id'), ($request->input('visible') === 'true') ? 1 : 0); $data = TagGroups::toggleVisible($request->input('id'), $request->input('visible') === 'true' ? 1 : 0);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);
} }

4
app/Http/Controllers/Admin/Shop/TariffController.php
View File

@@ -29,7 +29,9 @@ class TariffController extends Controller
public function show($id) public function show($id)
{ {
$data['tariff'] = Tariffs::getArray($id); $data = [
'tariff' => Tariffs::getArray($id),
];
return view('Admin.Shop.Tariffs.view', $data); return view('Admin.Shop.Tariffs.view', $data);
} }

8
app/Http/Controllers/Admin/Shop/TariffUnityController.php
View File

@@ -35,7 +35,9 @@ class TariffUnityController extends Controller
public function edit($id) public function edit($id)
{ {
$data['tariff_unity'] = TariffUnities::get($id)->toArray(); $data = [
'tariff_unity' => TariffUnities::getArray($id),
];
return view('Admin.Shop.TariffUnities.edit', $data); return view('Admin.Shop.TariffUnities.edit', $data);
} }
@@ -44,8 +46,4 @@ class TariffUnityController extends Controller
{ {
return TariffUnities::destroy($id); return TariffUnities::destroy($id);
} }
public function update($id)
{
}
} }

8
app/Http/Controllers/Admin/Shop/UnityController.php
View File

@@ -40,7 +40,9 @@ class UnityController extends Controller
public function edit($id) public function edit($id)
{ {
$data['unity'] = Unities::get($id)->toArray(); $data = [
'unity' => Unities::get($id)->toArray(),
];
return view('Admin.Shop.Unities.edit', $data); return view('Admin.Shop.Unities.edit', $data);
} }
@@ -49,8 +51,4 @@ class UnityController extends Controller
{ {
return Unities::destroy($id); return Unities::destroy($id);
} }
public function update($id)
{
}
} }

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

@@ -9,8 +9,10 @@ class ArticleController extends Controller
{ {
public function show($id) public function show($id)
{ {
$data['article'] = Articles::getArticleToSell($id); $data = [
$data['offers2'] = Articles::getSiblings($id)->toArray(); 'article' => Articles::getArticleToSell($id),
'offers2' => Articles::getSiblings($id)->toArray(),
];
return view('Shop.Articles.show', $data); return view('Shop.Articles.show', $data);
} }

3
app/Http/Controllers/Shop/Auth/LoginController.php
View File

@@ -33,7 +33,7 @@ class LoginController extends Controller
if ($this->guard()->attempt($credentials, $request->get('remember'))) { if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate(); $request->session()->regenerate();
return (back()->getTargetUrl() === route('Shop.login')) ? redirect()->intended(route('home')) : back(); return back()->getTargetUrl() === route('Shop.login') ? redirect()->intended(route('home')) : back();
} }
return back()->withErrors([ return back()->withErrors([
@@ -59,5 +59,4 @@ class LoginController extends Controller
{ {
return Auth::guard('customer'); return Auth::guard('customer');
} }
} }

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

@@ -75,5 +75,4 @@ class RegisterController extends Controller
{ {
return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard')); return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
} }
} }

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

@@ -68,7 +68,9 @@ class BasketController extends Controller
public function getBasketTotal($deliveryId = false, $deliveryTypeId = false) public function getBasketTotal($deliveryId = false, $deliveryTypeId = false)
{ {
$data['basket'] = Baskets::getBasketTotal($deliveryId, $deliveryTypeId); $data = [
'basket' => Baskets::getBasketTotal($deliveryId, $deliveryTypeId),
];
return view('Shop.Baskets.partials.basketTotal', $data); return view('Shop.Baskets.partials.basketTotal', $data);
} }

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

@@ -18,7 +18,9 @@ class CustomerController extends Controller
public function modalProfile($id = false) public function modalProfile($id = false)
{ {
$data['customer'] = Customers::get($id); $data = [
'customer' => Customers::get($id),
];
return view('Shop.Customers.partials.registration', $data); return view('Shop.Customers.partials.registration', $data);
} }
@@ -26,7 +28,9 @@ class CustomerController extends Controller
public function edit() public function edit()
{ {
$id = Auth::id(); $id = Auth::id();
$data['customer'] = Customers::edit($id); $data = [
'customer' => Customers::edit($id),
];
return view('Shop.Customers.edit', $data); return view('Shop.Customers.edit', $data);
} }
@@ -42,8 +46,6 @@ class CustomerController extends Controller
public function store(Request $request) public function store(Request $request)
{ {
$data = $request->all(); $data = $request->all();
dump($data);
exit;
$customer = Customers::storeFull($data); $customer = Customers::storeFull($data);
return response()->json(['error' => 0]); return response()->json(['error' => 0]);

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

@@ -23,7 +23,9 @@ class InvoiceController extends Controller
public function pdf($uuid) public function pdf($uuid)
{ {
\Debugbar::disable(); \Debugbar::disable();
$data['invoice'] = Invoices::getByUUID($uuid); $data = [
'invoice' => Invoices::getByUUID($uuid),
];
$filename = 'invoice-'.$uuid.'.pdf'; $filename = 'invoice-'.$uuid.'.pdf';
return PDF::view('Shop.Invoices.pdf', $data, $filename); return PDF::view('Shop.Invoices.pdf', $data, $filename);

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

@@ -24,7 +24,9 @@ class OrderController extends Controller
public function view($uuid) public function view($uuid)
{ {
$data['order'] = Orders::view($uuid); $data = [
'order' => Orders::view($uuid),
];
return view('Shop.Orders.view', $data); return view('Shop.Orders.view', $data);
} }

2
app/Repositories/Core/Auth/Roles.php
View File

@@ -41,7 +41,7 @@ class Roles
return $role; return $role;
} }
public static function toggle_active($id, $active) public static function toggleActive($id, $active)
{ {
return Role::find($id)->update(['active' => $active]); return Role::find($id)->update(['active' => $active]);
} }

69
app/Repositories/Core/Auth/Teams.php
View File

@@ -5,12 +5,12 @@ namespace App\Repositories\Core\Auth;
use App\Models\Core\Auth\Team; use App\Models\Core\Auth\Team;
use App\Models\Core\Auth\TeamUser; use App\Models\Core\Auth\TeamUser;
use App\Repositories\Users; use App\Repositories\Users;
use App\Traits\Model\Basic;
use Laratrust\Traits\LaratrustUserTrait; use Laratrust\Traits\LaratrustUserTrait;
use Yajra\DataTables\DataTables;
class Teams class Teams
{ {
use LaratrustUserTrait; use Basic, LaratrustUserTrait;
public static function getTeamsByUser($user_id = false) public static function getTeamsByUser($user_id = false)
{ {
@@ -34,48 +34,11 @@ class Teams
return Team::find($id)->users(); return Team::find($id)->users();
} }
public static function getOptions()
{
return Team::orderBy('name', 'asc')->get()->pluck('name', 'id')->toArray();
}
public static function getInfo($id)
{
return Team::find($id);
}
public static function select_all()
{
return self::getAll()->toArray();
}
public static function select_by_id($id)
{
return Team::find($id)->toArray();
}
public static function getAll()
{
return Team::orderBy('name', 'asc')->get();
}
public static function getByName($name) public static function getByName($name)
{ {
return Team::where('name', $name)->first(); return Team::where('name', $name)->first();
} }
public static function get($id)
{
return Team::find($id);
}
public static function getTable($id)
{
$datas = Team::with(['societe'])->withCount(['users']);
return Datatables::of($datas)->make(true);
}
public static function delete($id) public static function delete($id)
{ {
Users::destroyByUniqueTeam($id); Users::destroyByUniqueTeam($id);
@@ -91,32 +54,8 @@ class Teams
} }
} }
public static function store($data) public static function getModel()
{ {
if (isset($data['id']) && $data['id']) { return Team::query();
return self::update($data);
}
return self::create($data);
}
public static function create($data)
{
return Team::create($data);
}
public static function update($data)
{
return Team::find($data['id'])->update($data);
}
public static function count()
{
return Team::count();
}
public static function toggle_active($id, $active)
{
return Team::find($id)->update(['active' => $active]);
} }
} }

50
app/Repositories/Core/Auth/Users.php
View File

@@ -5,6 +5,7 @@ namespace App\Repositories\Core\Auth;
use App\Models\Core\Auth\RoleUser; use App\Models\Core\Auth\RoleUser;
use App\Models\Core\Auth\User; use App\Models\Core\Auth\User;
use App\Repositories\Core\Upload; use App\Repositories\Core\Upload;
use App\Traits\Model\Basic;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
@@ -14,7 +15,7 @@ use Laratrust\Traits\LaratrustUserTrait;
class Users class Users
{ {
use LaratrustUserTrait; use Basic, LaratrustUserTrait;
public static function isAdmin() public static function isAdmin()
{ {
@@ -59,22 +60,6 @@ class Users
return $user; return $user;
} }
public static function update($data, $id = false)
{
$id = $id ? $id : $data['id'];
$user = self::get($id);
$ret = $user->update($data);
return $user;
}
public static function get($id = false)
{
$id = $id ? $id : self::getId();
return User::findOrFail($id);
}
public static function getId() public static function getId()
{ {
$user = self::getUser(); $user = self::getUser();
@@ -206,32 +191,12 @@ class Users
return User::select('id', DB::raw("concat(last_name,' ',first_name) as name")); return User::select('id', DB::raw("concat(last_name,' ',first_name) as name"));
} }
public static function count()
{
return User::count();
}
public static function select_all_by_status_id($status_id)
{
return User::byStatus($status_id);
}
public static function select_by_id($user_id)
{
return User::with('status')->find($user_id)->toArray();
}
public static function select_by_name($name)
{
return self::getByName($name)->toArray();
}
public static function getByUsername($username) public static function getByUsername($username)
{ {
return User::byUsername($username)->withTrashed()->first(); return User::byUsername($username)->withTrashed()->first();
} }
public static function toggle_active($id, $active) public static function toggleActive($id, $active)
{ {
return self::get($id)->update(['active' => $active]); return self::get($id)->update(['active' => $active]);
} }
@@ -249,12 +214,12 @@ class Users
]; ];
} }
public static function update_avatar($id, $avatar) public static function updateAvatar($id, $avatar)
{ {
return User::find($id)->update(['avatar' => $avatar]); return User::find($id)->update(['avatar' => $avatar]);
} }
public static function update_password($id, $password) public static function updatePassword($id, $password)
{ {
$password = Hash::make($password); $password = Hash::make($password);
@@ -265,4 +230,9 @@ class Users
{ {
return PasswordRules::changePassword($username, $field); return PasswordRules::changePassword($username, $field);
} }
public static function getModel()
{
return User::query();
}
} }

2
app/Repositories/Shop/Deliveries.php
View File

@@ -44,7 +44,7 @@ class Deliveries
return Delivery::orderBy('name', 'asc')->active()->public()->with('sale_channel')->get(); return Delivery::orderBy('name', 'asc')->active()->public()->with('sale_channel')->get();
} }
public static function toggle_active($id, $active) public static function toggleActive($id, $active)
{ {
return self::update(['active' => $active], $id); return self::update(['active' => $active], $id);
} }

2
app/Repositories/Shop/Offers.php
View File

@@ -141,7 +141,7 @@ class Offers
return Offer::with(['article.tags'])->byTags($tags)->get(); return Offer::with(['article.tags'])->byTags($tags)->get();
} }
public static function toggle_active($id, $status_id) public static function toggleActive($id, $status_id)
{ {
return self::update(['status_id' => $status_id], $id); return self::update(['status_id' => $status_id], $id);
} }

7
app/Repositories/Shop/Packages.php
View File

@@ -9,6 +9,13 @@ class Packages
{ {
use Basic; use Basic;
public static function init()
{
return [
'families' => ArticleNatures::getOptions(),
];
}
public static function getOptions() public static function getOptions()
{ {
return Package::orderBy('value', 'asc')->pluck('value', 'id')->toArray(); return Package::orderBy('value', 'asc')->pluck('value', 'id')->toArray();

9
app/Repositories/Shop/PriceListValues.php
View File

@@ -10,6 +10,15 @@ class PriceListValues
{ {
use Basic; use Basic;
public static function init()
{
return [
'unities' => Unities::getOptions(),
'taxes_options' => Taxes::getOptions(),
'categories' => PriceListValueCategories::getOptions(),
];
}
public static function getPriceByOffer($offer_id, $quantity = 1, $sale_channel_id = false) public static function getPriceByOffer($offer_id, $quantity = 1, $sale_channel_id = false)
{ {
$prices = self::getPricesByOffer($offer_id, $sale_channel_id); $prices = self::getPricesByOffer($offer_id, $sale_channel_id);

49
app/Repositories/Shop/Shelves.php
View File

@@ -6,25 +6,11 @@ class Shelves
{ {
public static function getOffersByCategoryAndNature($categoryId, $articleNatureId = false, $tags = [], $articleNature = false, $displayByRows = false) public static function getOffersByCategoryAndNature($categoryId, $articleNatureId = false, $tags = [], $articleNature = false, $displayByRows = false)
{ {
$productTypes = Articles::getProductTypesWithOffers([ $articleNatures = Articles::getArticleNaturesWithOffers(['category_id' => $categoryId]);
'category_id' => $categoryId, $productType = self::getProductType($articleNature, $articleNatures);
]); $articleNatureId = $articleNatureId ?
$articleNatureId :
$articleNatures = Articles::getArticleNaturesWithOffers([ self::getArticleNatureId($articleNature, $articleNatures);
'category_id' => $categoryId,
]);
if ($articleNatureId) {
$productType = ArticleNatures::getProductType($articleNatureId);
} else {
if (! $articleNature) {
if (count($articleNatures)) {
$articleNature = $articleNatures[0];
}
}
$productType = ArticleNatures::getProductTypeBySlug($articleNature);
$articleNatureId = ArticleNatures::getIdBySlug($articleNature);
}
return [ return [
'category' => Categories::getFull($categoryId), 'category' => Categories::getFull($categoryId),
@@ -33,7 +19,7 @@ class Shelves
'product_type' => $productType, 'product_type' => $productType,
'article_nature' => $articleNature, 'article_nature' => $articleNature,
'article_natures' => $articleNatures ?? [], 'article_natures' => $articleNatures ?? [],
'product_types' => $productTypes ?? [], 'product_types' => Articles::getProductTypesWithOffers(['category_id' => $categoryId]),
'tags_selected' => $tags, 'tags_selected' => $tags,
'articles' => Articles::getArticlesToSell([ 'articles' => Articles::getArticlesToSell([
'category_id' => $categoryId, 'category_id' => $categoryId,
@@ -44,4 +30,27 @@ class Shelves
'tags' => TagGroups::getWithTagsAndCountOffers($categoryId), 'tags' => TagGroups::getWithTagsAndCountOffers($categoryId),
]; ];
} }
public static function getArticleNatureId($articleNature, $articleNatures = [])
{
if (! $articleNature && count($articleNatures)) {
$articleNature = $articleNatures[0];
}
return ArticleNatures::getIdBySlug($articleNature);
}
public static function getProductType($articleNatureId, $articleNature, $articleNatures = [])
{
if ($articleNatureId) {
$productType = ArticleNatures::getProductType($articleNatureId);
} else {
if (! $articleNature && count($articleNatures)) {
$articleNature = $articleNatures[0];
}
$productType = ArticleNatures::getProductTypeBySlug($articleNature);
}
return $productType;
}
} }

10
routes/Admin/Shop/PriceListValues.php
View File

@@ -1,10 +0,0 @@
<?php
Route::prefix('PriceListValues')->name('PriceListValues.')->group(function () {
Route::get('', 'PriceListValueController@index')->name('index');
Route::get('create', 'PriceListValueController@create')->name('create');
Route::delete('destroy/{id?}', 'PriceListValueController@destroy')->name('destroy');
Route::post('store', 'PriceListValueController@store')->name('store');
Route::get('edit/{id}', 'PriceListValueController@edit')->name('edit');
Route::get('addPrice/{index?}', 'PriceListValueController@addPrice')->name('addPrice');
});

1
routes/Admin/Shop/route.php
View File

@@ -19,7 +19,6 @@ Route::middleware('auth')->prefix('Shop')->namespace('Shop')->name('Shop.')->gro
include_once __DIR__.'/Orders.php'; include_once __DIR__.'/Orders.php';
include_once __DIR__.'/Packages.php'; include_once __DIR__.'/Packages.php';
include_once __DIR__.'/PriceLists.php'; include_once __DIR__.'/PriceLists.php';
include_once __DIR__.'/PriceListValues.php';
include_once __DIR__.'/Producers.php'; include_once __DIR__.'/Producers.php';
include_once __DIR__.'/SaleChannels.php'; include_once __DIR__.'/SaleChannels.php';
include_once __DIR__.'/Tags.php'; include_once __DIR__.'/Tags.php';