Projekt

Allgemein

Profil

GX-Abgewiesen #46974 » hausnummer_als_pflichtfeld.patch

Simon Ankele, 08.11.2016 15:30

Unterschiede anzeigen:

src/GXMainComponents/Services/Core/Customer/ValueObjects/CustomerInputValidatorSettings.inc.php (revision )
48 48
	 * @var int
49 49
	 */
50 50
	protected $emailMinLength;
51

  
51
	
52 52
	/**
53 53
	 * Customer's street minimum length.
54 54
	 * @var int
55 55
	 */
56 56
	protected $streetMinLength;
57

  
57
	
58 58
	/**
59
	 * Customer's house number minimum length.
60
	 * @var int
61
	 */
62
	protected $houseNumberMinLength;
63

  
64
	/**
59 65
	 * Customer's company minimum length.
60 66
	 * @var int
61 67
	 */
......
150 156
	 * @var string
151 157
	 */
152 158
	protected $emailExistsErrorMessage;
153

  
159
	
154 160
	/**
155 161
	 * Customer's street error message.
156 162
	 * @var string
157 163
	 */
158 164
	protected $streetErrorMessage;
159

  
165
	
160 166
	/**
167
	 * Customer's house number error message.
168
	 * @var string
169
	 */
170
	protected $houseNumberErrorMessage;
171

  
172
	/**
161 173
	 * Customer's post code error message.
162 174
	 * @var string
163 175
	 */
......
283 295
	 * @var int
284 296
	 */
285 297
	protected $vatNumberMaxLength;
286

  
298
	
287 299
	/**
288 300
	 * Customer's street maximum length.
289 301
	 * @var int
290 302
	 */
291 303
	protected $streetMaxLength;
292

  
304
	
293 305
	/**
306
	 * Customer's house number maximum length.
307
	 * @var int
308
	 */
309
	protected $houseNumberMaxLength;
310

  
311
	/**
294 312
	 * Customer's post code maximum length.
295 313
	 * @var int
296 314
	 */
......
344 362
		$this->dateOfBirthMinLength     = (int)ENTRY_DOB_MIN_LENGTH;
345 363
		$this->emailMinLength           = (int)ENTRY_EMAIL_ADDRESS_MIN_LENGTH;
346 364
		$this->streetMinLength          = (int)ENTRY_STREET_ADDRESS_MIN_LENGTH;
365
		$this->houseNumberMinLength     = (int)ENTRY_HOUSENUMBER_MIN_LENGTH;
347 366
		$this->companyMinLength         = (int)ENTRY_COMPANY_MIN_LENGTH;
348 367
		$this->postcodeMinLength        = (int)ENTRY_POSTCODE_MIN_LENGTH;
349 368
		$this->cityMinLength            = (int)ENTRY_CITY_MIN_LENGTH;
......
362 381
		$this->emailConfirmationErrorMessage    = ENTRY_EMAIL_ADDRESS_CONFIRM_DIFFERENT_ERROR;
363 382
		$this->emailExistsErrorMessage          = ENTRY_EMAIL_ADDRESS_ERROR_EXISTS;
364 383
		$this->streetErrorMessage               = sprintf(ENTRY_STREET_ADDRESS_ERROR, ENTRY_STREET_ADDRESS_MIN_LENGTH);
384
		$this->houseNumberErrorMessage          = sprintf(ENTRY_HOUSENUMBER_ERROR, ENTRY_HOUSENUMBER_MIN_LENGTH);
365 385
		$this->postcodeErrorMessage             = sprintf(ENTRY_POST_CODE_ERROR, ENTRY_POSTCODE_MIN_LENGTH);
366 386
		$this->cityErrorMessage                 = sprintf(ENTRY_CITY_ERROR, ENTRY_CITY_MIN_LENGTH);
367 387
		$this->countryErrorMessage              = ENTRY_COUNTRY_ERROR;
......
397 417
		$this->companyMaxLength     = 255;
398 418
		$this->vatNumberMaxLength   = 20;
399 419
		$this->streetMaxLength      = 64;
420
		$this->houseNumberMaxLength = 10;
400 421
		$this->postcodeMaxLength    = 10;
401 422
		$this->cityMaxLength        = 32;
402 423
		$this->countryZoneMaxLength = 32;
......
653 674
	{
654 675
		return $this->postcodeMinLength;
655 676
	}
656

  
657

  
677
	
678
	
