From 9d35ecd2c7a78002e5b8073dab59eb57194b6a93 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 25 Jul 2019 13:45:12 +0300
Subject: [PATCH] simple address form

---
 ....module.profile__create_profile_fields.php |  2 +-
 ...t.module.profile__create_adress_stream.php | 16 ++--
 .../views/profile/adress_create.twig          | 86 ++++++++----------
 .../resources/views/profile/adress_edit.twig  | 88 +++++++++----------
 4 files changed, 87 insertions(+), 105 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php b/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php
index 28bd5130d..aa4059f58 100644
--- a/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php
+++ b/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php
@@ -102,7 +102,7 @@ class VisiosoftModuleProfileCreateProfileFields extends Migration
                 "options" => [],
             ]
         ],
-        'adress_content' => 'anomaly.field_type.text',
+        'adress_content' => 'anomaly.field_type.textarea',
         'adress_post_code' => 'anomaly.field_type.text',
         'adress_gsm_phone' => 'anomaly.field_type.text',
         'adress_land_phone' => 'anomaly.field_type.text',
diff --git a/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php b/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
index c8534c6eb..6f6c41639 100644
--- a/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
+++ b/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
@@ -35,21 +35,21 @@ class VisiosoftModuleProfileCreateAdressStream extends Migration
         'adress_last_name' => [
             'required' => true,
         ],
-        'country',
-        'city',
-        'district',
-        'neighborhood',
-        'village',
-        'adress_content' => [
+        'country' => [
             'required' => true,
         ],
-        'adress_post_code' => [
+        'city' => [
+            'required' => true,
+        ],
+        'district' => [
+            'required' => true,
+        ],
+        'adress_content' => [
             'required' => true,
         ],
         'adress_gsm_phone' => [
             'required' => true,
         ],
-        'adress_land_phone',
     ];
 
 }
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/adress_create.twig b/addons/default/visiosoft/profile-module/resources/views/profile/adress_create.twig
index 47e11e8e7..5ce2864f9 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/adress_create.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/adress_create.twig
@@ -5,7 +5,9 @@
             <div class="breadcrumb-section">
                 <!-- breadcrumb -->
                 <ol class="breadcrumb">
-                    <li><a href="{{ url_route("visiosoft.module.profile::profile") }}">{{ trans("visiosoft.module.profile::field.menu_profile.name") }}</a></li>
+                    <li>
+                        <a href="{{ url_route("visiosoft.module.profile::profile") }}">{{ trans("visiosoft.module.profile::field.menu_profile.name") }}</a>
+                    </li>
                     <li>{{ trans("visiosoft.module.profile::field.menu_address.name") }}</li>
                     <li>{{ trans("visiosoft.module.profile::field.create.name") }}</li>
                 </ol><!-- breadcrumb -->
@@ -28,66 +30,52 @@
                                 <a href="/profile#adress" class="btn btn-danger fa fa-chevron-left"
                                    style="margin-bottom: 20px" role="button" aria-pressed="true">Back</a>
 
-                                <div class="add-title">
-                                    {{ form.fields.adress_name|raw }}
-                                </div>
-                                <div class="add-title">
-                                    {{ form.fields.adress_first_name|raw }}
-                                </div>
-                                <div class="add-title">
-                                    {{ form.fields.adress_last_name|raw }}
-                                </div>
-                                <div class="row form-group location-map">
+                                <div class="row">
                                     <div class="col-sm-6">
-                                        <ul style="padding: 0">
+                                        {{ form.fields.adress_name|raw }}
+                                    </div>
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_gsm_phone|raw }}
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_first_name|raw }}
+                                    </div>
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_last_name|raw }}
+                                    </div>
+                                </div>
 
+                                <div class="row form-group location-map">
+                                    <div class="col-sm-4">
+                                        <label class="control-label">{{ trans("visiosoft.module.profile::field.country.name") }}</label>
+                                        <div class="input-wrapper">
+                                            <select name="country" class="custom-select form-control"
+                                                    data-content="{{ adress.country.id }}"
+                                                    data-field_name="adress_country_id"
+                                                    data-provides="anomaly.field_type.select">
+                                                {% for countryField in country %}
+                                                    <option value="{{ countryField.id }}">{{ countryField.name }}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col-sm-4">
+                                        {{ form.fields.city|raw }}
+                                    </div>
+                                    <div class="col-sm-4">
+                                        {{ form.fields.district|raw }}
 
-                                            <li class="location-field"><label
-                                                        class="control-label">{{ trans("visiosoft.module.profile::field.country.name") }}</label>
-                                                <div class="input-wrapper">
-                                                    <select name="country" class="custom-select form-control"
-                                                            data-content="{{ adress.country.id }}"
-                                                            data-field_name="adress_country_id"
-                                                            data-provides="anomaly.field_type.select">
-                                                        {% for countryField in country %}
-                                                            <option value="{{ countryField.id }}">{{ countryField.name }}</option>
-                                                        {% endfor %}
-                                                    </select>
-                                                </div>
-                                            </li>
-
-
-                                            <li class="location-field">{{ form.fields.city|raw }}</li>
-                                            <li class="location-field">{{ form.fields.district|raw }}</li>
-                                            <li class="location-field">{{ form.fields.neighborhood|raw }}
-                                            <li>
-                                            <li class="location-field">{{ form.fields.village|raw }}</li>
-                                        </ul>
                                     </div>
 
                                 </div>
-
-
                                 <div class="row form-group location-map">
                                     <div class="col-sm-12">
                                         <div class="add-title">
                                             {{ form.fields.adress_content|raw }}
 
                                         </div>
