From eafc617aaf127b8b203ba265f97940badaf8d4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Arag=C3=B3n?= <aragcar@gmail.com>
Date: Tue, 8 Oct 2019 17:59:01 -0500
Subject: [PATCH 1/4] add facture events

---
 app/Feature.php                               | 19 ++++++++++
 .../Controllers/Admin/FeatureController.php   | 10 ++++++
 ...019_10_08_161355_create_features_table.php | 35 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 app/Feature.php
 create mode 100644 app/Http/Controllers/Admin/FeatureController.php
 create mode 100644 database/migrations/2019_10_08_161355_create_features_table.php

diff --git a/app/Feature.php b/app/Feature.php
new file mode 100644
index 0000000..7d654eb
--- /dev/null
+++ b/app/Feature.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Feature extends Model
+{
+    protected $fillable = [
+        'event_id',
+        'title',
+        'content',
+        'extra',
+        'visible'
+    ];
+    public function event(){
+        return $this->belongsTo(Event::class);
+    }
+}
diff --git a/app/Http/Controllers/Admin/FeatureController.php b/app/Http/Controllers/Admin/FeatureController.php
new file mode 100644
index 0000000..76bf5b9
--- /dev/null
+++ b/app/Http/Controllers/Admin/FeatureController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use Illuminate\Http\Request;
+
+class FeatureController extends Controller
+{
+    //
+}
diff --git a/database/migrations/2019_10_08_161355_create_features_table.php b/database/migrations/2019_10_08_161355_create_features_table.php
new file mode 100644
index 0000000..f2b49d6
--- /dev/null
+++ b/database/migrations/2019_10_08_161355_create_features_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFeaturesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('features', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('title', 250);
+            $table->mediumText('content')->nullable();
+            $table->mediumText('extra')->nullable();
+            $table->boolean('visible');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('features');
+    }
+}

From 2a8e9dd6595fe3b7afb1686cc7c7b03b350ba21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Arag=C3=B3n?= <aragcar@gmail.com>
Date: Tue, 8 Oct 2019 21:04:04 -0500
Subject: [PATCH 2/4] add modal feature

---
 .../Controllers/Admin/FeatureController.php   | 46 +++++++++++++++++++
 resources/views/feature/create.blade.php      | 42 +++++++++++++++++
 resources/views/feature/edit.blade.php        |  7 +++
 routes/api.php                                |  6 +++
 4 files changed, 101 insertions(+)
 create mode 100644 resources/views/feature/create.blade.php
 create mode 100644 resources/views/feature/edit.blade.php

diff --git a/app/Http/Controllers/Admin/FeatureController.php b/app/Http/Controllers/Admin/FeatureController.php
index 76bf5b9..f5baea5 100644
--- a/app/Http/Controllers/Admin/FeatureController.php
+++ b/app/Http/Controllers/Admin/FeatureController.php
@@ -2,9 +2,55 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Feature;
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class FeatureController extends Controller
 {
     //
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function list($id)
+    {
+        $feature = Feature::where('event_id', $id)->orderBy('id','DESC')->paginate(10);
+        return response()->json($feature, 201);
+    }
+
+    /** Delete Feature */
+    public function destroy($id)
+    {
+        $feature = Feature::destroy($id);
+        return response()->json($feature);
+    }
+
+    /** Create Feature  */
+    public function store(Request $request)
+    {
+        $values = $request;
+        $direction = Feature::create([
+            'event_id' => $values['event_id'],
+            'title' => $values['title'],
+            'content' => $values['content'],
+            'extra' => $values['extra'],
+            'visible' => $values['visible'],
+        ]);
+        return response()->json($direction);
+    }
+
+    /** Update Feature */
+    public function update(Request $request, $id)
+    {
+        $feature = Feature::find($id)->update($request->all());
+        return response()->json($feature);
+    }
+
 }
