forge-joniko/ldc-crm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'trunk'

Browse source
This commit is contained in:
Jérémy Munsch 2021-10-26 16:02:08 +02:00
commit 6eab2196fd
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -33,7 +33,7 @@
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"kwaadpepper/crud-policies": "^0.1.17",
"kwaadpepper/crud-policies": "^0.1.22",
"kwaadpepper/enum": "^2.0",
"kwaadpepper/exception-handler": "^0.0.4",
"laravel-lang/lang": "~7.0",

14
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e4638739425eea8f9b4ff408c778dce8",
"content-hash": "b8758dfa7a98fe359d4f35d1caf11de0",
"packages": [
{
"name": "arondeparon/laravel-request-sanitizer",
@ -1924,16 +1924,16 @@
},
{
"name": "kwaadpepper/crud-policies",
"version": "0.1.17",
"version": "0.1.22",
"source": {
"type": "git",
"url": "https://github.com/Kwaadpepper/crud-policies.git",
"reference": "0cd52413f9ee2f95b2ebc2d2d4621cfc2a104e47"
"reference": "fb3c8e2ee065f9ed102db90394838b255d06cc15"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Kwaadpepper/crud-policies/zipball/0cd52413f9ee2f95b2ebc2d2d4621cfc2a104e47",
"reference": "0cd52413f9ee2f95b2ebc2d2d4621cfc2a104e47",
"url": "https://api.github.com/repos/Kwaadpepper/crud-policies/zipball/fb3c8e2ee065f9ed102db90394838b255d06cc15",
"reference": "fb3c8e2ee065f9ed102db90394838b255d06cc15",
"shasum": ""
},
"require": {
@ -1982,9 +1982,9 @@
],
"support": {
"issues": "https://github.com/Kwaadpepper/crud-policies/issues",
"source": "https://github.com/Kwaadpepper/crud-policies/tree/0.1.17"
"source": "https://github.com/Kwaadpepper/crud-policies/tree/0.1.22"
},
"time": "2021-09-10T14:23:18+00:00"
"time": "2021-10-22T10:14:13+00:00"
},
{
"name": "kwaadpepper/enum",

6
resources/views/customer/index-tableHeaders.blade.php
View file

@ -1,6 +1,6 @@
<th scope="col">
@php $colname = 'customers.email' @endphp
@php function _genUrl($q) { return url()->current().(!empty(request()->all())?"?":"").http_build_query(array_merge(request()->query(), $q)); } @endphp
@php function _genUrl($q) { return request()->fullUrlWithQuery($q); } @endphp
{{ __('Email')}}
@if(!session("crud.$modelTable.sort_way") or session("crud.$modelTable.sort_col") !== $colname or (session("crud.$modelTable.sort_way") === 'desc' and session("crud.$modelTable.sort_col") === $colname))
<a class="col_sort text-secondary lead asc" href="{{ _genUrl(['sort_col' => $colname, 'sort_way' => 'asc', 'rst' => null]) }}">&nbsp;&darr;&nbsp;</a>
@ -70,5 +70,7 @@
@endif
</th>
<th scope="col">
{{ __('Voir')}}
@if(session("crud.$modelTable.sort_way") and session("crud.$modelTable.sort_col"))
<a href="{{ request()->fullUrlWithQuery(['rst' => 'true','sort_col' => null, 'sort_way' => null]) }}" class="btn btn-small btn-danger">&#9003;</a>
@endif
</th>

4
resources/views/customer/show.blade.php
View file

@ -70,7 +70,7 @@
</tr>
<tr>
<td><b>Abonné à la newsletter</b></td>
<td>{{ $customerInfos->opt_in === 1 ? "Oui" : "Non" }}</td>
<td>{{ $customerInfos->opt_in ? "Oui" : "Non" }}</td>
</tr>
<tr>
<td><b>Date de la dernière modification de l'abonnement</b></td>
@ -86,7 +86,7 @@
</tr>
<tr>
<td><b>Status du compte</b></td>
<td>{{ $customerLogin->status === 1 ? "Activé" : "Non activé" }}</td>
<td>{{ $customerLogin->status ? "Activé" : "Non activé" }}</td>
</tr>
<tr>
<td><b>Hashcode</b></td>