From: Mark Date: Thu, 27 Oct 2016 11:16:18 +0000 (+0200) Subject: latest updates X-Git-Url: https://xp-dev.com/git/namibia/commitdiff_plain/00360e7bf4369a0f38aeec2a9b695ce2b0243ff4 latest updates --- diff --git a/module/Company/src/Company/Fixture/Company.php b/module/Company/src/Company/Fixture/Company.php index 0d0d423..5fa79c2 100644 --- a/module/Company/src/Company/Fixture/Company.php +++ b/module/Company/src/Company/Fixture/Company.php @@ -43,7 +43,7 @@ class Company extends \Fixture\Service\Fixture 'Company.IndependantBuyer' => array( 'name' => 'IndependantBuyer', 'region' => self::getReference('Region.Gauteng'), - 'city' => self::getReference('Town.Centurion'), + 'city' => self::getReference('Town.Pretoria'), 'postalCode' => '0032', 'street' => 'Lenchen South', 'dealerType' => \Company\Entity\Company::DEALERTYPE_TRADER, @@ -58,7 +58,7 @@ class Company extends \Fixture\Service\Fixture 'Company.Dave' => array( 'name' => 'Dave\'s Dealership', 'region' => self::getReference('Region.Gauteng'), - 'city' => self::getReference('Town.Centurion'), + 'city' => self::getReference('Town.Pretoria'), 'contact' => self::getReference('Contact.Dave'), 'postalCode' => '0032', 'street' => 'Lenchen South', @@ -74,7 +74,7 @@ class Company extends \Fixture\Service\Fixture 'Company.Byron' => array( 'name' => 'Trade Center Dealership', 'region' => self::getReference('Region.Gauteng'), - 'city' => self::getReference('Town.Centurion'), + 'city' => self::getReference('Town.Pretoria'), 'contact' => self::getReference('Contact.Byron'), 'postalCode' => '0032', 'street' => 'Lenchen South', diff --git a/module/Location/src/Location/Fixture/Town.php b/module/Location/src/Location/Fixture/Town.php index 3934c6e..a481099 100644 --- a/module/Location/src/Location/Fixture/Town.php +++ b/module/Location/src/Location/Fixture/Town.php @@ -13,46 +13,6 @@ class Town extends \Fixture\Service\Fixture 'region' => self::getReference('Region.Gauteng'), 'name' => 'Pretoria' ), - 'Town.Centurion' => array( - 'region' => self::getReference('Region.Gauteng'), - 'name' => 'Centurion' - ), - array( - 'region' => self::getReference('Region.Gauteng'), - 'name' => 'Randburg' - ), - array( - 'region' => self::getReference('Region.Natal'), - 'name' => 'Durban' - ), - array( - 'region' => self::getReference('Region.Natal'), - 'name' => 'Port Elizabeth' - ), - array( - 'region' => self::getReference('Region.Natal'), - 'name' => 'Balito' - ), - array( - 'region' => self::getReference('Region.Eastern Cape'), - 'name' => 'Knysna' - ), - array( - 'region' => self::getReference('Region.The South'), - 'name' => 'Middle of Nowhere' - ), - array( - 'region' => self::getReference('Region.The South'), - 'name' => 'Close to Nowhere' - ), - array( - 'region' => self::getReference('Region.The North'), - 'name' => 'Somewhere' - ), - array( - 'region' => self::getReference('Region.The North'), - 'name' => 'Neverwhere' - ), )); } diff --git a/module/User/src/User/Fixture/Profile.php b/module/User/src/User/Fixture/Profile.php index aefcccf..85f84e0 100644 --- a/module/User/src/User/Fixture/Profile.php +++ b/module/User/src/User/Fixture/Profile.php @@ -131,7 +131,7 @@ class Profile extends \Fixture\Service\Fixture 'permissions' => self::getReference('Permissions.TradeCenterUser') ), 'Profile.Admin' => array( - 'email' => 'admin@admin.co.za', + 'email' => 'admin@bid4cars.co.za', 'password' => '123', 'firstName' => 'Full', 'familyName' => 'Administrator', diff --git a/public/index.html b/public/index.html index 8dd3374..01849a4 100644 --- a/public/index.html +++ b/public/index.html @@ -95,25 +95,25 @@ ON AUCTION -
  • - - MY STOCK -
    • -
  • - - TRADE STOCK -
    • -
  • - - MY VALUATIONS -
    • + + + + + + + + + + + +
  • - HISTORICAL DATA -
    • -
  • MY SETTINGS
    • + + +
  • CONTACT US
    • -
  • PRICE GUIDE
    • +
  • diff --git a/public/js/app/brochure-workspace/register.js b/public/js/app/brochure-workspace/register.js index ad587c0..31cc8e3 100644 --- a/public/js/app/brochure-workspace/register.js +++ b/public/js/app/brochure-workspace/register.js @@ -17,30 +17,30 @@ ? true : false; - App.DataStore.setData('companytypes', [ - {"value":"Limited", "label":"Limited"}, - {"value":"PTY Limited", "label":"PTY Limited"}, - {"value":"Closed Corporation", "label":"Closed Corporation"}, - {"value":"Sole Proprietor", "label":"Sole Proprietor"} - ]); - App.DataStore.setData('dealertypes', [ - {"value":"Dealer", "label":"Dealer"}, - {"value":"Wholesale / Trader", "label":"Wholesale / Trader"}, - {"value":"Trade Center", "label":"Trade Center"} - ]); - App.DataStore.setData('clienttypes', [ - {"value":"Buyer", "label":"Buyer"}, - {"value":"Buyer & Seller", "label":"Buyer & Seller"} - ]); - App.DataStore.setData('companyturnover', [ - {"value":"Turnover > R500,000", "label":"Turnover > R500,000"}, - {"value":"Turnover > R2,000,000", "label":"Turnover > R2,000,000"}, - {"value":"Turnover > R3,000,000", "label":"Turnover > R3,000,000"} - ]); + //App.DataStore.setData('companytypes', [ + // {"value":"Limited", "label":"Limited"}, + // {"value":"PTY Limited", "label":"PTY Limited"}, + // {"value":"Closed Corporation", "label":"Closed Corporation"}, + // {"value":"Sole Proprietor", "label":"Sole Proprietor"} + // ]); + //App.DataStore.setData('dealertypes', [ + // {"value":"Dealer", "label":"Dealer"}, + // {"value":"Wholesale / Trader", "label":"Wholesale / Trader"}, + // {"value":"Trade Center", "label":"Trade Center"} + // ]); + //App.DataStore.setData('clienttypes', [ + // {"value":"Buyer", "label":"Buyer"}, + // {"value":"Buyer & Seller", "label":"Buyer & Seller"} + // ]); + //App.DataStore.setData('companyturnover', [ + // {"value":"Turnover > R500,000", "label":"Turnover > R500,000"}, + // {"value":"Turnover > R2,000,000", "label":"Turnover > R2,000,000"}, + // {"value":"Turnover > R3,000,000", "label":"Turnover > R3,000,000"} + // ]); App.DataStore.loadSelectListData('permissions', true, 'User', 'Permissions.SelectList'); - App.DataStore.loadSelectListData('countries', true, 'Location', 'Country.SelectList'); - App.DataStore.loadSelectListData('groups', true, 'Company', 'Group.SelectList'); - App.DataStore.loadSelectListData('foundmethods', true, 'Company', 'FoundMethod.SelectList'); + //App.DataStore.loadSelectListData('countries', true, 'Location', 'Country.SelectList'); + //App.DataStore.loadSelectListData('groups', true, 'Company', 'Group.SelectList'); + //App.DataStore.loadSelectListData('foundmethods', true, 'Company', 'FoundMethod.SelectList'); @@ -88,9 +88,9 @@ type : 'select', id : 'permissions', title : 'User type', - value : 'Auction Buyer', + value : '12', dataStoreId : 'permissions', - readonly :true + disabled :true }, 'email' : { type : 'input', @@ -151,480 +151,480 @@ }, // Dealership contact - 'contactFirstName' : { - type : 'input', - id : 'contactFirstName', - title : 'Name', - value : '', - maxlength : 50 - }, - 'contactFamilyName' : { - type : 'input', - id : 'contactFamilyName', - title : 'Surname', - value : '', - maxlength : 50 - }, - 'contactOffice' : { - type : 'input', - id : 'contactOffice', - title : 'Landline', - value : '', - maxlength : 20 - }, - 'contactMobile' : { - type : 'mobile', - id : 'contactMobile', - title : 'Mobile number', - value : '', - maxlength : 20 - }, - 'contactEmail' : { - type : 'input', - id : 'contactEmail', - title : 'Email', - value : '', - maxlength : 255 - }, - - // Dealership details - 'dealerType' : { - type : 'select', - id : 'dealerType', - title : 'Registration type', - value : '', - dataStoreId : 'dealertypes' - }, - 'clientType' : { - type : 'select', - id : 'clientType', - title : 'Register as', - value : '', - dataStoreId : 'clienttypes' - }, - 'group' : { - type : 'select', - id : 'group', - title : 'Group Member', - value : '', - dataStoreId : 'groups', - onChange : function () { - if (!App.DataStore.getItem('BuildSelect:group', false)) - { - var groupId = $('#group').val(); - App.DataStore.loadSelectListData( - 'groupdivisions', false, 'Company', 'GroupDivision.SelectList', - null, {Filter: {group: groupId}} - ); - } - } - }, - 'groupDivision' : { - type : 'select', - id : 'groupDivision', - title : 'Group Division', - value : '', - dataStoreId : 'groupdivisions' - }, - 'companyType' : { - type : 'select', - id : 'companyType', - title : 'Company type', - value : '', - dataStoreId : 'companytypes', - onChange : function() { - if (!App.DataStore.getItem('BuildSelect:companyType', false)) - { - if ('Sole Proprietor' == $(this).val()) - { - $('#' + _w.register.ti.tid + '_docCopyOfDirectorId').hide(); - $('#' + _w.register.ti.tid + '_docCompanyRegistration').hide(); - $('#' + _w.register.ti.tid + '_docStockCertificate').show(); - $('#' + _w.register.ti.tid + '_docCopyOfId').show(); - $('#' + _w.register.ti.tid + '_docAddressProof').show(); - } - else - { - $('#' + _w.register.ti.tid + '_docStockCertificate').hide(); - $('#' + _w.register.ti.tid + '_docCopyOfId').hide(); - $('#' + _w.register.ti.tid + '_docAddressProof').show(); - $('#' + _w.register.ti.tid + '_docCopyOfDirectorId').show(); - $('#' + _w.register.ti.tid + '_docCompanyRegistration').show(); - } - } - } - }, - 'businessName' : { - type : 'input', - id : 'businessName', - title : 'Registered business name', - value : '', - maxlength : 100 - }, - 'name' : { - type : 'input', - id : 'name', - title : 'Trading name', - value : '', - maxlength : 100 - }, - 'companyRegistrationNumber' : { - type : 'input', - id : 'companyRegistrationNumber', - title : 'Company Reg no', - value : '', - mask : '9999/999999/99', - maxlength : 14 - }, - 'vatNumber' : { - type : 'input', - id : 'vatNumber', - title : 'Vat no', - value : '', - maxlength : 20 - }, - 'turmiNumber' : { - type : 'input', - id : 'turmiNumber', - title : 'TransUnion membership no', - value : '', - maxlength : 50 - }, - 'dealerStockNumber' : { - type : 'input', - id : 'dealerStockNumber', - title : 'Dealer stock no', - value : '', - maxlength : 50 - }, - 'turnover' : { - type : 'select', - id : 'turnover', - title : 'Turnover', - value : '', - dataStoreId : 'companyturnover' - }, - 'foundMethod' : { - type : 'select', - id : 'foundMethod', - title : 'Where did you find us?', - value : '', - dataStoreId : 'foundmethods', - onChange : function () { - if (!App.DataStore.getItem('BuildSelect:foundMethod', false)) - { - var foundId = $('#foundMethod').val(); - App.DataStore.loadSelectListData( - 'foundmethoddetails', false, 'Company', 'FoundMethodDetail.SelectList', - null, {Filter: {foundMethod: foundId}} - ); - } - } - }, - 'foundMethodDetail' : { - type : 'select', - id : 'foundMethodDetail', - title : 'Details', - value : '', - dataStoreId : 'foundmethoddetails' - }, - - - // Adresses and billing contact - 'country' : { - type : 'select', - id : 'country', - title : 'Country', - dataStoreId : 'countries', - value : '', - onChange : function () { - if (!App.DataStore.getItem('BuildSelect:country', false)) - { - App.DataStore.loadSelectListData( - 'regions', false, 'Location', 'Region.SelectList', null, - {"Filter": { - "country" : $(this).val() - }} - ); - App.DataStore.setData('cities', []); - if ($('#sameAsBusinessAddress').prop('checked')) - { - $('#billingCountry').selectpicker('val', $('#country').val()); - } - } - } - }, - 'region' : { - type : 'select', - id : 'region', - title : 'Region', - dataStoreId : 'regions', - value : '', - onChange : function () { - if (!App.DataStore.getItem('BuildSelect:region', false)) - { - App.DataStore.loadSelectListData( - 'cities', false, 'Location', 'Town.SelectList', null, - {"Filter": { - "region" : $(this).val() - }} - ); - if ($('#sameAsBusinessAddress').prop('checked')) - { - $('#billingRegion').selectpicker('val', $('#region').val()); - } - } - } - }, - 'city' : { - type : 'select', - id : 'city', - title : 'Town', - dataStoreId : 'cities', - value : '' - }, - 'street' : { - type : 'input', - id : 'street', - title : 'Street', - value : '', - maxlength : 75 - }, - 'postalCode' : { - type : 'input', - id : 'postalCode', - title : 'Code', - value : '', - maxlength : 10 - }, - 'sameAsBusinessAddress' : { - type : 'checkbox', - id : 'sameAsBusinessAddress', - title : 'Same as business address', - value : '', - onChange : function() { - if ($(this).prop('checked')) - { - App.DataStore.setItem('BuildSelect:migrateCountry', true); - $('#billingCountry').selectpicker('val', $('#country').val()); - App.DataStore.removeItem('BuildSelect:migrateCountry'); - App.DataStore.setItem('BuildSelect:migrateRegion', true); - App.DataStore.loadSelectListData( - 'billregions', false, 'Location', 'Region.SelectList', null, - {"Filter": { - "country" : $('#country').val() - }}, {}, function() { - $('#billingRegion').selectpicker('val', $('#region').val()); - App.DataStore.removeItem('BuildSelect:migrateRegion'); - } - ); - App.DataStore.setItem('BuildSelect:migrateTown', true); - App.DataStore.loadSelectListData( - 'billcities', false, 'Location', 'Town.SelectList', null, - {"Filter": { - "region" : $('#region').val() - }}, {}, function() { - $('#billingCity').selectpicker('val', $('#city').val()); - } - ); - $('#billingStreet').val($('#street').val()); - $('#billingPostalCode').val($('#postalCode').val()); - } - else - { - $('#billingCountry').selectpicker('val', ''); - App.DataStore.setData('billregions', []); - App.DataStore.setData('billcities', []); - $('#billingStreet').val(''); - $('#billingPostalCode').val(''); - } - } - }, - 'billingCountry' : { - type : 'select', - id : 'billingCountry', - title : 'Country', - dataStoreId : 'countries', - value : '', - onChange : function () { - if (!App.DataStore.getItem('BuildSelect:billingCountry', false) - && !App.DataStore.getItem('BuildSelect:migrateCountry', false)) - { - App.DataStore.loadSelectListData( - 'billregions', false, 'Location', 'Region.SelectList', null, - {"Filter": { - "country" : $(this).val() - }} - ); - App.DataStore.setData('billcities', []); - } - } - }, - 'billingRegion' : { - type : 'select', - id : 'billingRegion', - title : 'Region', - dataStoreId : 'billregions', - value : '', - onChange : function () { - if (!App.DataStore.getItem('BuildSelect:billingRegion', false) - && !App.DataStore.getItem('BuildSelect:migrateRegion', false)) - { - App.DataStore.loadSelectListData( - 'billcities', false, 'Location', 'Town.SelectList', null, - {"Filter": { - "region" : $(this).val() - }} - ); - } - } - }, - 'billingCity' : { - type : 'select', - id : 'billingCity', - title : 'Town', - dataStoreId : 'billcities', - value : '' - }, - 'billingStreet' : { - type : 'input', - id : 'billingStreet', - title : 'Street', - value : '', - maxlength : 75 - }, - 'billingPostalCode' : { - type : 'input', - id : 'billingPostalCode', - title : 'Code', - value : '', - maxlength : 10 - }, - - 'sameAsDealerContact' : { - type : 'checkbox', - id : 'sameAsDealerContact', - title : 'Same as dealership contact', - value : '', - onChange : function() { - if ($(this).prop('checked')) - { - $('#billingFirstName').val($('#contactFirstName').val()); - $('#billingFamilyName').val($('#contactFamilyName').val()); - $('#billingOffice').val($('#contactOffice').val()); - $('#billingMobile').val($('#contactMobile').val()); - $('#billingEmail').val($('#contactEmail').val()); - } - else - { - $('#billingFirstName').val(''); - $('#billingFamilyName').val(''); - $('#billingOffice').val(''); - $('#billingMobile').val(''); - $('#billingEmail').val(''); - } - } - }, - 'billingFirstName' : { - type : 'input', - id : 'billingFirstName', - title : 'Name', - value : '', - maxlength : 50 - }, - 'billingFamilyName' : { - type : 'input', - id : 'billingFamilyName', - title : 'Surname', - value : '', - maxlength : 50 - }, - 'billingOffice' : { - type : 'input', - id : 'billingOffice', - title : 'Landline', - value : '', - maxlength : 20 - }, - 'billingMobile' : { - type : 'mobile', - id : 'billingMobile', - title : 'Mobile number', - value : '', - maxlength : 20 - }, - 'billingEmail' : { - type : 'input', - id : 'billingEmail', - title : 'Email', - value : '', - maxlength : 255 - }, - - // Owners - 'ownerFirstName' : { - type : 'input', - id : 'ownerFirstName', - title : 'Name', - value : '', - maxlength : 100 - }, - 'ownerFamilyName' : { - type : 'input', - id : 'ownerFamilyName', - title : 'Surname', - value : '', - maxlength : 100 - }, - 'ownerIdNumber' : { - type : 'input', - id : 'ownerIdNumber', - title : 'ID Number', - value : '', - maxlength : 13 - }, - 'owners' : { - type : 'collector', - id : 'owners', - value : [] - }, - - // Documents - 'docStockCertificate' : { - type : 'document', - id : 'docStockCertificate', - title : 'Dealer stock certificate', - value : null - }, - 'docAddressProof' : { - type : 'document', - id : 'docAddressProof', - title : 'Proof of business address', - value : null - }, - 'docCopyOfId' : { - type : 'document', - id : 'docCopyOfId', - title : 'Copy of ID document', - value : null - }, - 'docCopyOfDirectorId' : { - type : 'document', - id : 'docCopyOfDirectorId', - title : 'Copy of directors ID document', - value : null - }, - 'docCompanyRegistration' : { - type : 'document', - id : 'docCompanyRegistration', - title : 'Company registration document', - value : null - }, + //'contactFirstName' : { + // type : 'input', + // id : 'contactFirstName', + // title : 'Name', + // value : '', + // maxlength : 50 + //}, + //'contactFamilyName' : { + // type : 'input', + // id : 'contactFamilyName', + // title : 'Surname', + // value : '', + // maxlength : 50 + //}, + //'contactOffice' : { + // type : 'input', + // id : 'contactOffice', + // title : 'Landline', + // value : '', + // maxlength : 20 + //}, + //'contactMobile' : { + // type : 'mobile', + // id : 'contactMobile', + // title : 'Mobile number', + // value : '', + // maxlength : 20 + //}, + //'contactEmail' : { + // type : 'input', + // id : 'contactEmail', + // title : 'Email', + // value : '', + // maxlength : 255 + //}, + // + //// Dealership details + //'dealerType' : { + // type : 'select', + // id : 'dealerType', + // title : 'Registration type', + // value : '', + // dataStoreId : 'dealertypes' + //}, + //'clientType' : { + // type : 'select', + // id : 'clientType', + // title : 'Register as', + // value : '', + // dataStoreId : 'clienttypes' + //}, + //'group' : { + // type : 'select', + // id : 'group', + // title : 'Group Member', + // value : '', + // dataStoreId : 'groups', + // onChange : function () { + // if (!App.DataStore.getItem('BuildSelect:group', false)) + // { + // var groupId = $('#group').val(); + // App.DataStore.loadSelectListData( + // 'groupdivisions', false, 'Company', 'GroupDivision.SelectList', + // null, {Filter: {group: groupId}} + // ); + // } + // } + //}, + //'groupDivision' : { + // type : 'select', + // id : 'groupDivision', + // title : 'Group Division', + // value : '', + // dataStoreId : 'groupdivisions' + //}, + //'companyType' : { + // type : 'select', + // id : 'companyType', + // title : 'Company type', + // value : '', + // dataStoreId : 'companytypes', + // onChange : function() { + // if (!App.DataStore.getItem('BuildSelect:companyType', false)) + // { + // if ('Sole Proprietor' == $(this).val()) + // { + // $('#' + _w.register.ti.tid + '_docCopyOfDirectorId').hide(); + // $('#' + _w.register.ti.tid + '_docCompanyRegistration').hide(); + // $('#' + _w.register.ti.tid + '_docStockCertificate').show(); + // $('#' + _w.register.ti.tid + '_docCopyOfId').show(); + // $('#' + _w.register.ti.tid + '_docAddressProof').show(); + // } + // else + // { + // $('#' + _w.register.ti.tid + '_docStockCertificate').hide(); + // $('#' + _w.register.ti.tid + '_docCopyOfId').hide(); + // $('#' + _w.register.ti.tid + '_docAddressProof').show(); + // $('#' + _w.register.ti.tid + '_docCopyOfDirectorId').show(); + // $('#' + _w.register.ti.tid + '_docCompanyRegistration').show(); + // } + // } + // } + //}, + //'businessName' : { + // type : 'input', + // id : 'businessName', + // title : 'Registered business name', + // value : '', + // maxlength : 100 + //}, + //'name' : { + // type : 'input', + // id : 'name', + // title : 'Trading name', + // value : '', + // maxlength : 100 + //}, + //'companyRegistrationNumber' : { + // type : 'input', + // id : 'companyRegistrationNumber', + // title : 'Company Reg no', + // value : '', + // mask : '9999/999999/99', + // maxlength : 14 + //}, + //'vatNumber' : { + // type : 'input', + // id : 'vatNumber', + // title : 'Vat no', + // value : '', + // maxlength : 20 + //}, + //'turmiNumber' : { + // type : 'input', + // id : 'turmiNumber', + // title : 'TransUnion membership no', + // value : '', + // maxlength : 50 + //}, + //'dealerStockNumber' : { + // type : 'input', + // id : 'dealerStockNumber', + // title : 'Dealer stock no', + // value : '', + // maxlength : 50 + //}, + //'turnover' : { + // type : 'select', + // id : 'turnover', + // title : 'Turnover', + // value : '', + // dataStoreId : 'companyturnover' + //}, + //'foundMethod' : { + // type : 'select', + // id : 'foundMethod', + // title : 'Where did you find us?', + // value : '', + // dataStoreId : 'foundmethods', + // onChange : function () { + // if (!App.DataStore.getItem('BuildSelect:foundMethod', false)) + // { + // var foundId = $('#foundMethod').val(); + // App.DataStore.loadSelectListData( + // 'foundmethoddetails', false, 'Company', 'FoundMethodDetail.SelectList', + // null, {Filter: {foundMethod: foundId}} + // ); + // } + // } + //}, + //'foundMethodDetail' : { + // type : 'select', + // id : 'foundMethodDetail', + // title : 'Details', + // value : '', + // dataStoreId : 'foundmethoddetails' + //}, + // + // + //// Adresses and billing contact + //'country' : { + // type : 'select', + // id : 'country', + // title : 'Country', + // dataStoreId : 'countries', + // value : '', + // onChange : function () { + // if (!App.DataStore.getItem('BuildSelect:country', false)) + // { + // App.DataStore.loadSelectListData( + // 'regions', false, 'Location', 'Region.SelectList', null, + // {"Filter": { + // "country" : $(this).val() + // }} + // ); + // App.DataStore.setData('cities', []); + // if ($('#sameAsBusinessAddress').prop('checked')) + // { + // $('#billingCountry').selectpicker('val', $('#country').val()); + // } + // } + // } + //}, + //'region' : { + // type : 'select', + // id : 'region', + // title : 'Region', + // dataStoreId : 'regions', + // value : '', + // onChange : function () { + // if (!App.DataStore.getItem('BuildSelect:region', false)) + // { + // App.DataStore.loadSelectListData( + // 'cities', false, 'Location', 'Town.SelectList', null, + // {"Filter": { + // "region" : $(this).val() + // }} + // ); + // if ($('#sameAsBusinessAddress').prop('checked')) + // { + // $('#billingRegion').selectpicker('val', $('#region').val()); + // } + // } + // } + //}, + //'city' : { + // type : 'select', + // id : 'city', + // title : 'Town', + // dataStoreId : 'cities', + // value : '' + //}, + //'street' : { + // type : 'input', + // id : 'street', + // title : 'Street', + // value : '', + // maxlength : 75 + //}, + //'postalCode' : { + // type : 'input', + // id : 'postalCode', + // title : 'Code', + // value : '', + // maxlength : 10 + //}, + //'sameAsBusinessAddress' : { + // type : 'checkbox', + // id : 'sameAsBusinessAddress', + // title : 'Same as business address', + // value : '', + // onChange : function() { + // if ($(this).prop('checked')) + // { + // App.DataStore.setItem('BuildSelect:migrateCountry', true); + // $('#billingCountry').selectpicker('val', $('#country').val()); + // App.DataStore.removeItem('BuildSelect:migrateCountry'); + // App.DataStore.setItem('BuildSelect:migrateRegion', true); + // App.DataStore.loadSelectListData( + // 'billregions', false, 'Location', 'Region.SelectList', null, + // {"Filter": { + // "country" : $('#country').val() + // }}, {}, function() { + // $('#billingRegion').selectpicker('val', $('#region').val()); + // App.DataStore.removeItem('BuildSelect:migrateRegion'); + // } + // ); + // App.DataStore.setItem('BuildSelect:migrateTown', true); + // App.DataStore.loadSelectListData( + // 'billcities', false, 'Location', 'Town.SelectList', null, + // {"Filter": { + // "region" : $('#region').val() + // }}, {}, function() { + // $('#billingCity').selectpicker('val', $('#city').val()); + // } + // ); + // $('#billingStreet').val($('#street').val()); + // $('#billingPostalCode').val($('#postalCode').val()); + // } + // else + // { + // $('#billingCountry').selectpicker('val', ''); + // App.DataStore.setData('billregions', []); + // App.DataStore.setData('billcities', []); + // $('#billingStreet').val(''); + // $('#billingPostalCode').val(''); + // } + // } + //}, + //'billingCountry' : { + // type : 'select', + // id : 'billingCountry', + // title : 'Country', + // dataStoreId : 'countries', + // value : '', + // onChange : function () { + // if (!App.DataStore.getItem('BuildSelect:billingCountry', false) + // && !App.DataStore.getItem('BuildSelect:migrateCountry', false)) + // { + // App.DataStore.loadSelectListData( + // 'billregions', false, 'Location', 'Region.SelectList', null, + // {"Filter": { + // "country" : $(this).val() + // }} + // ); + // App.DataStore.setData('billcities', []); + // } + // } + //}, + //'billingRegion' : { + // type : 'select', + // id : 'billingRegion', + // title : 'Region', + // dataStoreId : 'billregions', + // value : '', + // onChange : function () { + // if (!App.DataStore.getItem('BuildSelect:billingRegion', false) + // && !App.DataStore.getItem('BuildSelect:migrateRegion', false)) + // { + // App.DataStore.loadSelectListData( + // 'billcities', false, 'Location', 'Town.SelectList', null, + // {"Filter": { + // "region" : $(this).val() + // }} + // ); + // } + // } + //}, + //'billingCity' : { + // type : 'select', + // id : 'billingCity', + // title : 'Town', + // dataStoreId : 'billcities', + // value : '' + //}, + //'billingStreet' : { + // type : 'input', + // id : 'billingStreet', + // title : 'Street', + // value : '', + // maxlength : 75 + //}, + //'billingPostalCode' : { + // type : 'input', + // id : 'billingPostalCode', + // title : 'Code', + // value : '', + // maxlength : 10 + //}, + // + //'sameAsDealerContact' : { + // type : 'checkbox', + // id : 'sameAsDealerContact', + // title : 'Same as dealership contact', + // value : '', + // onChange : function() { + // if ($(this).prop('checked')) + // { + // $('#billingFirstName').val($('#contactFirstName').val()); + // $('#billingFamilyName').val($('#contactFamilyName').val()); + // $('#billingOffice').val($('#contactOffice').val()); + // $('#billingMobile').val($('#contactMobile').val()); + // $('#billingEmail').val($('#contactEmail').val()); + // } + // else + // { + // $('#billingFirstName').val(''); + // $('#billingFamilyName').val(''); + // $('#billingOffice').val(''); + // $('#billingMobile').val(''); + // $('#billingEmail').val(''); + // } + // } + //}, + //'billingFirstName' : { + // type : 'input', + // id : 'billingFirstName', + // title : 'Name', + // value : '', + // maxlength : 50 + //}, + //'billingFamilyName' : { + // type : 'input', + // id : 'billingFamilyName', + // title : 'Surname', + // value : '', + // maxlength : 50 + //}, + //'billingOffice' : { + // type : 'input', + // id : 'billingOffice', + // title : 'Landline', + // value : '', + // maxlength : 20 + //}, + //'billingMobile' : { + // type : 'mobile', + // id : 'billingMobile', + // title : 'Mobile number', + // value : '', + // maxlength : 20 + //}, + //'billingEmail' : { + // type : 'input', + // id : 'billingEmail', + // title : 'Email', + // value : '', + // maxlength : 255 + //}, + // + //// Owners + //'ownerFirstName' : { + // type : 'input', + // id : 'ownerFirstName', + // title : 'Name', + // value : '', + // maxlength : 100 + //}, + //'ownerFamilyName' : { + // type : 'input', + // id : 'ownerFamilyName', + // title : 'Surname', + // value : '', + // maxlength : 100 + //}, + //'ownerIdNumber' : { + // type : 'input', + // id : 'ownerIdNumber', + // title : 'ID Number', + // value : '', + // maxlength : 13 + //}, + //'owners' : { + // type : 'collector', + // id : 'owners', + // value : [] + //}, + // + //// Documents + //'docStockCertificate' : { + // type : 'document', + // id : 'docStockCertificate', + // title : 'Dealer stock certificate', + // value : null + //}, + //'docAddressProof' : { + // type : 'document', + // id : 'docAddressProof', + // title : 'Proof of business address', + // value : null + //}, + //'docCopyOfId' : { + // type : 'document', + // id : 'docCopyOfId', + // title : 'Copy of ID document', + // value : null + //}, + //'docCopyOfDirectorId' : { + // type : 'document', + // id : 'docCopyOfDirectorId', + // title : 'Copy of directors ID document', + // value : null + //}, + //'docCompanyRegistration' : { + // type : 'document', + // id : 'docCompanyRegistration', + // title : 'Company registration document', + // value : null + //}, 'subscribeNewsletter' : { type : 'checkbox', id : 'subscribeNewsletter', - title : 'Sign me up for the monthly newsletter abd Bid4Cars updates.', + title : 'Sign me up for the monthly newsletter and Bid4Cars updates.', value : false }, 'acceptTermsAndConditions' : { @@ -690,7 +690,7 @@ rules: { firstName: {required: true}, familyName: {required: true}, - permissions: {required: true}, + permissions: {required: false}, email: {required: true, email: true, remote: { url: "/workspace/check-unique-email", type: "post" @@ -702,40 +702,40 @@ dateOfBirth: {required: true, dateISO: true}, mobile: {required: true, mobile: true}, - contactFirstName: {required: true}, - contactFamilyName: {required: true}, - contactOffice: {required: true, digits: true}, - contactMobile: {required: true, mobile: true}, - contactEmail: {required: true, email: true}, - - dealerType: {required: true}, - clientType: {required: true}, - companyType: {required: true}, - businessName: {required: true}, - name: {required: true, remote: { - url: "/workspace/check-unique-company", - type: "post" - }}, - companyRegistrationNumber: {companyReg: true}, - vatNumber: {digits: true}, + //contactFirstName: {required: true}, + //contactFamilyName: {required: true}, + //contactOffice: {required: true, digits: true}, + //contactMobile: {required: true, mobile: true}, + //contactEmail: {required: true, email: true}, - country: {required: true}, - region: {required: true}, - city: {required: true}, - street: {required: true}, - postalCode: {required: true, digits: true}, - billingCountry: {required: true}, - billingRegion: {required: true}, - billingCity: {required: true}, - billingStreet: {required: true}, - billingPostalCode: {required: true, digits: true}, - billingFirstName: {required: true}, - billingFamilyName: {required: true}, - billingOffice: {required: true, digits: true}, - billingMobile: {required: true, mobile: true}, - billingEmail: {required: true, email: true}, + //dealerType: {required: true}, + //clientType: {required: true}, + //companyType: {required: true}, + //businessName: {required: true}, + //name: {required: true, remote: { + // url: "/workspace/check-unique-company", + // type: "post" + // }}, + //companyRegistrationNumber: {companyReg: true}, + //vatNumber: {digits: true}, - ownerIdNumber: {minlength: 13, maxlength: 13, digits: true} + //country: {required: true}, + //region: {required: true}, + //city: {required: true}, + //street: {required: true}, + //postalCode: {required: true, digits: true}, + //billingCountry: {required: true}, + //billingRegion: {required: true}, + //billingCity: {required: true}, + //billingStreet: {required: true}, + //billingPostalCode: {required: true, digits: true}, + //billingFirstName: {required: true}, + //billingFamilyName: {required: true}, + //billingOffice: {required: true, digits: true}, + //billingMobile: {required: true, mobile: true}, + //billingEmail: {required: true, email: true}, + // + //ownerIdNumber: {minlength: 13, maxlength: 13, digits: true} }, messages: { email: { email: "Must be a valid email address.", remote: "Email address already in use."}, diff --git a/public/js/app/element-library.js b/public/js/app/element-library.js index e946889..8d8c0a8 100644 --- a/public/js/app/element-library.js +++ b/public/js/app/element-library.js @@ -769,7 +769,7 @@ var html = ''; html += '
    '; - html += '+27'; + html += '+264'; html += ''; html += '
    '; @@ -1210,11 +1210,11 @@ { value = value.substring(1); } - if ('string' == typeof value && '27' == value.substring(0,2)) + if ('string' == typeof value && '264' == value.substring(0,2)) { value = value.substring(2); } - if ('string' == typeof value && '+27' == value.substring(0,3)) + if ('string' == typeof value && '+264' == value.substring(0,3)) { value = value.substring(3); } @@ -1285,11 +1285,11 @@ { value = value.substring(1); } - if (value && '+27' == value.substring(0,3)) + if (value && '+264' == value.substring(0,3)) { value = value.substring(3); } - return '+27' + value; + return '+264' + value; break; case 'htmltext': return $('#' + meta.id).html(); diff --git a/public/js/app/portal-workspace/auction.js b/public/js/app/portal-workspace/auction.js index 2f28fe1..e213137 100644 --- a/public/js/app/portal-workspace/auction.js +++ b/public/js/app/portal-workspace/auction.js @@ -148,46 +148,46 @@ constructor: 'GridContextFilter', items: { - RefNum: { - title: 'Search here:', - style: 'filter-input-wrapper hidden-tablet hidden-phone', - id: 'gridAuctionContext_RefNo', - placeholder: 'Ref number', - context: 'gridAuctionContext' - }, - RegNum: { - style: 'filter-input-wrapper hidden-tablet hidden-phone', - id: 'gridAuctionContext_RegNo', - placeholder: 'Registration number', - context: 'gridAuctionContext' - }, - DateFrom: { - style: 'input-append date filter-input-wrapper-date mobile-width12p dfrom hidden-tablet hidden-phone', - title: 'Search by date here', - id: 'gridAuctionContext_DateFrom', - placeholder: 'From', - context: 'gridAuctionContext', - append: '', - readonly: true, - bind: function () { - $('#gridAuctionContext_DateFrom').change(function () { - _w.auction.dFrom = $(this).val(); - }); - } - }, - DateTo: { - style: 'input-append date filter-input-wrapper-date mobile-width12p dto hidden-tablet hidden-phone', - id: 'gridAuctionContext_DateTo', - placeholder: 'To', - context: 'gridAuctionContext', - append: '', - readonly: true, - bind: function () { - $('#gridAuctionContext_DateTo').change(function () { - _w.auction.dTo = $(this).val(); - }); - } - }, + //RefNum: { + // title: 'Search here:', + // style: 'filter-input-wrapper hidden-tablet hidden-phone', + // id: 'gridAuctionContext_RefNo', + // placeholder: 'Ref number', + // context: 'gridAuctionContext' + //}, + //RegNum: { + // style: 'filter-input-wrapper hidden-tablet hidden-phone', + // id: 'gridAuctionContext_RegNo', + // placeholder: 'Registration number', + // context: 'gridAuctionContext' + //}, + //DateFrom: { + // style: 'input-append date filter-input-wrapper-date mobile-width12p dfrom hidden-tablet hidden-phone', + // title: 'Search by date here', + // id: 'gridAuctionContext_DateFrom', + // placeholder: 'From', + // context: 'gridAuctionContext', + // append: '', + // readonly: true, + // bind: function () { + // $('#gridAuctionContext_DateFrom').change(function () { + // _w.auction.dFrom = $(this).val(); + // }); + // } + //}, + //DateTo: { + // style: 'input-append date filter-input-wrapper-date mobile-width12p dto hidden-tablet hidden-phone', + // id: 'gridAuctionContext_DateTo', + // placeholder: 'To', + // context: 'gridAuctionContext', + // append: '', + // readonly: true, + // bind: function () { + // $('#gridAuctionContext_DateTo').change(function () { + // _w.auction.dTo = $(this).val(); + // }); + // } + //}, MakeMobi: { style: 'filter-input-wrapper filter-input-select', placeholder: 'Make Mobi', @@ -223,11 +223,11 @@ context: 'gridAuctionContext' }, Buttons: { - actions: true, - searchId: 'btnSearch', - bindSearch: _w.auction.searchAuctionGrid, - clearId: 'btnClearSearch', - bindClear: _w.auction.clearAuctionGridContext + //actions: true, + //searchId: 'btnSearch', + //bindSearch: _w.auction.searchAuctionGrid, + //clearId: 'btnClearSearch', + //bindClear: _w.auction.clearAuctionGridContext } } @@ -235,19 +235,19 @@ 'gridColumnHeaders': { constructor: 'GridColumnHeader', items: { - Seller: { - id: 'gridAuctionColumn_Seller', - title: 'SELLER', - orderAsc: { - id: 'gridAuctionOrder_SellerAsc', - bind: $.proxy(_w.auction.orderAuctionGrid, this, 'auction.auctionCompanyName', 'ASC') - }, - orderDesc: { - id: 'gridAuctionOrder_SellerDesc', - bind: $.proxy(_w.auction.orderAuctionGrid, this, 'auction.auctionCompanyName', 'DESC') - }, - style: 'hidden-phone' - }, + //Seller: { + // id: 'gridAuctionColumn_Seller', + // title: 'SELLER', + // orderAsc: { + // id: 'gridAuctionOrder_SellerAsc', + // bind: $.proxy(_w.auction.orderAuctionGrid, this, 'auction.auctionCompanyName', 'ASC') + // }, + // orderDesc: { + // id: 'gridAuctionOrder_SellerDesc', + // bind: $.proxy(_w.auction.orderAuctionGrid, this, 'auction.auctionCompanyName', 'DESC') + // }, + // style: 'hidden-phone' + //}, Make: { id: 'gridAuctionColumn_Make', title: 'MAKE', @@ -315,7 +315,7 @@ }, Region: { id: 'gridAuctionColumn_Retail', - title: 'REGION', + title: 'TOWN', orderAsc: { id: 'gridAuctionOrder_RegionAsc', bind: $.proxy(_w.auction.orderAuctionGrid, this, 'auction.regionName', 'ASC') @@ -382,10 +382,10 @@ 'gridColumnFilters': { constructor: 'GridColumnFilter', items: { - Seller: { - id: 'gridAuctionFilter_Seller', - context: 'gridAuctionFilter' - }, + //Seller: { + // id: 'gridAuctionFilter_Seller', + // context: 'gridAuctionFilter' + //}, Make: { id: 'gridAuctionFilter_Make', context: 'gridAuctionFilter', @@ -669,7 +669,7 @@ }); }, style: { - Seller: 'hidden-phone', + Seller: 'hidden', Make: 'make hidden-phone', Model: 'hidden-phone', Type: 'type', diff --git a/public/js/app/portal-workspace/bidview.js b/public/js/app/portal-workspace/bidview.js index d0a4053..abd5734 100644 --- a/public/js/app/portal-workspace/bidview.js +++ b/public/js/app/portal-workspace/bidview.js @@ -429,14 +429,14 @@ + data.stock.type.name + '' : '', - 'seller' : data.stock.type - ? '
    Seller Details:
    ' - + data.company.contact.firstName + ' ' + data.company.contact.familyName + ', ' - + data.company.contact.mobile + ', ' + data.company.name + '
    ' - + data.company.street + ', ' - + data.company.city.name + ', ' + data.company.region.name + ', ' - + data.company.postalCode + '
    ' - : '', + //'seller' : data.stock.type + //? '
    Seller Details:
    ' + // + data.company.contact.firstName + ' ' + data.company.contact.familyName + ', ' + // + data.company.contact.mobile + ', ' + data.company.name + '
    ' + // + data.company.street + ', ' + // + data.company.city.name + ', ' + data.company.region.name + ', ' + // + data.company.postalCode + '
    ' + // : '', 'vehicleYear' : { title : 'Year', style : 'bid-information', diff --git a/public/js/app/router.js b/public/js/app/router.js index de5df50..4f84a86 100644 --- a/public/js/app/router.js +++ b/public/js/app/router.js @@ -19,8 +19,8 @@ '#/publichome' : 'publichome', // Brochure - '' : 'home', - '#/' : 'home', + '' : 'dealerhome', + '#/' : 'dealerhome', '#/dealerhome' : 'dealerhome', '#/faq' : 'faq', '#/login' : 'login', diff --git a/public/js/app/workspace.js b/public/js/app/workspace.js index fdc4005..5ef3185 100644 --- a/public/js/app/workspace.js +++ b/public/js/app/workspace.js @@ -1216,7 +1216,7 @@ var mobile = $('#mobile').val(); mobile = ('' == mobile) ? '' - : '+27' + mobile; + : '+264' + mobile; var data = { "Reset":{ "email" : $('#email').val(), diff --git a/public/templates/page/auction.html b/public/templates/page/auction.html index c03c4ce..a187a82 100644 --- a/public/templates/page/auction.html +++ b/public/templates/page/auction.html @@ -15,10 +15,10 @@ My basket - +
    - [gridContextFilter] +
    -
    + + + + +
    @@ -79,7 +79,7 @@

    The reconditioning expenses are, to the best of the Seller's knowledge and belief, accurate and the amounts quoted are reasonably market related.

    - In this regard the Purchaser's attention is drawn to the provisions of clauses 8.3 and 9 of the Conditions of Sale (PART 3) + In this regard the Purchaser's attention is drawn to the provisions of clauses 21 and 23 of the Conditions of Sale (PART 3)

    @@ -258,22 +258,22 @@ -
    -
     
    -
    - -
    -
    TransUnion HPI (Accident) Report
    -
    -
    Last date requested:
    -
    -
    Not requested yet.
    -
    -
    -
    -
    -
    -
    + + + + + + + + + + + + + + + + diff --git a/public/templates/page/contact_us.html b/public/templates/page/contact_us.html index 0d2ae50..67f4249 100644 --- a/public/templates/page/contact_us.html +++ b/public/templates/page/contact_us.html @@ -17,11 +17,11 @@

    VAT No. 4520254782

    7 Corobrick Road, Meadowdale, Edenvale, 1600

    -

    Contact
    0861 00 70 70

    -
    -

    Head Office

    -

    021 824 1882/3 — info@bid4cars.com.na

    -
    +

    Contact
    william@bid4cars.com.na

    + + + + @@ -32,13 +32,13 @@
    - +27 + +264
    - +27 + +264
    diff --git a/public/templates/page/forgot.html b/public/templates/page/forgot.html index e4b8c91..c7860ce 100644 --- a/public/templates/page/forgot.html +++ b/public/templates/page/forgot.html @@ -33,7 +33,7 @@ value="">
    - +27+264
    @@ -64,7 +64,7 @@
      -
      • +
    Sign up
    diff --git a/public/templates/page/publiccontact_us.html b/public/templates/page/publiccontact_us.html index 921119c..d78ae3e 100644 --- a/public/templates/page/publiccontact_us.html +++ b/public/templates/page/publiccontact_us.html @@ -63,13 +63,13 @@
    - +27 + +264
    - +27 + +264
    diff --git a/public/templates/page/register.js b/public/templates/page/register.js index ab41c5d..47483de 100644 --- a/public/templates/page/register.js +++ b/public/templates/page/register.js @@ -13,55 +13,55 @@ var template_register = function( static ) dateOfBirth : new App.TemplateElement.FieldComponent('dateOfBirth'), mobile : new App.TemplateElement.FieldComponent('mobile'), - contactFirstName : new App.TemplateElement.FieldComponent('contactFirstName'), - contactFamilyName : new App.TemplateElement.FieldComponent('contactFamilyName'), - contactOffice : new App.TemplateElement.FieldComponent('contactOffice'), - contactMobile : new App.TemplateElement.FieldComponent('contactMobile'), - contactEmail : new App.TemplateElement.FieldComponent('contactEmail'), + //contactFirstName : new App.TemplateElement.FieldComponent('contactFirstName'), + //contactFamilyName : new App.TemplateElement.FieldComponent('contactFamilyName'), + //contactOffice : new App.TemplateElement.FieldComponent('contactOffice'), + //contactMobile : new App.TemplateElement.FieldComponent('contactMobile'), + //contactEmail : new App.TemplateElement.FieldComponent('contactEmail'), - dealerType : new App.TemplateElement.FieldComponent('dealerType'), - clientType : new App.TemplateElement.FieldComponent('clientType'), - group : new App.TemplateElement.FieldComponent('group'), - groupDivision : new App.TemplateElement.FieldComponent('groupDivision'), - companyType : new App.TemplateElement.FieldComponent('companyType'), - businessName : new App.TemplateElement.FieldComponent('businessName'), - name : new App.TemplateElement.FieldComponent('name'), - companyRegistrationNumber : new App.TemplateElement.FieldComponent('companyRegistrationNumber'), - vatNumber : new App.TemplateElement.FieldComponent('vatNumber'), - turmiNumber : new App.TemplateElement.FieldComponent('turmiNumber'), - dealerStockNumber : new App.TemplateElement.FieldComponent('dealerStockNumber'), - turnover : new App.TemplateElement.FieldComponent('turnover'), - foundMethod : new App.TemplateElement.FieldComponent('foundMethod'), - foundMethodDetail : new App.TemplateElement.FieldComponent('foundMethodDetail'), + //dealerType : new App.TemplateElement.FieldComponent('dealerType'), + //clientType : new App.TemplateElement.FieldComponent('clientType'), + //group : new App.TemplateElement.FieldComponent('group'), + //groupDivision : new App.TemplateElement.FieldComponent('groupDivision'), + //companyType : new App.TemplateElement.FieldComponent('companyType'), + //businessName : new App.TemplateElement.FieldComponent('businessName'), + //name : new App.TemplateElement.FieldComponent('name'), + //companyRegistrationNumber : new App.TemplateElement.FieldComponent('companyRegistrationNumber'), + //vatNumber : new App.TemplateElement.FieldComponent('vatNumber'), + //turmiNumber : new App.TemplateElement.FieldComponent('turmiNumber'), + //dealerStockNumber : new App.TemplateElement.FieldComponent('dealerStockNumber'), + //turnover : new App.TemplateElement.FieldComponent('turnover'), + //foundMethod : new App.TemplateElement.FieldComponent('foundMethod'), + //foundMethodDetail : new App.TemplateElement.FieldComponent('foundMethodDetail'), - country : new App.TemplateElement.FieldComponent('country'), - region : new App.TemplateElement.FieldComponent('region'), - city : new App.TemplateElement.FieldComponent('city'), - street : new App.TemplateElement.FieldComponent('street'), - postalCode : new App.TemplateElement.FieldComponent('postalCode'), - sameAsBusinessAddress : new App.TemplateElement.FieldComponent('sameAsBusinessAddress'), - billingCountry : new App.TemplateElement.FieldComponent('billingCountry'), - billingRegion : new App.TemplateElement.FieldComponent('billingRegion'), - billingCity : new App.TemplateElement.FieldComponent('billingCity'), - billingStreet : new App.TemplateElement.FieldComponent('billingStreet'), - billingPostalCode : new App.TemplateElement.FieldComponent('billingPostalCode'), - sameAsDealerContact : new App.TemplateElement.FieldComponent('sameAsDealerContact'), - billingFirstName : new App.TemplateElement.FieldComponent('billingFirstName'), - billingFamilyName : new App.TemplateElement.FieldComponent('billingFamilyName'), - billingOffice : new App.TemplateElement.FieldComponent('billingOffice'), - billingMobile : new App.TemplateElement.FieldComponent('billingMobile'), - billingEmail : new App.TemplateElement.FieldComponent('billingEmail'), + //country : new App.TemplateElement.FieldComponent('country'), + //region : new App.TemplateElement.FieldComponent('region'), + //city : new App.TemplateElement.FieldComponent('city'), + //street : new App.TemplateElement.FieldComponent('street'), + //postalCode : new App.TemplateElement.FieldComponent('postalCode'), + //sameAsBusinessAddress : new App.TemplateElement.FieldComponent('sameAsBusinessAddress'), + //billingCountry : new App.TemplateElement.FieldComponent('billingCountry'), + //billingRegion : new App.TemplateElement.FieldComponent('billingRegion'), + //billingCity : new App.TemplateElement.FieldComponent('billingCity'), + //billingStreet : new App.TemplateElement.FieldComponent('billingStreet'), + //billingPostalCode : new App.TemplateElement.FieldComponent('billingPostalCode'), + //sameAsDealerContact : new App.TemplateElement.FieldComponent('sameAsDealerContact'), + //billingFirstName : new App.TemplateElement.FieldComponent('billingFirstName'), + //billingFamilyName : new App.TemplateElement.FieldComponent('billingFamilyName'), + //billingOffice : new App.TemplateElement.FieldComponent('billingOffice'), + //billingMobile : new App.TemplateElement.FieldComponent('billingMobile'), + //billingEmail : new App.TemplateElement.FieldComponent('billingEmail'), - ownerFirstName : new App.TemplateElement.FieldComponent('ownerFirstName'), - ownerFamilyName : new App.TemplateElement.FieldComponent('ownerFamilyName'), - ownerIdNumber : new App.TemplateElement.FieldComponent('ownerIdNumber'), - owners : new App.TemplateElement.FieldComponent('owners'), - - docStockCertificate : new App.TemplateElement.FieldComponent('docStockCertificate'), - docAddressProof : new App.TemplateElement.FieldComponent('docAddressProof'), - docCopyOfId : new App.TemplateElement.FieldComponent('docCopyOfId'), - docCopyOfDirectorId : new App.TemplateElement.FieldComponent('docCopyOfDirectorId'), - docCompanyRegistration : new App.TemplateElement.FieldComponent('docCompanyRegistration'), + //ownerFirstName : new App.TemplateElement.FieldComponent('ownerFirstName'), + //ownerFamilyName : new App.TemplateElement.FieldComponent('ownerFamilyName'), + //ownerIdNumber : new App.TemplateElement.FieldComponent('ownerIdNumber'), + //owners : new App.TemplateElement.FieldComponent('owners'), + // + //docStockCertificate : new App.TemplateElement.FieldComponent('docStockCertificate'), + //docAddressProof : new App.TemplateElement.FieldComponent('docAddressProof'), + //docCopyOfId : new App.TemplateElement.FieldComponent('docCopyOfId'), + //docCopyOfDirectorId : new App.TemplateElement.FieldComponent('docCopyOfDirectorId'), + //docCompanyRegistration : new App.TemplateElement.FieldComponent('docCompanyRegistration'), subscribeNewsletter : new App.TemplateElement.FieldComponent('subscribeNewsletter'), acceptTermsAndConditions : new App.TemplateElement.FieldComponent('acceptTermsAndConditions')