diff --git a/resources/views/feature/create.blade.php b/resources/views/feature/create.blade.php
new file mode 100644
index 0000000..d3e9c20
--- /dev/null
+++ b/resources/views/feature/create.blade.php
@@ -0,0 +1,42 @@
+<!-- Modal Register Billings -->
+<div class="modal fade" id="features_create" tabindex="-1" role="dialog" aria-labelledby="features_create" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <form id="formFeature" class="form-horizontal" method="POST" v-on:submit.prevent="createFeature">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="features_modal">{{ __('Add address') }}</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+
+                    <div class="alert alert-danger" v-if="errors.length > 0">
+                        <ul>
+                            <li v-for="error in errors">@{{ error }}</li>
+                        </ul>
+                    </div>
+
+                    {{ Form::hidden('event_id', '',['id' => 'event_id', 'v-model' => 'feature.event_id']) }}
+                    <div class="form-group">
+                        {{ Form::label('ruc', 'N° RUC') }}
+                        {{ Form::text('ruc', null, ['class' => 'form-control', 'id' => 'ruc', 'v-model' => 'billings.ruc']) }}
+                    </div>
+                    <div class="form-group">
+                        {{ Form::label('business_name', 'Razón social') }}
+                        {{ Form::text('business_name', null, ['class' => 'form-control', 'id' => 'business_name', 'v-model' => 'billings.business_name']) }}
+                    </div>
+                    <div class="form-group">
+                        {{ Form::label('fiscal_address', 'Dirección fiscal') }}
+                        {{ Form::text('fiscal_address', null, ['class' => 'form-control', 'id' => 'fiscal_address' , 'v-model' => 'billings.fiscal_address']) }}
+                    </div>
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('Close') }}</button>
+                    <button type="submit" class="btn btn-primary">{{ __('Save changes') }}</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/feature/edit.blade.php b/resources/views/feature/edit.blade.php
new file mode 100644
index 0000000..ac98898
--- /dev/null
+++ b/resources/views/feature/edit.blade.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: aragonc
+ * Date: 08/10/19
+ * Time: 08:58 PM
+ */
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index c641ca5..688216d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -16,3 +16,9 @@
 Route::middleware('auth:api')->get('/user', function (Request $request) {
     return $request->user();
 });
+
+//Route Feature
+Route::get('/feature/list/{slug}','Admin\FeatureController@list')->name('list');
+Route::delete('/feature/{slug}','Admin\FeatureController@destroy')->name('delete');
+Route::post('/feature','Admin\FeatureController@store')->name('store');
+Route::post('/feature/{slug}','Admin\FeatureController@update')->name('update');
\ No newline at end of file

From 9b97d1e2b33f2cde400c2a23d124ff7213df874e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Arag=C3=B3n?= <aragcar@gmail.com>
Date: Tue, 8 Oct 2019 23:09:18 -0500
Subject: [PATCH 3/4] fix feature

---
 app/Feature.php                               |  3 +-
 .../Controllers/Admin/FeatureController.php   |  5 ++--
 ...019_10_08_161355_create_features_table.php | 10 ++++---
 public/css/app.css                            |  4 +++
 resources/sass/app.scss                       |  3 ++
 resources/views/event/partials/form.blade.php |  7 ++++-
 resources/views/feature/create.blade.php      | 28 ++++++++++++-------
 7 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/app/Feature.php b/app/Feature.php
index 7d654eb..342550d 100644
--- a/app/Feature.php
+++ b/app/Feature.php
@@ -11,7 +11,8 @@ class Feature extends Model
         'title',
         'content',
         'extra',
