CRM-15168 add titles to Price Set Entities

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 09cfa08236f4dcfe3e0295eac2b22acb6e822ce2..afe7684b62ae1fff47cde4c711dfb68a4c535b41 100644 (file)
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -275,7 +275,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
       'MembershipBlock', 'MembershipPayment', 'MessageTemplate',
       'MembershipType', 'OptionGroup', 'OptionValue', 'MembershipStatus',
       'ParticipantPayment', 'ParticipantStatusType', 'PledgePayment',
-      'Premium', 'PriceSet', 'PriceFieldValue', 'PriceField', 'PaymentProcessorType', 'PaymentProcessor',
+      'Premium', 'PaymentProcessorType', 'PaymentProcessor',
       'PrintLabel', 'Product', 'ReportTemplate',
       'Setting',);
     if ($sequential === TRUE) {

diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml
index 5ff8825f6b826b99bd84b59ab2ec9306c94606b1..a9c6d1d6439d68c8f5a21179a5effc50129a03de 100644 (file)
--- a/xml/schema/Price/PriceField.xml
+++ b/xml/schema/Price/PriceField.xml
@@ -8,6 +8,7 @@
   <log>true</log>
   <field>
     <name>id</name>
+    <title>Price Field ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Price Field</comment>
@@ -19,6 +20,7 @@
   </primaryKey>
   <field>
     <name>price_set_id</name>
+    <title>Price Set</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>FK to civicrm_price_set</comment>
@@ -75,6 +77,7 @@
   </field>
   <field>
     <name>is_enter_qty</name>
+    <title>Price Field Quantity Required?</title>
     <type>boolean</type>
     <default>0</default>
     <comment>Enter a quantity for this field?</comment>
@@ -85,6 +88,7 @@
   </field>
   <field>
     <name>help_pre</name>
+    <title>Price Field Pre Text</title>
     <type>text</type>
     <localizable>true</localizable>
     <comment>Description and/or help text to display before this field.</comment>
@@ -97,6 +101,7 @@
   </field>
   <field>
     <name>help_post</name>
+    <title>Price Field Post Test</title>
     <type>text</type>
     <localizable>true</localizable>
     <comment>Description and/or help text to display after this field.</comment>
@@ -109,6 +114,7 @@
   </field>
   <field>
     <name>weight</name>
+    <title>Price Field Weight</title>
     <type>int</type>
     <default>1</default>
     <comment>Order in which the fields should appear</comment>
@@ -119,6 +125,7 @@
   </field>
   <field>
     <name>is_display_amounts</name>
+    <title>Price Field Show Amounts?</title>
     <type>boolean</type>
     <default>1</default>
     <comment>Should the price be displayed next to the label for each option?</comment>
@@ -128,6 +135,7 @@
   </field>
   <field>
     <name>options_per_line</name>
+    <title>Price Field Options per Row</title>
     <type>int unsigned</type>
     <default>1</default>
     <comment>number of options per line for checkbox and radio</comment>
@@ -138,6 +146,7 @@
   </field>
   <field>
     <name>is_active</name>
+    <title>Price Field Is Active?</title>
     <type>boolean</type>
     <comment>Is this price field active</comment>
     <default>1</default>
@@ -148,6 +157,7 @@
   </field>
   <field>
     <name>is_required</name>
+    <title>Price Field is Required?</title>
     <type>boolean</type>
     <comment>Is this price field required (value must be > 1)</comment>
     <default>1</default>
@@ -158,6 +168,7 @@
   </field>
   <field>
     <name>active_on</name>
+    <title>Price Field Start Date</title>
     <type>datetime</type>
     <default>NULL</default>
     <comment>If non-zero, do not show this field before the date specified</comment>
@@ -168,6 +179,7 @@
   </field>
   <field>
     <name>expire_on</name>
+    <title>Price Field End Date</title>
     <type>datetime</type>
     <default>NULL</default>
     <comment>If non-zero, do not show this field after the date specified</comment>
@@ -178,6 +190,7 @@
   </field>
   <field>
     <name>javascript</name>
+    <title>Price Field Javascript</title>
     <type>varchar</type>
     <length>255</length>
     <comment>Optional scripting attributes for field</comment>
@@ -188,6 +201,7 @@
   </field>
   <field>
     <name>visibility_id</name>
+    <title>Price Field Visibility</title>
     <type>int unsigned</type>
     <default>1</default>
     <comment>Implicit FK to civicrm_option_group with name = \'visibility\'</comment>

diff --git a/xml/schema/Price/PriceFieldValue.xml b/xml/schema/Price/PriceFieldValue.xml
index 19a89947e1aeee72da7d620593828f0a291663e4..3a0a490c9ebeda76935c1b43677164e80f3ad2eb 100644 (file)
--- a/xml/schema/Price/PriceFieldValue.xml
+++ b/xml/schema/Price/PriceFieldValue.xml
@@ -7,6 +7,7 @@
   <add>3.3</add>
   <field>
     <name>id</name>
+    <title>Price Field Value ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Price Field Value</comment>
@@ -18,6 +19,7 @@
   </primaryKey>
   <field>
     <name>price_field_id</name>
+    <title>Price Field</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>FK to civicrm_price_field</comment>
@@ -110,6 +112,7 @@
   </field>
   <field>
     <name>membership_type_id</name>
+    <title>Membership Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
     <comment>FK to Membership Type</comment>
@@ -137,6 +140,7 @@
   </field>
   <field>
     <name>is_default</name>
+    <title>Is Default Price Field Option?</title>
     <type>boolean</type>
     <comment>Is this default price field option</comment>
     <default>0</default>
@@ -147,6 +151,7 @@
   </field>
   <field>
     <name>is_active</name>
+    <title>Price Field Value is Active</title>
     <type>boolean</type>
     <comment>Is this price field value active</comment>
     <default>1</default>

diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index 3b961957de097d1d1a213b811d3d8cea8354131c..034fe1b5e07571f747b193baf4bde4eab5f536ae 100644 (file)
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -8,6 +8,7 @@
   <log>true</log>
   <field>
     <name>id</name>
+    <title>Price Set ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Price Set</comment>
@@ -19,6 +20,7 @@
   </primaryKey>
   <field>
     <name>domain_id</name>
+    <title>Price Set Domain</title>
     <type>int unsigned</type>
     <pseudoconstant>
       <table>civicrm_domain</table>
@@ -56,6 +58,7 @@
   </index>
   <field>
     <name>title</name>
+    <title>Price Set Title</title>
     <type>varchar</type>
     <length>255</length>
     <required>true</required>
@@ -68,6 +71,7 @@
   </field>
   <field>
     <name>is_active</name>
+    <title>Price Set Is Active?</title>
     <type>boolean</type>
     <default>1</default>
     <comment>Is this price set active</comment>
@@ -78,6 +82,7 @@
   </field>
   <field>
     <name>help_pre</name>
+    <title>Price Set Pre Help</title>
     <type>text</type>
     <localizable>true</localizable>
     <comment>Description and/or help text to display before fields in form.</comment>
@@ -90,6 +95,7 @@
   </field>
   <field>
     <name>help_post</name>
+    <title>Price Set Post Help</title>
     <type>text</type>
     <localizable>true</localizable>
     <comment>Description and/or help text to display after fields in form.</comment>
@@ -102,6 +108,7 @@
   </field>
   <field>
     <name>javascript</name>
+    <title>Price Set Javascript</title>
     <type>varchar</type>
     <length>64</length>
     <comment>Optional Javascript script function(s) included on the form with this price_set. Can be used for conditional</comment>
@@ -112,6 +119,7 @@
   </field>
   <field>
     <name>extends</name>
+    <title>Price Set Extends</title>
     <type>varchar</type>
     <length>255</length>
     <required>true</required>
@@ -128,6 +136,7 @@
   </field>
   <field>
     <name>contribution_type_id</name>
+    <title>Price Set Contribution Type</title>
     <type>int unsigned</type>
     <default>NULL</default>
     <comment>FK to Contribution Type(for membership price sets only).</comment>
@@ -167,6 +176,7 @@
   </foreignKey>
   <field>
     <name>is_quick_config</name>
+    <title>Is Price Set Quick Config?</title>
     <type>boolean</type>
     <default>0</default>
     <comment>Is set if edited on Contribution or Event Page rather than through Manage Price Sets</comment>
@@ -177,6 +187,7 @@
   </field>
   <field>
     <name>is_reserved</name>
+    <title>Price Set Is Reserved</title>
     <type>boolean</type>
     <default>0</default>
     <comment>Is this a predefined system price set  (i.e. it can not be deleted, edited)?</comment>