diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
index 623d88a6d..652a496e1 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
@@ -1,6 +1,5 @@
'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations',
'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage',
'advs/adv/{id}' => [
- 'as' => 'adv_detail',
+ 'as' => 'adv_detail_backup',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
],
'advs/adv/{id}/{seo}' => [
- 'as' => 'adv_detail_seo',
+ 'as' => 'adv_detail_seo_backup',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view'
],
'ad/{id}' => [
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index 57fc649a1..4a4d018fe 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -319,7 +319,7 @@ class AdvsController extends PublicController
$recommended_advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad);
}
- for ($i = 1; $i < 7; $i++) {
+ for ($i = 1; $i <= 10; $i++) {
$cat = "cat" . $i;
if ($adv->$cat != null) {
$item = $this->category_repository->getItem($adv->$cat);
@@ -417,7 +417,6 @@ class AdvsController extends PublicController
$count_user_ads = count($this->adv_model->userAdv()->get());
if (empty($cats->toArray())) {
-
$cats = trans('visiosoft.module.advs::message.create_ad_with_post_cat');
if (setting_value('visiosoft.module.advs::default_adv_limit') <= $count_user_ads) {
@@ -433,8 +432,6 @@ class AdvsController extends PublicController
return $msg;
}
}
-
-
}
return $cats;
}
@@ -504,8 +501,9 @@ class AdvsController extends PublicController
if ($package != null)
$this->messages->error(trans('visiosoft.module.advs::message.please_buy_package'));
- } else
+ } else {
$this->messages->error(trans('visiosoft.module.advs::message.max_ad_limit.title'));
+ }
return redirect('/');
}
@@ -540,7 +538,6 @@ class AdvsController extends PublicController
app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->store($adv, $request);
}
-
$form->render($request->update_id);
$post = $form->getPostData();
$post['id'] = $request->update_id;
@@ -577,7 +574,6 @@ class AdvsController extends PublicController
$events->dispatch(new EditAd($request->update_id, $settings, $adv));//Update Notify
}
-
if ($isActiveDopings) {
return redirect(route('add_doping', [$request->update_id]));
} else {
@@ -615,7 +611,7 @@ class AdvsController extends PublicController
$cat = 'cat';
$cats = array();
- for ($i = 1; $i < 7; $i++) {
+ for ($i = 1; $i <= 10; $i++) {
if ($adv[$cat . $i] != null) {
$name = $categoryRepository->getSingleCat($adv[$cat . $i]);
if (!is_null($name)) {
@@ -699,7 +695,6 @@ class AdvsController extends PublicController
$main_cats = $this->category_repository->mainCats();
return $this->view->make('visiosoft.module.advs::new-ad/post-cat', compact('main_cats'));
-
}
/**
@@ -722,7 +717,7 @@ class AdvsController extends PublicController
$params = $this->requestHttp->all();
unset($params['action']);
- for ($i = 2; $i <= 7; $i++) {
+ for ($i = 2; $i <= 10; $i++) {
if (!isset($params['cat' . $i])) {
$params['cat' . $i] = NULL;
}
diff --git a/addons/default/visiosoft/base-theme/resources/css/forgot.css b/addons/default/visiosoft/base-theme/resources/css/forgot.css
new file mode 100644
index 000000000..0e8bf74df
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/css/forgot.css
@@ -0,0 +1,25 @@
+@media only screen and (min-width: 768px) {
+ .forgot-wrapper {
+ padding-top: 4em;
+ padding-bottom: 4em;
+ padding-left: 4.25em;
+ border: 1px solid #dee2e6!important;
+ }
+}
+@media only screen and (min-width: 768px) {
+ .forgot-form-wrapper {
+ width: 20em !important;
+ }
+}
+.forgot-img {
+ height: 11em;
+ width: 10em;
+}
+.forgot-wrapper label {
+ font-size: 14px;
+}
+@media only screen and (min-width: 768px) {
+ .forgot-form-wrapper button {
+ width: initial !important;
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/css/login.css b/addons/default/visiosoft/base-theme/resources/css/login.css
index cf3d89a08..49027249c 100644
--- a/addons/default/visiosoft/base-theme/resources/css/login.css
+++ b/addons/default/visiosoft/base-theme/resources/css/login.css
@@ -111,10 +111,9 @@
background: #fafafa;
color: #489ae8;
}
-
@media only screen and (min-width: 470px) {
.login-section {
- padding: 70px 78px 148px 77px;
+ padding: 70px 30px 148px;
}
.register-section {
@@ -123,4 +122,9 @@
padding-right: 85px;
background-color: #fff;
}
+}
+@media only screen and (min-width: 1200px) {
+ .login-section {
+ padding: 70px 78px 148px 77px;
+ }
}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/css/register.css b/addons/default/visiosoft/base-theme/resources/css/register.css
index cbfd641bd..954390e8e 100644
--- a/addons/default/visiosoft/base-theme/resources/css/register.css
+++ b/addons/default/visiosoft/base-theme/resources/css/register.css
@@ -11,4 +11,19 @@
.personal-advantages img {
max-height: 60px;
max-width: 60px;
+}
+
+.approved-phone {
+ background-color: #ebf2e5 !important;
+ border-color: #4a7c20 !important;
+}
+
+.rejected-phone {
+ background-color: #f8e6e9 !important;
+ border-color: #ba7b84 !important;
+}
+
+.phone-validation-error {
+ color: #c75050;
+ font-size: 14px;
}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/images/forgot-password.png b/addons/default/visiosoft/base-theme/resources/images/forgot-password.png
new file mode 100644
index 000000000..a68d244ee
Binary files /dev/null and b/addons/default/visiosoft/base-theme/resources/images/forgot-password.png differ
diff --git a/addons/default/visiosoft/base-theme/resources/js/register.js b/addons/default/visiosoft/base-theme/resources/js/register.js
index b5b0d5572..5930e77f5 100644
--- a/addons/default/visiosoft/base-theme/resources/js/register.js
+++ b/addons/default/visiosoft/base-theme/resources/js/register.js
@@ -1 +1,48 @@
phoneMask("input[name='phone'],input[name='land_phone']");
+
+// Phone register validation
+//setup before functions
+let typingTimer;
+let doneTypingInterval = 650;
+let phoneInput = $(".validate-phone input[name='phone']");
+
+//on keyup, start the countdown
+phoneInput.on('keyup', function () {
+ clearTimeout(typingTimer);
+ typingTimer = setTimeout(function () {
+ doneTyping(phoneInput.val())
+ }, doneTypingInterval)
+});
+
+//on keydown, clear the countdown
+phoneInput.on('keydown', function () {
+ clearTimeout(typingTimer);
+});
+
+function doneTyping(phoneNum) {
+ if (!phoneNum.includes('_') && phoneNum !== "") {
+ let countryCode = $(".iti__selected-flag").attr('title').split("+");
+ countryCode = '+' + countryCode[countryCode.length - 1];
+
+ $.ajax({
+ type: 'GET',
+ data: {'phoneNumber': countryCode + phoneNum.substr(1)},
+ url: 'ajax/phone-validation',
+ success: function (response) {
+ if (response.userExists) {
+ phoneInput.addClass('rejected-phone');
+ phoneInput.removeClass('approved-phone');
+ $('.phone-validation-error').removeClass('d-none')
+ } else {
+ phoneInput.addClass('approved-phone');
+ phoneInput.removeClass('rejected-phone');
+ $('.phone-validation-error').addClass('d-none')
+ }
+ },
+ });
+ } else {
+ phoneInput.removeClass('approved-phone');
+ phoneInput.removeClass('rejected-phone');
+ $('.phone-validation-error').addClass('d-none')
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/field.php b/addons/default/visiosoft/base-theme/resources/lang/ar/field.php
index a97fd0621..7d9270817 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ar/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ar/field.php
@@ -30,4 +30,13 @@ return [
'personal_registration_list_2' => 'أضف الإعلانات التي تهتم بها ، واتبع تغيرات الأسعار بعد إضافتها إلى مفضلاتك ، وإنشاء عمليات بحث مفضلة تلبي معاييرك ،',
'personal_registration_list_3' => 'أرسل رسائل إلى مالكي الإعلانات على الموقع.',
'register_information_note' => 'تؤخذ المعلومات على هذه الصفحة ل ' . env('APPLICATION_DOMAIN') . ' عضوية. يمكنك العثور على معلومات مفصلة حول حماية البيانات الشخصية هنا.',
+
+ // Register page
+ 'phone_validation_error' => 'رقم الهاتف هذا قيد الاستخدام من قبل عضو آخر.',
+
+ // Forgot Password
+ 'create_new_password' => 'إنشاء كلمة مرور جديدة',
+
+ // Login page
+ 'or' => 'أو'
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
index 4e1fb6920..14c442b87 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
@@ -30,4 +30,13 @@ return [
'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.',
+
+ // Register page
+ 'phone_validation_error' => 'This phone number is in use by another member.',
+
+ // Forgot Password
+ 'create_new_password' => 'Create New Password',
+
+ // Login page
+ 'or' => 'or'
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/field.php b/addons/default/visiosoft/base-theme/resources/lang/ru/field.php
index 61ebbee37..7ecfa4021 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ru/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ru/field.php
@@ -30,4 +30,13 @@ return [
'personal_registration_list_2' => 'Добавьте объявления, которые вас интересуют, следите за изменениями цен после добавления их в избранное, создавайте избранные поиски, которые соответствуют вашим критериям,',
'personal_registration_list_3' => 'Отправляйте сообщения владельцам рекламы на сайте.',
'register_information_note' => 'Информация на этой странице принимается за ' . env('APPLICATION_DOMAIN') . ' членство. Вы можете найти подробную информацию о защите персональных данных здесь.',
+
+ // Register page
+ 'phone_validation_error' => 'Этот номер телефона используется другим участником.',
+
+ // Forgot Password
+ 'create_new_password' => 'Создать новый пароль',
+
+ // Login page
+ 'or' => 'или'
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/field.php b/addons/default/visiosoft/base-theme/resources/lang/sq/field.php
index a2cda1599..ec42ac9f4 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sq/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sq/field.php
@@ -30,4 +30,13 @@ return [
'personal_registration_list_2' => 'Shtoni reklamat që ju interesojnë, ndiqni ndryshimet e çmimeve pasi t\'i shtoni ato në të preferuarat tuaja, krijoni kërkime të preferuara që plotësojnë kriteret tuaja,',
'personal_registration_list_3' => 'Dërgoni mesazhe pronarëve të reklamave në faqe.',
'register_information_note' => 'Informacioni në këtë faqe merret për ' . env('APPLICATION_DOMAIN') . ' anëtarësimi. Mund të gjeni informacione të hollësishme në lidhje me mbrojtjen e të dhënave personale këtu.',
+
+ // Register page
+ 'phone_validation_error' => 'Ky numër telefoni është në përdorim nga një anëtar tjetër.',
+
+ // Forgot Password
+ 'create_new_password' => 'Krijoni fjalëkalimin e ri',
+
+ // Login page
+ 'or' => 'ose'
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
index c33f904dd..fca972cdf 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
@@ -30,4 +30,13 @@ return [
'personal_registration_list_2' => 'İlgilendiğiniz reklamları ekleyin, favorilerinize ekledikten sonra fiyat değişikliklerini takip edin, kriterlerinize uygun favori aramalar oluşturun,',
'personal_registration_list_3' => 'Sitedeki reklam sahiplerine mesaj gönderin.',
'register_information_note' => 'Bu sayfadaki bilgiler ' . env('APPLICATION_DOMAIN') . ' üyelik. Kişisel verilerin korunması hakkında ayrıntılı bilgiyi burada bulabilirsiniz.',
+
+ // Register page
+ 'phone_validation_error' => 'Bu telefon numarası başka bir üye tarafından kullanılıyor.',
+
+ // Forgot Password
+ 'create_new_password' => 'Yeni Şifre Oluştur',
+
+ // Login page
+ 'or' => 'veya'
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
index 1906e45f4..6adb3e93c 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
@@ -58,17 +58,19 @@
-
- {{ addBlock('login/oauth')|raw }}
-
+ {% if addBlock('login/oauth') %}
+
- {{ trans('visiosoft.theme.base::field.or') }} -
+
+ {{ addBlock('login/oauth')|raw }}
+
+ {% endif %}
.url }})
+