Order template buttons by type and by name

Alex Urucu · Alex Urucu · commit f02bedb7c174 · 2015-12-22T15:45:57.000+02:00
diff --git a/app/Http/Controllers/ClientsController.php b/app/Http/Controllers/ClientsController.php
@@ -44,7 +44,7 @@ public function editClientByEmail($site, $emailAddress) {
         $client = new Client(['listid' => $site->id]);
         $client->email = $emailAddress;
 
-        $templates = $site->templates()->ofCategory('email')->active()->get();
+        $templates = $site->templates()->ofCategory('email')->active()->orderBy('type')->orderBy('name')->get();
         $infocosts = $site->infocosts()->active()->default()->get();
 
         $email = Email::fromEmail($emailAddress)->toSite($site)->orderBy('sent_at', 'desc')->first();
@@ -275,7 +275,7 @@ public function edit($site, $client, $templateCategory = 'email')
             }
         }
 
-        $templates = Template::active()->ofCategory($templateCategory)->ofSite($site->id)->get();
+        $templates = Template::active()->ofCategory($templateCategory)->ofSite($site->id)->orderBy('type')->orderBy('name')->get();
 
         $infocosts = $site->infocosts()->active()->default()->get();
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function editClientByEmail($site, $emailAddress) {`
`44`	`44`	`$client = new Client(['listid' => $site->id]);`
`45`	`45`	`$client->email = $emailAddress;`
`46`	`46`
`47`		`- $templates = $site->templates()->ofCategory('email')->active()->get();`
	`47`	`+ $templates = $site->templates()->ofCategory('email')->active()->orderBy('type')->orderBy('name')->get();`
`48`	`48`	`$infocosts = $site->infocosts()->active()->default()->get();`
`49`	`49`
`50`	`50`	`$email = Email::fromEmail($emailAddress)->toSite($site)->orderBy('sent_at', 'desc')->first();`
`@@ -275,7 +275,7 @@ public function edit($site, $client, $templateCategory = 'email')`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`278`		`- $templates = Template::active()->ofCategory($templateCategory)->ofSite($site->id)->get();`
	`278`	`+ $templates = Template::active()->ofCategory($templateCategory)->ofSite($site->id)->orderBy('type')->orderBy('name')->get();`
`279`	`279`
`280`	`280`	`$infocosts = $site->infocosts()->active()->default()->get();`
`281`	`281`