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

[feature] project report updates #621

Merged
merged 4 commits into from
Oct 17, 2024
Merged

Conversation

subiabre
Copy link
Member

🎩 What? Why?

Added a new table for admins in the projects financial report that displays the project's income by payment method and relative fees and tax.

Added relative project associated numbers to the report.

📷 Screenshots

imagen

♥️ Thank you!

@subiabre subiabre self-assigned this Sep 30, 2024
@subiabre subiabre merged commit 722151c into live Oct 17, 2024
3 checks passed
@subiabre subiabre deleted the feature/project_report_updates branch October 17, 2024 10:36
subiabre added a commit that referenced this pull request Oct 21, 2024
* 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

* [feat] Antispam forms (#609)

* 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

* [FEAT] Add project numeric ids to invests paid via Paypal (#608)

* 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 transactions id in payments to pool (#613)

* 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 <daniel.subiabre@platoniq.net>

* [FIX] Product references on Stripe for wallet payments (#614)

* 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 <davidbenabarre@platoniq.net>

* Fix style of honeypot input field to be of size true 0 (#611)

* Fix node project get list return type (#615)

* make nodeproject get list return not only arrays

* change php doc definition of getList function

* Move ajax loader to expected route (#618)

* [fix] $dataSets variable naming (#617)

* Fix $dataSets variable naming

* Revert "Fix $dataSets variable naming"

This reverts commit a06b2f0.

* Add data sets to channel list projects route

* add entries in robots.txt for new bots (#619)

* [feature] project report updates (#621)

* Fix code formatting

* Add incomes table to project report

* Add relevant associated ids to project report

* Rename project num id to tracking number

* [fix] report table raw invests (#622)

* Pass raw invests data to report

* Show full invests calcs on project report table

---------

Co-authored-by: David <david@goteo.org>
Co-authored-by: David Igón <davidbenabarre@platoniq.net>
davidbeig added a commit that referenced this pull request Nov 18, 2024
* 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

* [feat] Antispam forms (#609)

* 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

* [FEAT] Add project numeric ids to invests paid via Paypal (#608)

* 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 transactions id in payments to pool (#613)

* 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 <daniel.subiabre@platoniq.net>

* [FIX] Product references on Stripe for wallet payments (#614)

* 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 <davidbenabarre@platoniq.net>

* Fix style of honeypot input field to be of size true 0 (#611)

* Fix node project get list return type (#615)

* make nodeproject get list return not only arrays

* change php doc definition of getList function

* Move ajax loader to expected route (#618)

* [fix] $dataSets variable naming (#617)

* Fix $dataSets variable naming

* Revert "Fix $dataSets variable naming"

This reverts commit a06b2f0.

* Add data sets to channel list projects route

* add entries in robots.txt for new bots (#619)

* [feature] project report updates (#621)

* Fix code formatting

* Add incomes table to project report

* Add relevant associated ids to project report

* Rename project num id to tracking number

* [fix] report table raw invests (#622)

* Pass raw invests data to report

* Show full invests calcs on project report table

* add migration and models to faq sections and subsections from feature/new-faq

* fix faq test

* create new admin modules for new faq models

* change type of subsections and sections ids

* make improvements based on review

* refactor faqsection getfaqs function

* create new admin modules for new faq models

(cherry picked from commit 2caa326)

* add missing copies

* fixes on faq admin controller

* remove unnecessary template

* fix bug on faqsection admin controller

* use of new methods from models and fixes

* files from #400 related to the views of the new faqs

* fix integration

* add missing copies

* refactor in partials of faq header and classes

* change accordion to details tag

* fix pagination in faq admin controller

* add faq search action and views

* not show faq subsections if empty

* fixes in faq search

* fixes on faq individuals styles and home colors

* change date of new faqs migration

* fixes on title in individual faq

* fixes in styles for faqs

* rename faq migration

* update migration date

* add drag and drop to faq forms

* update migration date

---------

Co-authored-by: Daniel Subiabre García <subiabrewd@gmail.com>
Co-authored-by: Daniel Subiabre <daniel.subiabre@platoniq.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant