[00:00:53] (CR) jerkins-bot: [V: -1] Drupal submodule update [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/512072 (owner: Eileen) [00:01:26] (CR) jerkins-bot: [V: -1] Drupal submodule update [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/512072 (owner: Eileen) [00:05:37] (PS1) Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/512073 [00:09:34] (CR) Eileen: [C: +2] "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/512072 (owner: Eileen) [00:14:02] (Merged) jenkins-bot: Drupal submodule update [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/512072 (owner: Eileen) [00:16:44] (PS1) Eileen: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/512074 [00:16:58] (CR) Eileen: [C: +2] Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/512074 (owner: Eileen) [00:17:33] (Merged) jenkins-bot: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/512074 (owner: Eileen) [00:22:18] (CR) Ejegg: [C: +2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/512073 (owner: Ejegg) [00:23:05] (Merged) jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/512073 (owner: Ejegg) [00:25:51] (PS1) Ejegg: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/512075 [00:26:03] (CR) Ejegg: [C: +2] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/512075 (owner: Ejegg) [00:28:01] (Merged) jenkins-bot: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/512075 (owner: Ejegg) [00:33:37] !log updated payments-wiki from fa005a0640 to 786d76e212 [00:33:41] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [01:41:00] !log civicrm revision changed from e6e846708f to 21afd001b6, config revision is 87e78d3eac [01:41:03] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [02:07:38] (PS6) Ejegg: Fix Ingenico hosted checkout variants [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/510622 (https://phabricator.wikimedia.org/T222290) [03:54:57] Fundraising-Backlog: Clicking "Cancel" inside the credit card iframe pushes donors out of the payment page - https://phabricator.wikimedia.org/T224063 (scervantes) Thank you for the prompt response @DStrine! I see your point about giving the user a way to cancel the donation at this point in the process and... [10:36:47] Fundraising-Backlog, MediaWiki-extensions-CentralNotice: Remove hacky EventLogging-duplicating code and use new lightweight EL facilities - https://phabricator.wikimedia.org/T214709 (Maintenance_bot) [10:51:34] fundraising-tech-ops, Operations: rack/setup/install Prometeuse/Grafana host frmon2001 for fr-tech - https://phabricator.wikimedia.org/T196476 (Maintenance_bot) [12:57:15] (CR) Jgleeson: [C: +2] "tests passing now and code looks good!" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/510622 (https://phabricator.wikimedia.org/T222290) (owner: Ejegg) [13:02:47] (Merged) jenkins-bot: Fix Ingenico hosted checkout variants [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/510622 (https://phabricator.wikimedia.org/T222290) (owner: Ejegg) [14:05:58] (PS2) Mepps: Mustache flag to use spaces in helper args [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511800 (https://phabricator.wikimedia.org/T218240) (owner: Ejegg) [14:06:01] (CR) Mepps: [C: +2] Mustache flag to use spaces in helper args [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511800 (https://phabricator.wikimedia.org/T218240) (owner: Ejegg) [14:07:07] (Merged) jenkins-bot: Mustache flag to use spaces in helper args [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511800 (https://phabricator.wikimedia.org/T218240) (owner: Ejegg) [14:07:37] thanks for the cr mepps and jgleeson ! [14:07:51] I'll get that stuff out shortly [14:08:22] hey ejegg, when you say "payment" role on this commit message--do you mean the fundraising role? just confirming there is no additional role [14:08:25] https://gerrit.wikimedia.org/r/#/c/mediawiki/vagrant/+/511613/ [14:08:42] the link would be helpful :) ^^ [14:09:11] ah right, I guess that's the one. I'll reword that [14:10:15] it almost feels like those settings shouldn't be there, but since we're really the only people using the role now, I'm not too concerned [14:10:19] okay cool, not a big deal, just wanting to confirm [14:10:29] why shouldn't they be there ejegg? [14:10:40] because they're specific to our account [14:10:44] other ingenico users/ [14:10:47] ?* [14:10:55] np ejegg [14:13:14] ok, reworded: https://gerrit.wikimedia.org/r/511613 [14:13:23] ah i get it ejegg [14:13:31] AndyRussG, I think the faulure provisioning the eventbus role alongside the fundraising role was related to the dash errors, which trips up for fundraising on its own anyway. After commenting out the crm/dash manifest it provisioned successfully for me [14:14:01] ejegg, I think we can fix the dash bug by just switching the package manager from bower? [14:14:08] oh got it re: the console--i +2ed but it occurs to me a code comment might be helpful [14:14:09] to gulp/other maybe [14:14:24] jgleeson: yeah! [14:14:58] mepps the good thing is that if you pass a variant that doesn't exist, ingenico just falls back to the default [14:15:02] instead of erroring out [14:15:14] oh good, that was my worry [14:15:16] jgleeson: do you have one in mind? [14:15:23] yarn* I meant, not gulp [14:15:31] yarn is the one all the cool kids use I think [14:15:36] developed by facebook [14:15:42] ah, ok [14:15:48] or I guess we could just use npm [14:16:08] I think that is the recommended path on bowers site last time I checked [14:16:47] jgleeson cool! [14:47:16] fr-tech I see ppena just fwd'ed us another email from adyen saying our test ipn endpoint isn't accepting messages [14:47:37] Since we don't actually have a test ipn endpoint right now, I think we should just turn it off in our account config [14:48:06] fr-tech who among us is not familiar with the adyen console and wants to learn? [14:48:33] I am not familiar with it at all [14:48:49] ok, you do have an account though, right? [14:49:02] https://ca-test.adyen.com/ [14:50:12] ditto [14:50:28] @cstone [14:50:51] hmmm I remember trying to set one up but I think we ran into issues let me hunt down if i had any notes [14:51:07] so, they have us sign in with an umbrella organization 'account', which has a child merchant account [14:51:20] and most relevant settings are at the merchant level [14:51:46] so once you sign in the first thing to do is generally click at the top right and select the merchant accont [14:51:50] *account [14:52:56] Then, for this particular setting, you'll hover over 'Account' from the top-left menu and click 'Server communication' [14:53:12] cstone, jgleeson, let me know if you need me to re-send account setup emails [14:53:29] I just signed into my test account [14:53:41] my pw had expired but just updated it [14:54:21] mepps, it looks like you didn't actually have access to the merchant account! sorry, I just fixed that [14:54:26] ejegg I might need one I can only find email address verification links from them [14:56:14] ah, ok, looks like you're not verified yet. I'll resend that verification email [14:56:26] ok, sent, please give it a click [14:56:48] ok I did and it brings me to the login screen [14:57:23] from there can you do a password reset? [14:58:02] yeah would my username be my email? [15:03:09] cstone: answered in otherchan [15:07:06] ok cool waiting for the reset link [15:21:19] ejegg hmm I dont see a reset email yet [15:54:10] (PS2) Jgleeson: WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) [15:54:26] (PS4) Jgleeson: WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) [15:54:38] (CR) jerkins-bot: [V: -1] WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [15:56:52] (CR) jerkins-bot: [V: -1] WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [15:58:27] cstone were you able to get to the 'server communication' screen? [16:00:01] ejegg yep [16:02:23] cstone: see the green check mark? we want to get rid of that [16:03:26] so that would be unchecking the active box in the settings? [16:03:58] yep [16:04:50] hmm it wont let me save it saying the URL is invalid [16:06:07] wow, that's annoying. can you enter https://example.com ? [16:06:40] yep that let me save it [16:06:59] nice [16:07:52] (PS3) Jgleeson: WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) [16:10:42] (CR) jerkins-bot: [V: -1] WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [16:21:19] (PS4) Jgleeson: WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) [16:22:41] will the jenkis gods be good to me this time ... [16:24:13] (CR) jerkins-bot: [V: -1] WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [16:24:52] no they will not!!! [16:25:08] capricious gods that they are [16:26:51] (PS1) Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/512188 [16:26:55] (CR) Ejegg: [C: +2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/512188 (owner: Ejegg) [16:27:03] (PS5) Jgleeson: WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) [16:32:45] (Merged) jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/512188 (owner: Ejegg) [16:33:24] (PS5) Jgleeson: WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) [16:33:38] (CR) jerkins-bot: [V: -1] WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [17:01:07] (PS6) Jgleeson: WIP add optional form fields support [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/511785 (https://phabricator.wikimedia.org/T219558) [17:01:09] (PS6) Jgleeson: WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) [17:04:07] (CR) jerkins-bot: [V: -1] WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [17:08:34] (PS7) Jgleeson: WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) [17:11:23] (CR) jerkins-bot: [V: -1] WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [17:13:20] (PS8) Jgleeson: WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) [17:13:35] well that's tricky, our codesniff config in CI appears to be different to my local [17:13:47] whoa, weird [17:14:11] I wonder if that's the due to me running phpcs from the paymentswiki route vs the extensions/DonationInterface root [17:14:13] do you do 'composer test' locally? [17:14:24] yeah, or directly composer phpcs [17:14:26] ahh, i run 'composer test' in DonationInterface [17:14:38] ah that'll probably be it then [17:15:28] (PS1) Ejegg: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/512194 [17:15:37] hmm [17:15:41] if I run it from DI root [17:15:44] I get some weird t exist [17:15:52] that paste never worked [17:15:55] lets try it again [17:16:06] ERROR: Referenced sniff "./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" does not exist [17:16:23] (CR) jerkins-bot: [V: -1] WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) (owner: Jgleeson) [17:16:35] agrant@mwv:/vagrant/mediawiki-fr/extensions/DonationInterface$ composer phpcs [17:16:35] > phpcs -p -s [17:16:35] ERROR: Referenced sniff "./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" does not exist [17:16:54] hmm, let me give it a shot [17:18:59] (CR) Ejegg: [C: +2] Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/512194 (owner: Ejegg) [17:22:06] jgleeson_: it worked for me [17:22:11] I had to composer install first [17:22:19] ah [17:22:32] hmm I checked composer-merge cfg an that looks right [17:22:40] I'll try an install in the ext root [17:22:51] ah right, that's where i did the composer install [17:23:43] it's installing, although I would have thought this would have happened during the mediawiki-fr install due to us now using the composer-merge plugin [17:24:34] aha, it's because the path is explicitly set to the DI vendor dir in .phpcs.xml [17:24:48] we could probably just fix that to point to the MW vendor dir [17:24:49] ahhh [17:24:51] makes sense [17:25:05] cool, well at least we know! [17:25:09] thanks [17:25:23] ..we know that composer-merge is working as expected [17:25:30] that would of been scarier [17:25:32] have* [17:27:16] (Merged) jenkins-bot: Update DonationInterface submodule [core] (fundraising/REL1_31) - https://gerrit.wikimedia.org/r/512194 (owner: Ejegg) [17:30:46] fr-tech, here's a question for ya... I added a some info for the new employer field in https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/DonationInterface/+/507412/8/gateway_common/i18n/interface/en.json but CI is complaining that I haven't documented the new fields anywhere here https://integration.wikimedia.org/ci/job/mwgate-npm-node-6-docker/109861/console .. do you know where it's expecting documentation for this new [17:30:46] field? e.g. in php/json/other [17:31:14] hmm? [17:31:28] yeah I'm scratching my head [17:31:44] ohhh, it means the entry in qqq.json is missing [17:31:55] -_- [17:36:55] (PS9) Jgleeson: WIP: add employer field variant [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/507412 (https://phabricator.wikimedia.org/T219558) [17:38:41] ejegg, anywhere I can read about the significane of the i18n files and qqq? [17:38:59] significance* [17:42:32] jgleeson_: basically, qqq.json is for the benifit of translators [17:42:41] to give them some context on how a message is used [17:43:28] jgleeson_: There's more info at https://www.mediawiki.org/wiki/Localisation#Message_documentation [17:43:30] https://www.mediawiki.org/wiki/Localisation#Message_documentation [17:43:44] oops, thanks pcoombe! [17:43:45] thanks both! [17:44:22] looks like that employer patch has finally got through CI [17:44:25] yay [17:44:33] now to the tests [17:45:59] fr-tech gotta jump off as the place I'm working from is closing. I'll be back on for a bit later on as I need to break to pickup roxy and the kids [17:54:53] gotta hop off too [18:58:11] (PS1) Umherirrender: Use ?? to define default values for null property [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/512215 [19:48:06] !log updated payments-wiki from 786d76e212 to 332aaa96e2 [19:48:10] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [19:51:50] Fundraising Sprint Fistful of $variables, Fundraising Sprint Greps of Wrath, Fundraising Sprint Hansel and grep -l, Fundraising Sprint It Came From Out of Scope, and 3 others: Create variants for fancy new opt in pages on payments wiki - https://phabricator.wikimedia.org/T218240 (Ejegg) @MBeat33,... [19:54:45] Fundraising Sprint James Bond: Licensed to Share, Fundraising-Backlog, FR-Ingenico, Patch-For-Review: set up and test new iframe setting for ingenico - https://phabricator.wikimedia.org/T222290 (Ejegg) OK, this is on production! Now if you're on an Ingenico card entry field and tab past the 'canc... [20:37:03] Fundraising-Backlog, fundraising-tech-ops, Epic: fundraising database improvements for 2018 - https://phabricator.wikimedia.org/T183138 (Jgreen) Open→Resolved a:Jgreen [20:37:34] Fundraising-Backlog, fundraising-tech-ops: Update civi1001 django_settings.py, backfill banner impressions - https://phabricator.wikimedia.org/T222761 (Jgreen) Open→Resolved [20:39:11] fundraising-tech-ops, observability, Epic: [Epic] overhaul fundraising cluster monitoring - https://phabricator.wikimedia.org/T91508 (Jgreen) [21:51:23] hey ejegg, looking at this regex stuff again I think they might be fine and the template itself is missing another set of of p tags that would match up with the missing ones [21:52:56] oh yeah? [21:52:57] although the only difference between the working set of if elses and the broken one is an extra new line, do those get turned into

somehow? [21:53:04] so the templates are written in wikitext [21:53:38] and we make a wiki-api-call to get them rendered as HTML [21:54:01] at the very top of the template there is [21:54:01] [ifFirstnameAndLastname] Hi [given name]! [21:54:01] [elseifFirstnameAndLastname] Dear donor, [endifFirstnameAndLastname] [21:54:17] and that block doesn't end up with missing tags [21:56:41] cstone: remind me what the one which DOES end up with missing tags looks like? [21:57:40] [ifFirstnameAndLastname] [given name], thank you for helping free knowledge thrive. [elseifFirstnameAndLastname] Thank you for helping free knowledge thrive. [endifFirstnameAndLastname] [21:57:51] hmm that didnt translate well [22:01:13] ok, lemme take a peek [22:02:12] maybe this way makes more sense, I pulled it down but didn't run any of the regex replacement on it [22:02:28]

[ifFirstnameAndLastname] [22:02:28] Hi [given name]! [22:02:28]

[22:02:28]

[elseifFirstnameAndLastname] [22:02:28] Dear donor, [22:02:29] [endifFirstnameAndLastname] [22:02:29]

[22:02:30] is how the working set comes down [22:02:42]

[ifFirstnameAndLastname] [22:02:42] [given name], thank you for helping free knowledge thrive. [22:02:42] [elseifFirstnameAndLastname] [22:02:42] Thank you for helping free knowledge thrive. [22:02:42] [endifFirstnameAndLastname] [22:02:42]

[22:02:47] and that is how the broken set comes down [22:03:15] oh hmm, that actually looks like it should be fine [22:03:26] checking the post-replacements text in gerrit again [22:05:28] the first set starts and ends the tags in the same block but then the 2nd set does end up with mismatched ones [22:05:29] ok, so it looks like we're moving the

tag inside the {% if first_name and last_name %} [22:07:07] yeah but then the mismatched one is missing that second

to move inside the else [22:07:12] right, so that's this regex: https://phabricator.wikimedia.org/diffusion/WFCG/browse/master/sites/all/modules/thank_you/generators/ThankYou.php$14 [22:07:38] trying to be too clever? [22:07:56] what happens if we strip the (

)? off the start and the \1 off the end of that [22:08:13] and just replace \[ifFirstnameAndLastname\] with {% if first_name and last_name %} [22:08:16] ? [22:08:36] does the first section end up ugly? [22:11:25] well, and also remove the

\1 bits from the next two lines [22:13:33] hmm if moved the

above the top else maybe I missed a part [22:18:45] want to screenshare or put up a wip / pastebin? [22:22:01] sure lets screenshare [22:23:44] ok, give me a sec to switch networks and I'll jump into the daily standup meet room [22:23:49] ok [23:31:53] (PS1) Ejegg: Fix Adyen fraud filtering [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/512302 (https://phabricator.wikimedia.org/T221377) [23:34:36] (CR) jerkins-bot: [V: -1] Fix Adyen fraud filtering [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/512302 (https://phabricator.wikimedia.org/T221377) (owner: Ejegg) [23:36:40] (PS1) Ejegg: Update PHP version requirement in composer.json [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/512303 [23:38:49] (PS2) Ejegg: Fix Adyen fraud filtering [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/512302 (https://phabricator.wikimedia.org/T221377)