Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add currency setting to paypal donation and allow unhosted button setting #5452

Merged
merged 1 commit into from Jan 6, 2015

Conversation

@Flaburgan
Copy link
Member

commented Dec 2, 2014

I didn't find the way to set up easily an "hosted button" on paypal, all I found was the unhosted one, so I modified diaspora* to allow both type of button.

@jhass

This comment has been minimized.

Copy link
Member

commented Dec 2, 2014

We're onto a major release, so such breaking changes are okay, but still add to the big notices in the changelog please.

@Flaburgan Flaburgan force-pushed the Flaburgan:allow-non-hosted-paypal-buttons branch from f24e389 to 3c0c1c4 Dec 2, 2014

@Flaburgan

This comment has been minimized.

Copy link
Member Author

commented Dec 2, 2014

Done ;)

@Flaburgan

This comment has been minimized.

Copy link
Member Author

commented Dec 8, 2014

Any other remarks about this pull request?

@goobertron

This comment has been minimized.

Copy link

commented Dec 9, 2014

I hope you don't mind: I'd like to suggest a clearer and more simple explanation for the changelog and diaspora.yml.example.

Also, it was decided in #5088 that the defaults in diaspora.yml.example should match the defaults in defaults.yml. So enable: should, I think, be set to false. I've done this, and added a note that the default is 'false to the section header.

First, in the changelog:

## Paypal unhosted button and currency
Podmins can now set the currency for donations, and use an unhosted button if they can't use
a hosted one. Note: you need to **copy the new settings from diaspora.yml.example to your
diaspora.yml file**. The existing settings from 0.4.x and before will not work any more.

Next, in diaspora.yml.example:

    ## Paypal donations (disabled by default)
    ## You can set details for a Paypal button here to allow donations
    ## towards running the pod.
    ## First, enable the function, then set the currency in which you
    ## wish to receive donations, and **either** a hosted button id
    ## **or** an encrypted key for an unhosted button.

    paypal_donations: ## Section
      #enable: false

      ## Currency used (USD, EUR...)
      #currency: USD

      ## hosted Paypal button id
      #paypal_hosted_button_id: "change_me"
      ## OR encrypted key of unhosted button
      #paypal_unhosted_button_encrypted: "-----BEGIN PKCS7-----"

(I've retained your double asterisk for exmphasis, but I'm not sure they're that useful. These won't display as bold (at least, not in my tet editor) when the file is used, and there are no formatting codes in the existing diaspora.yml.example. So it might be best to omit these.)

Hope that's OK!

@Flaburgan

This comment has been minimized.

Copy link
Member Author

commented Dec 9, 2014

Hey goob! Thanks for your review! I can copy paste your changes, but if you have time and want to, you can open a pull request on my branch. That way, I will just have to merge your PR and your commit will be integrated in the diaspora core, so more recognition for you ;)

@Flaburgan

This comment has been minimized.

Copy link
Member Author

commented Dec 9, 2014

if you want to create the PR, go on your diaspora repository then
git remote add flaburgan git://github.com/flaburgan/diaspora.git
Then you can git fetch flaburgan allow-non-hosted-paypal-buttons and git checkout allow-non-hosted-paypal-buttons and work there. I say that from the top of my head, not sure but ask if you need help.

@goobertron

This comment has been minimized.

Copy link

commented Dec 9, 2014

Hey Fla, thanks for the thought, but I typed those suggestions in plain text in this thread, rather than amending the files in my repo. I'd rather not go poking around in git at the moment, so unless it's a real pain for you to do itm would you mind making the changes yourself? I need to get away from the computer for the rest of the day!

@Flaburgan

This comment has been minimized.

Copy link
Member Author

commented Dec 9, 2014

No problem I'll do that tomorrow. Thank you for your review!

@Flaburgan Flaburgan force-pushed the Flaburgan:allow-non-hosted-paypal-buttons branch from 3c0c1c4 to b444cdf Dec 28, 2014

@Flaburgan

This comment has been minimized.

Copy link
Member Author

commented Dec 28, 2014

I applied goob's suggestions.

@jhass jhass merged commit b444cdf into diaspora:develop Jan 6, 2015

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
jhass added a commit that referenced this pull request Jan 6, 2015
Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons
Add currency setting to paypal donation and allow unhosted button setting

Conflicts:
	Changelog.md

@jhass jhass added this to the next-major milestone Jan 6, 2015

@jhass

This comment has been minimized.

Copy link
Member

commented Jan 6, 2015

Thanks!

@Flaburgan Flaburgan deleted the Flaburgan:allow-non-hosted-paypal-buttons branch Jan 6, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.