mirror of
https://github.com/openclassify/openclassify.git
synced 2026-01-24 22:11:01 -06:00
Merge branch 'master' of https://github.com/openclassify/openclassify
This commit is contained in:
commit
7659702de1
@ -1,7 +1,7 @@
|
|||||||
{% if setting_value('visiosoft.module.location::create_ad_page_location') %}
|
{% if setting_value('visiosoft.module.location::create_ad_page_location') %}
|
||||||
<div class="row form-group location-map">
|
<div class="row form-group location-map">
|
||||||
<div class="col-sm-4">
|
<div class="col-sm-4">
|
||||||
<ul style="padding: 0">
|
<ul style="padding: 0" class="list-unstyled">
|
||||||
<li class="country-data" data-content="{{ adv['country_id'] }}"
|
<li class="country-data" data-content="{{ adv['country_id'] }}"
|
||||||
data-default="{{ setting_value('visiosoft.module.location::default_country') }}"
|
data-default="{{ setting_value('visiosoft.module.location::default_country') }}"
|
||||||
class="location-field country-data">{{ form.fields.country|raw }}</li>
|
class="location-field country-data">{{ form.fields.country|raw }}</li>
|
||||||
|
|||||||
@ -11,6 +11,9 @@
|
|||||||
<div class="card-read-more text-center row">
|
<div class="card-read-more text-center row">
|
||||||
{{ buttons(row.buttons)|raw }}
|
{{ buttons(row.buttons)|raw }}
|
||||||
</div>
|
</div>
|
||||||
|
{% if loop.index == 1 %}
|
||||||
|
<div class="main-image image-eye-{{ row.key }}"><i class="fa fa-eye "></i></div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
@ -188,7 +188,7 @@ class MyProfileController extends PublicController
|
|||||||
|
|
||||||
$message = [];
|
$message = [];
|
||||||
$message[] = trans('visiosoft.module.profile::message.adress_success_update');
|
$message[] = trans('visiosoft.module.profile::message.adress_success_update');
|
||||||
return redirect('/profile')->with('success', $message);
|
return redirect(route('profile::address'))->with('success', $message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -208,7 +208,7 @@ class MyProfileController extends PublicController
|
|||||||
|
|
||||||
$message = [];
|
$message = [];
|
||||||
$message[] = trans('visiosoft.module.profile::message.adress_success_create');
|
$message[] = trans('visiosoft.module.profile::message.adress_success_create');
|
||||||
return redirect('/profile/adress')->with('success', $message);
|
return redirect(route('profile::address'))->with('success', $message);
|
||||||
}
|
}
|
||||||
$country = CountryModel::all();
|
$country = CountryModel::all();
|
||||||
return $this->view->make('visiosoft.module.profile::address/create', compact('country'));
|
return $this->view->make('visiosoft.module.profile::address/create', compact('country'));
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
<?php namespace Visiosoft\ProfileModule\Profile\Password;
|
<?php namespace Visiosoft\ProfileModule\Profile\Password;
|
||||||
|
|
||||||
use Anomaly\Streams\Platform\Message\MessageBag;
|
use Anomaly\Streams\Platform\Message\MessageBag;
|
||||||
|
use Anomaly\UsersModule\User\User;
|
||||||
use Anomaly\UsersModule\User\UserModel;
|
use Anomaly\UsersModule\User\UserModel;
|
||||||
use Anomaly\UsersModule\User\UserPassword;
|
use Anomaly\UsersModule\User\UserPassword;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
@ -41,10 +42,9 @@ class PasswordFormHandler
|
|||||||
return redirect()->back();
|
return redirect()->back();
|
||||||
}
|
}
|
||||||
|
|
||||||
$userModel->find(Auth::id())
|
$user = User::query()->find(Auth::id());
|
||||||
->update([
|
$user->setAttribute('password', $builder->getPostValue('new_password'));
|
||||||
'password' => Hash::make($builder->getPostValue('new_password'))
|
$user->save($user->toArray());
|
||||||
]);
|
|
||||||
$messages->success(trans('visiosoft.module.profile::message.your_password_changed'));
|
$messages->success(trans('visiosoft.module.profile::message.your_password_changed'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user