-
-                                        <div class="add-title">
-                                            {{ form.fields.adress_post_code|raw }}
-
-                                        </div>
-
-                                        <div class="add-title">
-                                            {{ form.fields.adress_gsm_phone|raw }}
-
-                                        </div>
-                                        <div class="add-title">
-                                            {{ form.fields.adress_land_phone|raw }}
-
-                                        </div>
                                     </div>
 
                                 </div>
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/adress_edit.twig b/addons/default/visiosoft/profile-module/resources/views/profile/adress_edit.twig
index 2c5e7a321..9df0b7ef9 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/adress_edit.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/adress_edit.twig
@@ -5,7 +5,9 @@
             <div class="breadcrumb-section">
                 <!-- breadcrumb -->
                 <ol class="breadcrumb">
-                    <li><a href="{{ url_route("visiosoft.module.profile::profile") }}">{{ trans("visiosoft.module.profile::field.menu_profile.name") }}</a></li>
+                    <li>
+                        <a href="{{ url_route("visiosoft.module.profile::profile") }}">{{ trans("visiosoft.module.profile::field.menu_profile.name") }}</a>
+                    </li>
                     <li>{{ trans("visiosoft.module.profile::field.menu_address.name") }}</li>
                     <li>{{ trans("visiosoft.module.profile::field.edit.name") }}</li>
                 </ol><!-- breadcrumb -->
@@ -17,7 +19,7 @@
                         {% include "theme::partials/messages" %}
                     </div>
                     <div class="col-md-8">
-                        {% set form = form('profile', 'adress').get() %}
+                        {% set form = form('profile', 'adress').entry(adress.id).get() %}
                         {{ form_open({
                             'class': 'form ' ~ form.options.class ,
                             'enctype': 'multipart/form-data',
@@ -27,43 +29,46 @@
                             <div class="section postdetails">
                                 <a href="/profile#adress" class="btn btn-danger fa fa-chevron-left"
                                    style="margin-bottom: 20px" role="button" aria-pressed="true">Back</a>
-                                <div class="row form-group add-title">
-                                    <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_name.name") }}</label>
-                                    {{ adress.adress_name.input|raw }}                                </div>
-                                <div class="row form-group add-title">
-                                    <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_first_name.name") }}</label>
-                                    {{ adress.adress_first_name.input|raw }}
+
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_name|raw }}
+                                    </div>
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_gsm_phone|raw }}
+                                    </div>
                                 </div>
-                                <div class="row form-group add-title">
-                                    <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_last_name.name") }}</label>
-                                    {{ adress.adress_last_name.input|raw }}
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_first_name|raw }}
+                                    </div>
+                                    <div class="col-sm-6">
+                                        {{ form.fields.adress_last_name|raw }}
+                                    </div>
                                 </div>
+
                                 <div class="row form-group location-map">
                                     <div class="col-sm-4">
-                                        <ul style="padding: 0">
-                                            <li class="location-field"><label
-                                                        class="control-label">{{ trans("visiosoft.module.profile::field.country.name") }}</label>
-                                                <div class="input-wrapper">
-                                                    <select name="country" class="custom-select form-control"
-                                                            data-content="{{ adress.country.id }}"
-                                                            data-field_name="adress_country_id"
-                                                            data-provides="anomaly.field_type.select">
-                                                        {% for countryField in country %}
-                                                            <option value="{{ countryField.id }}">{{ countryField.name }}</option>
-                                                        {% endfor %}
-                                                    </select>
-                                                </div>
-                                            </li>
-                                            <li class="location-field city-data"
-                                                data-content="{{ adress.city }}">{{ form.fields.city|raw }}</li>
-                                            <li class="location-field district-data"
-                                                data-content="{{ adress.district }}">{{ form.fields.district|raw }}</li>
-                                            <li class="location-field neighborhood-data"
-                                                data-content="{{ adress.neighborhood }}">{{ form.fields.neighborhood|raw }}
-                                            <li>
-                                            <li class="location-field village-data"
-                                                data-content="{{ adress.village }}">{{ form.fields.village|raw }}</li>
-                                        </ul>
+                                        <label class="control-label">{{ trans("visiosoft.module.profile::field.country.name") }}</label>
+                                        <div class="input-wrapper">
+                                            <select name="country" class="custom-select form-control"
+                                                    data-content="{{ adress.country.id }}"
+                                                    data-field_name="adress_country_id"
+                                                    data-provides="anomaly.field_type.select">
+                                                {% for countryField in country %}
+                                                    <option value="{{ countryField.id }}">{{ countryField.name }}</option>
+                                                {% endfor %}
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-sm-4 location-field city-data"
+                                         data-content="{{ adress.city }}">
+                                        {{ form.fields.city|raw }}
+                                    </div>
+                                    <div class="col-sm-4 location-field district-data"
+                                         data-content="{{ adress.district }}">
+                                        {{ form.fields.district|raw }}
                                     </div>
 
                                 </div>
@@ -73,18 +78,7 @@
                                             <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_content.name") }}</label>
                                             {{ adress.adress_content.input|raw }}
                                         </div>
-                                        <div class="row form-group add-title">
-                                            <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_post_code.name") }}</label>
-                                            {{ adress.adress_post_code.input|raw }}
-                                        </div>
-                                        <div class="row form-group add-title">
-                                            <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_gsm_phone.name") }}</label>
-                                            {{ adress.adress_gsm_phone.input|raw }}
-                                        </div>
-                                        <div class="row form-group add-title">
-                                            <label class="control-label">{{ trans("visiosoft.module.profile::field.adress_land_phone.name") }}</label>
-                                            {{ adress.adress_land_phone.input|raw }}
-                                        </div>
+
                                     </div>
 
                                 </div>