ajustes

mixdinternet · Apr 10, 2017 · 6c4efa2 · 6c4efa2
1 parent 8f07a43
commit 6c4efa2
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 394 deletions.
diff --git a/.idea/Newsletters.iml b/.idea/Newsletters.iml
diff --git a/.idea/blade.xml b/.idea/blade.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/Http/Controllers/NewslettersAdminController.php b/src/Http/Controllers/NewslettersAdminController.php
@@ -22,10 +22,14 @@ public function index(Request $request)
         ($trash) ? $query->onlyTrashed() : '';
 
         $search = [];
-        $search['name'] = $request->input('name', '');
+        if(config('mnewsletters.fields.name') !== false) {
+            $search['name'] = $request->input('name', '');
+        }
         $search['email'] = $request->input('email', '');
 
-        ($search['name']) ? $query->where('name', 'LIKE', '%' . $search['name'] . '%') : '';
+        if(config('mnewsletters.fields.name') !== false) {
+            ($search['name']) ? $query->where('name', 'LIKE', '%' . $search['name'] . '%') : '';
+        }
         ($search['email']) ? $query->where('email', 'LIKE', '%' . $search['email'] . '%') : '';
 
         $newsletters = $query->paginate(50);
@@ -37,40 +41,6 @@ public function index(Request $request)
         return view('mixdinternet/newsletters::admin.index', $view);
     }
 
