Compare commits

..

No commits in common. "63097ea17eb5b35a30bbb8f25f6066d36fe63fc9" and "a7010dad534e927f7915e172abf76bcc48ce0f37" have entirely different histories.

5 changed files with 23 additions and 41 deletions

View file

@ -1,3 +0,0 @@
0.2.0
* Group e-mails by first character in the group creation/edition form.

View file

@ -53,12 +53,6 @@ class CustomersGroupsController extends Controller {
->pluck('emails') ->pluck('emails')
->flatten() ->flatten()
->sortBy('email'); ->sortBy('email');
// Group Emails by their first character.
// This is used to display them in collapsible groups.
$emails = $emails->mapToGroups(function ($email) {
$first_character = substr($email->email, $offset = 0, $length = 1);
return [ $first_character => $email ];
});
return view('mmfcustomersgroups::groups/edit', [ return view('mmfcustomersgroups::groups/edit', [
'mailboxes' => $mailboxes, 'mailboxes' => $mailboxes,

View file

@ -84,36 +84,27 @@
</label> </label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="multi-container"> <div class="multi-container">
@foreach ( $emails as $first_character => $emails_group ) @foreach ( $emails as $email )
<details> <div class="control-group">
<summary <div class="controls">
style="display: list-item; counter-increment: list-item 0; list-style: disclosure-closed inside; cursor: pointer;" <label
> class="control-label checkbox"
{{ $first_character }} for="email-{{ $email->id }}"
</summary> style="text-align: left;"
@foreach ( $emails_group as $email ) >
<div class="control-group"> <input
<div class="controls"> type="checkbox"
<label name="emails[]"
class="control-label checkbox" id="email-{{ $email->id }}"
for="email-{{ $email->id }}" value="{{ $email->id }}"
style="text-align: left;" @if ( $group->emails()->contains($email) )
> checked="checked"
<input @endif
type="checkbox" >
name="emails[]" {{ $email->email }}
id="email-{{ $email->id }}" </label>
value="{{ $email->id }}" </div>
@if ( $group->emails()->contains($email) ) </div>
checked="checked"
@endif
>
{{ $email->email }}
</label>
</div>
</div>
@endforeach
</details>
@endforeach @endforeach
</div> </div>
{{-- @include('partials/field_error', ['field'=>'emails.*']) --}} {{-- @include('partials/field_error', ['field'=>'emails.*']) --}}

View file

@ -1,7 +1,7 @@
{ {
"name": "millions-missing-france/freescout-customers-groups", "name": "millions-missing-france/freescout-customers-groups",
"description": "Freescout customers groups - Set groups of Freescout Customers for easier group emailing", "description": "Freescout customers groups - Set groups of Freescout Customers for easier group emailing",
"version": "0.2.0", "version": "0.1.0",
"type": "library", "type": "library",
"license": ["AGPL-3.0-only"], "license": ["AGPL-3.0-only"],
"authors": [ "authors": [

View file

@ -2,7 +2,7 @@
"name": "MMFCustomersGroups", "name": "MMFCustomersGroups",
"alias": "mmfcustomersgroups", "alias": "mmfcustomersgroups",
"description": "Freescout customers groups - Set groups of Freescout Customers for easier group emailing", "description": "Freescout customers groups - Set groups of Freescout Customers for easier group emailing",
"version": "0.2.0", "version": "0.1.0",
"detailsUrl": "", "detailsUrl": "",
"author": "Millions Missing FRANCE", "author": "Millions Missing FRANCE",
"authorUrl": "info@millionsmissing.fr", "authorUrl": "info@millionsmissing.fr",