From 4b42cf700efd693b6aa227305b9e87529ff17e09 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 19:41:46 +1000 Subject: [PATCH 1/7] minor changes --- storage/templates/bold.js | 0 storage/templates/clean.js | 0 storage/templates/modern.js | 0 storage/templates/plain.js | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 storage/templates/bold.js mode change 100644 => 100755 storage/templates/clean.js mode change 100644 => 100755 storage/templates/modern.js mode change 100644 => 100755 storage/templates/plain.js diff --git a/storage/templates/bold.js b/storage/templates/bold.js old mode 100644 new mode 100755 diff --git a/storage/templates/clean.js b/storage/templates/clean.js old mode 100644 new mode 100755 diff --git a/storage/templates/modern.js b/storage/templates/modern.js old mode 100644 new mode 100755 diff --git a/storage/templates/plain.js b/storage/templates/plain.js old mode 100644 new mode 100755 From b49938e36ddab14104f630264b81d5e2b30dc18b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 20:40:23 +1000 Subject: [PATCH 2/7] contacts array sorter --- app/Ninja/Repositories/ClientRepository.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index 9df81663a5e5..f62014177e33 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -100,6 +100,10 @@ class ClientRepository extends BaseRepository $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts']; $contactIds = []; + $contacts = usort($contacts, function ($left, $right) { + return $left['priority'] - $right['priority']; + }); + foreach ($contacts as $contact) { $contact = $client->addContact($contact, $first); $contactIds[] = $contact->public_id; From b022ae0c773911280f738d91978e4f3a7ed3e489 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 20:42:30 +1000 Subject: [PATCH 3/7] contacts array sorter --- app/Ninja/Repositories/ClientRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index f62014177e33..1ef5322f05c8 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -100,7 +100,7 @@ class ClientRepository extends BaseRepository $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts']; $contactIds = []; - $contacts = usort($contacts, function ($left, $right) { + usort($contacts, function ($left, $right) { return $left['priority'] - $right['priority']; }); From edf7b6eb37e4205e2262c8383b85aacdb8695d89 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 20:42:51 +1000 Subject: [PATCH 4/7] contacts array sorter --- app/Ninja/Repositories/ClientRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index 1ef5322f05c8..7d6a7dd4c1f7 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -101,7 +101,7 @@ class ClientRepository extends BaseRepository $contactIds = []; usort($contacts, function ($left, $right) { - return $left['priority'] - $right['priority']; + return $left['is_primary'] - $right['is_primary']; }); foreach ($contacts as $contact) { From 57c0a91de80e3b8c1f94fbe3fa1a69ac19733ab2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 20:45:24 +1000 Subject: [PATCH 5/7] contacts array sorter --- app/Ninja/Repositories/ClientRepository.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index 7d6a7dd4c1f7..dc5488f9692b 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -8,6 +8,7 @@ use App\Models\Contact; use App\Models\Activity; use App\Events\ClientWasCreated; use App\Events\ClientWasUpdated; +use Illuminate\Support\Facades\Log; class ClientRepository extends BaseRepository { @@ -100,9 +101,13 @@ class ClientRepository extends BaseRepository $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts']; $contactIds = []; + Log::info($contacts); + usort($contacts, function ($left, $right) { return $left['is_primary'] - $right['is_primary']; }); + + Log::info($contacts); foreach ($contacts as $contact) { $contact = $client->addContact($contact, $first); From 7f6f34b3020b1bfb7355af3c1dc4296e64216bbd Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 20:50:06 +1000 Subject: [PATCH 6/7] contacts array sorter --- app/Ninja/Repositories/ClientRepository.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index dc5488f9692b..a30ce9c0672c 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -100,13 +100,11 @@ class ClientRepository extends BaseRepository $first = true; $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts']; $contactIds = []; - - Log::info($contacts); - - usort($contacts, function ($left, $right) { - return $left['is_primary'] - $right['is_primary']; - }); + usort($contacts, function ($left, $right) { + return $right['is_primary'] - $left['is_primary']; + }); + Log::info($contacts); foreach ($contacts as $contact) { From d19c43edced437babfebcf29ab1dd228b0e85d5d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 17 Apr 2016 20:53:53 +1000 Subject: [PATCH 7/7] contacts array sorter --- app/Ninja/Repositories/ClientRepository.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php index a30ce9c0672c..46f16d0676e7 100644 --- a/app/Ninja/Repositories/ClientRepository.php +++ b/app/Ninja/Repositories/ClientRepository.php @@ -8,7 +8,6 @@ use App\Models\Contact; use App\Models\Activity; use App\Events\ClientWasCreated; use App\Events\ClientWasUpdated; -use Illuminate\Support\Facades\Log; class ClientRepository extends BaseRepository { @@ -100,13 +99,11 @@ class ClientRepository extends BaseRepository $first = true; $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts']; $contactIds = []; - + usort($contacts, function ($left, $right) { return $right['is_primary'] - $left['is_primary']; }); - Log::info($contacts); - foreach ($contacts as $contact) { $contact = $client->addContact($contact, $first); $contactIds[] = $contact->public_id;