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

Add display articles by rows, and display article in full mode

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-01-18 23:39:27 +01:00
parent 3641bd7d68
commit cefe956bc4
11 changed files with 147 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,79 +9,14 @@ use App\Repositories\Shop\Articles;
class ArticleController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Article $article
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
$data = self::init();
$data['article'] = Articles::getArticle($id);
// dump($data);
// exit;
return view('Shop.Articles.show', $data);
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Article $article
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\Article $article
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Article $article
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

11
app/Repositories/Core/Medias.php
View File

@@ -74,6 +74,17 @@ class Medias
return '.' . pathinfo($filename, PATHINFO_EXTENSION);
}
public static function getImageSrc($image)
{
if (!$image) {
return null;
}
$id = $image['id'];
$filename = $image['name'] . self::getExtension($image['file_name']);
return "/storage/$id/$filename";
}
public static function getThumbSrc($image)
{
if (!$image) {

6
app/Repositories/Shop/Articles.php
View File

@@ -51,7 +51,9 @@ class Articles
{
$article = self::get($id);
$data = $article->toArray();
$data['description'] = (!empty($article->description)) ? $article->description : $article->product->description;
$data['image'] = Articles::getPreview($article->image);
$data['image_big'] = Articles::getImage($article->image);
$data['inherited'] = self::getInherited($id);
$data['categories'] = self::getCategoriesNameByArticle($article);
$data['tags'] = self::getTagsNameByArticle($article);
@@ -63,6 +65,7 @@ class Articles
{
$articles = self::getArticlesWithOffers();
// dump($articles->toArray());
// exit;
foreach ($articles as $article) {
$price_lists = $article->offers[0]->tariff->price_lists->toArray();
// dump($price_lists);
@@ -81,6 +84,7 @@ class Articles
'offer_id' => $article->offers[0]->id,
'quantity' => $prices['quantity'],
'price' => $prices['price_taxed'],
'variation' => $article->offers[0]->variation->name,
];
}
}
@@ -95,7 +99,7 @@ class Articles
'image',
'product',
'article_nature',
'offers.variation',
'offers.variation.package',
'offers.tariff.price_lists.price_list_values',
])->get();
}

10
app/Traits/Repository/Imageable.php
View File

@@ -36,6 +36,16 @@ trait Imageable
return $image ? Medias::getPreviewSrc($image) : null;
}
public static function getImage($image)
{
return '<img src="' . self::getImageSrc($image) . '" class="img-fluid">';
}
public static function getImageSrc($image)
{
return $image ? Medias::getImageSrc($image) : null;
}
public static function deleteImage($id, $index)
{
return Medias::deleteImage(self::get($id), $index);

20
resources/views/Shop/Articles/partials/article.blade.php
View File

@@ -2,23 +2,29 @@
<div class="card">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="...">
<div class="card-body">
<span class="card-title">{{ $product_name }}</span>
<span class="pull-right">
<span class="card-title" style="font-weight: bold; color: green;">{{ $product_name }}</span>
<span class="float-right" style="font-size: 2em; color: red;">
<i class="fa fa-heart"></i>
</span>
<p class="card-text">
<div class="row">
<div class="row" style="color: green;">
<div class="col-6">
{{ $article['semences']['price'] ?? null }}<br>
@if ($article['semences'] ?? false)
<span style="font-size: 1.4em; font-weight: bold;">{{ $article['semences']['price'] ?? null }}</span> €<br>
@else
Indisponible
@endif
Semence
</div>
@if ($article['plants'] ?? false)
<div class="col-6">
{{ $article['plants']['price'] }}<br>
@if ($article['plants'] ?? false)
<span style="font-size: 1.4em; font-weight: bold;">{{ $article['plants']['price'] }}</span> €<br>
@else
Indisponible
@endif
Plant
</div>
@endif
</div>
</p>
</div>

55
resources/views/Shop/Articles/partials/article_rows.blade.php Normal file
View File

@@ -0,0 +1,55 @@
<a href="{{ route('Shop.Articles.show', ['id' => $article['semences']['article_id'] ?? false ]) }}">
<div class="row pb-3">
<div class="col-12">
<div class="card-title" style="font-weight: bold; color: green;">{{ $product_name }}</div>
</div>
<div class="col-12">
<div class="row">
<div class="col-8">
<div class="row">
<div class="col-2">
<div class="row">
<div class="col-9">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="...">
</div>
<div class="col-3 text-center">
<span style="font-size: 2em; color: red;">
<i class="fa fa-heart"></i>
</span>
</div>
</div>
</div>
<div class="col-10">
{!! $article['description'] !!}
</div>
</div>
</div>
<div class="col-4">
<p class="card-text">
<div class="row" style="color: green;">
<div class="col-6 text-center">
@if ($article['semences'] ?? false)
<span style="font-size: 1.4em; font-weight: bold;">{{ $article['semences']['price'] ?? null }}</span> €<br>
{{ $article['semences']['variation'] }}
<div>
Quantité :
</div>
@include('components.form.button', [
'class' => 'btn-success basket semences',
'txt' => 'Ajouter au panier',
])
@endif
</div>
<div class="col-6 text-center">
@if ($article['plants'] ?? false)
<span style="font-size: 1.4em; font-weight: bold;">{{ $article['plants']['price'] }}</span> €<br>
{{ $article['plants']['variation'] }}
@endif
</div>
</div>
</p>
</div>
</div>
</div>
</div>
</a>

33
resources/views/Shop/Articles/show.blade.php Normal file
View File

@@ -0,0 +1,33 @@
@extends('Shop.layout.layout', [
'title' => __('home.title'),
])
@section('content')
<div class="row">
<div class="col-1">
</div>
<div class="col-4">
{!! $article['image_big'] !!}
</div>
<div class="col-4">
<h1>{{ $article['name'] }}</h1>
{!! $article['description'] !!}
</div>
<div class="col-3">
@component('components.card', [
'title' => 'Semence',
'class' => 'mb-3',
])
@include('components.form.button', [
'class' => 'btn-success basket semences',
'txt' => 'Ajouter au panier',
])
@endcomponent
@component('components.card', [
'title' => 'Plant',
])
@endcomponent
</div>
</div>
@endsection

4
resources/views/Shop/home.blade.php
View File

@@ -3,5 +3,9 @@
])
@section('content')
@if ($display_by_rows ?? true)
@include('Shop.layout.partials.category_articles_rows')
@else
@include('Shop.layout.partials.category_articles')
@endif
@endsection

3
resources/views/Shop/layout/partials/category_articles_rows.blade.php Normal file
View File

@@ -0,0 +1,3 @@
@foreach ($articles as $product_name => $article)
@include('Shop.Articles.partials.article_rows')
@endforeach

2
resources/views/components/card.blade.php
View File

@@ -4,7 +4,7 @@
@isset($header)
{{ $header }}
@else
<h3 class="card-title">{{ $title }}</h3>
<h3 class="card-title">{{ $title ?? false }}</h3>
@isset($tools)
<div class="card-tools">
{!! $tools !!}

2
resources/views/components/form/button.blade.php
View File

@@ -1,4 +1,6 @@
<button type="{{ $type ?? 'button' }}" class="btn {{ $class ?? ''}}" @if (isset($id)) id="{{ $id }}"@endif>
@if ($icon ?? false)
<i class="fa fa-fw {{ $icon ?? '' }}"></i>
@endif
{{ $txt ?? '' }}
</button>