CRM-21050: Use datepicker for all date fields used in contribution backoffice form #10841

pradpnayak · 2017-08-09T21:22:50Z

Overview

Use datepicker for datefields used in backoffice contribtution, these are:

Recieve Date
Thank you Date
Receipt Date
Cancel/Refund Date

Before

Date fields were using jcalender.

After

Replaced all the date fields with datepicker. Here's the screencast to show that default date values and correctly set after submission:

CRM-21050: Use datepicker for backoffice date fields

NOTE original PR was tackling this in a different way - hence comments don't appear to make sense.

monishdeb

Tested, working fine.

eileenmcnaughton · 2017-08-11T22:01:00Z

This makes me sad. We really want to switch to datepicker rather than deal with this nasty handling.

However, I'm ok for this to be merged after one clarification. It seems to me it is not receive_date (per the title of the PR) but rather trxn_date that is not being set correctly. Is that correct? If so can we correct that in the PR / JIRA?

mattwire · 2017-08-12T08:53:36Z

@eileenmcnaughton

This makes me sad. We really want to switch to datepicker rather than deal with this nasty handling.

Agreed, but I've abandoned datepicker so many times as I cannot, for want of trying, get it to set a default date passed in from CiviCRM. With the old method this is easy!

eileenmcnaughton · 2017-08-12T18:01:30Z

is this actually adding trxn_date to the form? If so it seems a bigger change than I realised

eileenmcnaughton · 2017-08-12T18:15:06Z

@mattwire - this patch works on that form to convert thank you date & loads the default ok - does it offer you any clues as to the problem you were having?

eileenmcnaughton@d0177d8

Note that the Contribution.xml already has metadata to describe the date field so I didn't need to add it

JoeMurray · 2017-10-27T17:26:45Z

@eileenmcnaughton there are three date fields displayed on the form, this ensures that all three have their correct time displayed rather than 12:00am for the part of the form we're talking about is the payment section. The before and after images show the payment trxn_date now get their time displayed unlike before. receive_date processing should be unchanged.

eileenmcnaughton · 2017-11-07T21:47:50Z

Right - but I think if we fix any date fields we should change them to use the preferred datepicker at that point. We shouldn't fix the deprecated date field version - the patch above was the example of how to do that for one field

colemanw · 2018-01-01T14:29:33Z

@mattwire the confusing thing about switching to the new datpicker is that it uses a different format than the old method, which might mess up the defaults if you're dealing with legacy code. The old fields would use a localized format across 2 fields (one for date, one for time) which got complicated and messy. The new datepicker widget contains a standard ISO date/time value, which should be much easier to work with once you clear away the legacy stuff.

monishdeb · 2018-01-01T14:38:18Z

Jenkins test this please

monishdeb · 2018-01-01T15:07:39Z

@eileenmcnaughton @colemanw I have changed the JIRA title and description, because as per change it's an improvement to use datepicker for all date fields used in backoffice contribution. Also, I have shared a screencast above to show that the date field values are correctly submitted and set as default on the edit form.

eileenmcnaughton · 2018-01-02T20:44:10Z

tests/phpunit/CRM/Activity/BAO/ActivityTest.php

