[WIP] Working on uploader

This commit is contained in:
Ludovic CANDELLIER
2020-06-01 01:13:01 +02:00
parent 8cf5de7f9f
commit 9acf35f5ee
55 changed files with 1496 additions and 285 deletions

View File

@@ -7,23 +7,23 @@
<div class="row">
<div class="col-2">
{{ Form::label('tax_id', 'TVA') }}
@include('components.select', ['name' => 'prices[][tax_id]', 'value' => (isset($tax_id)) ? $tax_id : null, 'list' => isset($taxes) ? $taxes : null, 'required' => true])
{{ Form::label('tax_id', 'TVA') }}<br/>
@include('components.select', ['name' => 'prices[][tax_id]', 'value' => (isset($tax_id)) ? $tax_id : null, 'list' => isset($taxes) ? $taxes : null, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-2">
{{ Form::label('price', 'Prix HT') }}
@include('components.money', ['name' => 'prices[][price}', 'value' => (isset($price)) ? $price : 0, 'required' => true])
@include('components.money', ['name' => 'prices[][price}', 'value' => (isset($price)) ? $price : 0, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-2">
{{ Form::label('price_taxed', 'Prix TTC') }}
@include('components.money', ['name' => 'prices[][price_taxed]', 'value' => (isset($price_ht)) ? $price_ht : 0, 'required' => true])
@include('components.money', ['name' => 'prices[][price_taxed]', 'value' => (isset($price_ht)) ? $price_ht : 0, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-2">
<br/>
<button class="btn btn-primary btn-xs add-new-attribute-btn mt-3" data-toggle="collapse" href="#attributes" type="button">
<button class="btn btn-primary btn-xs add-new-attribute mt-1" href="#attributes" type="button">
Ajout d'un attribut
<i class="fas fa-plus"></i>
</button>
@@ -39,22 +39,27 @@
</div>
</div>
<div class="collapse" id="attributes">
<div class="d-none" id="attributes">
<div class="card-body">
<div class="row">
<div id="append_attribute" class="row">
</div>
<div class="row row-new-attribute row-attribute">
<div class="col-xs-3 col-md-2">
{{ Form::label('quantity', 'Quantité') }}
@include('components.input', ['name' => 'prices[][quantity][]', 'value' => (isset($quantity)) ? $quantity : 1, 'required' => true])
{{ Form::label('quantity', 'Quantité') }}<br/>
@include('components.input', ['name' => 'prices[][quantity][]', 'value' => (isset($quantity)) ? $quantity : 1, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-xs-4 col-md-4">
{{ Form::label('attribute_family_id', 'Attributs') }}
@include('components.select', ['name' => 'prices[][attribute_family_id][]', 'value' => (isset($attribute_value['attribute_family_id'])) ? $attribute_value['attribute_family_id'] : null, 'list' => $attribute_families, 'required' => true])
{{ Form::label('attribute_family_id', 'Attributs') }}<br/>
@include('components.select', ['name' => 'prices[][attribute_family_id][]', 'value' => (isset($attribute_value['attribute_family_id'])) ? $attribute_value['attribute_family_id'] : null, 'list' => $attribute_families, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-xs-5 col-md-4">
{{ Form::label('attribute_value_id', 'Valeur') }}
@include('components.select', ['name' => 'prices[][attribute_value_id][]', 'value' => (isset($attribute_value['id'])) ? $attribute_value['id'] : null, 'list' => (isset($attribute_values)) ? $attribute_values : null, 'required' => true])
{{ Form::label('attribute_value_id', 'Valeur') }}<br/>
@include('components.select', ['name' => 'prices[][attribute_value_id][]', 'value' => (isset($attribute_value['id'])) ? $attribute_value['id'] : null, 'list' => (isset($attribute_values)) ? $attribute_values : null, 'required' => true, 'class' => 'form-control-sm'])
</div>
</div>

View File

@@ -33,7 +33,7 @@
<div class="row">
<div class="col-12">
{{ Form::label('tags', 'Tags') }}
@include('components.select', ['name' => 'tags', 'value' => isset($tags) ? $tags : null, 'class' => 'select2 form-control', 'multiple' => true])
@include('components.select-tree', ['name' => 'tags', 'list' => $tags_list, 'value' => isset($tags) ? $tags : null, 'class' => 'select2 form-control', 'multiple' => true])
</div>
</div>
@@ -46,7 +46,6 @@
</div>
<div class="col-md-4">
{{ Form::label('photo', 'Photos') }}
@include('components.file', ['name' => 'photo', 'value' => isset($photo) ? $photo : null, 'required' => true])
@include('components.uploader.widget', ['images' => isset($media) ? $media : null])
</div>
</div>

View File

@@ -1,5 +1,4 @@
@include('Shop.Admin.Articles.partials.block_price_new')
<div id="append_price" class="row">
@include('Shop.Admin.Articles.partials.list-prices')
@@ -26,5 +25,22 @@
hideSection: true
});
function append_attribute() {
}
$("#append_attribute").appender({
rowSection: '.row-new-attribute',
type: '.row-attribute',
addBtn: '.add-new-attribute',
appendEffect: 'slide',
addClass: 'animated bounceInLeft',
rowNumber: '.row-attribute-number',
deleteBtn: '.delete-new-attribute-btn',
callback: append_attribute,
rowNumberStart: 2,
hideSection: true
});
</script>
@endpush

View File

@@ -2,16 +2,18 @@
@include('boilerplate::load.select2')
@include('boilerplate::load.tinymce')
<input type="hidden" name="category_id" value="{{ $category_id }}">
<div class="row">
<div class="col-md-8">
<div class="row">
<div class="col-6">
<div class="col-8">
{{ Form::label('name', 'Nom') }}
@include('components.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true])
</div>
<div class="col-6">
{{ Form::label('category_id', 'Catégorie parente') }}
@include('components.select', ['name' => 'category_id', 'list' => $categories, 'value' => isset($category_id) ? $category_id : null, 'class' => 'select2 form-control'])
<div class="col-4 text-right">
{{ Form::label('visible', 'Visible') }}<br/>
@include('components.toggle', ['name' => 'visible', 'value' => isset($visible) ? $visible : null])
</div>
</div>
<div class="row">
@@ -33,19 +35,13 @@
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="float-right mt-3">
@include('components.button-save')
</div>
</div>
</div>
@include('components.save')
@push('js')
<script>
$(function() {
$(".select2").select2();
$('.editor').tinymce({});
});
</script>
<script>
$(function() {
$(".select2").select2();
$('.editor').tinymce({});
});
</script>
@endpush

View File

@@ -1,7 +1,7 @@
<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' => 'ion ion-bag', 'text' => 'Commandes'])
</a>
</div>
<!-- /.col -->
@@ -17,7 +17,7 @@
<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($total_invoices)) ? $total_invoices : 0, 'class' => 'bg-yellow', 'icon' => 'ion ion-stats-bars', 'text' => 'CA du mois'])
</a>
</div>
<!-- /.col -->

View File

@@ -0,0 +1,42 @@
<div class="card">
<div class="card-header">
<h3 class="card-title">Dernières commandes</h3>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fa fa-minus"></i>
</button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fa fa-times"></i></button>
</div>
</div>
<!-- /.box-header -->
<div class="card-body">
<div class="table-responsive">
<table class="table no-margin">
<thead>
<tr>
<th>Nom</th>
<th>Localisation</th>
<th>Date</th>
<th>Montant</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="pages/examples/invoice.html">Ludovic CANDELLIER</a></td>
<td>Amiens (80)</td>
<td>14/05/2020</td>
<td><span class="label label-success">300.53 </span></td>
</tr>
</tbody>
</table>
</div>
<!-- /.table-responsive -->
</div>
<!-- /.box-body -->
<div class="card-header clearfix">
<a href="javascript:void(0)" class="btn btn-sm btn-info btn-flat pull-left">Nouvelle commande</a>
<a href="javascript:void(0)" class="btn btn-sm btn-default btn-flat pull-right">Voir toutes les commandes</a>
</div>
<!-- /.box-footer -->
</div>
<!-- /.box -->

View File

@@ -1,43 +0,0 @@
<!-- TABLE: LATEST ORDERS -->
<div class="box box-info">
<div class="box-header with-border">
<h3 class="box-title">Derniers dossiers</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
</button>
<button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
</div>
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="table-responsive">
<table class="table no-margin">
<thead>
<tr>
<th>Résidence</th>
<th>Lot</th>
<th>Prix</th>
<th>Vendeur</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="pages/examples/invoice.html">Résidence</a></td>
<td>Lot</td>
<td><span class="label label-success">Prix</span></td>
<td>Vendeur</td>
</tr>
</tbody>
</table>
</div>
<!-- /.table-responsive -->
</div>
<!-- /.box-body -->
<div class="box-footer clearfix">
<a href="javascript:void(0)" class="btn btn-sm btn-info btn-flat pull-left">Nouveau dossier</a>
<a href="javascript:void(0)" class="btn btn-sm btn-default btn-flat pull-right">Voir tous les dossiers</a>
</div>
<!-- /.box-footer -->
</div>
<!-- /.box -->

View File

@@ -1,15 +1,15 @@
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">Type de lots</h3>
<div class="card">
<div class="card-header">
<h3 class="card-title">Répartion par types</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fa fa-minus"></i>
</button>
<button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
<button type="button" class="btn btn-tool" data-widget="remove"><i class="fa fa-times"></i></button>
</div>
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="card-body">
<div class="row">
<div class="col-md-8">
<div class="chart-responsive">
@@ -20,12 +20,10 @@
<!-- /.col -->
<div class="col-md-4">
<ul class="chart-legend clearfix">
<li><i class="fa fa-circle-o text-red"></i> T1</li>
<li><i class="fa fa-circle-o text-green"></i> T2</li>
<li><i class="fa fa-circle-o text-yellow"></i> T3</li>
<li><i class="fa fa-circle-o text-aqua"></i> T4</li>
<li><i class="fa fa-circle-o text-light-blue"></i> T5</li>
<li><i class="fa fa-circle-o text-gray"></i> Part</li>
<li><i class="fa fa-circle-o text-red"></i> Semences</li>
<li><i class="fa fa-circle-o text-green"></i> Plants</li>
<li><i class="fa fa-circle-o text-yellow"></i> Plats</li>
<li><i class="fa fa-circle-o text-aqua"></i> Outils</li>
</ul>
</div>
<!-- /.col -->
@@ -33,7 +31,7 @@
<!-- /.row -->
</div>
<!-- /.box-body -->
<div class="box-footer no-padding">
<div class="card-footer">
<ul class="nav nav-pills nav-stacked">
<li>
<a href="#">

View File

@@ -13,11 +13,11 @@
<div class="row">
<div class="col-md-8">
@include('Shop.Admin.Dashboard._partials.latest_orders')
@include('Shop.Admin.Dashboard._partials.latestOrders')
</div>
<div class="col-md-4">
@include('Shop.Admin.Dashboard._partials.stats_sections')
@include('Shop.Admin.Dashboard._partials.ordersByTypes')
</div>
</div>

View File

@@ -1,40 +1,40 @@
<div class="row">
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Evolution du CA</h3>
<div class="card">
<div class="card-header">
<h3 class="card-title">Evolution du CA</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
<div class="card-tools">
<button type="button" class="btn btn-tool" data-card-widget="collapse">
<i class="fas fa-minus"></i>
</button>
<div class="btn-group">
<button type="button" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-wrench"></i></button>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Par semaine</a></li>
<li><a href="#">Par mois</a></li>
<li class="divider"></li>
<li><a href="#">Autre chose</a></li>
</ul>
<button type="button" class="btn btn-tool dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
</button>
<div class="dropdown-menu dropdown-menu-right" role="menu">
<a href="#" class="dropdown-item">Par semaine</a>
<a href="#" class="dropdown-item">Par mois</a>
<a class="dropdown-divider"></a>
<a href="#" class="dropdown-item">Autre chose</a>
</div>
</div>
<button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
<button type="button" class="btn btn-tool" data-widget="remove">
<i class="fa fa-times"></i>
</button>
</div>
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="card-body">
<div class="row">
<div class="col-md-12">
@include('Shop.Admin.Dashboard.components.chart')
</div>
</div>
<!-- /.row -->
</div>
<!-- ./box-body -->
<div class="box-footer">
<div class="card-footer">
@include('Shop.Admin.Dashboard._partials.evolutions')
</div>
<!-- /.box-footer -->
</div>
<!-- /.box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->

View File

@@ -1,20 +0,0 @@
<div class="pad box-pane-right bg-green" style="min-height: 280px">
<div class="description-block margin-bottom">
<div class="sparkbar pad" data-color="#fff"><canvas width="34" height="30" style="display: inline-block; width: 34px; height: 30px; vertical-align: top;"></canvas></div>
<h5 class="description-header">{{ $nb_residences }}</h5>
<span class="description-text">Résidences</span>
</div>
<div class="description-block margin-bottom">
<div class="sparkbar pad" data-color="#fff"><canvas width="34" height="30" style="display: inline-block; width: 34px; height: 30px; vertical-align: top;"></canvas></div>
<h5 class="description-header">{{ $nb_lots }}</h5>
<span class="description-text">Lots</span>
</div>
<div class="description-block">
<div class="sparkbar pad" data-color="#fff"><canvas width="34" height="30" style="display: inline-block; width: 34px; height: 30px; vertical-align: top;"></canvas></div>
<h5 class="description-header">{{ $lots_percent }} %</h5>
<span class="description-text">En cours</span>
</div>
</div>

View File

@@ -1,14 +1,14 @@
@extends('layout.index', [
'title' => __('article_families.title'),
'subtitle' => __('article_families.create.title'),
'breadcrumb' => [__('article_families.title'), __('article_families.create.title')]
'title' => __('tags.title'),
'subtitle' => __('tags.create.title'),
'breadcrumb' => [__('tags.title'), __('tags.create.title')]
])
@include('boilerplate::load.fileinput')
@section('content')
{{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.store', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }}
{{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.store', 'id' => 'tag-form', 'autocomplete' => 'off', 'files' => true]) }}
<div class="row">
<div class="col-sm-12 mbl">

View File

@@ -1,11 +1,5 @@
@include('boilerplate::load.tinymce')
<div class="row">
<div class="col-md-8">
{{ Form::label('group_id', 'Groupe') }}
@include('components.select', ['name' => 'group_id', 'list' => isset($groups) ? $groups : null, 'value' => isset($group_id) ? $group_id : null, 'required' => true])
{{ Form::label('name', 'Nom') }}
@include('components.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true])
@@ -21,10 +15,3 @@
</div>
</div>
@push('js')
<script>
$(function() {
$('.editor').tinymce({});
});
</script>
@endpush

View File

@@ -8,7 +8,7 @@
<div class="row pb-3">
<div class="col text-right">
<a href="{{ route('Shop.Admin.Tags.create') }}" class="btn btn-sm btn-success">{{ __('Shop.Admin.Tags.add') }} <i class="fa fa-plus"></i></a>
<a href="{{ route('Shop.Admin.Tags.create') }}" class="btn btn-sm btn-success">{{ __('Shop.tags.add') }} <i class="fa fa-plus"></i></a>
</div>
</div>
@@ -17,5 +17,12 @@
@endsection
@push('scripts')
@include('components.js.datatable', ['route' => '/Shop/Admin/Tags', 'model' => 'Tags'])
<script>
$.extend( true, $.fn.dataTable.defaults, {
rowReorder: true
} );
</script>
@include('components.js.datatable', ['route' => '/Shop/Admin/Tags', 'model' => 'tags'])
@endpush

View File

@@ -0,0 +1,5 @@
<div id="header-basket">
<div class="" data-refresh-url="/module/ps_Shoppingcart/ajax">
<i class="fa fa-3x fa-shopping-basket"></i>
</div>
</div>

View File

@@ -0,0 +1,7 @@
<div class="language-selector dropdown js-dropdown">
<span class="language-selector-label">Langue :</span>
<a data-target="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="Sélecteur de langue">
<span class="expand-more">Français</span>
<i class="material-icons expand-more">&#xE313;</i>
</a>
</div>

View File

@@ -1,72 +1,25 @@
<nav class="header-nav">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 left-nav">
<div id="ishiheaderblock" class="clearfix">
<div class="header-text">Obtenez 25% de réduction aujourd hui</div>
</div>
<div class="pull-left">
<div id="menu-icon" class="menu-icon hidden-lg-up">
<i class="fa fa-bars" aria-hidden="true"></i>
</div>
<img src="/img/logo.png" class="img-responvive" height="64">
</div>
<div class="pull-left">
{{ include("Shop._partials.search")}}
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-6 right-nav">
<div class="language-selector dropdown js-dropdown">
<span class="language-selector-label">Langue :</span>
<a data-target="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="Sélecteur de langue">
<span class="expand-more">Français</span>
<i class="material-icons expand-more">&#xE313;</i>
</a>
<!--
<ul class="dropdown-menu" aria-labelledby="language-selector-label">
<li >
<a href="en/" class="dropdown-item" data-iso-code="en">English</a>
</li>
<li >
<a href="ar/" class="dropdown-item" data-iso-code="ar">اللغة العربية</a>
</li>
<li >
<a href="es/" class="dropdown-item" data-iso-code="es">Español</a>
</li>
<li class="current" >
<a href="fr/" class="dropdown-item" data-iso-code="fr">Français</a>
</li>
<li >
<a href="it/" class="dropdown-item" data-iso-code="it">Italiano</a>
</li>
<li >
<a href="pl/" class="dropdown-item" data-iso-code="pl">Polski</a>
</li>
</ul>
-->
</div>
<!--
<div class="currency-selector dropdown js-dropdown">
<span class="currency-selector-label">Devise :</span>
<a data-target="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="Sélecteur de devise">
<span class="expand-more">USD $</span>
<i class="material-icons expand-more">&#xE313;</i>
</a>
<ul class="dropdown-menu" aria-labelledby="currency-selector-label">
<li >
<a title="Euro" rel="nofollow" href="fr/?SubmitCurrency=1&amp;id_currency=2" class="dropdown-item">EUR €</a>
</li>
<li class="current" >
<a title="Dollar des États-Unis" rel="nofollow" href="fr/?SubmitCurrency=1&amp;id_currency=1" class="dropdown-item">USD $</a>
</li>
</ul>
</div>
-->
<div class="user-info dropdown js-dropdown">
<span class="account-logo expand-more" data-toggle="dropdown" role="button">Compte client <i class="material-icons expand-more">&#xE313;</i></span>
<ul class="dropdown-menu" aria-labelledby="dLabel">
<li>
<a href="fr/mon-compte" title="Identifiez-vous" rel="nofollow">
<span>Connexion</span>
</a>
</li>
</ul>
</div>
{{ include("Shop._partials.header-profile")}}
{{ include("Shop._partials.header-basket")}}
</div>
</div>
</div>
</nav>

View File

@@ -0,0 +1,13 @@
<div class="user-info dropdown js-dropdown">
<span class="account-logo expand-more" data-toggle="dropdown" role="button">Compte client
<i class="material-icons expand-more">&#xE313;</i>
</span>
<ul class="dropdown-menu" aria-labelledby="dLabel">
<li>
<a href="fr/mon-compte" title="Identifiez-vous" rel="nofollow">
<span>Connexion</span>
</a>
</li>
</ul>
</div>

View File

@@ -2,19 +2,13 @@
<div class="header-banner"></div>
{{ 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")}}
<div id="menu-icon" class="menu-icon hidden-lg-up">
<i class="fa fa-bars" aria-hidden="true"></i>
</div>
<div id="_mobile_cart"></div>
<div id="_mobile_seach_widget"></div>
<div id="_mobile_user_info"></div>