Merge pull request #291 from openclassify/dia

#707 [Store] If store is installed show store register
This commit is contained in:
Fatih Alp 2020-02-07 13:01:17 +03:00 committed by GitHub
commit aab8949608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 151 additions and 83 deletions

View File

@ -0,0 +1,9 @@
.small-notice {
background-color: #f7f7f7;
}
.small-notice i {
font-size: 18px;
position: relative;
top: 4px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -1,3 +1,4 @@
// Personal Registration
var inputQuery = document.querySelector("input[name=\"phone\"]");
var iti = intlTelInput(inputQuery, {
hiddenInput: "full_phone",
@ -11,3 +12,18 @@ var iti = intlTelInput(inputQuery, {
});
}
});
// Store registration
var storeInputQuery = document.querySelector(".store-phone input");
var storeIti = intlTelInput(storeInputQuery, {
hiddenInput: "full_phone",
class:"form-control",
initialCountry: "auto",
geoIpLookup: function (success, failure) {
$.get("https://ipinfo.io", function () {
}, "jsonp").always(function (resp) {
var countryCode = (resp && resp.country) ? resp.country : "";
success(countryCode);
});
}
});

View File

@ -22,4 +22,12 @@ return [
'forgot_password' => 'I Forgot My Password',
'email_or_phone_number' => 'Email Address or Phone Number',
'phone_number' => 'Phone Number',
// Registration instructions
'personal_registration_header' => 'What Are Individual Membership Advantages?',
'personal_registration_body' => 'Sell and rent your home, car, sell your unused items, get new ones.',
'personal_registration_list_1' => 'Post a free ad,',
'personal_registration_list_2' => 'Add the ads you are interested in, follow the price changes after adding them to your favorites, create favorite searches that meet your criteria,',
'personal_registration_list_3' => 'Send messages to the ad owners on the site.',
'register_information_note' => 'The information on this page is taken for ' . env('APPLICATION_DOMAIN') . ' membership. You can find detailed information about the protection of personal data here.',
];

View File

