From: Mark Date: Mon, 21 Nov 2016 18:15:54 +0000 (+0200) Subject: user registration remove company and owner etc X-Git-Url: https://xp-dev.com/git/namibia/commitdiff_plain/9aa85c56e9cd4cb70d6d651b0e2fb8e9d40c15ff?ds=inline user registration remove company and owner etc --- diff --git a/module/User/src/User/DataBin/Registration.php b/module/User/src/User/DataBin/Registration.php index e1b0308..4e5a769 100644 --- a/module/User/src/User/DataBin/Registration.php +++ b/module/User/src/User/DataBin/Registration.php @@ -40,18 +40,18 @@ class Registration extends \Workspace\Service\DataBin ), 'RequiredInput' => array( 'Company' => array( - 'clientType' => 'DealerClientType', - 'dealerType' => 'DealerType', - 'name' => 'String100', - 'businessName' => 'String100', - 'region' => 'Id', - 'city' => 'Id', - 'postalCode' => 'String10', - 'street' => 'String75', - - 'billingCity' => 'Id', - 'billingPostalCode' => 'String10', - 'billingStreet' => 'String75' +// 'clientType' => 'DealerClientType', +// 'dealerType' => 'DealerType', +// 'name' => 'String100', +// 'businessName' => 'String100', +// 'region' => 'Id', +// 'city' => 'Id', +// 'postalCode' => 'String10', +// 'street' => 'String75', +// +// 'billingCity' => 'Id', +// 'billingPostalCode' => 'String10', +// 'billingStreet' => 'String75' ), 'Profile' => array( 'firstName' => 'String100', @@ -61,44 +61,44 @@ class Registration extends \Workspace\Service\DataBin 'password' => 'String40', 'idNumber' => 'IdNumber', 'dateOfBirth' => 'Date', - 'permissions' => 'Id' +// 'permissions' => 'Id' ), 'Contact' => array( - 'firstName' => 'String50', - 'familyName' => 'String50', - 'mobile' => 'Mobile', - 'office' => 'String12', - 'email' => 'Email' +// 'firstName' => 'String50', +// 'familyName' => 'String50', +// 'mobile' => 'Mobile', +// 'office' => 'String12', +// 'email' => 'Email' ), 'BillingContact' => array( - 'firstName' => 'String50', - 'familyName' => 'String50', - 'mobile' => 'Mobile', - 'office' => 'String12', - 'email' => 'Email' +// 'firstName' => 'String50', +// 'familyName' => 'String50', +// 'mobile' => 'Mobile', +// 'office' => 'String12', +// 'email' => 'Email' ) ), 'OptionalInput' => array( 'Company' => array( - 'group' => 'Id', - 'groupDivision' => 'Id', - 'companyRegistrationNumber' => 'String100', - 'vatNumber' => 'String20', - 'turmiNumber' => 'String50', - 'dealerStockNumber' => 'String50', - 'companyType' => 'CompanyType', - 'turnover' => 'String25', - 'foundMethod' => 'Id', - 'foundMethodDetail' => 'Id', - 'auctionCity' => 'Id', - 'auctionPostalCode' => 'String10', - 'auctionStreet' => 'String75', - 'owners' => 'Array', - 'docStockCertificate' => 'Id', - 'docAddressProof' => 'Id', - 'docCopyOfId' => 'Id', - 'docCopyOfDirectorId' => 'Id', - 'docCompanyRegistration' => 'Id' +// 'group' => 'Id', +// 'groupDivision' => 'Id', +// 'companyRegistrationNumber' => 'String100', +// 'vatNumber' => 'String20', +// 'turmiNumber' => 'String50', +// 'dealerStockNumber' => 'String50', +// 'companyType' => 'CompanyType', +// 'turnover' => 'String25', +// 'foundMethod' => 'Id', +// 'foundMethodDetail' => 'Id', +// 'auctionCity' => 'Id', +// 'auctionPostalCode' => 'String10', +// 'auctionStreet' => 'String75', +// 'owners' => 'Array', +// 'docStockCertificate' => 'Id', +// 'docAddressProof' => 'Id', +// 'docCopyOfId' => 'Id', +// 'docCopyOfDirectorId' => 'Id', +// 'docCompanyRegistration' => 'Id' ), 'Profile' => array( 'subscribeNewsletter' => 'Boolean', diff --git a/module/User/src/User/Service/Registration.php b/module/User/src/User/Service/Registration.php index 3ee232a..4b33854 100644 --- a/module/User/src/User/Service/Registration.php +++ b/module/User/src/User/Service/Registration.php @@ -23,30 +23,31 @@ class Registration extends \User\DataBin\Registration { $contactService = new \Person\Service\Contact(); $contactService->setWorkflow(new \Person\Workflow()); - $companyService = new \Company\Service\Company(); - $companyService->setWorkflow(new \Company\Workflow()); +// $companyService = new \Company\Service\Company(); +// $companyService->setWorkflow(new \Company\Workflow()); $profileService = new \User\Service\Profile(); $profileService->setWorkflow(new \User\Workflow()); //\Utility\Debug::errorLog('create contact', $session->Contact); $contact = $contactService->create($session->Contact); $session->Company['contact'] = $contact->id; - if (isset($session->BillingContact)) - { - //\Utility\Debug::errorLog('create billing contact', $session->BillingContact); - $billingContact = $contactService->create($session->BillingContact); - $session->Company['contbillingContactact'] = $billingContact->id; - } +// if (isset($session->BillingContact)) +// { +// //\Utility\Debug::errorLog('create billing contact', $session->BillingContact); +// $billingContact = $contactService->create($session->BillingContact); +// $session->Company['contbillingContactact'] = $billingContact->id; +// } //\Utility\Debug::errorLog('create company', $session->Company); - $company = $companyService->create($session->Company); - $session->Profile['company'] = $company->id; - if ($session->Profile['permissions'] < 5 || $session->Profile['permissions'] > 8) - { - $session->Profile['permissions'] = 5; - } - //\Utility\Debug::errorLog('create profile', $session->Profile); +// $company = $companyService->create($session->Company); +// $session->Profile['company'] = $company->id; +// if ($session->Profile['permissions'] < 5 || $session->Profile['permissions'] > 8) +// { +// $session->Profile['permissions'] = 5; +// } + $session->Profile['permissions'] = 12; + \Utility\Debug::errorLog('create profile', $session->Profile); $profile = $profileService->create($session->Profile); - $toCompanyId = $company->id; +// $toCompanyId = ''; $toProfileId = $profile->id; $email = $profile->email; $mobile = null; diff --git a/public/js/app/brochure-workspace/register.js b/public/js/app/brochure-workspace/register.js index 31cc8e3..1b8d8dd 100644 --- a/public/js/app/brochure-workspace/register.js +++ b/public/js/app/brochure-workspace/register.js @@ -84,14 +84,14 @@ value : '', maxlength : 100 }, - 'permissions' : { - type : 'select', - id : 'permissions', - title : 'User type', - value : '12', - dataStoreId : 'permissions', - disabled :true - }, + //'permissions' : { + // type : 'select', + // id : 'permissions', + // title : 'User type', + // value : '12', + // dataStoreId : 'permissions', + // readonly :true + //}, 'email' : { type : 'input', id : 'email', @@ -755,17 +755,17 @@ clientType : "This field is required." }, submitHandler: function( form ) { - if (0 == _w.register.ownerCount) { - $('#ownerFirstName').addClass('error'); - $('#ownerFamilyName').addClass('error'); - $('#ownerIdNumber').addClass('error'); - alert('At least 1 owner / director required.'); - return false; - } else { + //if (0 == _w.register.ownerCount) { + //$('#ownerFirstName').addClass('error'); + //$('#ownerFamilyName').addClass('error'); + //$('#ownerIdNumber').addClass('error'); + // alert('At least 1 owner / director required.'); + // return false; + //} else { $('#ownerFirstName').removeClass('error'); $('#ownerFamilyName').removeClass('error'); $('#ownerIdNumber').removeClass('error'); - } + //} $('#btnUpdate').prop('disabled', true); var data = _w.register._prepRegisterUpdateData(); App.API.execTask( @@ -792,15 +792,15 @@ "firstName","familyName","permissions","email","confirmEmail", "pin","confirmPin","idNumber","dateOfBirth","mobile", "subscribeNewsletter" ]; - var companyFields = [ - "dealerType","clientType","group","groupDivision","companyType", - "businessName","name","companyRegistrationNumber","vatNumber","turmiNumber", - "dealerStockNumber","turnover","foundMethod","foundMethodDetail", - "country","region","city","street","postalCode", - "billingCountry","billingRegion","billingCity","billingStreet","billingPostalCode", - "docStockCertificate","docAddressProof","docCopyOfId", - "docCopyOfDirectorId","docCompanyRegistration" - ]; + //var companyFields = [ + // "dealerType","clientType","group","groupDivision","companyType", + // "businessName","name","companyRegistrationNumber","vatNumber","turmiNumber", + // "dealerStockNumber","turnover","foundMethod","foundMethodDetail", + // "country","region","city","street","postalCode", + // "billingCountry","billingRegion","billingCity","billingStreet","billingPostalCode", + // "docStockCertificate","docAddressProof","docCopyOfId", + // "docCopyOfDirectorId","docCompanyRegistration" + // ]; var contactFields = { "contactFirstName" : "firstName", "contactFamilyName" : "familyName", @@ -817,22 +817,23 @@ }; for (var field in data) { - if (-1 != companyFields.indexOf(field)) - { - postData.Company[field] = '' != data[field] ? data[field] : null; - } - else if (-1 != profileFields.indexOf(field)) + //if (-1 != companyFields.indexOf(field)) + //{ + // postData.Company[field] = '' != data[field] ? data[field] : null; + //} + //else + if (-1 != profileFields.indexOf(field)) { postData.Profile[field] = '' != data[field] ? data[field] : null; } - else if (contactFields[field]) - { - postData.Contact[contactFields[field]] = '' != data[field] ? data[field] : null; - } - else if (billingContactFields[field]) - { - postData.BillingContact[billingContactFields[field]] = '' != data[field] ? data[field] : null; - } + //else if (contactFields[field]) + //{ + // postData.Contact[contactFields[field]] = '' != data[field] ? data[field] : null; + //} + //else if (billingContactFields[field]) + //{ + // postData.BillingContact[billingContactFields[field]] = '' != data[field] ? data[field] : null; + //} } postData.Profile.password = postData.Profile.pin; postData.Company.owners = _w.register.owners;