Merge pull request #857 from openclassify/muammertop

#2819 minor fix (google & facebook address bonus)

addons/default/visiosoft/advs-module/resources/config/settings/sections.php

@@ -23,6 +23,7 @@ return [
                     'latest-limit',
                     'popular_ads_limit',
                     'default_view_type',
+	                'price_area_hidden',
                     'hide_listing_standard_price',
                     'hide_zero_price',
                     'auto_approve',

addons/default/visiosoft/advs-module/resources/config/settings/settings.php

@@ -153,6 +153,12 @@ return [
             'mode' => 'checkbox'
         ]
     ],
+	'price_area_hidden' => [
+		'type' => 'anomaly.field_type.boolean',
+		'config' => [
+			'default_value' => false,
+		]
+	],
     'enabled_currencies' => [
         'bind' => 'streams::currencies.enabled',
         'env' => 'ADV_ENABLED_CURRENCIES',

addons/default/visiosoft/advs-module/resources/lang/en/setting.php

@@ -126,7 +126,9 @@ return [
     'market_place' => [
         'name' => 'Market Place',
     ],
-
+	'price_area_hidden' => [
+		'name' => 'Price Area Hidden',
+	],
     'hide_price_filter' => [
         'name' => 'Hide Price Filter',
     ],

addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig

@@ -90,7 +90,9 @@
                                     </div>
                                 </div>
 
-                                <div class="row form-group select-price">
+                                <div class="row form-group select-price
+                                            {{ setting_value('visiosoft.module.advs::price_area_hidden') ? 'hidden' }}">
+
                                     <label class="col-sm-2 col-xs-12">
                                         {{ form.fields.price.label|raw }}
                                         <span class="required">*</span>

addons/default/visiosoft/media-field_type/resources/views/upload/partials/body.twig

@@ -1,3 +1,8 @@
+{% set folders = entries('files','folders').whereIn('slug',field_type.configGet('folders')).get() %}
+{% set allowed_types = {} %}
+{% for mimes in  folders.pluck('allowed_types.value').all() %}
+	{% set allowed_types = allowed_types|merge(mimes) %}
+{% endfor %}
 <div class="modal-body">
 	<div class="dropzone"
 	     data-folder="1"
@@ -8,7 +13,7 @@
 	     data-uploading="{{ trans('visiosoft.field_type.media::message.uploading') }}"
 	     data-overwrite="{{ trans('anomaly.field_type.file::message.overwrite') }}"
 	     data-max-parallel="{{ setting_value('anomaly.module.files::max_parallel_uploads', 3) }}"
-         data-allowed="{{ folder.allowed_types.value ? '.' ~ folder.allowed_types.value|join(',.') }}"></div>
+	     data-allowed="{{ (count(allowed_types)) ?'.'~allowed_types|join(',.'):'' }}"></div>
 
 	<div class="uploads"></div>
 

addons/default/visiosoft/profile-module/resources/lang/en/field.php

@@ -58,6 +58,12 @@ return [
     'birthday' => [
         'name' => 'Birthday'
     ],
+	'facebook_address' => [
+		'name' => 'Facebook Address'
+	],
+	'google_address' => [
+		'name' => 'Google Address'
+	],
     'education' => [
         'name' => 'Education'
     ],

addons/default/visiosoft/profile-module/resources/views/profile/detail.twig

@@ -149,7 +149,22 @@
                                         {{ profileForm.fields.birthday.configSet('date_format','Y-m-d').setPlaceholder(now|date('Y-m-d')).input|raw }}
                                     </div>
                                 </div>
-
+                                <div class="col-md-6">
+                                    <div class="form-group facebook_address-field">
+                                        <label class="control-label font-weight-bold">
+                                            {{ trans("visiosoft.module.profile::field.facebook_address.name") }}
+                                        </label>
+                                        {{ profileForm.fields.facebook_address.input|raw }}
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="form-group google_address-field">
+                                        <label class="control-label font-weight-bold">
+                                            {{ trans("visiosoft.module.profile::field.google_address.name") }}
+                                        </label>
+                                        {{ profileForm.fields.google_address.input|raw }}
+                                    </div>
+                                </div>
                                 {% if setting_value('visiosoft.module.profile::show_education_profession') %}
                                     <div class="col-md-12">
                                         <div class="form-group education-field">

addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php

@@ -17,7 +17,9 @@ class ProfileFormBuilder extends FormBuilder
         'state_of_education',
         'profession',
         'birthday',
-        'register_type'
+        'register_type',
+	    'facebook_address',
+	    'google_address',
     ];
 
     protected $actions = [

addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php

@@ -23,6 +23,8 @@ class ProfileFormHandler
             'identification_number' => $builder->getPostValue('identification_number'),
             'birthday' => $builder->getPostValue('birthday'),
             'register_type' => $builder->getPostValue('register_type'),
+            'facebook_address' => $builder->getPostValue('facebook_address'),
+            'google_address' => $builder->getPostValue('google_address'),
         ];
 
         if (setting_value('visiosoft.module.profile::show_education_profession')) {

addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php

@@ -139,6 +139,16 @@ class UsersFieldsSeeder extends Seeder
                 'slug' => 'profession',
                 'type' => 'anomaly.field_type.text',
             ],
+	        [
+	        	'name' => trans('visiosoft.module.profile::field.facebook_address.name'),
+		        'slug' => 'facebook_address',
+		        'type' => 'anomaly.field_type.text',
+	        ],
+	        [
+	        	'name' => trans('visiosoft.module.profile::field.google_address.name'),
+		        'slug' => 'google_address',
+		        'type' => 'anomaly.field_type.text',
+	        ]
         ];
 
         foreach ($customFields as $customField) {

database/seeds/DatabaseSeeder.php

@@ -148,5 +148,13 @@ class DatabaseSeeder extends Seeder
 				'disk' => $disk
 			]);
 		};
+
+		if ($images_folder = $this->folders->findBySlug('images')) {
+			$images_folder->update([
+				'allowed_types' => [
+					'jpg', 'jpeg','png'
+				],
+			]);
+		}
 	}
 }