+ {% set isCompany = form.entry.is_company %}
+
+
+
+
+
+
+ {{ form_open({
+ 'class': 'form ' ~ form.options.class ,
+ 'enctype': 'multipart/form-data',
+ 'url':form.options.url
+ })|raw }}
+
+
+ {% include "visiosoft.module.profile::address/partials/fields" %}
+
+
+ {{ form.actions|raw }}
+ {{ form_close() }}
-
-
- {{ form.fields.city.input|raw }}
-
-
-
- {{ form.fields.district.input|raw }}
-
-
+
+
+ {{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/create.js") }}
{% endblock %}
{% endembed %}
{% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/resources/views/address/edit.twig b/addons/default/visiosoft/profile-module/resources/views/address/edit.twig
deleted file mode 100644
index 947a255ba..000000000
--- a/addons/default/visiosoft/profile-module/resources/views/address/edit.twig
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "theme::layouts/default" %}
-
-{% block content %}
- {% embed 'visiosoft.module.profile::profile/index' %}
- {% block detail %}
-
-
-
{{ trans('visiosoft.module.profile::field.edit_address.name') }}
-
-
- {% set form = form('profile', 'adress').entry(adress.id).actions({'update':'update'}).get() %}
- {{ form_open({
- 'class': 'form ' ~ form.options.class ,
- 'enctype': 'multipart/form-data',
- 'url': 'profile/adress/update/'~ adress.id
- })|raw }}
-
-
-
-
- {{ form.fields.adress_name.input|raw }}
-
-
-
- {{ form.fields.adress_gsm_phone.input|raw }}
-
-
-
- {{ form.fields.adress_first_name.input|raw }}
-
-
-
- {{ form.fields.adress_last_name.input|raw }}
-
-
-
-
- {{ form.actions|raw }}
-
-
-
-
-
-
- {{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/country.js") }}
- {{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/address.js") }}
- {% endblock %}
- {% endembed %}
-{% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/resources/views/address/partials/fields.twig b/addons/default/visiosoft/profile-module/resources/views/address/partials/fields.twig
new file mode 100644
index 000000000..82e12095a
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/resources/views/address/partials/fields.twig
@@ -0,0 +1,36 @@
+
+ {{ form.fields.adress_name|raw }}
+
+
+ {{ form.fields.adress_gsm_phone|raw }}
+
+
+ {{ form.fields.adress_first_name|raw }}
+
+
+ {{ form.fields.adress_last_name|raw }}
+
+
+
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php
index d7795d1e1..a3056af25 100644
--- a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php
@@ -5,14 +5,6 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
class AdressFormBuilder extends FormBuilder
{
- /**
- * The form fields.
- *
- * @var array|string
- */
- protected $fields = [
- ];
-
/**
* Additional validation rules.
*
@@ -49,6 +41,8 @@ class AdressFormBuilder extends FormBuilder
* @var array
*/
protected $options = [
+ 'redirect' => '/profile/address',
+ 'success_message' => 'visiosoft.module.profile::message.adress_success_create',
];
/**
diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php
new file mode 100644
index 000000000..1f99c9871
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php
@@ -0,0 +1,36 @@
+setFields(
+ [
+ 'adress_name' => [
+ 'required' => true,
+ ],
+ 'adress_gsm_phone' => [
+ 'required' => true,
+ ],
+ 'adress_first_name' => [
+ 'required' => true,
+ ],
+ 'adress_last_name' => [
+ 'required' => true,
+ ],
+ 'country' => [
+ 'required' => true,
+ ],
+ 'city' => [
+ 'required' => true,
+ ],
+ 'district',
+ 'adress_content' => [
+ 'required' => true,
+ ],
+ ]
+ );
+ }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php
new file mode 100644
index 000000000..c4a8b530a
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php
@@ -0,0 +1,30 @@
+canSave()) {
+ return;
+ }
+
+ $builder->saveForm();
+
+ $entry = $builder->getFormEntry();
+
+ $entry->user_id = Auth::id();
+
+ $entry->save();
+ }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php
new file mode 100644
index 000000000..960ddb4d5
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php
@@ -0,0 +1,65 @@
+ '/profile/address',
+ 'success_message' => 'visiosoft.module.profile::message.adress_success_create',
+ ];
+
+ /**
+ * The form sections.
+ *
+ * @var array
+ */
+ protected $sections = [];
+
+ /**
+ * The form assets.
+ *
+ * @var array
+ */
+ protected $assets = [];
+
+}
diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php
new file mode 100644
index 000000000..d647a9ffc
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php
@@ -0,0 +1,48 @@
+setFields(
+ [
+ 'company' => [
+ 'required' => true,
+ ],
+ 'tax_number' => [
+ 'required' => true,
+ ],
+ 'adress_name' => [
+ 'required' => true,
+ ],
+ 'adress_gsm_phone' => [
+ 'required' => true,
+ ],
+ 'adress_first_name' => [
+ 'required' => true,
+ ],
+ 'adress_last_name' => [
+ 'required' => true,
+ ],
+ 'country' => [
+ 'required' => true,
+ ],
+ 'city' => [
+ 'required' => true,
+ ],
+ 'district',
+ 'adress_content' => [
+ 'required' => true,
+ ],
+ ]
+ );
+
+ if (setting_value('visiosoft.module.profile::show_tax_office')) {
+ $builder->addField('tax_office', [
+ 'required' => true,
+ ]);
+ }
+ }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php
new file mode 100644
index 000000000..9aa52a88c
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php
@@ -0,0 +1,25 @@
+canSave()) {
+ return;
+ }
+
+ $builder->saveForm();
+
+ $entry = $builder->getFormEntry();
+
+ $entry->user_id = Auth::id();
+ $entry->is_company = true;
+
+ $entry->save();
+ }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/AddressController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/AddressController.php
new file mode 100644
index 000000000..0cf3c4fa8
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/AddressController.php
@@ -0,0 +1,50 @@
+address = $address;
+ parent::__construct();
+ }
+
+ public function index(AdressTableBuilder $table)
+ {
+ $address = $this->address->getUserAdress();
+ return $this->view->make('visiosoft.module.profile::address/list', compact('address'));
+ }
+
+ public function create()
+ {
+ return $this->view->make('visiosoft.module.profile::address/create');
+ }
+
+ public function edit($id)
+ {
+ return $this->view->make('visiosoft.module.profile::address/create', compact('id'));
+
+ }
+
+ public function delete($id)
+ {
+ $address = $this->address->newQuery()->find($id);
+
+ if ($address->user_id == Auth::id()) {
+ $address->delete();
+ }
+
+ return $this->redirect->back();
+ }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 8dd0758d1..241a90b33 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -132,71 +132,6 @@ class MyProfileController extends PublicController
}
- public function adressEdit($id)
- {
- $adressModel = new AdressModel();
- $adress = $adressModel->getAdressFirst($id);
- if ($adress->getAttribute('user_id') == Auth::id()) {
- $country = CountryModel::all();
- return $this->view->make('visiosoft.module.profile::address/edit', compact('adress', 'country'));
- }
- }
-
- public function adressSoftDelete($id)
- {
- $address = $this->adressRepository->find($id);
- if ($address->user_id == Auth::id()) {
- $address->update([
- 'deleted_at' => date('Y-m-d H:i:s')
- ]);
- }
- return $this->redirect->back();
- }
-
- public function adressUpdate(AdressFormBuilder $form, Request $request, $id)
- {
- $error = $form->build()->validate()->getFormErrors()->getMessages();
- if (!empty($error)) {
- return $this->redirect->back();
- }
-
- $adressModel = new AdressModel();
- $adress = $adressModel->getAdressFirst($id);
-
- if ($adress->getAttribute('user_id') == Auth::id()) {
-
- $New_value = $request->all();
- $New_value['country_id'] = $New_value['country'];
- unset($New_value['_token'], $New_value['action'], $New_value['country']);
- $adressModel->getAdress($id)->update($New_value);
-
- $message = [];
- $message[] = trans('visiosoft.module.profile::message.adress_success_update');
- return redirect(route('profile::address'))->with('success', $message);
- }
- }
-
- public function adressCreate(AdressFormBuilder $form, Request $request)
- {
- if (isset($request->request->all()['action']) == "save") {
- $error = $form->build()->validate()->getFormErrors()->getMessages();
- if (!empty($error)) {
- return $this->redirect->back();
- }
- $new_adress = $request->request->all();
- unset($new_adress['action'], $new_adress['_to*ken']);
- $new_adress['user_id'] = Auth::id();
-
- $adressModel = new AdressModel();
- $adressModel->getAdress()->create($new_adress);
-
- $message = [];
- $message[] = trans('visiosoft.module.profile::message.adress_success_create');
- return redirect(route('profile::address'))->with('success', $message);
- }
- $country = CountryModel::all();
- return $this->view->make('visiosoft.module.profile::address/create', compact('country'));
- }
public function adressAjaxCreate(AdressFormBuilder $form, Request $request)
{
@@ -274,13 +209,6 @@ class MyProfileController extends PublicController
}
}
- public function Address()
- {
- $address = new AdressModel();
- $address = $address->getUserAdress();
- return $this->view->make('visiosoft.module.profile::address/list', compact('address'));
- }
-
public function disableAccount()
{
diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
index 05a972874..023dc5658 100644
--- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
+++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
@@ -5,6 +5,8 @@ use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface;
use Visiosoft\ProfileModule\Adress\AdressRepository;
use Anomaly\Streams\Platform\Model\Profile\ProfileAdressEntryModel;
use Visiosoft\ProfileModule\Adress\AdressModel;
+use Visiosoft\ProfileModule\Adress\Form\AdressFormBuilder;
+use Visiosoft\ProfileModule\Adress\FormCompany\AddressCompanyFormBuilder;
use Visiosoft\ProfileModule\Http\Middleware\authCheck;
use Visiosoft\ProfileModule\Profile\Password\ForgotPassFormBuilder;
use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder;
@@ -67,14 +69,7 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
'admin/profile/editAdress/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@edit',
'admin/profile/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\Admin\AdressController@adressupdate',
'profile/adress/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressUpdate',
- 'profile/address' => [
- 'as' => 'profile::address',
- 'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@Address',
- ],
- 'profile/adress/create' => [
- 'as' => 'visiosoft.module.profile::adress_create',
- 'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressCreate'
- ],
+
'profile/adress/ajaxCreate' => [
'as' => 'visiosoft.module.profile::adress_ajax_create',
'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressAjaxCreate'
@@ -87,14 +82,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
'as' => 'visiosoft.module.profile::adress_ajax_detail',
'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressAjaxDetail'
],
- 'profile/adress/edit/{id}' => [
- 'as' => 'visiosoft.module.profile::address_edit',
- 'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressEdit'
- ],
- 'profile/adress/soft-del/{id}' => [
- 'as' => 'visiosoft.module.profile::address_soft_delete',
- 'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressSoftDelete'
- ],
/* Profile */
'profile/edit' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@edit',
@@ -128,6 +115,26 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
'ajax/update-user-info' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@updateAjaxProfile',
+
+ //Address
+ 'profile/address' => [
+ 'as' => 'profile::address',
+ 'uses' => 'Visiosoft\ProfileModule\Http\Controller\AddressController@index',
+ ],
+ 'profile/adress/create' => [
+ 'as' => 'visiosoft.module.profile::adress_create',
+ 'uses' => 'Visiosoft\ProfileModule\Http\Controller\AddressController@create'
+ ],
+ 'profile/adress/edit/{id}' => [
+ 'as' => 'visiosoft.module.profile::address_edit',
+ 'uses' => 'Visiosoft\ProfileModule\Http\Controller\AddressController@edit'
+ ],
+ 'profile/adress/delete/{id}' => [
+ 'as' => 'visiosoft.module.profile::address_soft_delete',
+ 'uses' => 'Visiosoft\ProfileModule\Http\Controller\AddressController@delete'
+ ],
+
+
// Cache links
'ajax/get-user-info' => 'Visiosoft\ProfileModule\Http\Controller\CacheController@getUserInfo',
];
@@ -189,6 +196,8 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
'userProfile' => UserFormBuilder::class,
'profile' => ProfileFormBuilder::class,
'signIn' => SignInFormBuilder::class,
+ 'address' => AdressFormBuilder::class,
+ 'addressCompany' => AddressCompanyFormBuilder::class,
ProfileAdressEntryModel::class => AdressModel::class,
];