Fixes
This commit is contained in:
Ludovic CANDELLIER
@@ -1,13 +1,13 @@
|
||||
<div class="row">
|
||||
<div class="col-md-3 col-sm-6 col-xs-12">
|
||||
<a href="{!! route('Shop.Admin.Orders.index') !!}">
|
||||
@include('shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_orders)) ? $nb_orders : 0, 'class' => 'bg-aqua', 'icon' => 'fa-building-o', 'text' => 'Commandes'])
|
||||
@include('Shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_orders)) ? $nb_orders : 0, 'class' => 'bg-aqua', 'icon' => 'fa-building-o', 'text' => 'Commandes'])
|
||||
</a>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
<div class="col-md-3 col-sm-6 col-xs-12">
|
||||
<a href="{!! route('Shop.Admin.Invoices.index') !!}">
|
||||
@include('shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_invoices)) ? $nb_invoices : 0, 'class' => 'bg-red', 'icon' => 'fa-clock-o', 'text' => 'Factures'])
|
||||
@include('Shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_invoices)) ? $nb_invoices : 0, 'class' => 'bg-red', 'icon' => 'fa-clock-o', 'text' => 'Factures'])
|
||||
</a>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
<div class="col-md-3 col-sm-6 col-xs-12">
|
||||
<a href="{!!route('Shop.Admin.Orders.index') !!}">
|
||||
@include('shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_dossiers_encours)) ? $nb_dossiers_encours : 0, 'class' => 'bg-yellow', 'icon' => 'fa-hourglass-start', 'text' => 'CA du mois'])
|
||||
@include('Shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_dossiers_encours)) ? $nb_dossiers_encours : 0, 'class' => 'bg-yellow', 'icon' => 'fa-hourglass-start', 'text' => 'CA du mois'])
|
||||
</a>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
<div class="col-md-3 col-sm-6 col-xs-12">
|
||||
<a href="{!! route('Shop.Admin.Orders.index') !!}">
|
||||
@include('shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_ventes)) ? $nb_ventes : 0, 'class' => 'bg-green', 'icon' => 'fa-check-square-o', 'text' => 'Panier moyen'])
|
||||
@include('Shop.admin.Dashboard.components.infobox', ['count' => (isset($nb_ventes)) ? $nb_ventes : 0, 'class' => 'bg-green', 'icon' => 'fa-check-square-o', 'text' => 'Panier moyen'])
|
||||
</a>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
@@ -0,0 +1,23 @@
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-8">
|
||||
@include('Shop.admin.Dashboard._partials.salesByPeriod')
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
@include('Shop.admin.Dashboard._partials.stock')
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
@include('Shop.admin.Dashboard._partials.latest_orders')
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
@include('Shop.admin.Dashboard._partials.stats_sections')
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -22,14 +22,14 @@
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
@include('shop.admin.Dashboard.components.chart')
|
||||
@include('Shop.admin.Dashboard.components.chart')
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
</div>
|
||||
<!-- ./box-body -->
|
||||
<div class="box-footer">
|
||||
@include('shop.admin.Dashboard._partials.evolutions')
|
||||
@include('Shop.admin.Dashboard._partials.evolutions')
|
||||
</div>
|
||||
<!-- /.box-footer -->
|
||||
</div>
|
||||
@@ -1,7 +1,7 @@
|
||||
@include('shop.admin.Dashboard.components.infobox2', ['count' => (isset($nb_lots_optionne)) ? $nb_lots_optionne : 0, 'class' => 'bg-aqua', 'icon' => 'fa-building-o', 'text' => 'Lots optionnés', 'percent' => 0 ])
|
||||
@include('Shop.admin.Dashboard.components.infobox2', ['count' => (isset($nb_lots_optionne)) ? $nb_lots_optionne : 0, 'class' => 'bg-aqua', 'icon' => 'fa-building-o', 'text' => 'Lots optionnés', 'percent' => 0 ])
|
||||
|
||||
@include('shop.admin.Dashboard.components.infobox2', ['count' => (isset($montant_options_encours)) ? $montant_options_encours : 0, 'class' => 'bg-red', 'icon' => 'fa-clock-o', 'text' => 'Options En cours', 'percent' => 10 ])
|
||||
@include('Shop.admin.Dashboard.components.infobox2', ['count' => (isset($montant_options_encours)) ? $montant_options_encours : 0, 'class' => 'bg-red', 'icon' => 'fa-clock-o', 'text' => 'Options En cours', 'percent' => 10 ])
|
||||
|
||||
@include('shop.admin.Dashboard.components.infobox2', ['count' => (isset($montant_dossiers_encours)) ? $montant_dossiers_encours : 0, 'class' => 'bg-yellow', 'icon' => 'fa-hourglass-start', 'text' => 'Dossiers en cours', 'percent' => 20 ])
|
||||
@include('Shop.admin.Dashboard.components.infobox2', ['count' => (isset($montant_dossiers_encours)) ? $montant_dossiers_encours : 0, 'class' => 'bg-yellow', 'icon' => 'fa-hourglass-start', 'text' => 'Dossiers en cours', 'percent' => 20 ])
|
||||
|
||||
@include('shop.admin.Dashboard.components.infobox2', ['count' => (isset($montant_ventes)) ? $montant_ventes : 0, 'class' => 'bg-green', 'icon' => 'fa-check-square-o', 'text' => 'Ventes', 'percent' => 30 ])
|
||||
@include('Shop.admin.Dashboard.components.infobox2', ['count' => (isset($montant_ventes)) ? $montant_ventes : 0, 'class' => 'bg-green', 'icon' => 'fa-check-square-o', 'text' => 'Ventes', 'percent' => 30 ])
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
@section('content')
|
||||
|
||||
@include('shop.admin.Dashboard._partials.counter')
|
||||
@include('shop.admin.Dashboard._partials.report')
|
||||
@include('Shop.admin.Dashboard._partials.counter')
|
||||
@include('Shop.admin.Dashboard._partials.report')
|
||||
|
||||
@endsection
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@extends('boilerplate::layout.index', [
|
||||
'title' => __('shop.families.title'),
|
||||
'subtitle' => __('shop.families.add'),
|
||||
'breadcrumb' => [__('shop.families.title'), __('shop.families.add')]
|
||||
'title' => __('Shop.families.title'),
|
||||
'subtitle' => __('Shop.families.add'),
|
||||
'breadcrumb' => [__('Shop.families.title'), __('Shop.families.add')]
|
||||
])
|
||||
|
||||
@include('boilerplate::load.fileinput')
|
||||
@@ -1,6 +1,6 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.families.title'),
|
||||
'subtitle' => __('shop.families.edit'),
|
||||
'title' => __('Shop.families.title'),
|
||||
'subtitle' => __('Shop.families.edit'),
|
||||
'breadcrumb' => ['Familles']
|
||||
])
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.families.title'),
|
||||
'subtitle' => __('shop.families.list'),
|
||||
'breadcrumb' => [__('shop.families.title')]
|
||||
'title' => __('Shop.families.title'),
|
||||
'subtitle' => __('Shop.families.list'),
|
||||
'breadcrumb' => [__('Shop.families.title')]
|
||||
])
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="row pb-3">
|
||||
<div class="col text-right">
|
||||
<a href="{{ route('Shop.Admin.Families.create') }}" class="btn btn-sm btn-success">{{ __('shop.families.add') }} <i class="fa fa-plus"></i></a>
|
||||
<a href="{{ route('Shop.Admin.Families.create') }}" class="btn btn-sm btn-success">{{ __('Shop.families.add') }} <i class="fa fa-plus"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.genres.title'),
|
||||
'subtitle' => __('shop.genres.add'),
|
||||
'breadcrumb' => [__('shop.genres.title'), __('shop.genres.add')]
|
||||
'title' => __('Shop.genres.title'),
|
||||
'subtitle' => __('Shop.genres.add'),
|
||||
'breadcrumb' => [__('Shop.genres.title'), __('Shop.genres.add')]
|
||||
])
|
||||
|
||||
@section('content')
|
||||
@@ -1,6 +1,6 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.genres.title'),
|
||||
'subtitle' => __('shop.genres.edit'),
|
||||
'title' => __('Shop.genres.title'),
|
||||
'subtitle' => __('Shop.genres.edit'),
|
||||
'breadcrumb' => ['Familles']
|
||||
])
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.genres.title'),
|
||||
'subtitle' => __('shop.genres.list'),
|
||||
'breadcrumb' => [__('shop.genres.title')]
|
||||
'title' => __('Shop.genres.title'),
|
||||
'subtitle' => __('Shop.genres.list'),
|
||||
'breadcrumb' => [__('Shop.genres.title')]
|
||||
])
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="row pb-3">
|
||||
<div class="col text-right">
|
||||
<a href="{{ route('Shop.Admin.Genres.create') }}" class="btn btn-sm btn-success">{{ __('shop.genres.add') }} <i class="fa fa-plus"></i></a>
|
||||
<a href="{{ route('Shop.Admin.Genres.create') }}" class="btn btn-sm btn-success">{{ __('Shop.genres.add') }} <i class="fa fa-plus"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@extends('boilerplate::layout.index', [
|
||||
'title' => __('shop.sections.title'),
|
||||
'subtitle' => __('shop.sections.add'),
|
||||
'breadcrumb' => [__('shop.sections.title'), __('shop.sections.add')]
|
||||
'title' => __('Shop.sections.title'),
|
||||
'subtitle' => __('Shop.sections.add'),
|
||||
'breadcrumb' => [__('Shop.sections.title'), __('Shop.sections.add')]
|
||||
])
|
||||
|
||||
@include('boilerplate::load.fileinput')
|
||||
@@ -1,6 +1,6 @@
|
||||
@extends('boilerplate::layout.index', [
|
||||
'title' => __('shop.sections.title'),
|
||||
'breadcrumb' => [__('shop.sections.title')]
|
||||
'title' => __('Shop.sections.title'),
|
||||
'breadcrumb' => [__('Shop.sections.title')]
|
||||
])
|
||||
|
||||
@section('content')
|
||||
@@ -15,7 +15,7 @@
|
||||
<th>
|
||||
</th>
|
||||
<th class="text-right">
|
||||
<a href="{{ route('Shop.Admin.Sections.create') }}" class="btn btn-sm btn-success">{{ __('shop.sections.add') }} <i class="fa fa-plus"></i></a>
|
||||
<a href="{{ route('Shop.Admin.Sections.create') }}" class="btn btn-sm btn-success">{{ __('Shop.sections.add') }} <i class="fa fa-plus"></i></a>
|
||||
</th>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -1,7 +1,7 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.species.title'),
|
||||
'subtitle' => __('shop.species.add'),
|
||||
'breadcrumb' => [__('shop.species.title'), __('shop.species.add')]
|
||||
'title' => __('Shop.species.title'),
|
||||
'subtitle' => __('Shop.species.add'),
|
||||
'breadcrumb' => [__('Shop.species.title'), __('Shop.species.add')]
|
||||
])
|
||||
|
||||
@include('boilerplate::load.fileinput')
|
||||
@@ -1,6 +1,6 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.species.title'),
|
||||
'subtitle' => __('shop.species.edit'),
|
||||
'title' => __('Shop.species.title'),
|
||||
'subtitle' => __('Shop.species.edit'),
|
||||
'breadcrumb' => ['Familles']
|
||||
])
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.species.title'),
|
||||
'subtitle' => __('shop.species.list'),
|
||||
'breadcrumb' => [__('shop.species.title')]
|
||||
'title' => __('Shop.species.title'),
|
||||
'subtitle' => __('Shop.species.list'),
|
||||
'breadcrumb' => [__('Shop.species.title')]
|
||||
])
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="row pb-3">
|
||||
<div class="col text-right">
|
||||
<a href="{{ route('Shop.Admin.Species.create') }}" class="btn btn-sm btn-success">{{ __('shop.species.add') }} <i class="fa fa-plus"></i></a>
|
||||
<a href="{{ route('Shop.Admin.Species.create') }}" class="btn btn-sm btn-success">{{ __('Shop.species.add') }} <i class="fa fa-plus"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.varieties.title'),
|
||||
'subtitle' => __('shop.varieties.add'),
|
||||
'breadcrumb' => [__('shop.varieties.title'), __('shop.varieties.add')]
|
||||
'title' => __('Shop.varieties.title'),
|
||||
'subtitle' => __('Shop.varieties.add'),
|
||||
'breadcrumb' => [__('Shop.varieties.title'), __('Shop.varieties.add')]
|
||||
])
|
||||
|
||||
@include('boilerplate::load.fileinput')
|
||||
@@ -1,6 +1,6 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.varieties.title'),
|
||||
'subtitle' => __('shop.varieties.edit'),
|
||||
'title' => __('Shop.varieties.title'),
|
||||
'subtitle' => __('Shop.varieties.edit'),
|
||||
'breadcrumb' => ['Familles']
|
||||
])
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@extends('layout.index', [
|
||||
'title' => __('shop.varieties.title'),
|
||||
'subtitle' => __('shop.varieties.list'),
|
||||
'breadcrumb' => [__('shop.varieties.title')]
|
||||
'title' => __('Shop.varieties.title'),
|
||||
'subtitle' => __('Shop.varieties.list'),
|
||||
'breadcrumb' => [__('Shop.varieties.title')]
|
||||
])
|
||||
|
||||
@section('content')
|
||||
|
||||
<div class="row pb-3">
|
||||
<div class="col text-right">
|
||||
<a href="{{ route('Shop.Admin.Varieties.create') }}" class="btn btn-sm btn-success">{{ __('shop.varieties.add') }} <i class="fa fa-plus"></i></a>
|
||||
<a href="{{ route('Shop.Admin.Varieties.create') }}" class="btn btn-sm btn-success">{{ __('Shop.varieties.add') }} <i class="fa fa-plus"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
8
resources/views/Shop/_partials/block-bottom.twig
Normal file
8
resources/views/Shop/_partials/block-bottom.twig
Normal file
@@ -0,0 +1,8 @@
|
||||
<div id="bottom_home">
|
||||
{{ include('Shop._partials.testimonials')}}
|
||||
{{ include('Shop._partials.services')}}
|
||||
{{ include('Shop._partials.special-products')}}
|
||||
{{ include("Shop._partials.newsletter")}}
|
||||
{{ include("Shop._partials.block-news")}}
|
||||
{{ include("Shop._partials.block-manufacturers")}}
|
||||
</div>
|
||||
@@ -4,15 +4,15 @@
|
||||
<div id="manufacturer-carousel" class="owl-carousel owl-loaded owl-drag">
|
||||
<div class="owl-stage-outer">
|
||||
<div class="owl-stage" style="transform: translate3d(-1200px, 0px, 0px); transition: all 0.25s ease 0s; width: 3600px;">
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
{{ include("Shop._partials.manufacturer")}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="owl-nav disabled">
|
||||
@@ -7,9 +7,9 @@
|
||||
<div id="smartblog-carousel" class="product_list owl-carousel owl-loaded owl-drag">
|
||||
<div class="owl-stage-outer">
|
||||
<div class="owl-stage" style="transform: translate3d(-1200px, 0px, 0px); transition: all 0s ease 0s; width: 4800px;">
|
||||
{{ include ("shop._partials.blog") }}
|
||||
{{ include ("shop._partials.blog") }}
|
||||
{{ include ("shop._partials.blog") }}
|
||||
{{ include ("Shop._partials.blog") }}
|
||||
{{ include ("Shop._partials.blog") }}
|
||||
{{ include ("Shop._partials.blog") }}
|
||||
</div>
|
||||
<div class="owl-nav">
|
||||
<div class="owl-prev"><i class="material-icons"></i></div>
|
||||
@@ -19,14 +19,14 @@
|
||||
<div id="featured-products-block" class="tab-pane active">
|
||||
<div class="block_content row">
|
||||
<div id="ishi-featured-products" class="owl-carousel">
|
||||
{{ include("shop._partials.product", {index:1}) }}
|
||||
{{ include("shop._partials.product", {index:2}) }}
|
||||
{{ include("shop._partials.product", {index:3}) }}
|
||||
{{ include("shop._partials.product", {index:4}) }}
|
||||
{{ include("shop._partials.product", {index:5}) }}
|
||||
{{ include("shop._partials.product", {index:6}) }}
|
||||
{{ include("shop._partials.product", {index:7}) }}
|
||||
{{ include("shop._partials.product", {index:8}) }}
|
||||
{{ include("Shop._partials.product", {index:1}) }}
|
||||
{{ include("Shop._partials.product", {index:2}) }}
|
||||
{{ include("Shop._partials.product", {index:3}) }}
|
||||
{{ include("Shop._partials.product", {index:4}) }}
|
||||
{{ include("Shop._partials.product", {index:5}) }}
|
||||
{{ include("Shop._partials.product", {index:6}) }}
|
||||
{{ include("Shop._partials.product", {index:7}) }}
|
||||
{{ include("Shop._partials.product", {index:8}) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -9,7 +9,7 @@
|
||||
</h1>
|
||||
</div>
|
||||
<div id="_desktop_cart">
|
||||
<div class="blockcart cart-preview inactive" data-refresh-url="/module/ps_shoppingcart/ajax">
|
||||
<div class="blockcart cart-preview inactive" data-refresh-url="/module/ps_Shoppingcart/ajax">
|
||||
<div class="header">
|
||||
<span class="cart-link">
|
||||
<span class="cart-img"></span>
|
||||
@@ -1,16 +1,16 @@
|
||||
<header id="header">
|
||||
<div class="header-banner"></div>
|
||||
|
||||
{{ include("shop._partials.header-nav") }}
|
||||
{{ include("shop._partials.header-top")}}
|
||||
{{ include("Shop._partials.header-nav") }}
|
||||
{{ include("Shop._partials.header-top")}}
|
||||
|
||||
|
||||
<div class="nav-full-width">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
|
||||
{{ include("shop._partials.sections")}}
|
||||
{{ include("shop._partials.search")}}
|
||||
{{ include("Shop._partials.sections")}}
|
||||
{{ include("Shop._partials.search")}}
|
||||
|
||||
<div id="menu-icon" class="menu-icon hidden-lg-up">
|
||||
<i class="fa fa-bars" aria-hidden="true"></i>
|
||||
File diff suppressed because one or more lines are too long
@@ -27,7 +27,7 @@
|
||||
<input type="hidden" name="id_customization" value="0">
|
||||
<input type="hidden" name="qty" value="1">
|
||||
<a data-button-action="add-to-cart" class="btn btn-primary ajax_add_to_cart_button add-to-cart">
|
||||
<i class="material-icons shopping-cart"></i>
|
||||
<i class="material-icons Shopping-cart"></i>
|
||||
<span class="lblcart">Ajouter au panier</span>
|
||||
</a>
|
||||
</form>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user