CRM-12252 Add in help_pre and help_post fields for price field options #8521

seamuslee001 · 2016-06-06T23:36:24Z

CRM-12252: What is price set price option description for?

jitendrapurohit · 2016-06-10T13:18:21Z

CRM/Price/BAO/PriceField.php

+            $pre_help = isset($opt['help_pre']) ?
+              '<span class="crm-price-amount-help-pre">' . $opt['help_pre'] . '</span>: ' : '';
+            $post_help = isset($opt['help_post']) ?
+              ': <span class="crm-price-amount-help-post">' . $opt['help_post'] . '</span>' : '';


I think we need to also add description class to make the span look similar to other help texts(custom fields, etc).

jitendrapurohit · 2016-06-10T13:21:39Z

Can you please update this PR as it has gone stale due to generated data changes.

JoeMurray · 2016-06-13T16:44:51Z

Heh Seamus, as Release Manager this month, I'm trying to recruit people to help pare down the backlog of almost 100 PRs, some going back to last summer. I'm wondering if you would be able to help QA another PR if I got someone to QA this PR and your other ones like #7499 #8503 #8273 #8424 ?

jitendrapurohit · 2016-06-20T13:17:21Z

CRM/Price/BAO/PriceField.php

+            $pre_help = isset($opt['help_pre']) ?
+              '<span class="crm-price-amount-help-pre">' . $opt['help_pre'] . '</span>: ' : '';
+            $post_help = isset($opt['help_post']) ?
+              ': <span class="crm-price-amount-help-post">' . $opt['help_post'] . '</span>' : '';


@seamuslee001 shouldn't description class be added here too ?

jitendrapurohit · 2016-06-21T09:03:39Z

@seamuslee001 I get an error on upgrade after the updated code.

ALTER TABLE civicrm_price_field_value_en_US ADD COLUMN help_pre_en_US text COLLATE utf8_unicode_ci COMMENT "Price field option pre help text." [nativecode=1347 ** 'test_drupal_civi.civicrm_price_field_value_en_US' is not BASE TABLE]

Screenshot - http://goo.gl/Zds5N5

JoeMurray · 2016-06-21T20:42:02Z

@mlutfy could you review where the i18n / l10n is going wrong in patch?

eileenmcnaughton · 2016-06-23T04:11:55Z

I think you need to look at how you are calling executeQuery - here is the call sig

  public static function &executeQuery(
    $query,
    $params = array(),
    $abort = TRUE,
    $daoName = NULL,
    $freeDAO = FALSE,
    $i18nRewrite = TRUE,
    $trapException = FALSE

seamuslee001 · 2016-06-23T04:47:14Z

thanks Eileen :) @eileenmcnaughton

jitendrapurohit · 2016-06-23T07:02:27Z

@seamuslee001 After multilingual upgrade to 4.7.9 with this patch included, fields added here(pre help and post help) do appear on the form, but they are not saved when the form is submitted.

Can you please check if this is replicated by you as well ?

Thanks!

seamuslee001 · 2016-06-23T07:31:35Z

@jitendrapurohit I don't have access to a multilingual DB so bit difficult for me but I have just pushed something to try and make it like we're adding label. I don't know what is causing the problem

eileenmcnaughton · 2016-06-23T07:42:20Z

CRM/Price/Form/Option.php