658 679
	/**
659 680
	 * Returns a street error message.
660 681
	 * @return string Street error message.
......
663 684
	{
664 685
		return $this->streetErrorMessage;
665 686
	}
666

  
667

  
687
	
688
	
668 689
	/**
690
	 * Returns a house number error message.
691
	 * @return string house number error message.
692
	 */
693
	public function getHouseNumberErrorMessage()
694
	{
695
		return $this->houseNumberErrorMessage;
696
	}
697
	
698
	
699
	/**
669 700
	 * Returns the minimum required street character length.
670 701
	 * @return int Minimum required street character length.
671 702
	 */
......
673 704
	{
674 705
		return $this->streetMinLength;
675 706
	}
676

  
677

  
707
	
708
	
678 709
	/**
710
	 * Returns the minimum required house number character length.
711
	 * @return int Minimum required house number character length.
712
	 */
713
	public function getHouseNumberMinLength()
714
	{
715
		return $this->houseNumberMinLength;
716
	}
717

  
718

  
719
	/**
679 720
	 * Returns a telephone number error message.
680 721
	 * @return string Telephone number error message.
681 722
	 */
......
823 864
	{
824 865
		return $this->vatNumberMaxLength;
825 866
	}
826

  
827

  
867
	
868
	
828 869
	/**
829 870
	 * Returns the maximum required street character length.
830 871
	 * @return int Maximum required street character length.
......
832 873
	public function getStreetMaxLength()
833 874
	{
834 875
		return $this->streetMaxLength;
876
	}
877
	
878
	
879
	/**
880
	 * Returns the maximum required house number character length.
881
	 * @return int Maximum required house number character length.
882
	 */
883
	public function getHouseNumberMaxLength()
884
	{
885
		return $this->houseNumberMaxLength;
835 886
	}
836 887

  
837 888

  
src/lang/german/original_sections/general.lang.inc.php (revision )
125 125
	'ENTRY_STREET_ADDRESS_ERROR'                     => 'mindestens %s Zeichen',
126 126
	'ENTRY_STREET_ADDRESS_NOT_STREET'                => 'Als Rechnungsadresse kann keine Packstation oder Postfiliale angegeben werden.',
127 127
	'ENTRY_STREET_ADDRESS_TEXT'                      => '*',
128
	'ENTRY_HOUSENUMBER_ERROR'                        => 'mindestens %s Zeichen',
129
	'ENTRY_HOUSENUMBER_TEXT'                         => '*',
128 130
	'ENTRY_SUBURB_TEXT'                              => '',
129 131
	'ENTRY_TELEPHONE_NUMBER_ERROR'                   => 'mindestens %s Zeichen',
130 132
	'ENTRY_TELEPHONE_NUMBER_TEXT'                    => '*',
src/lang/english/original_sections/admin/configuration.lang.inc.php (revision )
219 219
	'ENTRY_STATE_MIN_LENGTH_TITLE' => 'State',
220 220
	'ENTRY_STREET_ADDRESS_MIN_LENGTH_DESC' => 'Minimum length of street address',
221 221
	'ENTRY_STREET_ADDRESS_MIN_LENGTH_TITLE' => 'Street Address',
222
	'ENTRY_HOUSENUMBER_MIN_LENGTH_DESC' => 'Minimum length of house number',
223
	'ENTRY_HOUSENUMBER_MIN_LENGTH_TITLE' => 'House Number',
222 224
	'ENTRY_TELEPHONE_MIN_LENGTH_DESC' => 'Minimum length of telephone number',
223 225
	'ENTRY_TELEPHONE_MIN_LENGTH_TITLE' => 'Telephone Number',
224 226
	'ERROR_IMAGE_QUALITY' => 'Insert a numeric value between 0 and 100.',
src/GXMainComponents/Services/Core/Customer/CustomerInputValidator.inc.php (revision )
381 381

  
382 382
		return true;
383 383
	}
384

  
385

  
384
	
385
	
386 386
	/**
387 387
	 * Checks if the entered street is valid.
388 388
	 *
......
396 396
		{
397 397
			$this->errorStatus = true;
398 398
			$this->errorMessageCollection->setValue('error_street', $this->settings->getInvalidInputErrorMessage());
399

  
399
			
400 400
			return false;
401 401
		}
402 402
		
......
404 404
		{
405 405
			$this->errorStatus = true;
406 406
			$this->errorMessageCollection->setValue('error_street', $this->settings->getStreetErrorMessage());
407

  
407
			
408 408
			return false;
409 409
		}
410

  
410
		
411 411
		return true;
412 412
	}
413

  
414

  
413
	
414
	
415 415
	/**
416
	 * Checks if the entered house number is valid.
417
	 *
418
	 * @param string $p_house_number Customer's house number.
419
	 *
420
	 * @return bool Is valid?
421
	 */
