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

refactoring on Articles, minor fixes

Browse Source
This commit is contained in:
ludo
2024-01-21 11:42:42 +01:00
parent 7e5b1fea89
commit 88a57a9c32
21 changed files with 467 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ use App\Datatables\Admin\Shop\ArticlesDataTable;
use App\Http\Requests\Admin\Shop\StoreArticlePost;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\ArticleInherited;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\Tags;
use Illuminate\Http\Request;
@@ -71,7 +72,7 @@ class ArticleController extends Controller
{
$data = [
'article' => [
'inherited' => Articles::getInheritedByProduct($productId, base64_decode($model)),
'inherited' => ArticleInherited::getInheritedByProduct($productId, base64_decode($model)),
],
];
@@ -80,7 +81,7 @@ class ArticleController extends Controller
public function getProductTags($productId, $model)
{
$data = Articles::getInheritedByProduct($productId, base64_decode($model));
$data = ArticleInherited::getInheritedByProduct($productId, base64_decode($model));
return view('Admin.Shop.Articles.partials.product.tags', $data);
}

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

@@ -28,7 +28,7 @@ class ContentController extends Controller
public function edit($id)
{
$data = [
'homepage' => Contents::get($id),
'content' => Contents::get($id),
];
return view('Admin.Shop.Contents.edit', $data);

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

@@ -10,19 +10,17 @@ class CustomerAddressController extends Controller
{
public function index(CustomerAddressesDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.Customers.list', $data);
return $dataTable->render('Admin.Shop.Customers.list');
}
public function create()
{
return view('Admin.Shop.CustomerAddresses.create', $data);
return view('Admin.Shop.CustomerAddresses.create');
}
public function store(Request $request)
{
$ret = CustomerAddresses::storeFull($request->all());
$ret = CustomerAddresses::store($request->all());
return redirect()->route('Admin.Shop.CustomerAddresses.index');
}

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Shop;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\ArticleSiblings;
class ArticleController extends Controller
{
@@ -11,7 +12,7 @@ class ArticleController extends Controller
{
$data = [
'article' => Articles::getArticleToSell($id),
'offers2' => Articles::getSiblings($id)->toArray(),
'offers2' => ArticleSiblings::getSiblings($id)->toArray(),
];
return view('Shop.Articles.show', $data);

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

@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Shop;
use App\Http\Controllers\Controller;
use App\Repositories\Core\PDF;
use App\Repositories\Shop\InvoicePDF;
use App\Repositories\Shop\Invoices;
class InvoiceController extends Controller
@@ -24,11 +24,6 @@ class InvoiceController extends Controller
{
\Debugbar::disable();
$data = [
'invoice' => Invoices::getByUUID($uuid),
];
$filename = 'invoice-'.$uuid.'.pdf';
return PDF::view('Shop.Invoices.pdf', $data, $filename);
return InvoicePDF::getByUUID($uuid);
}
}