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 992cad425..b5c3aa9c8 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -485,117 +485,8 @@ class AdvsController extends PublicController $adv->save(); } } - if ($advModel->is_enabled('customfields')) { - - $customField_model = new CustomFieldModel(); - if ($adv->slug == "") { - //new ads - $jsonVal = []; - $id = auth()->user()->id; - $adv_id = $advRepository->getLastAd($id); - - for ($i = 1; $i < 7; $i++) { - $cat = 'cat' . $i; - if ($request->$cat != 0) { - $findcustomfields = $customField_model->getCustomfieldsJoinCategoryWithCategoryID($cat); - foreach ($findcustomfields as $findcustomfield) { - $cs_name = 'cf__' . $findcustomfield->slug; - $cf_id = "cf" . $findcustomfield->id; - if ($request->$cs_name) { - $new_cs = new CustomfieldsCustomFieldAdvsEntryModel(); - $new_cs->parent_adv_id = $adv_id; - $new_cs->custom_field_category_id = $findcustomfield->id; - $new_cs->custom_field_type = $findcustomfield->type; - if (is_array($request->$cs_name)) { - $new_cs->custom_field_value = implode(',', $request->$cs_name); - } else { - $new_cs->custom_field_value = $request->$cs_name; - } - $jsonVal[$cf_id] = $request->$cs_name; - $new_cs->save(); - } - } - } - } - - $findcustomfields = $customField_model->getCustomfieldsJoinCategoryWithCategoryID(); - foreach ($findcustomfields as $findcustomfield) { - $cs_name = 'cf__' . $findcustomfield->slug; - $cf_id = "cf" . $findcustomfield->id; - if ($request->$cs_name) { - $new_cs = new CustomfieldsCustomFieldAdvsEntryModel(); - $new_cs->parent_adv_id = $adv_id; - $new_cs->custom_field_category_id = $findcustomfield->id; - $new_cs->custom_field_type = $findcustomfield->type; - if (is_array($request->$cs_name)) { - $new_cs->custom_field_value = implode(',', $request->$cs_name); - } else { - $new_cs->custom_field_value = $request->$cs_name; - } - $jsonVal[$cf_id] = $request->$cs_name; - $new_cs->save(); - } - } - - $adv->cf_json = json_encode($jsonVal); - $adv->save(); - - } else { - //update ads - $jsonVal = []; - for ($i = 1; $i < 7; $i++) { - $cat = 'cat' . $i; - if ($request->$cat != 0) { - $findcustomfields = $customField_model->getCustomfieldsJoinCategoryWithCategoryID($cat); - foreach ($findcustomfields as $findcustomfield) { - - $cs_name = 'cf__' . $findcustomfield->slug; - $cf_id = "cf" . $findcustomfield->id; - if ($request->$cs_name) { - $new_cs = CustomfieldsCustomFieldAdvsEntryModel::query()->where('parent_adv_id', $request->update_id)->where('custom_field_category_id', $findcustomfield->id)->first(); - if (!$new_cs) { - $new_cs = new CustomfieldsCustomFieldAdvsEntryModel(); - } - $new_cs->parent_adv_id = $adv->id; - $new_cs->custom_field_category_id = $findcustomfield->id; - $new_cs->custom_field_type = $findcustomfield->type; - if (is_array($request->$cs_name)) { - $new_cs->custom_field_value = implode(',', $request->$cs_name); - } else { - $new_cs->custom_field_value = $request->$cs_name; - } - $jsonVal[$cf_id] = $request->$cs_name; - $new_cs->save(); - } - } - } - } - $findcustomfields = $customField_model->getCustomfieldsJoinCategoryWithCategoryID(); - foreach ($findcustomfields as $findcustomfield) { - - $cs_name = 'cf__' . $findcustomfield->slug; - $cf_id = "cf" . $findcustomfield->id; - if ($request->$cs_name) { - $new_cs = CustomfieldsCustomFieldAdvsEntryModel::query()->where('parent_adv_id', $request->update_id)->where('custom_field_category_id', $findcustomfield->id)->first(); - if (!$new_cs) { - $new_cs = new CustomfieldsCustomFieldAdvsEntryModel(); - } - $new_cs->parent_adv_id = $adv->id; - $new_cs->custom_field_category_id = $findcustomfield->id; - $new_cs->custom_field_type = $findcustomfield->type; - if (is_array($request->$cs_name)) { - $new_cs->custom_field_value = implode(',', $request->$cs_name); - } else { - $new_cs->custom_field_value = $request->$cs_name; - } - $jsonVal[$cf_id] = $request->$cs_name; - $new_cs->save(); - } - } - $adv->cf_json = json_encode($jsonVal); - $adv->save(); - - } + if ($this->adv_model->is_enabled('customfields')) { + app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->store($adv, $request); } diff --git a/addons/default/visiosoft/base-theme/resources/css/login.css b/addons/default/visiosoft/base-theme/resources/css/login.css new file mode 100644 index 000000000..46a28aa04 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/css/login.css @@ -0,0 +1,10 @@ +.login-section, +.register-section { + border: 1px solid #dfdfdf; +} + +.login-section button, .login-section a, +.register-section button, +.register-section a { + font-size: 16px; +} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css index 2b5f54606..4255e2f76 100644 --- a/addons/default/visiosoft/base-theme/resources/css/theme.css +++ b/addons/default/visiosoft/base-theme/resources/css/theme.css @@ -24,15 +24,4 @@ .register-section { padding: 100px 50px; } -} - -.login-section, -.register-section { - border: 1px solid #dfdfdf; -} - -.login-section button, .login-section a, -.register-section button, -.register-section a { - font-size: 16px; } \ 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 554f5262f..e09f05862 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php @@ -16,8 +16,8 @@ return [ 'reset_code' => 'Reset Code', 'password_confirmation' => 'Password Confirmation', 'password' => 'Password', - 'display_name' => 'Display Name', - 'username' => 'Username', + 'first_name' => 'First Name', + 'last_name' => 'Last Name', 'remember_me' => 'Remember Me', 'not_a_member_yet' => 'Not a Member Yet', 'not_a_member_yet_message' => 'Sign up for our members to benefit from our special service', 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 a835db2e3..e8f781a21 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php @@ -16,8 +16,8 @@ return [ 'reset_code' => 'Sıfırlama Kodu', 'password_confirmation' => 'Şifrenizi Onaylayın', 'password' => 'Şifreniz', - 'display_name' => 'İsim Soyisim', - 'username' => 'Kullanıcı Adı', + 'first_name' => 'Adınız', + 'last_name' => 'Soyadınız', 'remember_me' => 'Beni Hatırla', 'not_a_member_yet' => 'Henüz Üye Değil Misiniz', 'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun', 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 4d9117692..8b5632b5e 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 @@ -83,4 +83,5 @@ + {{ asset_add('styles.css','visiosoft.theme.base::css/login.css') }} {% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig index 2e1b9cc08..bc88dc7ff 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig @@ -3,7 +3,7 @@ {% block content %}
- {% set form = form('register').redirect(request_get('redirect', '/')) + {% set form = form('register2').redirect(request_get('redirect', '/')) .get() %} {{ form_open({ 'class': 'row form ' ~ form.options.class , @@ -13,24 +13,24 @@
- {{ form.fields.display_name.input|raw }} + {{ form.fields.first_name.input|raw }}
- {{ form.fields.username.input|raw }} + {{ form.fields.last_name.input|raw }}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php index 40668b609..4bf7cfedc 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php @@ -38,16 +38,18 @@ class Register2FormBuilder extends FormBuilder * @var array */ protected $fields = [ - 'display_name' => [ + 'first_name' => [ + 'instructions' => false, + 'required' => true, + ], + 'last_name' => [ + 'instructions' => false, + 'required' => true, + ], + 'email' => [ 'instructions' => false, ], - 'username' => [ - 'instructions' => false, - ], - 'email' => [ - 'instructions' => false, - ], - 'password' => [ + 'password' => [ 'instructions' => false, ], ]; @@ -69,10 +71,10 @@ class Register2FormBuilder extends FormBuilder * @var array */ protected $options = [ - 'redirect' => '/', - 'success_message' => 'anomaly.module.users::success.user_registered', - 'pending_message' => 'anomaly.module.users::message.pending_admin_activation', - 'confirm_message' => 'anomaly.module.users::message.pending_email_activation', + 'redirect' => '/', + 'success_message' => 'anomaly.module.users::success.user_registered', + 'pending_message' => 'anomaly.module.users::message.pending_admin_activation', + 'confirm_message' => 'anomaly.module.users::message.pending_email_activation', 'activated_message' => 'anomaly.module.users::message.account_activated', ]; diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php index 23cb87b9f..0166b3b35 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php @@ -26,9 +26,9 @@ class Register2FormHandler /** * Handle the form. * - * @param Repository $config - * @param RegisterFormBuilder $builder - * @param UserActivator $activator + * @param Repository $config + * @param RegisterFormBuilder $builder + * @param UserActivator $activator * @throws \Exception */ public function handle( @@ -36,7 +36,8 @@ class Register2FormHandler Dispatcher $events, Register2FormBuilder $builder, UserActivator $activator - ) { + ) + { if (!$builder->canSave()) { return;