-        'visible'
+        'visible',
+        'icon'
     ];
     public function event(){
         return $this->belongsTo(Event::class);
diff --git a/app/Http/Controllers/Admin/FeatureController.php b/app/Http/Controllers/Admin/FeatureController.php
index f5baea5..c845e21 100644
--- a/app/Http/Controllers/Admin/FeatureController.php
+++ b/app/Http/Controllers/Admin/FeatureController.php
@@ -36,14 +36,15 @@ public function destroy($id)
     public function store(Request $request)
     {
         $values = $request;
-        $direction = Feature::create([
+        $feature = Feature::create([
             'event_id' => $values['event_id'],
             'title' => $values['title'],
             'content' => $values['content'],
             'extra' => $values['extra'],
             'visible' => $values['visible'],
+            'icon' => $values['icon']
         ]);
-        return response()->json($direction);
+        return response()->json($feature);
     }
 
     /** Update Feature */
diff --git a/database/migrations/2019_10_08_161355_create_features_table.php b/database/migrations/2019_10_08_161355_create_features_table.php
index f2b49d6..05a36c4 100644
--- a/database/migrations/2019_10_08_161355_create_features_table.php
+++ b/database/migrations/2019_10_08_161355_create_features_table.php
@@ -15,10 +15,12 @@ public function up()
     {
         Schema::create('features', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('title', 250);
-            $table->mediumText('content')->nullable();
-            $table->mediumText('extra')->nullable();
-            $table->boolean('visible');
+            $table->integer('event_id')->unsigned();
+            $table->string('feature_title', 250);
+            $table->mediumText('feature_content')->nullable();
+            $table->mediumText('feature_extra')->nullable();
+            $table->boolean('feature_visible');
+            $table->string('feature_icon', 250);
             $table->timestamps();
         });
     }
diff --git a/public/css/app.css b/public/css/app.css
index b1b9abe..a066990 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -13872,3 +13872,7 @@ a.text-dark:focus {
   box-shadow: 10px 5px 5px 1px #cdcdcd;
 }
 
+.add-feature {
+  padding: 1rem 0.5rem;
+}
+
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 2b9c161..3f21120 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -59,4 +59,7 @@ $fa-font-path: "~font-awesome/fonts";
 }
 .tool:hover{
   box-shadow: 10px 5px 5px 1px #cdcdcd;
+}
+.add-feature{
+ padding: 1rem .5rem;
 }
\ No newline at end of file
diff --git a/resources/views/event/partials/form.blade.php b/resources/views/event/partials/form.blade.php
index 57b4da3..cd022ad 100644
--- a/resources/views/event/partials/form.blade.php
+++ b/resources/views/event/partials/form.blade.php
@@ -202,7 +202,11 @@
                 <small class="form-text text-muted">Subir una imagen debe ser de 600 x 144 pixeles .</small>
             </div>
         @endif
-
+        <div class="add-feature">
+            <button type="button" class="btn btn-block btn-success" data-toggle="modal" data-target="#features_create">
+                <i class="fas fa-plus"></i> {{ __('Add feature') }}
+            </button>
+        </div>
     </div>
 </div>
 <div class="row">
@@ -212,3 +216,4 @@
         </div>
     </div>
 </div>
+@include('feature.create')
\ No newline at end of file
diff --git a/resources/views/feature/create.blade.php b/resources/views/feature/create.blade.php
index d3e9c20..dc41e36 100644
--- a/resources/views/feature/create.blade.php
+++ b/resources/views/feature/create.blade.php
@@ -1,27 +1,35 @@
 <!-- Modal Register Billings -->
 <div class="modal fade" id="features_create" tabindex="-1" role="dialog" aria-labelledby="features_create" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
-        <form id="formFeature" class="form-horizontal" method="POST" v-on:submit.prevent="createFeature">
+        <form id="formFeature" class="form-horizontal" method="POST" >
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="features_modal">{{ __('Add address') }}</h5>
+                    <h5 class="modal-title" id="features_modal">{{ __('Add feature') }}</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
                 <div class="modal-body">
 
-                    <div class="alert alert-danger" v-if="errors.length > 0">
-                        <ul>
-                            <li v-for="error in errors">@{{ error }}</li>
-                        </ul>
+                    {{ Form::hidden('event_id', '',['id' => 'event_id']) }}
+
+                    <div class="form-group">
+                        {{ Form::label('feature_title', 'Título de característica') }}
+                        {{ Form::text('feature_title', null, ['class' => 'form-control', 'id' => 'feature_title']) }}
+                    </div>
+
+                    <div class="form-group">
+                        {{ Form::label('feature_icon', 'Icono') }}
+                        {{ Form::text('feature_icon', null, ['class' => 'form-control', 'id' => 'feature_icon']) }}
                     </div>
 
-                    {{ Form::hidden('event_id', '',['id' => 'event_id', 'v-model' => 'feature.event_id']) }}
                     <div class="form-group">
-                        {{ Form::label('ruc', 'N° RUC') }}
-                        {{ Form::text('ruc', null, ['class' => 'form-control', 'id' => 'ruc', 'v-model' => 'billings.ruc']) }}
+                        {{ Form::label('feature_content', 'Descripción') }}
+                        {{ Form::textarea('feature_content', null, ['class' => 'form-control ckeditor', 'id' => 'feature_content']) }}
                     </div>
+
+
+                   {{--
                     <div class="form-group">
                         {{ Form::label('business_name', 'Razón social') }}
                         {{ Form::text('business_name', null, ['class' => 'form-control', 'id' => 'business_name', 'v-model' => 'billings.business_name']) }}
@@ -29,7 +37,7 @@
                     <div class="form-group">
                         {{ Form::label('fiscal_address', 'Dirección fiscal') }}
                         {{ Form::text('fiscal_address', null, ['class' => 'form-control', 'id' => 'fiscal_address' , 'v-model' => 'billings.fiscal_address']) }}
-                    </div>
+                    </div>--}}
 
                 </div>
                 <div class="modal-footer">

From 8e95afa5fcd05cdf2af7f1046eb12792d1f63d03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2019 18:24:27 +0000
Subject: [PATCH 4/4] Bump lodash from 4.17.11 to 4.17.13

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7019fbd..4caaebe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4872,9 +4872,9 @@
             }
         },
         "lodash": {
-            "version": "4.17.11",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-            "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+            "version": "4.17.13",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz",
+            "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA=="
         },
         "lodash._baseassign": {
             "version": "3.2.0",
diff --git a/package.json b/package.json
index 3899929..86af02f 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "gijgo": "^1.9.13",
         "jquery": "^3.2",
         "laravel-mix": "^4.0.7",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.13",
         "popper.js": "^1.12",
         "resolve-url-loader": "^2.3.1",
         "sass": "^1.22.2",