422
	public function validateHouseNumber($p_house_number)
423
	{
424
		if(ACCOUNT_SPLIT_STREET_INFORMATION == 'true')
425
		{
426
			if(strlen_wrapper(trim((string)$p_house_number)) > $this->settings->getHouseNumberMaxLength())
427
			{
428
				$this->errorStatus = true;
429
				$this->errorMessageCollection->setValue('error_house_number',
430
				                                        $this->settings->getInvalidInputErrorMessage());
431
				
432
				return false;
433
			}
434
			
435
			if(strlen_wrapper((string)$p_house_number) < $this->settings->getHouseNumberMinLength())
436
			{
437
				$this->errorStatus = true;
438
				$this->errorMessageCollection->setValue('error_house_number',
439
				                                        $this->settings->getHouseNumberErrorMessage());
440
				
441
				return false;
442
			}
443
		}
444
		
445
		return true;
446
	}
447

  
448

  
449
	/**
416 450
	 * Checks if the entered postcode is valid.
417 451
	 *
418 452
	 * @param string $p_postcode Customer's post code.
src/system/classes/accounts/CreateAccountContentView.inc.php (revision )
312 312
			$this->content_array['form_data']['house_number']['name'] = 'house_number';
313 313
			$this->content_array['form_data']['house_number']['value'] = htmlspecialchars_wrapper($this->customer_data_array['house_number']);
314 314
			$this->content_array['form_data']['house_number']['required'] = 0;
315
			if((int)ENTRY_HOUSENUMBER_MIN_LENGTH > 0)
316
			{
317
				$this->content_array['form_data']['street_address']['required'] = 1;
318
			}
319
			
315 320
		}
316 321
		else
317 322
		{
src/templates/Honeygrid/module/create_account_guest.html (revision )
278 278
			{$txt.title_address}
279 279
		</legend>
280 280

  
281
		<div class="form-group{if $form_data.street_address.required == '1'} mandatory{/if}{if $error_street} has-feedback has-error{/if}">
281
		<div class="form-group{if $form_data.street_address.required == '1' || $form_data.house_number.required == '1'} mandatory{/if}">
282 282

  
283
			{if $split_street_information == '1'}
284
			<div {if $error_street || $error_house_number}class="has-feedback has-error"{/if}>
283
			<label for="{$form_data.street_address.name}" class="control-label col-sm-3">
284
				{$txt.text_street_number}
285
			</label>
285
				<label for="{$form_data.street_address.name}" class="control-label col-sm-3">
286
					{$txt.text_street_number}
287
				</label>
286

  
287
			{if $split_street_information == '1'}
288
				<div class="col-sm-6 col-lg-4 input-container">
288
			</div>
289
			<div class="col-sm-6 col-lg-4 input-container {if $error_street} has-feedback has-error{/if}">
289
					<input type="text"
290
						   placeholder="{$txt.text_street}"
291
						   id="{$form_data.street_address.name}"
292
						   name="{$form_data.street_address.name}"
293
						   class="form-control"
294
						   value="{$form_data.street_address.value}" />
290
				<input type="text"
291
				       placeholder="{$txt.text_street}"
292
				       id="{$form_data.street_address.name}"
293
				       name="{$form_data.street_address.name}"
294
				       class="form-control"
295
				       value="{$form_data.street_address.value}" />
295 296

  
296
					{if $error_street}
297
						<span class="help-block">{$error_street}</span>
298
					{/if}
299
				</div>
297
				{if $error_street}
298
					<span class="help-block">{$error_street}</span>
299
				{/if}
300
			</div>
300 301

  
301
				<div class="col-sm-3 col-lg-2 input-container">
302
			<div class="col-sm-3 col-lg-2 input-container {if $error_house_number} has-feedback has-error{/if}">
302
					<input type="text"
303
						   placeholder="{$txt.text_house_number}"
304
						   id="{$form_data.house_number.name}"
305
						   name="{$form_data.house_number.name}"
306
						   class="form-control"
307
						   value="{$form_data.house_number.value}" />
303
				<input type="text"
304
				       placeholder="{$txt.text_house_number}"
305
				       id="{$form_data.house_number.name}"
306
				       name="{$form_data.house_number.name}"
307
				       class="form-control"
308
				       value="{$form_data.house_number.value}" />
308 309

  
309
					{if $error_house_number}
310
						<span class="help-block">{$error_house_number}</span>
311
					{/if}
312
				</div>
313
			{else}
310
				{if $error_house_number}
311
					<span class="help-block">{$error_house_number}</span>
312
				{/if}
313
			</div>
314
		{else}
314
				<div class="col-sm-9 col-lg-6 input-container">
315
			<div class="col-sm-9 col-lg-6 input-container {if $error_street} has-feedback has-error{/if}">
315
					<input type="text"
316
						   placeholder="{$txt.text_street_number}"
317
						   id="{$form_data.street_address.name}"
318
						   name="{$form_data.street_address.name}"
319
						   class="form-control"
320
						   value="{$form_data.street_address.value}" />
316
				<input type="text"
317
				       placeholder="{$txt.text_street_number}"
318
				       id="{$form_data.street_address.name}"
319
				       name="{$form_data.street_address.name}"
320
				       class="form-control"
321
				       value="{$form_data.street_address.value}" />
321 322

  
322
					{if $error_street}
323
						<span class="help-block">
324
							{$error_street}
325
						</span>
326
					{/if}
327
				</div>
328
			{/if}
323
				{if $error_street}
324
					<span class="help-block">
325
						{$error_street}
326
					</span>
327
				{/if}
328
			</div>
329
		{/if}
329 330

  
330 331
		</div>
331 332

  
src/lang/english/original_sections/general.lang.inc.php (revision )
128 128
	'ENTRY_STATE_TEXT'                               => '*',
129 129
	'ENTRY_STREET_ADDRESS_ERROR'                     => 'at least %s characters',
130 130
	'ENTRY_STREET_ADDRESS_TEXT'                      => '*',
131
	'ENTRY_HOUSENUMBER_ERROR'                        => 'at least %s characters',
132
	'ENTRY_HOUSENUMBER_TEXT'                         => '*',
131 133
	'ENTRY_SUBURB_TEXT'                              => '',
132 134
	'ENTRY_TELEPHONE_NUMBER_ERROR'                   => 'at least %s characters',
133 135
	'ENTRY_TELEPHONE_NUMBER_TEXT'                    => '*',
src/GXMainComponents/Services/Core/Address/CustomerAddressInputValidator.inc.php (revision )
44 44
		$this->validateFirstname($inputArray['firstname']);
45 45
		$this->validateLastname($inputArray['lastname']);
46 46
		$this->validateStreet($inputArray['street_address']);
47
		$this->validateHouseNumber($inputArray['street_address']);
47 48
		$this->validateCountryZone($inputArray['state'], $inputArray['country']);
48 49
		$this->validatePostcode($inputArray['postcode']);
49 50
		$this->validateCity($inputArray['city']);
src/lang/german/original_sections/admin/admin_general.lang.inc.php (revision )
158 158
	'ENTRY_STATE' => 'Bundesland:',
159 159
	'ENTRY_STATE_ERROR' => ' <span class="errorText">notwendige Eingabe</font></small>',
160 160
	'ENTRY_STREET_ADDRESS' => 'Straße:',
161
	'ENTRY_HOUSE_NUMBER' => 'Hausnummer:',
162 161
	'ENTRY_STREET_ADDRESS_ERROR' => ' <span class="errorText">mindestens %s Buchstaben</span>',
162
	'ENTRY_HOUSENUMBER' => 'Hausnummer:',
163
	'ENTRY_HOUSENUMBER_ERROR' => ' <span class="errorText">mindestens %s Zeichen</span>',
163 164
	'ENTRY_SUBURB' => 'Stadtteil:',
164 165
	'ENTRY_TELEPHONE_NUMBER' => 'Telefonnummer:',
165 166
	'ENTRY_TELEPHONE_NUMBER_ERROR' => ' <span class="errorText">mindestens %s Zahlen</span>',
src/GXMainComponents/Services/Core/Customer/CustomerRegistrationInputValidatorService.inc.php (revision )
132 132
		$this->validateCompany($inputArray['company']);
133 133
		$this->validateEmailAndConfirmation($inputArray['email_address'], $inputArray['email_address_confirm']);
134 134
		$this->validateStreet($inputArray['street_address']);
135
		$this->validateHouseNumber($inputArray['house_number']);
135 136
		$this->validateSuburb($inputArray['suburb']);
136 137
		$this->validatePostcode($inputArray['postcode']);
137 138
		$this->validateCity($inputArray['city']);
......
140 141
		$this->validateTelephoneNumber($inputArray['telephone']);
141 142
		$this->validateFaxNumber($inputArray['fax']);
142 143
		$this->validatePrivacy($inputArray['privacy_accepted']);
143

  
144
		
144 145
		return !$this->getErrorStatus();
145 146
	}
146 147
	
src/lang/german/original_sections/admin/configuration.lang.inc.php (revision )
219 219
	'ENTRY_STATE_MIN_LENGTH_TITLE' => 'Bundesland',
220 220
	'ENTRY_STREET_ADDRESS_MIN_LENGTH_DESC' => 'Minimum Länge der Straßenanschrift',
221 221
	'ENTRY_STREET_ADDRESS_MIN_LENGTH_TITLE' => 'Straße',
222
	'ENTRY_HOUSENUMBER_MIN_LENGTH_DESC' => 'Minimum Länge der Hausnummer (nur aktiv, wenn Hausnummer und Straßenname getrennt dargestellt werden.',
223
	'ENTRY_HOUSENUMBER_MIN_LENGTH_TITLE' => 'Hausnummer',
222 224
	'ENTRY_TELEPHONE_MIN_LENGTH_DESC' => 'Minimum Länge der Telefonnummer',
223 225
	'ENTRY_TELEPHONE_MIN_LENGTH_TITLE' => 'Telefonnummer',
224 226
	'ERROR_IMAGE_QUALITY' => 'Geben Sie einen numerischen Wert zwischen 0 und 100 ein.',
src/lang/english/original_sections/admin/admin_general.lang.inc.php (revision )
156 156
	'ENTRY_STATE' => 'State:',
157 157
	'ENTRY_STATE_ERROR' => ' <span class="errorText">required</font></small>',
158 158
	'ENTRY_STREET_ADDRESS' => 'Street:',
159
	'ENTRY_HOUSE_NUMBER' => 'House Number:',
160 159
	'ENTRY_STREET_ADDRESS_ERROR' => ' <span class="errorText">min. %s Chars</span>',
160
	'ENTRY_HOUSENUMBER' => 'House Number:',
161
	'ENTRY_HOUSENUMBER_ERROR' => ' <span class="errorText">min. %s chars</span>',
161 162
	'ENTRY_SUBURB' => 'Suburb:',
162 163
	'ENTRY_TELEPHONE_NUMBER' => 'Telephone Number:',
163 164
	'ENTRY_TELEPHONE_NUMBER_ERROR' => ' <span class="errorText">min. %s chars</span>',
src/templates/Honeygrid/module/create_account.html (revision )
279 279
			{$txt.title_address}
280 280
		</legend>
281 281

  
282
		<div class="form-group{if $form_data.street_address.required == '1'} mandatory{/if}{if $error_street} has-feedback has-error{/if}">
282
		<div class="form-group{if $form_data.street_address.required == '1' || $form_data.house_number.required == '1'} mandatory{/if}">
283 283

  
284
			{if $split_street_information == '1'}
285
				<div {if $error_street || $error_house_number}class="has-feedback has-error"{/if}>
284
			<label for="{$form_data.street_address.name}" class="control-label col-sm-3">
285
				{$txt.text_street_number}
286
			</label>
286
					<label for="{$form_data.street_address.name}" class="control-label col-sm-3">
287
						{$txt.text_street_number}
288
					</label>
287

  
288
			{if $split_street_information == '1'}
289
				<div class="col-sm-6 col-lg-4 input-container">
289
				</div>
290
				<div class="col-sm-6 col-lg-4 input-container {if $error_street} has-feedback has-error{/if}">
290 291
					<input type="text"
291 292
						   placeholder="{$txt.text_street}"
292 293
						   id="{$form_data.street_address.name}"
......
299 300
					{/if}
300 301
				</div>
301 302

  
302
				<div class="col-sm-3 col-lg-2 input-container">
303
				<div class="col-sm-3 col-lg-2 input-container {if $error_house_number} has-feedback has-error{/if}">
303 304
					<input type="text"
304 305
						   placeholder="{$txt.text_house_number}"
305 306
						   id="{$form_data.house_number.name}"
......
312 313
					{/if}
313 314
				</div>
314 315
			{else}
315
				<div class="col-sm-9 col-lg-6 input-container">
316
				<div class="col-sm-9 col-lg-6 input-container {if $error_street} has-feedback has-error{/if}">
316 317
					<input type="text"
317 318
						   placeholder="{$txt.text_street_number}"
318 319
						   id="{$form_data.street_address.name}"
    (1-1/1)