(REF) civicrm_option_groups - Use key-value-tree for messy OGs

diff --git a/sql/civicrm_option_groups/account_relationship.sqldata.php b/sql/civicrm_option_groups/account_relationship.sqldata.php
index 025bccf29fe54c3b06a6c60083d17df036f73da5..4a3a9a68e9c93493225ee78c04a7d5914b7292e8 100644 (file)
--- a/sql/civicrm_option_groups/account_relationship.sqldata.php
+++ b/sql/civicrm_option_groups/account_relationship.sqldata.php
@@ -3,22 +3,103 @@ return CRM_Core_CodeGen_OptionGroup::create('account_relationship', 'a/0061')
   ->addMetadata([
     'title' => ts('Account Relationship'),
   ])
-  ->addValueTable(['label', 'name', 'value', 'description'], [
-    // TODO: Shouldn't we have ts() for these descriptions?
-    [ts('Income Account is'), 'Income Account is', 1, 'Income Account is', 'is_default' => 1],
-    [ts('Credit/Contra Revenue Account is'), 'Credit/Contra Revenue Account is', 2, 'Credit/Contra Revenue Account is'],
-    [ts('Accounts Receivable Account is'), 'Accounts Receivable Account is', 3, 'Accounts Receivable Account is'],
-    [ts('Credit Liability Account is'), 'Credit Liability Account is', 4, 'Credit Liability Account is', 'is_active' => 0],
-    [ts('Expense Account is'), 'Expense Account is', 5, 'Expense Account is'],
-    [ts('Asset Account is'), 'Asset Account is', 6, 'Asset Account is'],
-    [ts('Cost of Sales Account is'), 'Cost of Sales Account is', 7, 'Cost of Sales Account is'],
-    [ts('Premiums Inventory Account is'), 'Premiums Inventory Account is', 8, 'Premiums Inventory Account is'],
-    [ts('Discounts Account is'), 'Discounts Account is', 9, 'Discounts Account is'],
-    [ts('Sales Tax Account is'), 'Sales Tax Account is', 10, 'Sales Tax Account is'],
-    [ts('Chargeback Account is'), 'Chargeback Account is', 11, 'Chargeback Account is'],
-    [ts('Deferred Revenue Account is'), 'Deferred Revenue Account is', 12, 'Deferred Revenue Account is'],
-  ])
-  ->addDefaults([
-    'component_id' => 2,
-    'is_reserved' => 1,
+  ->addValues([
+    [
+      'label' => ts('Income Account is'),
+      'value' => 1,
+      'name' => 'Income Account is',
+      'is_default' => 1,
+      'description' => 'Income Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Credit/Contra Revenue Account is'),
+      'value' => 2,
+      'name' => 'Credit/Contra Revenue Account is',
+      'description' => 'Credit/Contra Revenue Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Accounts Receivable Account is'),
+      'value' => 3,
+      'name' => 'Accounts Receivable Account is',
+      'description' => 'Accounts Receivable Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Credit Liability Account is'),
+      'value' => 4,
+      'name' => 'Credit Liability Account is',
+      'description' => 'Credit Liability Account is',
+      'is_reserved' => 1,
+      'is_active' => 0,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Expense Account is'),
+      'value' => 5,
+      'name' => 'Expense Account is',
+      'description' => 'Expense Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Asset Account is'),
+      'value' => 6,
+      'name' => 'Asset Account is',
+      'description' => 'Asset Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Cost of Sales Account is'),
+      'value' => 7,
+      'name' => 'Cost of Sales Account is',
+      'description' => 'Cost of Sales Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Premiums Inventory Account is'),
+      'value' => 8,
+      'name' => 'Premiums Inventory Account is',
+      'description' => 'Premiums Inventory Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Discounts Account is'),
+      'value' => 9,
+      'name' => 'Discounts Account is',
+      'description' => 'Discounts Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Sales Tax Account is'),
+      'value' => 10,
+      'name' => 'Sales Tax Account is',
+      'description' => 'Sales Tax Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Chargeback Account is'),
+      'value' => 11,
+      'name' => 'Chargeback Account is',
+      'description' => 'Chargeback Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Deferred Revenue Account is'),
+      'value' => 12,
+      'name' => 'Deferred Revenue Account is',
+      'description' => 'Deferred Revenue Account is',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
   ]);

diff --git a/sql/civicrm_option_groups/environment.sqldata.php b/sql/civicrm_option_groups/environment.sqldata.php
index 97f5924426fa748f58a5fffaa1a8f25e091b6a2d..e6f378a366acbdc1ac37cd9601d1887dd7af5aef 100644 (file)
--- a/sql/civicrm_option_groups/environment.sqldata.php
+++ b/sql/civicrm_option_groups/environment.sqldata.php
@@ -3,10 +3,26 @@ return CRM_Core_CodeGen_OptionGroup::create('environment', 'a/0081')
   ->addMetadata([
     'title' => ts('Environment'),
   ])
