RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
398 Commits 4 Branches 11 Tags 14 MiB
8ef44f79db
Commit Graph

398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Grewe
8ef44f79db Fixing column name in settings table 
* This will change the name in the settings table for old installations

Fixes #167
 2013-06-12 11:19:07 +02:00
Sebastian Grewe
27b4c4473f Adding bonus to unconfirmed calculations 2013-06-12 09:17:50 +02:00
Sebastian Grewe
a006ea782a Adding confirmed and unconfirmed balance 
* Added SQL code to support both balances
* Added sidebar entries
* Modified auto_payout to use new index
* Mofified account page to use new index

Addresses #140 but needs to be tested!
 2013-06-12 09:13:14 +02:00
Sebastian Grewe
888461221f Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-06-11 16:33:18 +02:00
Sebastian Grewe
eb42993c2b formatting some numbers 2013-06-11 16:32:53 +02:00
Sebastian Grewe
8c937cf0b1 made prop default payout system in config 2013-06-11 15:44:16 +02:00
Sebastian Grewe
786926a328 fixing newline on footer 2013-06-10 20:39:41 +02:00
Sebastian Grewe
fc8ad9eee9 Merge pull request #165 from TheSerapher/issue-163 
removing debug dump output
 2013-06-10 11:24:42 -07:00
Sebastian Grewe
da6e217ac2 removing debug dump output 2013-06-10 20:23:53 +02:00
Sebastian Grewe
53f3c29d91 Merge pull request #164 from TheSerapher/issue-163 
Fixing montoring checkboxes
 2013-06-10 11:22:22 -07:00
Sebastian Grewe
d2daed3317 Fixing montoring checkboxes 
This will fix #163
 2013-06-10 20:21:42 +02:00
Sebastian Grewe
601b5c45cc Update README.md 
Added new features to list: PPS and Notifications
 2013-06-10 20:09:21 +03:00
Sebastian Grewe
27176d2e8a Merge pull request #161 from TheSerapher/issue-70 
Issue 70
 2013-06-10 10:03:09 -07:00
Sebastian Grewe
146b4e0c17 Merge branch 'issue-70' of github.com:TheSerapher/php-mmcfe-ng into issue-70 
Conflicts:
	public/include/classes/transaction.class.php
	public/include/config/global.inc.dist.php
	public/templates/mmcFE/account/transactions/default.tpl
 2013-06-10 18:58:12 +02:00
Sebastian Grewe
b4a09f22ee archive/purge accounted PPS shares 2013-06-10 18:56:28 +02:00
Sebastian Grewe
b782857c41 Adding new config option payout_system 
* Change templates based on the payout system used
* Modified sidebar for new PPS method

Further addresses #70
 2013-06-10 18:56:28 +02:00
Sebastian Grewe
e8f8b2f5f4 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 18:56:06 +02:00
Sebastian Grewe
666fde91b6 adding PPS value to sidebard 2013-06-10 18:54:54 +02:00
Sebastian Grewe
41b35a2d96 moved table header to the left 2013-06-10 18:49:58 +02:00
Sebastian Grewe
cb3e02e896 properly format pps value to 12 digits 2013-06-10 18:49:57 +02:00
Sebastian Grewe
3f8a1ea0f7 forgot 8 decimals 2013-06-10 18:49:57 +02:00
Sebastian Grewe
4acf119418 properly format payout and round it 2013-06-10 18:49:57 +02:00
Sebastian Grewe
4745a2f6f8 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-10 18:49:57 +02:00
Sebastian Grewe
56f3d57c35 further improved checkboxes 2013-06-10 18:37:14 +02:00
Sebastian Grewe
31e51061f7 archive/purge accounted PPS shares 2013-06-10 11:53:44 +02:00
Sebastian Grewe
ea9f6b2c9a Adding new config option payout_system 
* Change templates based on the payout system used
* Modified sidebar for new PPS method

Further addresses #70
 2013-06-10 11:34:20 +02:00
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