@@ -757,23 +757,18 @@ public function testbyActivityDateAndStatus() {
    $lastWeekActivities = array(1, 2, 3);
    $todayActivities = array(4, 5, 6, 7);
    $lastTwoMonthsActivities = array(8, 9, 10, 11);
-    $lastYearActivties = array(12, 13, 14, 15, 16);


I think this should be in a separate PR - even if we have to ignore the test fail for now

eileenmcnaughton · 2018-01-02T20:44:35Z

tests/phpunit/CRM/Contribute/BAO/ContributionTest.php

@@ -1203,8 +1203,6 @@ public function createContributionWithTax() {
    $form->testSubmit(array(
       'total_amount' => 100,
        'financial_type_id' => $financialType['id'],
-        'receive_date' => '04/21/2015',


can we update the format on these dates rather than remove?

@eileenmcnaughton 2 reasons why I removed it:

Provided the default value of current date time in the desired format here

In these unit-tests receive date has no importance, however I have retained in some UT like here where it's needed.

Or do you still want to update their formats?

that seems fine - sounds like we are not losing any test data

eileenmcnaughton · 2018-01-02T20:45:06Z

Looks solid from a code POV - I haven't tested

---------------------------------------- * CRM-21050: credit card invoice: receive time set to 12:00 https://issues.civicrm.org/jira/browse/CRM-21050

monishdeb · 2018-01-03T04:02:05Z

@eileenmcnaughton I have moved the additional UT failure fix in separate PR #11479

monishdeb · 2018-01-03T12:14:20Z

Jenkin test this please

eileenmcnaughton · 2018-01-03T20:12:26Z

test failure is unrelated

colemanw · 2018-01-04T22:11:58Z

@civicrm-builder retest this please

colemanw · 2018-01-04T22:12:24Z

I'm satisfied with the amount of review this has seen. Adding "merge on pass" label.

monishdeb · 2018-01-05T07:47:16Z

Test build failure is not related and fixed here #11479

eileenmcnaughton · 2018-01-06T05:20:07Z

Merging in accordance with merge on pass as fail is unrelated

monishdeb · 2018-01-06T16:00:42Z

Thanks @eileenmcnaughton and @colemanw for your review and getting it merged :)

jitendrapurohit · 2018-01-10T10:32:18Z

Fatal error is displayed when a user tries to delete a contribution after this change. Raised a fix at #11500

CRM-21050: Use datepicker for all date fields used in contribution backoffice form

civicrm-builder added the master label Aug 9, 2017

monishdeb approved these changes Aug 10, 2017

View reviewed changes

monishdeb force-pushed the CRM-21050 branch 2 times, most recently from 2aa9de2 to c08d817 Compare January 1, 2018 13:43

monishdeb changed the title ~~CRM-21050, fixed code to set receive date with correct timestamp~~ CRM-21050: Use datepicker for all date fields used in contribution backoffice form Jan 1, 2018

monishdeb force-pushed the CRM-21050 branch 2 times, most recently from 52daeb8 to 834e55b Compare January 1, 2018 18:58

eileenmcnaughton reviewed Jan 2, 2018

View reviewed changes

CRM-21050, fixed code to set receive date with correct timestamp

b25212e

---------------------------------------- * CRM-21050: credit card invoice: receive time set to 12:00 https://issues.civicrm.org/jira/browse/CRM-21050

monishdeb force-pushed the CRM-21050 branch from 834e55b to 726732b Compare January 3, 2018 04:00

test failure fixes

6298b16

monishdeb force-pushed the CRM-21050 branch from 726732b to 6298b16 Compare January 3, 2018 09:52

colemanw added the merge on pass label Jan 4, 2018

eileenmcnaughton merged commit ba5e20d into civicrm:master Jan 6, 2018

monishdeb deleted the CRM-21050 branch January 6, 2018 15:59

jitendrapurohit mentioned this pull request Jan 10, 2018

CRM-21647 - Fatal error on deleting any contribution record #11500

Merged

sluc23 pushed a commit to ixiam/civicrm-core that referenced this pull request Jan 10, 2018

Merge pull request civicrm#10841 from JMAConsulting/CRM-21050

5866ed1

CRM-21050: Use datepicker for all date fields used in contribution backoffice form

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CRM-21050: Use datepicker for all date fields used in contribution backoffice form #10841

CRM-21050: Use datepicker for all date fields used in contribution backoffice form #10841

pradpnayak commented Aug 9, 2017 •

edited by eileenmcnaughton

Loading

monishdeb left a comment

eileenmcnaughton commented Aug 11, 2017

mattwire commented Aug 12, 2017 •

edited

Loading

eileenmcnaughton commented Aug 12, 2017

eileenmcnaughton commented Aug 12, 2017

JoeMurray commented Oct 27, 2017

eileenmcnaughton commented Nov 7, 2017

colemanw commented Jan 1, 2018

monishdeb commented Jan 1, 2018

monishdeb commented Jan 1, 2018 •

edited

Loading

eileenmcnaughton Jan 2, 2018

eileenmcnaughton Jan 2, 2018

monishdeb Jan 3, 2018

eileenmcnaughton Jan 3, 2018

eileenmcnaughton commented Jan 2, 2018

monishdeb commented Jan 3, 2018

monishdeb commented Jan 3, 2018

eileenmcnaughton commented Jan 3, 2018

colemanw commented Jan 4, 2018

colemanw commented Jan 4, 2018

monishdeb commented Jan 5, 2018 •

edited

Loading

eileenmcnaughton commented Jan 6, 2018

monishdeb commented Jan 6, 2018

jitendrapurohit commented Jan 10, 2018

CRM-21050: Use datepicker for all date fields used in contribution backoffice form #10841

CRM-21050: Use datepicker for all date fields used in contribution backoffice form #10841

Conversation

pradpnayak commented Aug 9, 2017 • edited by eileenmcnaughton Loading

Overview

Before

After

monishdeb left a comment

Choose a reason for hiding this comment

eileenmcnaughton commented Aug 11, 2017

mattwire commented Aug 12, 2017 • edited Loading

eileenmcnaughton commented Aug 12, 2017

eileenmcnaughton commented Aug 12, 2017

JoeMurray commented Oct 27, 2017

eileenmcnaughton commented Nov 7, 2017

colemanw commented Jan 1, 2018

monishdeb commented Jan 1, 2018

monishdeb commented Jan 1, 2018 • edited Loading

eileenmcnaughton Jan 2, 2018

Choose a reason for hiding this comment

eileenmcnaughton Jan 2, 2018

Choose a reason for hiding this comment

monishdeb Jan 3, 2018

Choose a reason for hiding this comment

eileenmcnaughton Jan 3, 2018

Choose a reason for hiding this comment

eileenmcnaughton commented Jan 2, 2018

monishdeb commented Jan 3, 2018

monishdeb commented Jan 3, 2018

eileenmcnaughton commented Jan 3, 2018

colemanw commented Jan 4, 2018

colemanw commented Jan 4, 2018

monishdeb commented Jan 5, 2018 • edited Loading

eileenmcnaughton commented Jan 6, 2018

monishdeb commented Jan 6, 2018

jitendrapurohit commented Jan 10, 2018

pradpnayak commented Aug 9, 2017 •

edited by eileenmcnaughton

Loading

mattwire commented Aug 12, 2017 •

edited

Loading

monishdeb commented Jan 1, 2018 •

edited

Loading

monishdeb commented Jan 5, 2018 •

edited

Loading