-  ->addValueTable(['label', 'name', 'value', 'description'], [
-    [ts('Production'), 'Production', 'Production', ts('Production Environment'), 'is_default' => 1],
-    [ts('Staging'), 'Staging', 'Staging', ts('Staging Environment')],
-    [ts('Development'), 'Development', 'Development', ts('Development Environment')],
+  ->addValues([
+    [
+      'label' => ts('Production'),
+      'value' => 'Production',
+      'name' => 'Production',
+      'is_default' => 1,
+      'description' => ts('Production Environment'),
+    ],
+    [
+      'label' => ts('Staging'),
+      'value' => 'Staging',
+      'name' => 'Staging',
+      'description' => ts('Staging Environment'),
+    ],
+    [
+      'label' => ts('Development'),
+      'value' => 'Development',
+      'name' => 'Development',
+      'description' => ts('Development Environment'),
+    ],
   ])
   ->addDefaults([
     'filter' => NULL,

diff --git a/sql/civicrm_option_groups/financial_item_status.sqldata.php b/sql/civicrm_option_groups/financial_item_status.sqldata.php
index 387900e3455a3292bf376f429d0ca1d6cc74cdd7..e1947479212ee01d89456c4ce858fa8a96959c46 100644 (file)
--- a/sql/civicrm_option_groups/financial_item_status.sqldata.php
+++ b/sql/civicrm_option_groups/financial_item_status.sqldata.php
@@ -4,9 +4,32 @@ return CRM_Core_CodeGen_OptionGroup::create('financial_item_status', 'a/0071')
     'title' => ts('Financial Item Status'),
     'is_locked' => 1,
   ])
-  ->addValueTable(['label', 'name', 'value', 'weight', 'description'], [
-    // TODO: Shouldn't we have ts() for these descriptions?
-    [ts('Paid'), 'Paid', 1, 1, 'Paid', 'is_reserved' => 1, 'component_id' => 2],
-    [ts('Unpaid'), 'Unpaid', 3, 1, 'Unpaid', 'is_reserved' => 1, 'component_id' => 2],
-    [ts('Partially paid'), 'Partially paid', 2, 2, 'Partially paid', 'is_reserved' => 1, 'component_id' => 2],
+  ->addValues([
+    [
+      'label' => ts('Paid'),
+      'value' => 1,
+      'name' => 'Paid',
+      'weight' => 1,
+      'description' => 'Paid',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Unpaid'),
+      'value' => 3,
+      'name' => 'Unpaid',
+      'weight' => 1,
+      'description' => 'Unpaid',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
+    [
+      'label' => ts('Partially paid'),
+      'value' => 2,
+      'name' => 'Partially paid',
+      'weight' => 2,
+      'description' => 'Partially paid',
+      'is_reserved' => 1,
+      'component_id' => 2,
+    ],
   ]);

diff --git a/sql/civicrm_option_groups/from_email_address.sqldata.php b/sql/civicrm_option_groups/from_email_address.sqldata.php
index 28be1a8f36db2ed5b84f5a6473f92772361bd997..0a6f272729922ee01f38c12b53e62660100eb784 100644 (file)
--- a/sql/civicrm_option_groups/from_email_address.sqldata.php
+++ b/sql/civicrm_option_groups/from_email_address.sqldata.php
@@ -4,6 +4,13 @@ return CRM_Core_CodeGen_OptionGroup::create('from_email_address', 'a/0029')
     'title' => ts('From Email Address'),
     'description' => ts('By default, CiviCRM uses the primary email address of the logged in user as the FROM address when sending emails to contacts. However, you can use this page to define one or more general Email Addresses that can be selected as an alternative. EXAMPLE: "Client Services" <clientservices@example.org>.'),
   ])
-  ->addValueTable(['label', 'name', 'value', 'description'], [
-    ['"FIXME" <info@EXAMPLE.ORG>', '"FIXME" <info@EXAMPLE.ORG>', 1, ts('Default domain email address and from name.'), 'is_default' => 1, 'domain_id' => new CRM_Utils_SQL_Literal('@domainID')],
+  ->addValues([
+    [
+      'label' => '"FIXME" <info@EXAMPLE.ORG>',
+      'value' => 1,
+      'name' => '"FIXME" <info@EXAMPLE.ORG>',
+      'is_default' => 1,
+      'description' => ts('Default domain email address and from name.'),
+      'domain_id' => new CRM_Utils_SQL_Literal('@domainID'),
+    ],
   ]);

diff --git a/sql/civicrm_option_groups/label_format.sqldata.php b/sql/civicrm_option_groups/label_format.sqldata.php
index d1f8c7fb67f25e4520e9269e8ced19c8ae777b37..7653a92066ff5f8b53aad32282bac1ae72a82571 100644 (file)
--- a/sql/civicrm_option_groups/label_format.sqldata.php
+++ b/sql/civicrm_option_groups/label_format.sqldata.php
@@ -3,18 +3,84 @@ return CRM_Core_CodeGen_OptionGroup::create('label_format', 'a/0059')
   ->addMetadata([
     'title' => ts('Mailing Label Format'),
   ])
-  ->addValueTable(['label', 'name', 'value'], [
-    [ts('Avery 3475'), 3475, '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":10,"font-style":"","metric":"mm","lMargin":0,"tMargin":5,"NX":3,"NY":8,"SpaceX":0,"SpaceY":0,"width":70,"height":36,"lPadding":5.08,"tPadding":5.08}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery 5160'), 5160, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.21975,"tMargin":0.5,"NX":3,"NY":10,"SpaceX":0.14,"SpaceY":0,"width":2.5935,"height":1,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery 5161'), 5161, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.175,"tMargin":0.5,"NX":2,"NY":10,"SpaceX":0.15625,"SpaceY":0,"width":4,"height":1,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery 5162'), 5162, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.1525,"tMargin":0.88,"NX":2,"NY":7,"SpaceX":0.195,"SpaceY":0,"width":4,"height":1.33,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery 5163'), 5163, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.18,"tMargin":0.5,"NX":2,"NY":5,"SpaceX":0.14,"SpaceY":0,"width":4,"height":2,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery 5164'), 5164, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":12,"font-style":"","metric":"in","lMargin":0.156,"tMargin":0.5,"NX":2,"NY":3,"SpaceX":0.1875,"SpaceY":0,"width":4,"height":3.33,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery 8600'), 8600, '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"mm","lMargin":7.1,"tMargin":19,"NX":3,"NY":10,"SpaceX":9.5,"SpaceY":3.1,"width":66.6,"height":25.4,"lPadding":5.08,"tPadding":5.08}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery L7160'), 'L7160', '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.28,"tMargin":0.6,"NX":3,"NY":7,"SpaceX":0.1,"SpaceY":0,"width":2.5,"height":1.5,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery L7161'), 'L7161', '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.28,"tMargin":0.35,"NX":3,"NY":6,"SpaceX":0.1,"SpaceY":0,"width":2.5,"height":1.83,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery L7162'), 'L7162', '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.18,"tMargin":0.51,"NX":2,"NY":8,"SpaceX":0.1,"SpaceY":0,"width":3.9,"height":1.33,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
-    [ts('Avery L7163'), 'L7163', '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.18,"tMargin":0.6,"NX":2,"NY":7,"SpaceX":0.1,"SpaceY":0,"width":3.9,"height":1.5,"lPadding":0.20,"tPadding":0.20}', 'grouping' => 'Avery', 'is_reserved' => 1],
+  ->addValues([
+    [
+      'label' => ts('Avery 3475'),
+      'value' => '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":10,"font-style":"","metric":"mm","lMargin":0,"tMargin":5,"NX":3,"NY":8,"SpaceX":0,"SpaceY":0,"width":70,"height":36,"lPadding":5.08,"tPadding":5.08}',
+      'name' => 3475,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery 5160'),
+      'value' => '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.21975,"tMargin":0.5,"NX":3,"NY":10,"SpaceX":0.14,"SpaceY":0,"width":2.5935,"height":1,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 5160,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery 5161'),
+      'value' => '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.175,"tMargin":0.5,"NX":2,"NY":10,"SpaceX":0.15625,"SpaceY":0,"width":4,"height":1,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 5161,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery 5162'),
+      'value' => '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.1525,"tMargin":0.88,"NX":2,"NY":7,"SpaceX":0.195,"SpaceY":0,"width":4,"height":1.33,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 5162,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery 5163'),
+      'value' => '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"in","lMargin":0.18,"tMargin":0.5,"NX":2,"NY":5,"SpaceX":0.14,"SpaceY":0,"width":4,"height":2,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 5163,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery 5164'),
+      'value' => '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":12,"font-style":"","metric":"in","lMargin":0.156,"tMargin":0.5,"NX":2,"NY":3,"SpaceX":0.1875,"SpaceY":0,"width":4,"height":3.33,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 5164,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery 8600'),
+      'value' => '{"paper-size":"letter","orientation":"portrait","font-name":"dejavusans","font-size":8,"font-style":"","metric":"mm","lMargin":7.1,"tMargin":19,"NX":3,"NY":10,"SpaceX":9.5,"SpaceY":3.1,"width":66.6,"height":25.4,"lPadding":5.08,"tPadding":5.08}',
+      'name' => 8600,
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery L7160'),
+      'value' => '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.28,"tMargin":0.6,"NX":3,"NY":7,"SpaceX":0.1,"SpaceY":0,"width":2.5,"height":1.5,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 'L7160',
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery L7161'),
+      'value' => '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.28,"tMargin":0.35,"NX":3,"NY":6,"SpaceX":0.1,"SpaceY":0,"width":2.5,"height":1.83,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 'L7161',
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery L7162'),
+      'value' => '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.18,"tMargin":0.51,"NX":2,"NY":8,"SpaceX":0.1,"SpaceY":0,"width":3.9,"height":1.33,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 'L7162',
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Avery L7163'),
+      'value' => '{"paper-size":"a4","orientation":"portrait","font-name":"dejavusans","font-size":9,"font-style":"","metric":"in","lMargin":0.18,"tMargin":0.6,"NX":2,"NY":7,"SpaceX":0.1,"SpaceY":0,"width":3.9,"height":1.5,"lPadding":0.20,"tPadding":0.20}',
+      'name' => 'L7163',
+      'grouping' => 'Avery',
+      'is_reserved' => 1,
+    ],
   ])
   ->addDefaults([
     'filter' => NULL,

diff --git a/sql/civicrm_option_groups/paper_size.sqldata.php b/sql/civicrm_option_groups/paper_size.sqldata.php
index 41ca44ad092f3c4f1afa159490f2aef7e34a27e6..41f3cdd93ea5dd4780bdecaf848ce203402b2b74 100644 (file)
--- a/sql/civicrm_option_groups/paper_size.sqldata.php
+++ b/sql/civicrm_option_groups/paper_size.sqldata.php
@@ -3,69 +3,318 @@ return CRM_Core_CodeGen_OptionGroup::create('paper_size', 'a/0057')
   ->addMetadata([
     'title' => ts('Paper Size'),
   ])
-  ->addValueTable(['label', 'name', 'value'], [
-    [ts('Letter'), 'letter', '{"metric":"in","width":8.5,"height":11}', 'is_default' => 1],
-    [ts('Legal'), 'legal', '{"metric":"in","width":8.5,"height":14}'],
-    [ts('Ledger'), 'ledger', '{"metric":"in","width":17,"height":11}'],
-    [ts('Tabloid'), 'tabloid', '{"metric":"in","width":11,"height":17}'],
-    [ts('Executive'), 'executive', '{"metric":"in","width":7.25,"height":10.5}'],
-    [ts('Folio'), 'folio', '{"metric":"in","width":8.5,"height":13}'],
-    [ts('Envelope #9'), 'envelope-9', '{"metric":"pt","width":638.93,"height":278.93}'],
-    [ts('Envelope #10'), 'envelope-10', '{"metric":"pt","width":684,"height":297}'],
-    [ts('Envelope #11'), 'envelope-11', '{"metric":"pt","width":747,"height":324}'],
-    [ts('Envelope #12'), 'envelope-12', '{"metric":"pt","width":792,"height":342}'],
-    [ts('Envelope #14'), 'envelope-14', '{"metric":"pt","width":828,"height":360}'],
-    [ts('Envelope ISO B4'), 'envelope-b4', '{"metric":"pt","width":1000.63,"height":708.66}'],
-    [ts('Envelope ISO B5'), 'envelope-b5', '{"metric":"pt","width":708.66,"height":498.9}'],
-    [ts('Envelope ISO B6'), 'envelope-b6', '{"metric":"pt","width":498.9,"height":354.33}'],
-    [ts('Envelope ISO C3'), 'envelope-c3', '{"metric":"pt","width":1298.27,"height":918.42}'],
-    [ts('Envelope ISO C4'), 'envelope-c4', '{"metric":"pt","width":918.42,"height":649.13}'],
-    [ts('Envelope ISO C5'), 'envelope-c5', '{"metric":"pt","width":649.13,"height":459.21}'],
-    [ts('Envelope ISO C6'), 'envelope-c6', '{"metric":"pt","width":459.21,"height":323.15}'],
-    [ts('Envelope ISO DL'), 'envelope-dl', '{"metric":"pt","width":623.622,"height":311.811}'],
-    [ts('ISO A0'), 'a0', '{"metric":"pt","width":2383.94,"height":3370.39}'],
-    [ts('ISO A1'), 'a1', '{"metric":"pt","width":1683.78,"height":2383.94}'],
-    [ts('ISO A2'), 'a2', '{"metric":"pt","width":1190.55,"height":1683.78}'],
-    [ts('ISO A3'), 'a3', '{"metric":"pt","width":841.89,"height":1190.55}'],
-    [ts('ISO A4'), 'a4', '{"metric":"pt","width":595.28,"height":841.89}'],
-    [ts('ISO A5'), 'a5', '{"metric":"pt","width":419.53,"height":595.28}'],
-    [ts('ISO A6'), 'a6', '{"metric":"pt","width":297.64,"height":419.53}'],
-    [ts('ISO A7'), 'a7', '{"metric":"pt","width":209.76,"height":297.64}'],
-    [ts('ISO A8'), 'a8', '{"metric":"pt","width":147.4,"height":209.76}'],
-    [ts('ISO A9'), 'a9', '{"metric":"pt","width":104.88,"height":147.4}'],
-    [ts('ISO A10'), 'a10', '{"metric":"pt","width":73.7,"height":104.88}'],
-    [ts('ISO B0'), 'b0', '{"metric":"pt","width":2834.65,"height":4008.19}'],
-    [ts('ISO B1'), 'b1', '{"metric":"pt","width":2004.09,"height":2834.65}'],
-    [ts('ISO B2'), 'b2', '{"metric":"pt","width":1417.32,"height":2004.09}'],
-    [ts('ISO B3'), 'b3', '{"metric":"pt","width":1000.63,"height":1417.32}'],
-    [ts('ISO B4'), 'b4', '{"metric":"pt","width":708.66,"height":1000.63}'],
-    [ts('ISO B5'), 'b5', '{"metric":"pt","width":498.9,"height":708.66}'],
-    [ts('ISO B6'), 'b6', '{"metric":"pt","width":354.33,"height":498.9}'],
-    [ts('ISO B7'), 'b7', '{"metric":"pt","width":249.45,"height":354.33}'],
-    [ts('ISO B8'), 'b8', '{"metric":"pt","width":175.75,"height":249.45}'],
-    [ts('ISO B9'), 'b9', '{"metric":"pt","width":124.72,"height":175.75}'],
-    [ts('ISO B10'), 'b10', '{"metric":"pt","width":87.87,"height":124.72}'],
-    [ts('ISO C0'), 'c0', '{"metric":"pt","width":2599.37,"height":3676.54}'],
-    [ts('ISO C1'), 'c1', '{"metric":"pt","width":1836.85,"height":2599.37}'],
-    [ts('ISO C2'), 'c2', '{"metric":"pt","width":1298.27,"height":1836.85}'],
-    [ts('ISO C3'), 'c3', '{"metric":"pt","width":918.43,"height":1298.27}'],
-    [ts('ISO C4'), 'c4', '{"metric":"pt","width":649.13,"height":918.43}'],
-    [ts('ISO C5'), 'c5', '{"metric":"pt","width":459.21,"height":649.13}'],
-    [ts('ISO C6'), 'c6', '{"metric":"pt","width":323.15,"height":459.21}'],
-    [ts('ISO C7'), 'c7', '{"metric":"pt","width":229.61,"height":323.15}'],
-    [ts('ISO C8'), 'c8', '{"metric":"pt","width":161.57,"height":229.61}'],
-    [ts('ISO C9'), 'c9', '{"metric":"pt","width":113.39,"height":161.57}'],
-    [ts('ISO C10'), 'c10', '{"metric":"pt","width":79.37,"height":113.39}'],
-    [ts('ISO RA0'), 'ra0', '{"metric":"pt","width":2437.8,"height":3458.27}'],
-    [ts('ISO RA1'), 'ra1', '{"metric":"pt","width":1729.13,"height":2437.8}'],
-    [ts('ISO RA2'), 'ra2', '{"metric":"pt","width":1218.9,"height":1729.13}'],
-    [ts('ISO RA3'), 'ra3', '{"metric":"pt","width":864.57,"height":1218.9}'],
-    [ts('ISO RA4'), 'ra4', '{"metric":"pt","width":609.45,"height":864.57}'],
-    [ts('ISO SRA0'), 'sra0', '{"metric":"pt","width":2551.18,"height":3628.35}'],
-    [ts('ISO SRA1'), 'sra1', '{"metric":"pt","width":1814.17,"height":2551.18}'],
-    [ts('ISO SRA2'), 'sra2', '{"metric":"pt","width":1275.59,"height":1814.17}'],
-    [ts('ISO SRA3'), 'sra3', '{"metric":"pt","width":907.09,"height":1275.59}'],
-    [ts('ISO SRA4'), 'sra4', '{"metric":"pt","width":637.8,"height":907.09}'],
+  ->addValues([
+    [
+      'label' => ts('Letter'),
+      'value' => '{"metric":"in","width":8.5,"height":11}',
+      'name' => 'letter',
+      'is_default' => 1,
+    ],
+    [
+      'label' => ts('Legal'),
+      'value' => '{"metric":"in","width":8.5,"height":14}',
+      'name' => 'legal',
+    ],
+    [
+      'label' => ts('Ledger'),
+      'value' => '{"metric":"in","width":17,"height":11}',
+      'name' => 'ledger',
+    ],
+    [
+      'label' => ts('Tabloid'),
+      'value' => '{"metric":"in","width":11,"height":17}',
+      'name' => 'tabloid',
+    ],
+    [
+      'label' => ts('Executive'),
+      'value' => '{"metric":"in","width":7.25,"height":10.5}',
+      'name' => 'executive',
+    ],
+    [
+      'label' => ts('Folio'),
+      'value' => '{"metric":"in","width":8.5,"height":13}',
+      'name' => 'folio',
+    ],
+    [
+      'label' => ts('Envelope #9'),
+      'value' => '{"metric":"pt","width":638.93,"height":278.93}',
+      'name' => 'envelope-9',
+    ],
+    [
+      'label' => ts('Envelope #10'),
+      'value' => '{"metric":"pt","width":684,"height":297}',
+      'name' => 'envelope-10',
+    ],
+    [
+      'label' => ts('Envelope #11'),
+      'value' => '{"metric":"pt","width":747,"height":324}',
+      'name' => 'envelope-11',
+    ],
+    [
+      'label' => ts('Envelope #12'),
+      'value' => '{"metric":"pt","width":792,"height":342}',
+      'name' => 'envelope-12',
+    ],
+    [
+      'label' => ts('Envelope #14'),
+      'value' => '{"metric":"pt","width":828,"height":360}',
+      'name' => 'envelope-14',
+    ],
+    [
+      'label' => ts('Envelope ISO B4'),
+      'value' => '{"metric":"pt","width":1000.63,"height":708.66}',
+      'name' => 'envelope-b4',
+    ],
+    [
+      'label' => ts('Envelope ISO B5'),
+      'value' => '{"metric":"pt","width":708.66,"height":498.9}',
+      'name' => 'envelope-b5',
+    ],
+    [
+      'label' => ts('Envelope ISO B6'),
+      'value' => '{"metric":"pt","width":498.9,"height":354.33}',
+      'name' => 'envelope-b6',
+    ],
+    [
+      'label' => ts('Envelope ISO C3'),
+      'value' => '{"metric":"pt","width":1298.27,"height":918.42}',
+      'name' => 'envelope-c3',
+    ],
+    [
+      'label' => ts('Envelope ISO C4'),
+      'value' => '{"metric":"pt","width":918.42,"height":649.13}',
+      'name' => 'envelope-c4',
+    ],
+    [
+      'label' => ts('Envelope ISO C5'),
+      'value' => '{"metric":"pt","width":649.13,"height":459.21}',
+      'name' => 'envelope-c5',
+    ],
+    [
+      'label' => ts('Envelope ISO C6'),
+      'value' => '{"metric":"pt","width":459.21,"height":323.15}',
+      'name' => 'envelope-c6',
+    ],
+    [
+      'label' => ts('Envelope ISO DL'),
+      'value' => '{"metric":"pt","width":623.622,"height":311.811}',
+      'name' => 'envelope-dl',
+    ],
+    [
+      'label' => ts('ISO A0'),
+      'value' => '{"metric":"pt","width":2383.94,"height":3370.39}',
+      'name' => 'a0',
+    ],
+    [
+      'label' => ts('ISO A1'),
+      'value' => '{"metric":"pt","width":1683.78,"height":2383.94}',
+      'name' => 'a1',
+    ],
+    [
+      'label' => ts('ISO A2'),
+      'value' => '{"metric":"pt","width":1190.55,"height":1683.78}',
+      'name' => 'a2',
+    ],
+    [
+      'label' => ts('ISO A3'),
+      'value' => '{"metric":"pt","width":841.89,"height":1190.55}',
+      'name' => 'a3',
+    ],
+    [
+      'label' => ts('ISO A4'),
+      'value' => '{"metric":"pt","width":595.28,"height":841.89}',
+      'name' => 'a4',
+    ],
+    [
+      'label' => ts('ISO A5'),
+      'value' => '{"metric":"pt","width":419.53,"height":595.28}',
+      'name' => 'a5',
+    ],
+    [
+      'label' => ts('ISO A6'),
+      'value' => '{"metric":"pt","width":297.64,"height":419.53}',
+      'name' => 'a6',
+    ],
+    [
+      'label' => ts('ISO A7'),
+      'value' => '{"metric":"pt","width":209.76,"height":297.64}',
+      'name' => 'a7',
+    ],
+    [
+      'label' => ts('ISO A8'),
+      'value' => '{"metric":"pt","width":147.4,"height":209.76}',
+      'name' => 'a8',
+    ],
+    [
+      'label' => ts('ISO A9'),
+      'value' => '{"metric":"pt","width":104.88,"height":147.4}',
+      'name' => 'a9',
+    ],
+    [
+      'label' => ts('ISO A10'),
+      'value' => '{"metric":"pt","width":73.7,"height":104.88}',
+      'name' => 'a10',
+    ],
+    [
+      'label' => ts('ISO B0'),
+      'value' => '{"metric":"pt","width":2834.65,"height":4008.19}',
+      'name' => 'b0',
+    ],
+    [
+      'label' => ts('ISO B1'),
+      'value' => '{"metric":"pt","width":2004.09,"height":2834.65}',
+      'name' => 'b1',
+    ],
+    [
+      'label' => ts('ISO B2'),
+      'value' => '{"metric":"pt","width":1417.32,"height":2004.09}',
+      'name' => 'b2',
+    ],
+    [
+      'label' => ts('ISO B3'),
+      'value' => '{"metric":"pt","width":1000.63,"height":1417.32}',
+      'name' => 'b3',
+    ],
+    [
+      'label' => ts('ISO B4'),
+      'value' => '{"metric":"pt","width":708.66,"height":1000.63}',
+      'name' => 'b4',
+    ],
+    [
+      'label' => ts('ISO B5'),
+      'value' => '{"metric":"pt","width":498.9,"height":708.66}',
+      'name' => 'b5',
+    ],
+    [
+      'label' => ts('ISO B6'),
+      'value' => '{"metric":"pt","width":354.33,"height":498.9}',
+      'name' => 'b6',
+    ],
+    [
+      'label' => ts('ISO B7'),
+      'value' => '{"metric":"pt","width":249.45,"height":354.33}',
+      'name' => 'b7',
+    ],
+    [
+      'label' => ts('ISO B8'),
+      'value' => '{"metric":"pt","width":175.75,"height":249.45}',
+      'name' => 'b8',
+    ],
+    [
+      'label' => ts('ISO B9'),
+      'value' => '{"metric":"pt","width":124.72,"height":175.75}',
+      'name' => 'b9',
+    ],
+    [
+      'label' => ts('ISO B10'),
+      'value' => '{"metric":"pt","width":87.87,"height":124.72}',
+      'name' => 'b10',
+    ],
+    [
+      'label' => ts('ISO C0'),
+      'value' => '{"metric":"pt","width":2599.37,"height":3676.54}',
+      'name' => 'c0',
+    ],
+    [
+      'label' => ts('ISO C1'),
+      'value' => '{"metric":"pt","width":1836.85,"height":2599.37}',
+      'name' => 'c1',
+    ],
+    [
+      'label' => ts('ISO C2'),
+      'value' => '{"metric":"pt","width":1298.27,"height":1836.85}',
+      'name' => 'c2',
+    ],
+    [
+      'label' => ts('ISO C3'),
+      'value' => '{"metric":"pt","width":918.43,"height":1298.27}',
+      'name' => 'c3',
+    ],
+    [
+      'label' => ts('ISO C4'),
+      'value' => '{"metric":"pt","width":649.13,"height":918.43}',
+      'name' => 'c4',
+    ],
+    [
+      'label' => ts('ISO C5'),
+      'value' => '{"metric":"pt","width":459.21,"height":649.13}',
+      'name' => 'c5',
+    ],
+    [
+      'label' => ts('ISO C6'),
+      'value' => '{"metric":"pt","width":323.15,"height":459.21}',
+      'name' => 'c6',
+    ],
+    [
+      'label' => ts('ISO C7'),
+      'value' => '{"metric":"pt","width":229.61,"height":323.15}',
+      'name' => 'c7',
+    ],
+    [
+      'label' => ts('ISO C8'),
+      'value' => '{"metric":"pt","width":161.57,"height":229.61}',
+      'name' => 'c8',
+    ],
+    [
+      'label' => ts('ISO C9'),
+      'value' => '{"metric":"pt","width":113.39,"height":161.57}',
+      'name' => 'c9',
+    ],
+    [
+      'label' => ts('ISO C10'),
+      'value' => '{"metric":"pt","width":79.37,"height":113.39}',
+      'name' => 'c10',
+    ],
+    [
+      'label' => ts('ISO RA0'),
+      'value' => '{"metric":"pt","width":2437.8,"height":3458.27}',
+      'name' => 'ra0',
+    ],
+    [
+      'label' => ts('ISO RA1'),
+      'value' => '{"metric":"pt","width":1729.13,"height":2437.8}',
+      'name' => 'ra1',
+    ],
+    [
+      'label' => ts('ISO RA2'),
+      'value' => '{"metric":"pt","width":1218.9,"height":1729.13}',
+      'name' => 'ra2',
+    ],
+    [
+      'label' => ts('ISO RA3'),
+      'value' => '{"metric":"pt","width":864.57,"height":1218.9}',
+      'name' => 'ra3',
+    ],
+    [
+      'label' => ts('ISO RA4'),
+      'value' => '{"metric":"pt","width":609.45,"height":864.57}',
+      'name' => 'ra4',
+    ],
+    [
+      'label' => ts('ISO SRA0'),
+      'value' => '{"metric":"pt","width":2551.18,"height":3628.35}',
+      'name' => 'sra0',
+    ],
+    [
+      'label' => ts('ISO SRA1'),
+      'value' => '{"metric":"pt","width":1814.17,"height":2551.18}',
+      'name' => 'sra1',
+    ],
+    [
+      'label' => ts('ISO SRA2'),
+      'value' => '{"metric":"pt","width":1275.59,"height":1814.17}',
+      'name' => 'sra2',
+    ],
+    [
+      'label' => ts('ISO SRA3'),
+      'value' => '{"metric":"pt","width":907.09,"height":1275.59}',
+      'name' => 'sra3',
+    ],
+    [
+      'label' => ts('ISO SRA4'),
+      'value' => '{"metric":"pt","width":637.8,"height":907.09}',
+      'name' => 'sra4',
+    ],
   ])
   ->addDefaults([
     'filter' => NULL,

diff --git a/sql/civicrm_option_groups/postal_greeting.sqldata.php b/sql/civicrm_option_groups/postal_greeting.sqldata.php
index a02604cb5c8bee579ecb678b71fc1231f10a29e0..6929ac8a7737e2809bcdc72f489c56f3a84993e7 100644 (file)
--- a/sql/civicrm_option_groups/postal_greeting.sqldata.php
+++ b/sql/civicrm_option_groups/postal_greeting.sqldata.php
@@ -3,10 +3,37 @@ return CRM_Core_CodeGen_OptionGroup::create('postal_greeting', 'a/0041')
   ->addMetadata([
     'title' => ts('Postal Greeting Type'),
   ])
-  ->addValueTable(['label', 'name', 'value'], [
-    ['Dear {contact.first_name}', 'Dear {contact.first_name}', 1, 'filter' => 1, 'is_default' => 1],
-    ['Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}', 'Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}', 2, 'filter' => 1],
-    ['Dear {contact.prefix_id:label} {contact.last_name}', 'Dear {contact.prefix_id:label} {contact.last_name}', 3, 'filter' => 1],
-    ['Customized', 'Customized', 4, 'is_reserved' => 1],
-    ['Dear {contact.household_name}', 'Dear {contact.household_name}', 5, 'filter' => 2, 'is_default' => 1],
+  ->addValues([
+    [
+      'label' => 'Dear {contact.first_name}',
+      'value' => 1,
+      'name' => 'Dear {contact.first_name}',
+      'filter' => 1,
+      'is_default' => 1,
+    ],
+    [
+      'label' => 'Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}',
+      'value' => 2,
+      'name' => 'Dear {contact.prefix_id:label} {contact.first_name} {contact.last_name}',
+      'filter' => 1,
+    ],
+    [
+      'label' => 'Dear {contact.prefix_id:label} {contact.last_name}',
+      'value' => 3,
+      'name' => 'Dear {contact.prefix_id:label} {contact.last_name}',
+      'filter' => 1,
+    ],
+    [
+      'label' => 'Customized',
+      'value' => 4,
+      'name' => 'Customized',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => 'Dear {contact.household_name}',
+      'value' => 5,
+      'name' => 'Dear {contact.household_name}',
+      'filter' => 2,
+      'is_default' => 1,
+    ],
   ]);

diff --git a/sql/civicrm_option_groups/soft_credit_type.sqldata.php b/sql/civicrm_option_groups/soft_credit_type.sqldata.php
index defdecf520db7881f39eed8c53339d71956406d0..6a1239333d55a4ab36b78ed5343592e7242318aa 100644 (file)
--- a/sql/civicrm_option_groups/soft_credit_type.sqldata.php
+++ b/sql/civicrm_option_groups/soft_credit_type.sqldata.php
@@ -1,21 +1,68 @@
 <?php
-
-// CRM-13833
-return CRM_Core_CodeGen_OptionGroup::create('soft_credit_type', 'b/98')
+return CRM_Core_CodeGen_OptionGroup::create('soft_credit_type', 'a/0096')
   ->addMetadata([
     'title' => ts('Soft Credit Types'),
   ])
-  ->addValueTable(['label', 'value', 'name'], [
-    [ts('In Honor of'), 1, 'in_honor_of', 'is_reserved' => 1],
-    [ts('In Memory of'), 2, 'in_memory_of', 'is_reserved' => 1],
-    [ts('Solicited'), 3, 'solicited', 'is_reserved' => 1, 'is_default' => 1],
-    [ts('Household'), 4, 'household'],
-    [ts('Workplace Giving'), 5, 'workplace'],
-    [ts('Foundation Affiliate'), 6, 'foundation_affiliate'],
-    [ts('3rd-party Service'), 7, '3rd-party_service'],
-    [ts('Donor-advised Fund'), 8, 'donor-advised_fund'],
-    [ts('Matched Gift'), 9, 'matched_gift'],
-    [ts('Personal Campaign Page'), 10, 'pcp', 'is_reserved' => 1],
-    [ts('Gift'), 11, 'gift', 'is_reserved' => 1],
-  ])
-  ->addDefaults([]);
+  ->addValues([
+    [
+      'label' => ts('In Honor of'),
+      'value' => 1,
+      'name' => 'in_honor_of',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('In Memory of'),
+      'value' => 2,
+      'name' => 'in_memory_of',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Solicited'),
+      'value' => 3,
+      'name' => 'solicited',
+      'is_default' => 1,
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Household'),
+      'value' => 4,
+      'name' => 'household',
+    ],
+    [
+      'label' => ts('Workplace Giving'),
+      'value' => 5,
+      'name' => 'workplace',
+    ],
+    [
+      'label' => ts('Foundation Affiliate'),
+      'value' => 6,
+      'name' => 'foundation_affiliate',
+    ],
+    [
+      'label' => ts('3rd-party Service'),
+      'value' => 7,
+      'name' => '3rd-party_service',
+    ],
+    [
+      'label' => ts('Donor-advised Fund'),
+      'value' => 8,
+      'name' => 'donor-advised_fund',
+    ],
+    [
+      'label' => ts('Matched Gift'),
+      'value' => 9,
+      'name' => 'matched_gift',
+    ],
+    [
+      'label' => ts('Personal Campaign Page'),
+      'value' => 10,
+      'name' => 'pcp',
+      'is_reserved' => 1,
+    ],
+    [
+      'label' => ts('Gift'),
+      'value' => 11,
+      'name' => 'gift',
+      'is_reserved' => 1,
+    ],
+  ]);

diff --git a/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php b/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php
index 869dbd70bc4dd42e2a39e107f9c07447048946e3..b69391ff99ccaba56c77db970cfddb5e76b0d836 100644 (file)
--- a/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php
+++ b/sql/civicrm_option_groups/wysiwyg_presets.sqldata.php
@@ -3,10 +3,25 @@ return CRM_Core_CodeGen_OptionGroup::create('wysiwyg_presets', 'a/0077')
   ->addMetadata([
     'title' => ts('WYSIWYG Editor Presets'),
   ])
-  ->addValueTable(['label', 'name', 'value'], [
-    [ts('Default'), 'default', 1, 'is_default' => 1],
-    [ts('CiviMail'), 'civimail', 2, 'component_id' => 4],
-    [ts('CiviEvent'), 'civievent', 3, 'component_id' => 1],
+  ->addValues([
+    [
+      'label' => ts('Default'),
+      'value' => 1,
+      'name' => 'default',
+      'is_default' => 1,
+    ],
+    [
+      'label' => ts('CiviMail'),
+      'value' => 2,
+      'name' => 'civimail',
+      'component_id' => 4,
+    ],
+    [
+      'label' => ts('CiviEvent'),
+      'value' => 3,
+      'name' => 'civievent',
+      'component_id' => 1,
+    ],
   ])
   ->addDefaults([
     'filter' => NULL,