Commit Graph

822 Commits

Author SHA1 Message Date
Sebastian Grewe
31de069533 Changed getLockedBalance and added SQL
* New SQL file for upgrade includes next changes
* Properly calculate getLockedBalance based on shares

Further addresses #70
2013-06-10 11:28:20 +02:00
Sebastian Grewe
ec054cd2ef Merge pull request #156 from TheSerapher/issue-142
Issue 142
2013-06-10 01:56:33 -07:00
Sebastian Grewe
b1d698e686 Allow users to change their email address
* Added email to account page
* No confirmation required as of yet

Fixes #142
2013-06-10 10:54:57 +02:00
Sebastian Grewe
9e74175ca3 Make email mandatory during registration
Partially addresses #142
2013-06-10 10:45:46 +02:00
Sebastian Grewe
4c20a84fb9 Merge pull request #154 from TheSerapher/issue-149
Fixing manual payout race condition, fixes #149
2013-06-10 01:41:47 -07:00
Sebastian Grewe
b1f3c9bece Fixing manual payout race condition
* Mark manual payout active
* Run payout logics
* Reset manual payout

This ensures only one manual transaction can be run at a time.
If any users starts a manual payout others have to wait until the site
completed loading and finished the transaction process.

As long as we don't have too many users doing a manual payout at the
same time this should not be an issue. Best for users is using auto
payouts anyway.

This addresses #149
2013-06-10 10:38:05 +02:00
Sebastian Grewe
463f199040 Update edit.inc.php
Emergency fix: Transactions are not aborted if RPC transfer failed.
2013-06-10 11:31:49 +03:00
Sebastian Grewe
37beca9385 removing left over debug in findblock 2013-06-10 10:27:39 +02:00
Sebastian Grewe
b58060a8e2 Merge pull request #153 from TheSerapher/issue-148
Adding support for block finder bonus

Fixes #148
2013-06-10 01:14:27 -07:00
Sebastian Grewe
4e284895a8 Adding support for block finder bonus
* Added new configuration option `block_bonus`, see `global.inc.dist.php`, default 0
* Added new transaction types: `Bonus` and `Orphan_Bonus`
* Changes transaction table structure, added upgrade SQL
* Changed findblock cron to credit bonus to finder
* Modified transactions class to reflect changes

Fixes #148
2013-06-10 10:11:56 +02:00
Sebastian Grewe
bc485ec213 Merge pull request #151 from TheSerapher/issue-144
Issue 144 : Add notification handler and settings
2013-06-09 23:57:53 -07:00
Sebastian Grewe
37fc9fa147 adding full notification SQL for regular installations 2013-06-10 08:51:24 +02:00
Sebastian Grewe
8ed4638057 removed commented section to re-enable auto-payout 2013-06-10 08:51:07 +02:00
Sebastian Grewe
ae0252d927 adding PPS value to sidebard 2013-06-09 17:29:38 +02:00
Sebastian Grewe
453e041988 fixing merge conflict 2013-06-09 16:54:33 +02:00
Sebastian Grewe
20c3d771e6 moved table header to the left 2013-06-09 16:49:42 +02:00
Sebastian Grewe
638e33e525 properly format pps value to 12 digits 2013-06-09 16:49:42 +02:00
Sebastian Grewe
e62a3527db forgot 8 decimals 2013-06-09 16:49:41 +02:00
Sebastian Grewe
2c4bf7d4aa properly format payout and round it 2013-06-09 16:49:41 +02:00
Sebastian Grewe
c926eabf8d Adding support for PPS payout method
This commit changed a few things in the backend and classes code:

* Any <type>_PPS transaction does NOT need to be confirmed
* Queries updated for added <type>_PPS transactions
* Template updated to properly display these transactions

Cronjob

* Added pps_payput cron to run payouts based on worker submitted shares
* **IMPORTANT**: Can NOT be run with proportional_payout!

Addresses #70
2013-06-09 16:49:41 +02:00
Sebastian Grewe
6eeff19ff5 Fixing issue with notification cron
* Updated getAllActive to search by type
2013-06-09 16:44:32 +02:00
Sebastian Grewe
bbffdeb689 Allow pagination on Transaction page
* Added pager to all three transaction tables
* Added two additional pagination definitions to JS
* Added pagination ID to pagination template
2013-06-09 16:38:12 +02:00
Sebastian Grewe
3bc5c68403 Updated SQL Files
* Updated upgrade SQL
* Added full new structure
2013-06-09 16:09:32 +02:00
Sebastian Grewe
af9d2aed95 wrong syntax in upgrade SQL 2013-06-09 15:31:38 +02:00
Sebastian Grewe
b2b853d3e0 Added manual payout notification
* Added mail template for manual payouts
* Added code to account page to notify via mail on payout
* Added new option to notification setting template