@ -1,105 +1,139 @@
{% extends "theme::layouts/default" %}
{% block content %}
<div class="row justify-content-center">
<div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
{% set form = form('register2').redirect(request_get('redirect', '/'))
.get() %}
{{ form_open({
'class': 'row form ' ~ form.options.class ,
'enctype': 'multipart/form-data',
'url':form.options.url
})|raw }}
<div class="col-12">
<div class="form-group display_name-field display_name-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.first_name') }}
<span class="required">*</span>
</label>
<h3 class="mt-md-4 mb-3">Register</h3>
<div class="row justify-content-center bg-light rounded border px-3">
<div class="col-12 col-md-6 text-left p-3 m-0">
<div class="input-wrapper">
{{ form.fields.first_name.setPlaceholder(trans('visiosoft.theme.base::field.first_name')).input|raw }}
{{ form.fields.username.setValue(random()).setAttributes({
'class' :'hidden',
}).input|raw }}
</div>
</div>
</div>
<div class="col-12">
<div class="form-group username-field username-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.last_name') }}
<span class="required">*</span>
</label>
{{ addBlock('register/register-type')|raw }}
<div class="input-wrapper">
{{ form.fields.last_name.setPlaceholder(trans('visiosoft.theme.base::field.last_name')).input|raw }}
</div>
</div>
</div>
<div class="col-12">
<div class="form-group email-field phone-field_type register-phone">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.phone_number') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.phone.setValue(form.fields.full_phone.value).input|raw }}
</div>
</div>
</div>
{% if setting_value('visiosoft.module.advs::register_email_field') %}
<div class="col-12">
<div class="form-group email-field email-field_type">
<div class="personal-register">
{% set form = form('register2').redirect(request_get('redirect', '/'))
.get() %}
{{ form_open({
'class': 'row form ' ~ form.options.class ,
'enctype': 'multipart/form-data',
'url':form.options.url
})|raw }}
<div class="col-6">
<div class="form-group display_name-field display_name-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.email') }}
{{ trans('visiosoft.theme.base::field.first_name') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.email.setPlaceholder(trans('visiosoft.theme.base::field.email')).input|raw }}
{{ form.fields.first_name.setPlaceholder(trans('visiosoft.theme.base::field.first_name')).input|raw }}
{{ form.fields.username.setValue(random()).setAttributes({
'class' :'hidden',
}).input|raw }}
</div>
</div>
</div>
{% else %}
{% set domain = config('app.url')|replace({ ('https://'): '',('http://'): '',('/'): '/' }) %}
{% if domain == "localhost" %}
{% set domain = "example.com" %}
{% endif %}
{{ form.fields.email.setValue(random()~"@"~domain).setAttributes({
'class' :'hidden',
}).input|raw }}
{% endif %}
<div class="col-12">
<div class="form-group password-field password-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.password') }}
<span class="required">*</span>
</label>
<div class="col-6">
<div class="form-group username-field username-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.last_name') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.password.setPlaceholder(trans('visiosoft.theme.base::field.password')).input|raw }}
<div class="input-wrapper">
{{ form.fields.last_name.setPlaceholder(trans('visiosoft.theme.base::field.last_name')).input|raw }}
</div>
</div>
</div>
</div>
<div class="col-12 row m-0">
<div class="col-6 pr-0 pl-1">
<button class="btn btn-sm btn-success w-100 py-2">
<i class="fas fa-user-plus"></i>
{{ trans('visiosoft.theme.base::button.register') }}
</button>
{% if setting_value('visiosoft.module.advs::register_email_field') %}
<div class="col-12">
<div class="form-group email-field email-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.email') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.email.setPlaceholder(trans('visiosoft.theme.base::field.email')).input|raw }}
</div>
</div>
</div>
{% else %}
{% set domain = config('app.url')|replace({ ('https://'): '',('http://'): '',('/'): '/' }) %}
{% if domain == "localhost" %}
{% set domain = "example.com" %}
{% endif %}
{{ form.fields.email.setValue(random()~"@"~domain).setAttributes({
'class' :'hidden',
}).input|raw }}
{% endif %}
<div class="col-12">
<div class="form-group password-field password-field_type">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.password') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.password.setPlaceholder(trans('visiosoft.theme.base::field.password')).input|raw }}
</div>
</div>
</div>
<div class="col-6 pr-0 pl-1">
<a href="{{ url('login') }}" class="btn btn-sm btn-primary w-100 py-2">
<i class="fas fa-key"></i>
{{ trans('visiosoft.theme.base::button.login') }}
</a>
<div class="col-12">
<div class="form-group email-field phone-field_type register-phone">
<label class="control-label">
{{ trans('visiosoft.theme.base::field.phone_number') }}
<span class="required">*</span>
</label>
<div class="input-wrapper">
{{ form.fields.phone.setValue(form.fields.full_phone.value).input|raw }}
</div>
</div>
</div>
<div class="col-12 row m-0">
<div class="col-6 pr-0 pl-1">
<button class="btn btn-sm btn-success py-2">
<i class="fas fa-user-plus"></i>
{{ trans('visiosoft.theme.base::button.register') }}
</button>
</div>
</div>
<div class="social-login py-2 row col-12 m-0">
{{ addBlock('login/oauth')|raw }}
</div>
{{ form_close() }}
</div>
<div class="social-login py-2 row col-12 m-0">
{{ addBlock('login/oauth')|raw }}
{{ addBlock('register/corporate-register')|raw }}
</div>
<div class="col-12 col-md-6 py-3 pr-0 instructions d-none d-md-block">
<div class="border personal-advantages py-5 px-5">
<div class="d-flex align-items-center mb-4">
<img src="{{ img('visiosoft.theme.base::images/register-instruction.png').url }}">
<h4 class="ml-3">
{{ trans('visiosoft.theme.base::field.personal_registration_header') }}
</h4>
</div>
<div class="mb-4">
{{ trans('visiosoft.theme.base::field.personal_registration_body') }}
</div>
<ul class="pl-4">
<li>{{ trans('visiosoft.theme.base::field.personal_registration_list_1') }}</li>
<li>{{ trans('visiosoft.theme.base::field.personal_registration_list_2') }}</li>
<li>{{ trans('visiosoft.theme.base::field.personal_registration_list_3') }}</li>
</ul>
</div>
{{ addBlock('register/instructions')|raw }}
<div class="border small-notice py-3 px-4 mt-3">
<div class="d-flex text-muted">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i>
<small class="ml-2 text-muted">
{{ trans('visiosoft.theme.base::field.register_information_note') }}
</small>
</div>
</div>
</div>
</div>
@ -108,6 +142,7 @@
{{ asset_add("scripts.js", "visiosoft.theme.base::js/utils.js") }}
{{ asset_add("scripts.js", "visiosoft.theme.base::js/phonefield.js") }}
{{ asset_add("styles.css", "visiosoft.theme.base::css/intlTelInput.css") }}
{{ asset_add("styles.css", "visiosoft.theme.base::css/register.css") }}
{% endblock %}

View File

@ -34,7 +34,7 @@
{% endif %}
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile.name') }}</a>
<a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
</li>
<li class="nav-item">
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>