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

Merge branch 'live' of github.com:GoteoFoundation/goteo into edge #623

Merged
merged 16 commits into from
Oct 21, 2024
Merged

Conversation

subiabre
Copy link
Member

No description provided.

subiabre and others added 16 commits February 29, 2024 09:43
* Allow accounts and users admin sub controller to be accessed via module perm

* Add helper role with admin-module-users and admin-module-account perms
* Update stripe gateway responses data

* Simplify stripe gateway sub request

* Fix setting invest payment

* Codefixes on stripe webhook controller

* Cancel invest by transaction ref instead of payment ref
* Generic logic to list and tell subscription payment methods

* Change invest text on participate based on payment method subscription

* Add translations

* Add isSubscription method to payment method interface

* Use invest method isSubscription in participate view

* Fix typo

* Avoid db call with shallow invest object on return array
…594)

* Allow to filter backer invests by subscription based payment methods

* Remove 'subscription_methods' filter
* Add FormHoneypot DB model

* Add form honeypot in templates

* Check for form honeypots in contact controller

* Add timestamp to honeypot catches

* Add datetime in model
* Project-based transaction ids in PayPal (#604)

* Add transactionId same as CECA to PayPal

* Call to Exception from php global namespace (#601)

* Add role "helper" with access to users and accounts (#602)

* Allow accounts and users admin sub controller to be accessed via module perm

* Add helper role with admin-module-users and admin-module-account perms

* Fix/stripe refunds (#596)

* Update stripe gateway responses data

* Simplify stripe gateway sub request

* Fix setting invest payment

* Codefixes on stripe webhook controller

* Cancel invest by transaction ref instead of payment ref

* Fix participate invests from subscriptions (#595)

* Generic logic to list and tell subscription payment methods

* Change invest text on participate based on payment method subscription

* Add translations

* Add isSubscription method to payment method interface

* Use invest method isSubscription in participate view

* Fix typo

* Avoid db call with shallow invest object on return array

* Allow to filter backer invests by subscription based payment methods (#594)

* Allow to filter backer invests by subscription based payment methods

* Remove 'subscription_methods' filter

* Specify currency for PayPal in purchase step

* Specify currency to purchase array data

* Store generated transaction id with  project num id + invest id in invest preapproval
* fix use of project variable in Paypal payment method

* WIP: refactor use of project in stripe metadata

* change product description in stripe payment when there's no project

* Left pad transaction ids with 0

---------

Co-authored-by: Daniel Subiabre <[email protected]>
* fix use of project variable in Paypal payment method

* WIP: refactor use of project in stripe metadata

* change product description in stripe payment when there's no project

* Left pad transaction ids with 0

* Fix references to project

* Fix rediretions

---------

Co-authored-by: David Igón <[email protected]>
* make nodeproject get list return not only arrays

* change php doc definition of getList function
* Fix $dataSets variable naming

* Revert "Fix $dataSets variable naming"

This reverts commit a06b2f0.

* Add data sets to channel list projects route
* Fix code formatting

* Add incomes table to project report

* Add relevant associated ids to project report

* Rename project num id to tracking number
* Pass raw invests data to report

* Show full invests calcs on project report table
@subiabre subiabre self-assigned this Oct 21, 2024
@subiabre subiabre changed the title Merge branch 'live' of github.com:GoteoFoundation/goteo into live Merge branch 'live' of github.com:GoteoFoundation/goteo into edge Oct 21, 2024
@subiabre subiabre merged commit f8bd970 into edge Oct 21, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants