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

fixes

Browse Source
This commit is contained in:
ludo
2025-01-03 03:46:45 +01:00
parent b3fbfc38e7
commit befaa40b48
44 changed files with 442 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/Admin/Shop/InvoicePayments/create.blade.php
View File

@@ -1 +0,0 @@
@include('Admin.Shop.InvoicePayments.form')

5
resources/views/Admin/Shop/InvoicePayments/form.blade.php
View File

@@ -1,5 +1,7 @@
f{{ Form::open(['route' => 'Admin.Shop.InvoicePayments.store', 'id' => 'invoice_payment-form', 'autocomplete' => 'off']) }}
{{ Form::open(['route' => 'Admin.Shop.InvoicePayments.store', 'id' => 'invoice_payment-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" id="id" value="{{ $invoice_payment['id'] ?? false }}">
<input type="hidden" name="invoice_id" id="invoice_id" value="{{ $invoice_id ?? false }}">
<div class="row mb-3">
<div class="col-12">
@@ -43,4 +45,5 @@ f{{ Form::open(['route' => 'Admin.Shop.InvoicePayments.store', 'id' => 'invoice_
<script>
initDatepicker();
initSaveForm('#invoice_payment-form', '.modal-content .bootbox-accept');
</script>

2
resources/views/Admin/Shop/Invoices/edit.blade.php
View File

@@ -1,7 +1,7 @@
@extends('layout.index', [
'title' => 'Factures',
'subtitle' => 'Edition d\'une facture',
'breadcrumb' => ['Articles'],
'breadcrumb' => ['Factures'],
])
@section('content')

1
resources/views/Admin/Shop/Invoices/form.blade.php
View File

@@ -67,3 +67,4 @@
</form>
@include('load.layout.modal')
@include('load.form.save')

19
resources/views/Admin/Shop/Invoices/partials/payments.blade.php
View File

@@ -21,6 +21,10 @@
<td>{{ $payment_types[$payment['payment_type']] }}</td>
<td class="text-right font-weight-bold">{{ sprintf('%01.2f', $payment['amount']) }} €</td>
<td>{{ $payment['reference'] }}</td>
<td class="text-right">
<x-form.buttons.edit :dataId="$payment['id']" class="payment-edit btn-xs" />
<x-form.buttons.delete :dataId="$payment['id']" class="payment-delete btn-xs" />
</td>
</tr>
@endforeach
</tbody>
@@ -34,9 +38,15 @@
$('#add_payment').click(function() {
InvoicePaymentCreate();
});
$('.payment-edit').click(function() {
InvoicePaymentEdit($(this).data('id'));
});
$('.payment-delete').click(function() {
InvoicePaymentDelete($(this).data('id'));
});
function InvoicePaymentCreate() {
var url_open = "{{ route('Admin.Shop.InvoicePayments.create') }}";
var url_open = "{{ route('Admin.Shop.InvoicePayments.create') }}/{{ $invoice['id'] }}";
var url_save = "{{ route('Admin.Shop.InvoicePayments.store') }}";
openModal("Ajouter un paiement", '#invoice_payment-form', url_open, url_save,
"InvoicePaymentRefresh();", 'sm');
@@ -49,8 +59,11 @@
"InvoicePaymentRefresh();", 'sm');
}
function InvoicePaymentRefresh() {
function InvoicePaymentDelete(id) {
var url = "{{ route('Admin.Shop.InvoicePayments.destroy') }}/" + id;
$.get(url, function() {
window.location = "{{ route('Admin.Shop.Invoices.edit') }}/{{ $invoice['id'] }}";
});
}
</script>
@endpush

6
resources/views/Shop/Baskets/partials/basketTotal.blade.php
View File

@@ -14,7 +14,7 @@
</div>
<div class="col-6 text-right font-weight-bold">
<span id="basket-total">
{{ $basket['total_taxed'] ?? 0 }}
{{ number_format($basket['total_taxed'] ?? 0, 2, '.') }}
</span> €
</div>
</div>
@@ -25,7 +25,7 @@
</div>
<div class="col-6 text-right font-weight-bold">
<span id="shipping">
{{ $basket['shipping'] }}
{{ number_format($basket['shipping'], 2, '.') }}
</span> €
</div>
</div>
@@ -38,7 +38,7 @@
</div>
<div class="col-6 text-right">
<span id="basket-total-shipped">
{{ $basket['total_shipped'] ?? 0 }}
{{ number_format($basket['total_shipped'] ?? 0, 2, '.') }}
</span> €
</div>
</div>

24
resources/views/Shop/Customers/partials/address.blade.php
View File

@@ -2,8 +2,8 @@
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => $prefix ?? false ? $prefix . "['name']" : 'name',
'value' => $customer['name'] ?? '',
'name' => $prefix ?? false ? $prefix . '[name]' : 'name',
'value' => $customer['name'] ?? (old('name') ?? ''),
'label' => 'Nom',
])
</div>
@@ -13,9 +13,10 @@
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => $prefix ?? false ? $prefix . "['address']" : 'address',
'value' => $customer['address'] ?? '',
'name' => $prefix ?? false ? $prefix . '[address]' : 'address',
'value' => $customer['address'] ?? (old('address') ?? ''),
'label' => $label ?? '',
'required' => $required ?? false,
])
</div>
</div>
@@ -23,9 +24,10 @@
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => $prefix ?? false ? $prefix . "['address2']" : 'address2',
'value' => $customer['address2'] ?? '',
'name' => $prefix ?? false ? $prefix . '[address2]' : 'address2',
'value' => $customer['address2'] ?? (old('address2') ?? ''),
'label' => 'Complément d\'adresse',
'required' => false,
])
</div>
</div>
@@ -33,16 +35,18 @@
<div class="row">
<div class="col-4">
@include('components.form.input', [
'name' => $prefix ?? false ? $prefix . "['zipcode']" : 'zipcode',
'value' => $customer['zipcode'] ?? '',
'name' => $prefix ?? false ? $prefix . '[zipcode]' : 'zipcode',
'value' => $customer['zipcode'] ?? (old('zipcode') ?? ''),
'label' => 'Code postal',
'required' => $required ?? false,
])
</div>
<div class="col-8">
@include('components.form.input', [
'name' => $prefix ?? false ? $prefix . "['city']" : 'city',
'value' => $customer['city'] ?? '',
'name' => $prefix ?? false ? $prefix . '[city]' : 'city',
'value' => $customer['city'] ?? (old('city') ?? ''),
'label' => 'Ville',
'required' => $required ?? false,
])
</div>
</div>

9
resources/views/Shop/Customers/partials/addresses.blade.php
View File

@@ -4,9 +4,9 @@
<x-form.radios.icheck name="@if ($prefix ?? false) {{ $prefix }} . '[]' @endif address_id"
val="{{ $address['id'] }}" id="address_{{ $address['id'] }}" />
</div>
<div class="col-11">
<div class="col-10">
@if ($with_name ?? false)
{{ $address['name'] }}<br />>
{{ $address['name'] }}<br />
@endif
{{ $address['address'] }}<br />
@if ($address['address2'])
@@ -14,6 +14,11 @@
@endif
{{ $address['zipcode'] }} {{ $address['city'] }}
</div>
<div class="col-1">
<a href="{{ route('Shop.Customers.delete_address') }}/{{ $address['id'] }}">
<i class="fa fa-trash" class="delete" data-id="{{ $address['id'] }}"></i>
</a>
</div>
</div>
@endforeach

19
resources/views/Shop/Customers/partials/registration.blade.php
View File

@@ -1,7 +1,7 @@
@if ($errors->any())
@if ($errors->registration->any())
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
@foreach ($errors->registration->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
@@ -12,7 +12,7 @@
<div class="col-6">
@include('components.form.input', [
'name' => 'first_name',
'value' => $customer['first_name'] ?? '',
'value' => $customer['first_name'] ?? (old('first_name') ?? ''),
'label' => 'Prénom',
'required' => true,
])
@@ -20,7 +20,7 @@
<div class="col-6">
@include('components.form.input', [
'name' => 'last_name',
'value' => $customer['last_name'] ?? '',
'value' => $customer['last_name'] ?? (old('last_name') ?? ''),
'label' => 'Nom',
'required' => true,
])
@@ -30,14 +30,14 @@
<div class="col-6">
@include('components.form.input', [
'name' => 'company',
'value' => $customer['company'] ?? '',
'value' => $customer['company'] ?? (old('company') ?? ''),
'label' => 'Société',
])
</div>
<div class="col-6">
@include('components.form.input', [
'name' => 'tva',
'value' => $customer['tva'] ?? '',
'value' => $customer['tva'] ?? (old('tva') ?? ''),
'label' => 'N° de TVA',
])
</div>
@@ -46,18 +46,19 @@
<div class="col-6">
@include('components.form.input', [
'name' => 'email',
'value' => $customer['email'] ?? '',
'value' => $customer['email'] ?? (old('email') ?? ''),
'label' => 'Email',
'required' => true,
])
{!! $errors->registration->first('email', '<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
<div class="col-6">
@include('components.form.input', [
'name' => 'phone',
'value' => $customer['phone'] ?? '',
'value' => $customer['phone'] ?? (old('phone') ?? ''),
'label' => 'Téléphone',
])
</div>
</div>
@include('Shop.Customers.partials.address', ['label' => 'Adresse'])
@include('Shop.Customers.partials.address', ['label' => 'Adresse', 'required' => true])

12
resources/views/Shop/Orders/confirmed.blade.php
View File

@@ -1,11 +1,11 @@
@extends('Shop.layout.layout', [
'title' => __('Commande confirmée'),
'title' => __('Commande confirmée'),
])
@section('content')
<div class="row">
<div class="col-8">
Votre commande a été confirmée
</div>
</div>
<div class="row">
<div class="col-12">
{!! $content !!}
</div>
</div>
@endsection

14
resources/views/Shop/Orders/order.blade.php
View File

@@ -3,6 +3,15 @@
])
@section('content')
@php
if ($errors->registration) {
$classIdent = 'd-none';
$classRegister = '';
} else {
$classIdent = '';
$classRegister = 'd-none';
}
@endphp
<div class="row">
<div class="@if ($basket['count']) col-sm-12 col-lg-8 @else col-12 @endif">
@if (App\Repositories\Shop\Customers::isNotConnected())
@@ -11,12 +20,13 @@
<button class="btn btn-secondary" id="register">Créez mon compte</button>
</p>
<x-layout.collapse id="identification" title="Déjà client" class="identification rounded-lg" uncollapsed=true>
<x-layout.collapse id="identification" title="Déjà client"
class="{{ $classIdent }} identification rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.login')
</x-layout.collapse>
<x-layout.collapse id="personal_data" title="Informations personnelles"
class="d-none personal_data rounded-lg" uncollapsed=true>
class="{{ $classRegister }} personal_data rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.register')
</x-layout.collapse>
@else

3
resources/views/Shop/Orders/partials/addresses.blade.php
View File

@@ -6,7 +6,8 @@
'name' => $name,
'val' => $address['id'],
'id' => $prefix . '_address_' . $address['id'],
'value' => $address['priority'] || count($addresses) === 1 ? $address['id'] : false,
'value' =>
old($name) ?? $address['priority'] || count($addresses) === 1 ? $address['id'] : false,
])
</div>
<div class="col-11">

6
resources/views/Shop/Orders/partials/deliveries.blade.php
View File

@@ -4,6 +4,7 @@
@include('components.form.radios.icheck', [
'name' => 'delivery_id',
'val' => $delivery['id'],
'value' => (int) old('delivery_id') === $delivery['id'] ? $delivery['id'] : null,
'id' => 'delivery_' . $delivery['id'],
'class' => 'delivery_mode' . ($delivery['at_house'] ? ' at_house' : ''),
])
@@ -15,11 +16,14 @@
</div>
@endforeach
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs
{!! $errors->first('delivery_id', '<p class="text-danger"><strong>:message</strong></p>') !!}
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champ
ci-contre
@include('components.form.textarea', [
'name' => 'comment',
'value' => old('comment') ?? '',
])
@push('js')

13
resources/views/Shop/Orders/partials/payments.blade.php
View File

@@ -1,6 +1,6 @@
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="payment_type" val="1" id="payment_card"/>
<x-form.radios.icheck name="payment_type" val="1" id="payment_card" :value="old('payment_type') === '1' ? 1 : null" />
</div>
<div class="col-11 pt-2">
PAIEMENT PAR CARTE BANCAIRE
@@ -9,7 +9,7 @@
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="payment_type" val="2" id="payment_check"/>
<x-form.radios.icheck name="payment_type" val="2" id="payment_check" :value="old('payment_type') === '2' ? 2 : null" />
</div>
<div class="col-11 pt-2">
PAIEMENT PAR CHEQUE
@@ -18,20 +18,23 @@
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="payment_type" val="3" id="payment_transfer"/>
<x-form.radios.icheck name="payment_type" val="3" id="payment_transfer" :value="old('payment_type') === '3' ? 3 : null" />
</div>
<div class="col-11 pt-2">
PAIEMENT PAR VIREMENT BANCAIRE
</div>
</div>
{!! $errors->first('payment_type', '<p class="text-danger"><strong>:message</strong></p>') !!}
<div class="row pt-5">
<div class="col-1">
<x-form.checkboxes.icheck name="agree" val="1" required=true/>
<x-form.checkboxes.icheck name="agree" val="1" required=true />
</div>
<div class="col-11 pt-2">
J'ai lu les conditions générales de vente et j'y adhère sans réserve
</div>
{!! $errors->first('agree', '<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
<button type="submit" class="btn btn-primary mt-5">COMMANDE AVEC OBLIGATION DE PAIEMENT</button>
<button type="submit" class="btn btn-primary mt-5">COMMANDE AVEC OBLIGATION DE PAIEMENT</button>

68
resources/views/Shop/auth/partials/login.blade.php
View File

@@ -1,42 +1,42 @@
{!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
{!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete' => 'off']) !!}
<div class="form-group has-feedback">
<div class="input-group form-group {{ $errors->has('email') ? 'has-error' : '' }}">
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
<div class="input-group-append">
<div class="btn btn-outline-secondary">
<i class="fa fa-at"></i>
</div>
</div>
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="form-group has-feedback">
<div class="input-group form-group {{ $errors->has('password') ? 'has-error' : '' }}">
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
<div class="input-group-append">
<div class="btn btn-outline-secondary">
<i class="fa fa-lock"></i>
</div>
<div class="form-group has-feedback">
<div class="input-group form-group {{ $errors->has('email') ? 'has-error' : '' }}">
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
<div class="input-group-append">
<div class="btn btn-outline-secondary">
<i class="fa fa-at"></i>
</div>
</div>
{!! $errors->first('password','<p class="text-danger"><strong>:message</strong></p>') !!}
{!! $errors->first('email', '<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
@if ($errors->any())
<div class="form-group has-feedback">
<p class="text-danger">
<strong>{{ $errors->first('msg') }}</strong>
</p>
</div>
@endif
<div class="row">
<div class="col-12 col-lg-6 mbs">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ __('Se connecter') }}</button>
</div>
<div class="form-group has-feedback">
<div class="input-group form-group {{ $errors->has('password') ? 'has-error' : '' }}">
{{ Form::password('password', ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.password'), 'required']) }}
<div class="input-group-append">
<div class="btn btn-outline-secondary">
<i class="fa fa-lock"></i>
</div>
</div>
</div>
{!! $errors->first('password', '<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
@if ($errors->any())
<div class="form-group has-feedback">
<p class="text-danger">
<strong>{{ $errors->first('msg') }}</strong>
</p>
</div>
@endif
<div class="row">
<div class="col-12 col-lg-6 mbs">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ __('Se connecter') }}</button>
</div>
<div class="col-12 col-lg-6">
<a href="{{ route('Shop.password.request') }}">{{ __('Mot de passe oublié ?') }}</a><br>
<!--
<div class="col-12 col-lg-6">
<a href="{{ route('Shop.password.request') }}">{{ __('Mot de passe oublié ?') }}</a><br>
<!--
<div class="checkbox icheck">
<label style="padding-left: 0">
<input type="checkbox" name="remember" class="icheck" {{ old('remember') ? 'checked' : '' }}>
@@ -44,6 +44,6 @@
</label>
</div>
-->
</div>
</div>
</div>
{!! Form::close() !!}

7
resources/views/Shop/auth/partials/register.blade.php
View File

@@ -14,7 +14,7 @@
'placeholder' => __('boilerplate::auth.fields.password'),
'required',
]) }}
{!! $errors->first('password', '<p class="text-danger"><strong>:message</strong></p>') !!}
{!! $errors->registration->first('password', '<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-6">
@@ -25,7 +25,10 @@
'placeholder' => __('boilerplate::auth.fields.password_confirm'),
'required',
]) }}
{!! $errors->first('password_confirmation', '<p class="text-danger"><strong>:message</strong></p>') !!}
{!! $errors->registration->first(
'password_confirmation',
'<p class="text-danger"><strong>:message</strong></p>',
) !!}
</div>
</div>
</div>

1
resources/views/load/form/save.blade.php
View File

@@ -2,7 +2,6 @@
@push('scripts')
<script>
function initSaveForm(form, sel) {
console.log('ici');
if (typeof initValidator === 'function') {
initValidator();
}

7
resources/views/paybox/aborted.blade.php
View File

@@ -1,7 +0,0 @@
@extends('Shop.layout.layout', [
'title' => __('Paiement annulé'),
])
@section('content')
Le paiement a été annulé.
@endsection

9
resources/views/paybox/accepted.blade.php
View File

@@ -1,9 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
</head>
<body>
Thank you for your payment. Your payment should be accepted soon.
</body>
</html>

11
resources/views/paybox/paybox.blade.php Normal file
View File

@@ -0,0 +1,11 @@
@extends('Shop.layout.layout', [
'title' => __('Paiement CB'),
])
@section('content')
<div class="row">
<div class="col-12">
{!! $content !!}
</div>
</div>
@endsection

7
resources/views/paybox/refused.blade.php
View File

@@ -1,7 +0,0 @@
@extends('Shop.layout.layout', [
'title' => __('Paiement refusé'),
])
@section('content')
Le paiement a été refusé.
@endsection

23
resources/views/paybox/send.blade.php
View File

@@ -1,19 +1,22 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Send Paybox payment</title>
</head>
<body>
<form method="post" action="{{ $url }}" id="paybox-payment">
@foreach ($parameters as $name => $value)
<input type="hidden" name="{{ $name }}" value="{{ $value }}">
@endforeach
<input type="submit" value="Send payment">
</form>
<script>
document.getElementById("paybox-payment").submit();
</script>
<body>
<form method="post" action="{{ $url }}" id="paybox-payment">
@foreach ($parameters as $name => $value)
<input type="hidden" name="{{ $name }}" value="{{ $value }}">
@endforeach
<input type="submit" value="Send payment">
</form>
<script>
document.getElementById("paybox-payment").submit();
</script>
</body>
</html>

9
resources/views/paybox/waiting.blade.php
View File

@@ -1,9 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
</head>
<body>
Your payment is waiting. It might take some time until it is completed.
</body>
</html>