Commit Graph

350 Commits

Author SHA1 Message Date
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
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
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
Sebastian Grewe
207f59dc80 Merge pull request #134 from TheSerapher/issue-133
Properly display both shares and hashrates
2013-06-07 00:05:40 -07:00
Sebastian Grewe
671a2d01ca Properly display both shares and hashrates
* As proposed in #132 thi allows for both shares and hashsrates

Fixes #132.
2013-06-07 09:02:58 +02:00
Sebastian Grewe
6802bac4b9 Merge pull request #132 from TheSerapher/issue-130
Re-Adding shares for admin user panel
2013-06-06 23:43:07 -07:00
Sebastian Grewe
4b05846a78 Re-Adding shares for admin user panel
* Re-enables estimations
* Still fixes #130 which had issues with hashrates, those are still
  fixed
2013-06-07 08:42:07 +02:00
Sebastian Grewe
c80fae30d2 Merge pull request #131 from TheSerapher/issue-130
Fixing admin panel user display
2013-06-06 23:34:40 -07:00
Sebastian Grewe
f63485a539 Fixing admin panel user display
* Fixes #130. Removed total shares in favor of the hashrate.
* Fixes hashrate display.
* Added pagination template file to include pagination on other pages in
the future.
2013-06-07 08:33:14 +02:00
Sebastian Grewe
1046bd113d minor template update for contributor shares 2013-06-07 00:54:24 +02:00
Sebastian Grewe
84f48efa41 minor template update for contributor hashrates 2013-06-07 00:51:25 +02:00
Sebastian Grewe
2b0d4030f1 Merge pull request #129 from TheSerapher/issue-128
Fixing critical issue with manual- and autopayouts
2013-06-06 15:10:44 -07:00
Sebastian Grewe
87e721edb8 moved table header to the left 2013-06-06 23:48:09 +02:00
Sebastian Grewe
663c427d4a properly format pps value to 12 digits 2013-06-06 23:45:53 +02:00
Sebastian Grewe
ad6051df1c forgot 8 decimals 2013-06-06 23:34:02 +02:00
Sebastian Grewe
a3ddf0cfcc properly format payout and round it 2013-06-06 23:31:35 +02:00
Sebastian Grewe
6a8979d20b Fixing critical issue with manual- and autopayouts
This is a proposed fix for #128:

* Mark auto_payout running via DB setting, unlock when done
* Just before actually sending money, check for running cron

Please refer to the ticket for details
2013-06-06 23:23:54 +02:00
Sebastian Grewe
64d8d8abf3 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-06 23:04:34 +02:00
Sebastian Grewe
cad0cb8569 Merge pull request #127 from TheSerapher/issue-126
Add API call for getuserstatus
2013-06-06 13:42:11 -07:00
Sebastian Grewe
7c1d51cc7a Add API call for getuserstatus
Fixes #126, see Github Wiki for documentation
2013-06-06 22:40:51 +02:00
Sebastian Grewe
8db9449e27 Merge pull request #125 from TheSerapher/issue-124
Ensure no old blocks shares are counter for new ones
2013-06-06 13:29:33 -07:00
Sebastian Grewe
4691e077e2 Ensure no old blocks shares are counter for new ones
When finding more than a single block between runs it added shares to a
new block from a previous one. Properly fetch the last highest share ID
from the database prior to scanning for shares assigned to a block.

Fixes #124
2013-06-06 22:27:34 +02:00
Sebastian Grewe
85d81f821f Merge pull request #123 from TheSerapher/findblock-shares
Moving shares per block into findblock cron
2013-06-06 12:32:50 -07:00
Sebastian Grewe
596b0eac93 Moving shares per block into findblock cron
To better support more payout systems I have moved the share calculation
for a block into the findblock cron. This way these statistics are
always available and not depending on the actual payout method.
2013-06-06 21:31:05 +02:00
Sebastian Grewe
68ec939302 Merge pull request #122 from TheSerapher/structure-update
new database structure for future features
2013-06-06 12:05:22 -07:00