Skip to content

Commit 36a8248

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents c1da0ea + fcc6e24 commit 36a8248

File tree

11 files changed

+253
-94
lines changed

11 files changed

+253
-94
lines changed

‎app/code/Magento/Customer/Setup/CustomerSetup.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public function getDefaultEntities()
345345
'entity_attribute_collection' => 'Magento\Customer\Model\Resource\Address\Attribute\Collection',
346346
'attributes' => [
347347
'prefix' => [
348-
'type' => 'varchar',
348+
'type' => 'static',
349349
'label' => 'Prefix',
350350
'input' => 'text',
351351
'required' => false,
@@ -355,15 +355,15 @@ public function getDefaultEntities()
355355
'position' => 10,
356356
],
357357
'firstname' => [
358-
'type' => 'varchar',
358+
'type' => 'static',
359359
'label' => 'First Name',
360360
'input' => 'text',
361361
'sort_order' => 20,
362362
'validate_rules' => 'a:2:{s:15:"max_text_length";i:255;s:15:"min_text_length";i:1;}',
363363
'position' => 20,
364364
],
365365
'middlename' => [
366-
'type' => 'varchar',
366+
'type' => 'static',
367367
'label' => 'Middle Name/Initial',
368368
'input' => 'text',
369369
'required' => false,
@@ -373,15 +373,15 @@ public function getDefaultEntities()
373373
'position' => 30,
374374
],
375375
'lastname' => [
376-
'type' => 'varchar',
376+
'type' => 'static',
377377
'label' => 'Last Name',
378378
'input' => 'text',
379379
'sort_order' => 40,
380380
'validate_rules' => 'a:2:{s:15:"max_text_length";i:255;s:15:"min_text_length";i:1;}',
381381
'position' => 40,
382382
],
383383
'suffix' => [
384-
'type' => 'varchar',
384+
'type' => 'static',
385385
'label' => 'Suffix',
386386
'input' => 'text',
387387
'required' => false,
@@ -391,7 +391,7 @@ public function getDefaultEntities()
391391
'position' => 50,
392392
],
393393
'company' => [
394-
'type' => 'varchar',
394+
'type' => 'static',
395395
'label' => 'Company',
396396
'input' => 'text',
397397
'required' => false,
@@ -400,7 +400,7 @@ public function getDefaultEntities()
400400
'position' => 60,
401401
],
402402
'street' => [
403-
'type' => 'text',
403+
'type' => 'static',
404404
'label' => 'Street Address',
405405
'input' => 'multiline',
406406
'backend' => 'Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend',
@@ -410,23 +410,23 @@ public function getDefaultEntities()
410410
'position' => 70,
411411
],
412412
'city' => [
413-
'type' => 'varchar',
413+
'type' => 'static',
414414
'label' => 'City',
415415
'input' => 'text',
416416
'sort_order' => 80,
417417
'validate_rules' => 'a:2:{s:15:"max_text_length";i:255;s:15:"min_text_length";i:1;}',
418418
'position' => 80,
419419
],
420420
'country_id' => [
421-
'type' => 'varchar',
421+
'type' => 'static',
422422
'label' => 'Country',
423423
'input' => 'select',
424424
'source' => 'Magento\Customer\Model\Resource\Address\Attribute\Source\Country',
425425
'sort_order' => 90,
426426
'position' => 90,
427427
],
428428
'region' => [
429-
'type' => 'varchar',
429+
'type' => 'static',
430430
'label' => 'State/Province',
431431
'input' => 'text',
432432
'backend' => 'Magento\Customer\Model\Resource\Address\Attribute\Backend\Region',
@@ -435,7 +435,7 @@ public function getDefaultEntities()
435435
'position' => 100,
436436
],
437437
'region_id' => [
438-
'type' => 'int',
438+
'type' => 'static',
439439
'label' => 'State/Province',
440440
'input' => 'hidden',
441441
'source' => 'Magento\Customer\Model\Resource\Address\Attribute\Source\Region',
@@ -444,7 +444,7 @@ public function getDefaultEntities()
444444
'position' => 100,
445445
],
446446
'postcode' => [
447-
'type' => 'varchar',
447+
'type' => 'static',
448448
'label' => 'Zip/Postal Code',
449449
'input' => 'text',
450450
'sort_order' => 110,
@@ -454,15 +454,15 @@ public function getDefaultEntities()
454454
'required' => false,
455455
],
456456
'telephone' => [
457-
'type' => 'varchar',
457+
'type' => 'static',
458458
'label' => 'Phone Number',
459459
'input' => 'text',
460460
'sort_order' => 120,
461461
'validate_rules' => 'a:2:{s:15:"max_text_length";i:255;s:15:"min_text_length";i:1;}',
462462
'position' => 120,
463463
],
464464
'fax' => [
465-
'type' => 'varchar',
465+
'type' => 'static',
466466
'label' => 'Fax',
467467
'input' => 'text',
468468
'required' => false,

‎app/code/Magento/Customer/Setup/InstallData.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
7373
$attributesInfo = [
7474
'vat_id' => [
7575
'label' => 'VAT number',
76-
'type' => 'varchar',
76+
'type' => 'static',
7777
'input' => 'text',
7878
'position' => 140,
7979
'visible' => true,
@@ -83,25 +83,25 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
8383
'label' => 'VAT number validity',
8484
'visible' => false,
8585
'required' => false,
86-
'type' => 'int',
86+
'type' => 'static',
8787
],
8888
'vat_request_id' => [
8989
'label' => 'VAT number validation request ID',
90-
'type' => 'varchar',
90+
'type' => 'static',
9191
'visible' => false,
9292
'required' => false,
9393
],
9494
'vat_request_date' => [
9595
'label' => 'VAT number validation request date',
96-
'type' => 'varchar',
96+
'type' => 'static',
9797
'visible' => false,
9898
'required' => false,
9999
],
100100
'vat_request_success' => [
101101
'label' => 'VAT number validation request success',
102102
'visible' => false,
103103
'required' => false,
104-
'type' => 'int',
104+
'type' => 'static',
105105
],
106106
];
107107

‎app/code/Magento/Customer/Setup/InstallSchema.php

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,120 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
282282
null,
283283
['unsigned' => true, 'nullable' => false, 'default' => '1'],
284284
'Is Active'
285+
)->addColumn(
286+
'city',
287+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
288+
255,
289+
['nullable' => false],
290+
'City'
291+
)->addColumn(
292+
'company',
293+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
294+
255,
295+
['nullable' => true, 'default' => null],
296+
'Company'
297+
)->addColumn(
298+
'country_id',
299+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
300+
255,
301+
['nullable' => false],
302+
'Country'
303+
)->addColumn(
304+
'fax',
305+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
306+
255,
307+
['nullable' => true, 'default' => null],
308+
'Fax'
309+
)->addColumn(
310+
'firstname',
311+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
312+
255,
313+
['nullable' => false],
314+
'First Name'
315+
)->addColumn(
316+
'lastname',
317+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
318+
255,
319+
['nullable' => false],
320+
'Last Name'
321+
)->addColumn(
322+
'middlename',
323+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
324+
255,
325+
['nullable' => true, 'default' => null],
326+
'Middle Name'
327+
)->addColumn(
328+
'postcode',
329+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
330+
255,
331+
['nullable' => true, 'default' => null],
332+
'Zip/Postal Code'
333+
)->addColumn(
334+
'prefix',
335+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
336+
40,
337+
['nullable' => true, 'default' => null],
338+
'Prefix'
339+
)->addColumn(
340+
'region',
341+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
342+
255,
343+
['nullable' => true, 'default' => null],
344+
'State/Province'
345+
)->addColumn(
346+
'region_id',
347+
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
348+
null,
349+
['unsigned' => true, 'nullable' => true, 'default' => null],
350+
'State/Province'
351+
)->addColumn(
352+
'street',
353+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
354+
null,
355+
['nullable' => false],
356+
'Street Address'
357+
)->addColumn(
358+
'suffix',
359+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
360+
40,
361+
['nullable' => true, 'default' => null],
362+
'Suffix'
363+
)->addColumn(
364+
'telephone',
365+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
366+
255,
367+
['nullable' => false],
368+
'Phone Number'
369+
)->addColumn(
370+
'vat_id',
371+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
372+
255,
373+
['nullable' => true, 'default' => null],
374+
'VAT number'
375+
)->addColumn(
376+
'vat_is_valid',
377+
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
378+
null,
379+
['unsigned' => true, 'nullable' => true, 'default' => null],
380+
'VAT number validity'
381+
)->addColumn(
382+
'vat_request_date',
383+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
384+
255,
385+
['nullable' => true, 'default' => null],
386+
'VAT number validation request date'
387+
)->addColumn(
388+
'vat_request_id',
389+
\Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
390+
255,
391+
['nullable' => true, 'default' => null],
392+
'VAT number validation request ID'
393+
)->addColumn(
394+
'vat_request_success',
395+
\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
396+
null,
397+
['unsigned' => true, 'nullable' => true, 'default' => null],
398+
'VAT number validation request success'
285399
)->addIndex(
286400
$installer->getIdxName('customer_address_entity', ['parent_id']),
287401
['parent_id']

0 commit comments

Comments
 (0)