Adds another feature to #144
2013-06-09 15:24:58 +02:00
Sebastian Grewe
d723f4e8ef Adding notification on automatic payout
* Added new mail template
* Added notification code to auto_payout cron
2013-06-09 15:17:14 +02:00
Sebastian Grewe
79d9c9714d wrong method call 2013-06-09 14:31:00 +02:00
Sebastian Grewe
4ea8b6c695 Adding new notification system for new blocks
* Modified findblocks cron
* Modified notifications cron for new structure
* Improved notification class
* Added new template for new_block type
* Moved idle_worker type template
* Added new_block type to notification settings
2013-06-09 14:26:18 +02:00
Sebastian Grewe
88ade9cfa3 Adding support for various notifications
* Adding new SQL upgrade for notifications
* Added support for per user notification settings
* Added account_id to notifications table
* Added new notification_settings table
* Added new account page: notifications

Addresses #144
2013-06-09 13:10:58 +02:00
Sebastian Grewe
9eeb088734 check if notifications exist at all 2013-06-07 20:15:23 +02:00
Sebastian Grewe
d20efb3caa Merge pull request #141 from TheSerapher/issue-139
Issue 139
2013-06-07 11:10:56 -07:00
Sebastian Grewe
02eb400de9 proper whitespacing 2013-06-07 20:09:54 +02:00
Sebastian Grewe
efdbff8e53 Do not include unconfirmed transactions in balance view
This will fix #139 showing wrong liquid asset counts. Since
that was confusing I ensured confirmations are included in the calculations.
2013-06-07 20:07:55 +02:00
Sebastian Grewe
71612480f6 Merge branch 'issue-70' of github.com:TheSerapher/php-mmcfe-ng into issue-70 2013-06-07 15:54:07 +02:00
Sebastian Grewe
b6da195da5 moved table header to the left 2013-06-07 15:50:11 +02:00
Sebastian Grewe
4a36479fe2 properly format pps value to 12 digits 2013-06-07 15:50:11 +02:00
Sebastian Grewe
5f1e52767e forgot 8 decimals 2013-06-07 15:50:11 +02:00
Sebastian Grewe
dcfbd83270 properly format payout and round it 2013-06-07 15:50:11 +02:00
Sebastian Grewe
531e28cee8 Adding support for PPS payout method
This commit changed a few things in the backend and classes code:

* Any <type>_PPS transaction does NOT need to be confirmed
* Queries updated for added <type>_PPS transactions
* Template updated to properly display these transactions

Cronjob

* Added pps_payput cron to run payouts based on worker submitted shares
* **IMPORTANT**: Can NOT be run with proportional_payout!

Addresses #70
2013-06-07 15:50:11 +02:00
Sebastian Grewe
d986ed93b8 Merge pull request #137 from TheSerapher/worker-monitor
Worker monitor
2013-06-07 06:41:55 -07:00
Sebastian Grewe
d5d0b54705 adding new structure for notifications 2013-06-07 15:39:43 +02:00
Sebastian Grewe
d0a25a80ef Merge branch 'worker-monitor' of github.com:TheSerapher/php-mmcfe-ng into worker-monitor 2013-06-07 15:36:48 +02:00
Sebastian Grewe
4da9fd2369 Working notification system
* Added things to mail templates
* Modified user password reset call for new mail template
* Added BASEPATH to smarty code to ensure templates are compiled in the
  proper directory
* Updated mail and notification class
* Updated notification cron
* Added notification cron to run-cron list
2013-06-07 15:36:35 +02:00
Sebastian Grewe
69a3761be5 Adding notification reset once worker is active
Go through all active notifications (active means they are not notified
again) and check if their state has changed. If so, mark as inactive and
allow for re-notification of the same type and data.
2013-06-07 15:36:35 +02:00
Sebastian Grewe
9ac2dadd97 Progress on notifications
* Added main mail class
* notification class extends mail class
* Added mail template for IDLE workers
* Added notification table to SQL structure

This works already but once notified the status is not reset as soon as
a worker is active again. Need to think of a system to do that
automatically.

Addresses #116
2013-06-07 15:36:35 +02:00
Sebastian Grewe
c69fbe4fc4 Add worker montioring to template and worker class
* Add configurable monitoring for workers into template
* Store monitoring status in DB

First commit for #116
2013-06-07 15:36:35 +02:00
Sebastian Grewe
432540335f Working notification system
* Added things to mail templates
* Modified user password reset call for new mail template
* Added BASEPATH to smarty code to ensure templates are compiled in the
  proper directory
* Updated mail and notification class
* Updated notification cron
* Added notification cron to run-cron list
2013-06-07 15:35:58 +02:00
Sebastian Grewe
4966f64a59 Adding notification reset once worker is active
Go through all active notifications (active means they are not notified
again) and check if their state has changed. If so, mark as inactive and
allow for re-notification of the same type and data.
2013-06-07 15:07:26 +02:00
Sebastian Grewe
d7e65c7b37 Progress on notifications
* Added main mail class
* notification class extends mail class
* Added mail template for IDLE workers
* Added notification table to SQL structure

This works already but once notified the status is not reset as soon as
a worker is active again. Need to think of a system to do that
automatically.

Addresses #116
2013-06-07 14:42:29 +02:00
Sebastian Grewe
bf225fb0de Add worker montioring to template and worker class
* Add configurable monitoring for workers into template
* Store monitoring status in DB

First commit for #116
2013-06-07 11:18:32 +02:00