diff --git a/composer.json b/composer.json index b23e82f..63f5165 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/composer.lock b/composer.lock index d2de0c6..1192ba0 100644 --- a/composer.lock +++ b/composer.lock @@ -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", diff --git a/resources/views/customer/index-tableHeaders.blade.php b/resources/views/customer/index-tableHeaders.blade.php index 7f71d72..326bdbf 100644 --- a/resources/views/customer/index-tableHeaders.blade.php +++ b/resources/views/customer/index-tableHeaders.blade.php @@ -1,6 +1,6 @@ @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))  ↓  @@ -70,5 +70,7 @@ @endif - {{ __('Voir')}} + @if(session("crud.$modelTable.sort_way") and session("crud.$modelTable.sort_col")) + ⌫ + @endif diff --git a/resources/views/customer/show.blade.php b/resources/views/customer/show.blade.php index 0b12f77..67d63dd 100644 --- a/resources/views/customer/show.blade.php +++ b/resources/views/customer/show.blade.php @@ -70,7 +70,7 @@ Abonné à la newsletter - {{ $customerInfos->opt_in === 1 ? "Oui" : "Non" }} + {{ $customerInfos->opt_in ? "Oui" : "Non" }} Date de la dernière modification de l'abonnement @@ -86,7 +86,7 @@ Status du compte - {{ $customerLogin->status === 1 ? "Activé" : "Non activé" }} + {{ $customerLogin->status ? "Activé" : "Non activé" }} Hashcode