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 master #3360

Merged
merged 6 commits into from
Feb 12, 2025
Merged

Merge master #3360

merged 6 commits into from
Feb 12, 2025

Conversation

scx1332
Copy link
Collaborator

@scx1332 scx1332 commented Feb 12, 2025

No description provided.

scx1332 and others added 5 commits October 3, 2024 19:39
…3353)

* Get rid of github warning

* Update python version to 3.12

* Bigger timeouts in nginx
…will automatically batch transactions for payment driver. You can set payments based on cron or just interval. It's a bit beta and need some testing.

* fix error causing payments not to be confirmed

* new profile for development

* fix payments sum

* fix payments sum

* Do not change invoice status on settled prematurely

* New version of allocation table. Working on changes accordingly

* Working on up.sql

* Work up

* changes in allocation

* changed separate pay_agreement_payment and pay_activity_payment into one pay_payment_document

changed separate pay_agreement_payment and pay_activity_payment into one pay_payment_document

changed separate pay_agreement_payment and pay_activity_payment into one pay_payment_document

* changed name to allocation_expenditure

* fix after merge

* migration script updated

* migrations cannot be applied

* fix migration script

* fix

* added allocation id

* fix

* working on allocation expenditure

* working on allocations - not compiling

* Fix compilation errors after merge-rebase

* Working on payments from allocation

* Working on payments from allocation (deposits)

* Added deposit_status field to allocation to track deposit status

* Working on allocations

* Total amount scheduled doesn't matter anymore

* Fixed issue with updating activity null values

* Remove schedule message

* Removed dead code related to removed order table

* Simplify notify payment message

* Further simplifying the code

* More elegant filter

* Added post migration to sum paid activities into agreements

* Added post migration to sum paid activities into agreements

* Add missing allocation id foreign key reference to payment documents

* Fix merge

* Removed unused code

* Windows build

* Fix client version

* Fix client version

* Windows build

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Working on serve - fix payee_addr

* Adding frontend to build

* Adding frontend to build - fmt

* Fix warnings

* fetch tags

* fetch tags automatically

* fetch tags automatically

* fix warning

* Update frontend

* Fix fronted display

* Fix fronted display

* Fix fronted

* Fix problems with pay_payments

* Gather allocations without deposit into group and sum payments accordingly

* Update payments

* fmt

* wip

* wip

* All debit notes payable

* Fix value paid

* Work in progress

* Working on flush payments

* Merging Reqc code

* Merging Reqc code

* Merging Reqc code

* Merging Reqc code

* working on mockup data for testing

* wip

* wip

* wip

* wip

* extending API

* extending API

* extending API

* extending API

* extending API - added debit note chain query for activity

* extending API - added debit note chain query for activity

* fix date generation in mockup generator

* remove debug message

* fmt

* fix foreign keys in db

* add get invoice route

* wip

* working on batch payments

* working on batch payments

* working on batch payments, fix floats and format

* wip-not working

* API for batch orders

* working on API for batch orders

* working on API for batch orders, separating resolve invoices from resolve agreements

* first process activities, then invoices improving queries and accounting logic that way (easier checking which activity is paid).

* removed unused table payment

* Added debit_nonce field to debit notes

* Improving API

* Improvements

* Improvements

* Working on additional messages

* removed driver

* fixed what was broken, created DebitNotForApi

* fmt

* working on resolving invoices

* working on resolving invoices

* fmt

* fix

* fix

* fix compilation after merge

* move migrations

* work on cycles

* work on cycles

* work on cycles update

* fmt

* working on batch cycles

* added api

* added platform to cycles

* fmt

* working on cron

* working on nice cli presentation

* working on interval cli presentation

* working on interval cli presentation

* working on interval cli presentation - fix setup

* working on interval cli presentation - better set info

* working on interval cli presentation

* working on interval cli api

* fix error causing payments not to be confirmed

* fix payments sum

* fix payments sum

* Do not change invoice status on settled prematurely

* New version of allocation table. Working on changes accordingly

* Working on up.sql

* Work up

* changes in allocation

* changed separate pay_agreement_payment and pay_activity_payment into one pay_payment_document

changed separate pay_agreement_payment and pay_activity_payment into one pay_payment_document

changed separate pay_agreement_payment and pay_activity_payment into one pay_payment_document

* changed name to allocation_expenditure

* fix after merge

* migration script updated

* migrations cannot be applied

* fix migration script

* fix

* added allocation id

* fix

* working on allocation expenditure

* working on allocations - not compiling

* Fix compilation errors after merge-rebase

* Working on payments from allocation

* Working on payments from allocation (deposits)

* Added deposit_status field to allocation to track deposit status

* Working on allocations

* Total amount scheduled doesn't matter anymore

* Fixed issue with updating activity null values

* Remove schedule message

* Removed dead code related to removed order table

* Simplify notify payment message

* Further simplifying the code

* More elegant filter

* Added post migration to sum paid activities into agreements

* Added post migration to sum paid activities into agreements

* Add missing allocation id foreign key reference to payment documents

* Fix merge

* Removed unused code

* Windows build

* Fix client version

* Fix client version

* Windows build

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Windows build with cache

* Working on serve - fix payee_addr

* Adding frontend to build

* Adding frontend to build - fmt

* fetch tags

* fetch tags automatically

* fetch tags automatically

* Update frontend

* Fix fronted display

* Fix fronted display

* Fix fronted

* Fix problems with pay_payments

* Gather allocations without deposit into group and sum payments accordingly

* Working on payment notifications

* Working on payment notifications for peers

* Merging

* Fix ya-client version

* db manip moved to separate repo

* Added deduplication of merged allocations into payment

* Fix after merge

* Reverting unneeded changes

* Removed unused code

* fmt

* moved post migration into separate file

* Removed unused message

* Removed paid column. paid_amount is updated now

* Better order behaviour. Update date shows when last payment was done

* Fix index name

* Add primary key to pay_payment table

* Fixed migration

* Fix missing columns and change signature and signed_bytes to blob and text accordingly

* Added peer id to document payment

* Fix script

* useful sql scripts

* Fix schema relationship for document payment

* Batch cycles improvements

* improve batch cycle message

* Update after merge

* Check if goth will work when set 24s interval

* fix goth test

* fix goth tests

* fix logs

* fix logs2

* lock

* lock

* lock

* change default payment cycle

* todo fix

* update poetry

* reverted goth to main version
@scx1332 scx1332 requested a review from a team as a code owner February 12, 2025 12:03
@prekucki prekucki merged commit cba662b into release/v0.17 Feb 12, 2025
16 of 25 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