@@ -216,6 +216,8 @@ public function buildQuickForm() {
      $this->addRule('amount', ts('Please enter a monetary value for this field.'), 'money');

      $this->add('textarea', 'description', ts('Description'));
+      $this->add('textarea', 'help_pre', ts('Pre Option Help'), NULL, TRUE);


I'm guessing the problem is in the postProcess on this file? You shouldn't need to do anything re multilingual - esp if you use the api

jitendrapurohit · 2016-06-23T09:43:35Z

Nope, it still occurs for me :-(. I see that altering civicrm_price_field_value in upgrade doesn't add these columns to civicrm_price_field_value_{locale} view (is this because of executeQuery() call?).

The PriceFieldValue takes the BAO object which doesn't have pre_help and post_help and copy the values from $params which fails to save these two fields.

…e in table name as well

seamuslee001 · 2016-06-29T04:53:27Z

@jitendrapurohit Can you test it again please, I have tried again with the upgrade but not sure what else I can do

… base columns

jitendrapurohit · 2016-06-29T10:24:08Z

Confirmed that this works fine now. I'll create a new PR for some minor fixes on display and optimization.

Thanks @seamuslee001 :-)

jitendrapurohit · 2016-06-29T11:16:29Z

Additional PR at #8642

civicrm-builder added the master label Jun 6, 2016

jitendrapurohit reviewed Jun 10, 2016
View reviewed changes

seamuslee001 force-pushed the CRM-12252 branch 2 times, most recently from 3b3e1bc to 46bcd21 Compare June 20, 2016 06:26

jitendrapurohit reviewed Jun 20, 2016
View reviewed changes

seamuslee001 force-pushed the CRM-12252 branch from 46bcd21 to 2709983 Compare June 20, 2016 23:57

seamuslee001 force-pushed the CRM-12252 branch from 484c837 to 303a24f Compare June 23, 2016 03:17

seamuslee001 force-pushed the CRM-12252 branch from 303a24f to c119b79 Compare June 23, 2016 04:47

eileenmcnaughton reviewed Jun 23, 2016
View reviewed changes

seamuslee001 added 10 commits June 29, 2016 14:37

CRM-12252 Add in help_pre and help_post fields for price field options

5bfef8f

Add in mulyilingual handiling in upgrade script

7131b3c

Add in description class and add a class for the label seprator

b2a106b

Add in help pre and help post fields to price option form

724d2c5

finish adding description class to help pre and help post

836465c

Shift add table to php to make use of checking if field already exists

da1ecd7

Fix function calling as per comment from Eileen :)

3dc870a

Attempt to fix issue where doesn't save to multilingual db

b82785c

Re-run regen.sh

ac8a7cc

Move upgrade to 4.7.10 version and also test to see if it needs local…

e8a4535

…e in table name as well

seamuslee001 force-pushed the CRM-12252 branch from 57d1fd1 to e8a4535 Compare June 29, 2016 04:52

Fix up upgrade and get it to rebuild multilingual schema after adding…

01ee8ba

… base columns

monishdeb merged commit a5ac49f into civicrm:master Jun 29, 2016

jitendrapurohit mentioned this pull request Jun 29, 2016

CRM-12252 - Minor fixes #8642

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CRM-12252 Add in help_pre and help_post fields for price field options #8521

CRM-12252 Add in help_pre and help_post fields for price field options #8521

seamuslee001 commented Jun 6, 2016 •

edited by civicrm-builder

Loading

jitendrapurohit Jun 10, 2016

jitendrapurohit commented Jun 10, 2016 •

edited

Loading

JoeMurray commented Jun 13, 2016

jitendrapurohit Jun 20, 2016

jitendrapurohit commented Jun 21, 2016

JoeMurray commented Jun 21, 2016

eileenmcnaughton commented Jun 23, 2016

seamuslee001 commented Jun 23, 2016

jitendrapurohit commented Jun 23, 2016

seamuslee001 commented Jun 23, 2016

eileenmcnaughton Jun 23, 2016

jitendrapurohit commented Jun 23, 2016 •

edited

Loading

seamuslee001 commented Jun 29, 2016

jitendrapurohit commented Jun 29, 2016

jitendrapurohit commented Jun 29, 2016

CRM-12252 Add in help_pre and help_post fields for price field options #8521

CRM-12252 Add in help_pre and help_post fields for price field options #8521

Conversation

seamuslee001 commented Jun 6, 2016 • edited by civicrm-builder Loading

jitendrapurohit Jun 10, 2016

Choose a reason for hiding this comment

jitendrapurohit commented Jun 10, 2016 • edited Loading

JoeMurray commented Jun 13, 2016

jitendrapurohit Jun 20, 2016

Choose a reason for hiding this comment

jitendrapurohit commented Jun 21, 2016

JoeMurray commented Jun 21, 2016

eileenmcnaughton commented Jun 23, 2016

seamuslee001 commented Jun 23, 2016

jitendrapurohit commented Jun 23, 2016

seamuslee001 commented Jun 23, 2016

eileenmcnaughton Jun 23, 2016

Choose a reason for hiding this comment

jitendrapurohit commented Jun 23, 2016 • edited Loading

seamuslee001 commented Jun 29, 2016

jitendrapurohit commented Jun 29, 2016

jitendrapurohit commented Jun 29, 2016

seamuslee001 commented Jun 6, 2016 •

edited by civicrm-builder

Loading

jitendrapurohit commented Jun 10, 2016 •

edited

Loading

jitendrapurohit commented Jun 23, 2016 •

edited

Loading