-    public function create(Newsletter $newsletter)
-    {
-        $view['newsletter'] = $newsletter;
-        return view('mixdinternet/newsletters::admin.form', $view);
-    }
-
-    public function store(CreateEditNewslettersRequest $request)
-    {
-        if (Newsletter::create($request->all())) {
-            Flash::success('Item inserido com sucesso.');
-        } else {
-            Flash::error('Falha no cadastro.');
-        }
-
-        return ($url = session()->get('backUrl')) ? redirect($url) : redirect()->route('admin.newsletters.index');
-    }
-
-    public function edit(Newsletter $newsletter)
-    {
-        $view['newsletter'] = $newsletter;
-        return view('mixdinternet/newsletters::admin.form', $view);
-    }
-
-    public function update(Newsletter $newsletter, CreateEditNewslettersRequest $request)
-    {
-        if ($newsletter->update($request->all())) {
-            Flash::success('Item atualizado com sucesso.');
-        } else {
-            Flash::error('Falha na atualização.');
-        }
-
-        return ($url = session()->get('backUrl')) ? redirect($url) : redirect()->route('admin.newsletters.index');
-    }
-
     public function destroy(Request $request)
     {
         if (Newsletter::destroy($request->input('id'))) {
@@ -104,10 +74,13 @@ public function download(Request $request)
         $query = Newsletter::sort();
 
         $search = [];
-        $search['name'] = $request->input('name', '');
+        if(config('mnewsletters.fields.name') !== false) {
+            $search['name'] = $request->input('name', '');
+        }
         $search['email'] = $request->input('email', '');
-
-        ($search['name']) ? $query->where('name', 'LIKE', '%' . $search['name'] . '%') : '';
+        if(config('mnewsletters.fields.name') !== false) {
+            ($search['name']) ? $query->where('name', 'LIKE', '%' . $search['name'] . '%') : '';
+        }
         ($search['email']) ? $query->where('email', 'LIKE', '%' . $search['email'] . '%') : '';
 
         $newsletters = $query->paginate(50);
@@ -119,12 +92,21 @@ public function download(Request $request)
         $nameFile = "leads".$user_id.$date.".csv";
 
         $csv = '';
-        $csv .= "\"nome\";\"email\";\"data de cadastro\"\n";
+        if(config('mnewsletters.fields.name') !== false) {
+            $csv .= "\"nome\";\"email\";\"data de cadastro\"\n";
 
-        foreach($newsletters as $row) {
-            $csv .= "\"".$row['name']."\";\"".$row['email']."\";\"".Carbon::parse($row['created_at'])->format('d/m/Y H:i')."\"\n";
+            foreach ($newsletters as $row) {
+                $csv .= "\"" . $row['name'] . "\";\"" . $row['email'] . "\";\"" . Carbon::parse($row['created_at'])->format('d/m/Y H:i') . "\"\n";
+            }
         }
 
+        if(config('mnewsletters.fields.name') == false){
+            $csv .= "\"email\";\"data de cadastro\"\n";
+
+            foreach ($newsletters as $row) {
+                $csv .= "\"" . $row['email'] . "\";\"" . Carbon::parse($row['created_at'])->format('d/m/Y H:i') . "\"\n";
+            }
+        }
         $arquivo = $nameFile;
         // Configurações header para forçar o download
         header ("Expires: Mon, 26 Jul 1997 05:00:00 GMT");

diff --git a/src/Http/helpers.php b/src/Http/helpers.php
diff --git a/src/resources/views/admin/form.blade.php b/src/resources/views/admin/form.blade.php
diff --git a/src/resources/views/admin/index.blade.php b/src/resources/views/admin/index.blade.php
@@ -5,10 +5,6 @@
 @endsection
 
 @section('btn-insert')
-    {{-- @if((!checkRule('admin.newsletters.create')) && (!$trash))
-        @include('mixdinternet/admix::partials.actions.btn.insert', ['route' => route('admin.newsletters.create')])
-    @endif
-    --}}
     @if((!checkRule('admin.newsletters.trash')) && (!$trash))
         @include('mixdinternet/admix::partials.actions.btn.trash', ['route' => route('admin.newsletters.trash')])
     @endif
@@ -27,9 +23,11 @@
     {!! Form::model($search, ['route' => ($trash) ? 'admin.newsletters.trash' : 'admin.newsletters.index', 'method' => 'get', 'id' => 'form-search'
         , 'class' => '']) !!}
     <div class="row">
-        <div class="col-md-4">
-            {!! BootForm::text('name', 'Nome') !!}
-        </div>
+        @if(config('mnewsletters.fields.name') !== false)
+            <div class="col-md-4">
+                {!! BootForm::text('name', 'Nome') !!}
+            </div>
+        @endif
         <div class="col-md-4">
             {!! BootForm::text('email', 'Email') !!}
         </div>
@@ -38,7 +36,7 @@
     <div class="row">
         <div class="col-md-12">
             <div class="pull-right">
-                <a href="/admix/newsletters/download{{ getQueryString(Request::fullUrl()) }}" class="btn btn-default btn-flat" >
+                <a href="/admix/newsletters/download?{{ http_build_query($search) }}" class="btn btn-default btn-flat" >
                     <i class="fa fa-download"></i>
                     <i class="fs-normal hidden-xs texto-download">Download</i>
                 </a>
@@ -72,7 +70,9 @@ class="btn btn-default btn-flat">
                     </th>
                 @endif
                 <th>{!! columnSort('#', ['field' => 'id', 'sort' => 'asc']) !!}</th>
-                <th>{!! columnSort('Nome', ['field' => 'name', 'sort' => 'asc']) !!}</th>
+                @if(config('mnewsletters.fields.name') !== false)
+                    <th>{!! columnSort('Nome', ['field' => 'name', 'sort' => 'asc']) !!}</th>
+                @endif
                 <th>{!! columnSort('Email', ['field' => 'email', 'sort' => 'asc']) !!}</th>
                 <th>{!! columnSort('Data de cadastro', ['field' => 'created_at', 'sort' => 'asc']) !!}</th>
                 <th></th>
@@ -87,13 +87,12 @@ class="btn btn-default btn-flat">
                         </td>
                     @endif
                     <td>{{ $newsletter->id }}</td>
-                    <td>{{ $newsletter->name }}</td>
+                    @if (config('mnewsletters.fields.name') !== false)
+                        <td>{{ $newsletter->name }}</td>
+                    @endif
                     <td>{{ $newsletter->email }}</td>
                     <td>{{ $newsletter->created_at->format('d/m/Y') }}</td>
                     <td>
-                       {{-- !!} @if((!checkRule('admin.newsletters.edit')) && (!$trash))
-                            @include('mixdinternet/admix::partials.actions.btn.edit', ['route' => route('admin.newsletters.edit', $newsletter->id)])
-                        @endif --}}
                         @if((!checkRule('admin.newsletters.destroy')) && (!$trash))
                             @include('mixdinternet/admix::partials.actions.btn.delete', ['route' => route('admin.newsletters.destroy'), 'id' => $newsletter->id])
                         @endif

diff --git a/src/routes/web.php b/src/routes/web.php
@@ -3,6 +3,7 @@
     Route::group(['middleware' => ['auth.admin', 'auth.rules']], function () {
         Route::get('newsletters/trash', ['uses' => 'NewslettersAdminController@index', 'as' => '.trash']);
         Route::post('newsletters/restore/{id}', ['uses' => 'NewslettersAdminController@restore', 'as' => '.restore']);
+        Route::get('newsletters/download', ['uses' => 'NewslettersAdminController@download', 'as' => '.download']);
         Route::resource('newsletters', 'NewslettersAdminController', [
             'names' => [
                 'index' => '.index',
@@ -14,7 +15,7 @@
             ], 'except' => ['destroy']
         ]);
         Route::delete('newsletters/destroy', ['uses' => 'NewslettersAdminController@destroy', 'as' => '.destroy']);
-        Route::get('newsletters/download', ['uses' => 'NewslettersAdminController@download', 'as' => '.download']);
+
     });
 
 });