RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,197 Commits 4 Branches 11 Tags 14 MiB
fbf2a86162
Commit Graph

801 Commits

Author SHA1 Message Date
Sebastian Grewe
0bd21a0873 fixing pagination/pagesort conflicts 2013-09-12 10:02:48 +02:00
Sebastian Grewe
f3ce2cb812 [FEATURE] Added new icons, added pagination 
This commit uses the class icons instead of actual images. Also changed
the layout a slight bit to give room for data in the header just as used
in the tab involved version.
 2013-09-12 09:48:56 +02:00
Sebastian Grewe
39eddd979d Merge branch 'issue-444-theserapher' of https://github.com/TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-12 08:50:08 +02:00
Sebastian Grewe
e203f31ba9 adding login icon 2013-09-12 08:49:57 +02:00
Sebastian Grewe
00c6955680 removing unpaid shares, not used 2013-09-12 08:45:26 +02:00
Sebastian Grewe
85fa71136f adding placeholder dashboards and missing image 2013-09-12 08:43:01 +02:00
Sebastian Grewe
e2011a68b0 [FIX] Unconfirmed Wallet Balance 
Fixes #646
 2013-09-12 08:30:34 +02:00
Sebastian Grewe
f738b426f2 cleaned up dashboard page file 2013-09-09 16:07:42 +02:00
Sebastian Grewe
b05aac4678 @nrpatten: Updated dashboard for prop 2013-09-09 16:03:54 +02:00
Sebastian Grewe
a128ca3ba0 minor fix to contrib hashrates 2013-09-09 14:44:17 +02:00
Sebastian Grewe
823ba4d844 minor changes to account-edit 2013-09-09 14:41:44 +02:00
Sebastian Grewe
eb20c0304e adding hide button to admin panel 2013-09-09 09:53:54 +02:00
Sebastian Grewe
4b9105b84b small update to account-workers 2013-09-09 09:52:44 +02:00
Sebastian Grewe
2235f8e15a adding missing JS lib 2013-09-09 09:52:27 +02:00
Sebastian Grewe
31fe769091 adding API qrcode in account 2013-09-09 09:52:05 +02:00
Sebastian Grewe
6fa46137f5 adding account invitations 2013-09-09 09:47:28 +02:00
Sebastian Grewe
8e05ab71a6 adding notification account view 2013-09-09 09:37:59 +02:00
Sebastian Grewe
fb9fb9cdb2 adding account transaction view 2013-09-09 09:27:42 +02:00
Sebastian Grewe
ab7360d187 adding account edit page 2013-09-09 09:24:26 +02:00
Sebastian Grewe
f7ced8f80d added registration templates 2013-09-09 07:46:52 +02:00
Sebastian Grewe
0dd1cc7d50 template updates for new empty content 2013-09-09 07:46:36 +02:00
Sebastian Grewe
5c11c74974 allow simple authentication checks wihtout logout 2013-09-09 07:45:55 +02:00
Sebastian Grewe
3c7bb41f81 stats template changes 2013-09-09 07:45:35 +02:00
Sebastian Grewe
b4ed4ed06a fixing PHP warning 2013-09-08 00:23:00 +02:00
Sebastian Grewe
a19b3f5e31 Adding round statistics 2013-09-08 00:22:02 +02:00
Sebastian Grewe
82e8941c02 Merge branch 'next' into issue-444-theserapher 2013-09-07 23:55:49 +02:00
Sebastian Grewe
98688d5839 Updated testing template 
* Removed unneeded template icons
* Added new icon font
* Added icons to navbard
* Added full admin features

Updates #444
 2013-09-07 23:49:45 +02:00
Sebastian Grewe
bf5408568b Merge branch 'next' of https://github.com/TheSerapher/php-mmcfe-ng into next 2013-09-07 20:53:39 +02:00
Sebastian Grewe
8ae36844f1 fixing some PHP warnings 2013-09-07 20:53:28 +02:00
Sebastian Grewe
bc7e511177 removing debug echos 2013-09-06 15:00:47 +02:00
Sebastian Grewe
5257001153 fixing blockhash in round block details 2013-09-06 14:55:44 +02:00
Sebastian Grewe
b656be751d indentations 2013-09-06 10:51:55 +02:00
Sebastian Grewe
d4ce764d77 proper allow back/forth on blocks 2013-09-06 10:49:19 +02:00
Sebastian Grewe
ab6a4f57d3 further implemetation into mmcfe-ng 2013-09-06 10:29:42 +02:00
Sebastian Grewe
b3ba080345 obigals work, cherrypicked 2013-09-06 09:48:08 +02:00
Sebastian Grewe
5b353ab759 Merge branch 'next' into issue-543 2013-09-06 09:40:28 +02:00
Sebastian Grewe
ecfbeec01c adding new icon set 2013-09-02 12:55:33 +02:00
Sebastian Grewe
cecbcb7d4b Adding testing theme for #444 
This is just a WiP to test a new website template. Taken online from
source referenced in the sidebar footer.

Very nice and clean look, have not had the time to add all features yet
and is only used to demonstrate it.
 2013-08-26 20:07:54 +02:00
Sebastian Grewe
0e27cda093 Fix: Blocks not being confirmed 
Fixes an issue introduce with #610.
 2013-08-26 11:11:52 +02:00
Sebastian Grewe
0a4047420b Merge pull request #631 from TheSerapher/issue-630 
Fix: Properly send notifications again
 2013-08-23 02:45:11 -07:00
Sebastian Grewe
e6cf43efa0 Fix: Properly send notifications again 
Fixes #630
 2013-08-23 11:28:07 +02:00
Sebastian Grewe
a98080ec13 adding missing THEME_DIR to dist config 2013-08-22 16:32:06 +02:00
Sebastian Grewe
1f6ccfd6be Merge pull request #628 from TheSerapher/issue-610 
Issue 610
 2013-08-22 02:47:46 -07:00
Sebastian Grewe
1c24820735 Adding network_confirmations to configuration 
* Added new configuration option `$config['network_confirmations']` to
  dist config
* Default to 120 if not set

This will allow us to define a different confirmation level for user
transactions but still display blocks at their approriate unconfirmed
value when displaying them in the wallet information for admins. Risky
for pool owners but still a viable option.

Fixes #610
 2013-08-22 11:45:40 +02:00
Sebastian Grewe
10a794cd4f Merge pull request #626 from TheSerapher/issue-622 
Issue 622
 2013-08-22 02:36:12 -07:00
Sebastian Grewe
6ec5b4b845 Fixing hashrate graphs 
* Proper initilize array in order
* Fill data after initilizing
* Removed 0 fills

Thanks @iriiria for this fix!

Fixes #624
 2013-08-22 11:33:26 +02:00
Sebastian Grewe
ba95d678a0 moved motd to website tab 2013-08-20 12:08:59 +02:00
Sebastian Grewe
7ec8fa9b95 Moving a lot of settings from config to adminpanel 
* Migrated configuration options to admin panel
* Removed configuration options from config file
* Added help text for each configuration option into panel

Addresses #622 and needs extensive testing by pools. A lot has changed
so pool owners might have to adjust their own templates to match this
new system.
 2013-08-20 12:02:47 +02:00
Sebastian Grewe
4abe462e01 Merge pull request #618 from TheSerapher/issue-617 
Fix: Display proper PPS value
 2013-08-19 01:41:44 -07:00
Sebastian Grewe
2db6dba482 Fix: Display proper PPS value 
* Fixes: Wrong PPS value before the first block is found

Fixes #617
 2013-08-19 10:40:25 +02:00
Sebastian Grewe
c057efce3e Merge pull request #616 from TheSerapher/issue-605 
Issue 605
 2013-08-19 01:00:12 -07:00
Sebastian Grewe
59bd71c75d Fixing admin requests 
Fixes #605
 2013-08-19 09:59:41 +02:00
Sebastian Grewe
2e4a94ff8c Merge pull request #615 from TheSerapher/issue-612 
Removing IRC reference
 2013-08-19 00:40:10 -07:00
Sebastian Grewe
f8f50fdc05 Removing IRC reference 
Fixes #612
 2013-08-19 09:39:45 +02:00
Sebastian Grewe
d6422ea5a8 Merge pull request #602 from TheSerapher/issue-582 
Adding QRCodes under Accounts
 2013-08-19 00:38:37 -07:00
Sebastian Grewe
7e4c5dab4e Adding unconfirmed blocks to wallet 
First attempt addressing #610, still missing a detection for the actual
confirmation limit required for each block in case one lowers it in the
config.
 2013-08-19 09:31:53 +02:00
Sebastian Grewe
a56907ba00 Adding gethourlyhashrates API call 
Fixes #608
 2013-08-15 10:08:48 +02:00
Sebastian Grewe
1708e5d2b5 Do not add 24th hour, use 0 hour 2013-08-15 10:03:22 +02:00
Sebastian Grewe
14c0535b10 Fill empty hours with proper data 
* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
 2013-08-15 09:58:33 +02:00
Sebastian Grewe
50f380c25e first test to fill with data 2013-08-15 09:14:02 +02:00
Sebastian Grewe
16557465e4 Added: getuserbalance API call 
* Adds getbalance to API
* Admins: Can fetch any users balance
* Users: Can fetch only their own balance

Fixes #605
 2013-08-15 08:58:50 +02:00
Sebastian Grewe
ad6ceed77e fixing worker activity on mobile template 2013-08-14 11:47:46 +02:00
Sebastian Grewe
fcf5a21ce3 Adding QRCodes under Accounts 
* Added: API String QR Code for #582 and #591

This will allow more QRCodes being added that are specific to an
account. The require library is added and the API string can be used as
an example how codes are generated.

Fixes #582
 2013-08-14 11:44:29 +02:00
Sebastian Grewe
e5cb4d0886 Fixing combined hashrate graph 
This shouuld fix #598 with graphs being completely off
 2013-08-14 11:23:14 +02:00
Sebastian Grewe
184ad5d58b fixing color of total percentage again 2013-08-14 11:15:49 +02:00
Sebastian Grewe
567b8e1655 Fix rounding issues on total row 
* Use actual percentages to calculate the total to ensure
  the rows average matches the totals average

Fixes #596
 2013-08-14 11:10:58 +02:00
Sebastian Grewe
0679601fbd Initilize totals with 0 values 
Addresses #596
 2013-08-14 11:03:56 +02:00
Sebastian Grewe
0833bc3a3e Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-08-14 11:00:06 +02:00
Sebastian Grewe
c0e8459519 fix coloring of total percentage 2013-08-14 10:59:50 +02:00
Sebastian Grewe
0b701d7d06 Merge pull request #593 from TheSerapher/issue-585 
Fixing round estimates on public stats page
 2013-08-13 00:21:12 -07:00
Sebastian Grewe
22e7904da7 Fixing round estimates on public stats page 
* Fix: Display round restimates when making pool stats public via ACL
* Fix: Display proper pool efficiency when pool stats are public

Fixes #585
 2013-08-13 09:20:06 +02:00
Sebastian Grewe
85e22bc02f Adding totals to block statistics 
* Total expected shares
* Total actual shares
* Average Percentage
 2013-08-12 10:07:19 +02:00
Sebastian Grewe
7214d27d9e make blocks list sortable 2013-08-09 14:58:46 +02:00
Sebastian Grewe
71abaf29f3 Merge pull request #583 from TheSerapher/issue-581 
Issue 581
 2013-08-09 05:58:12 -07:00
Sebastian Grewe
d42b66d94e removing useless strings 2013-08-08 12:09:50 +02:00
Sebastian Grewe
031b4940cd admin should see all transactions in summary 2013-08-08 12:05:06 +02:00
Sebastian Grewe
1a459a7913 Adding transaction summary by types 
Addresses #581
 2013-08-08 12:02:39 +02:00
Sebastian Grewe
92623902b2 adding round shares back to PPS sidebar 2013-08-08 10:03:33 +02:00
Sebastian Grewe
c568683152 Adding empty example for round stat integration 
Addresses #543
 2013-08-08 10:01:33 +02:00
Sebastian Grewe
aad8271a13 Fix blockexplorer links to use blockhash not height 
Fixes #571
 2013-08-08 09:42:10 +02:00
Sebastian Grewe
03da52117a Fix user seeing other users transactions 
Fixes #577
 2013-08-08 09:36:05 +02:00
Sebastian Grewe
6767b5a235 Merge pull request #576 from TheSerapher/issue-561 
Issue 561
 2013-08-07 21:46:44 -07:00
Sebastian Grewe
2dbf2a231e Merge pull request #575 from TheSerapher/issue-535 
Honor anonymous flag on mobile template
 2013-08-07 21:46:12 -07:00
Sebastian Grewe
c9139034a4 Merge pull request #573 from TheSerapher/issue-549 
Make block count on stats page configurable
 2013-08-07 21:44:30 -07:00
Sebastian Grewe
cbf39f7905 Fix IDLE worker detection 
* Also mark as IDLE if no valid shares were received

Fixes #561
 2013-08-07 09:27:50 +02:00
Sebastian Grewe
073a42cfc8 Fixing worker hashrates and activity status 
* Fix hashrate calculations and include archived shares
* Fix worker activity to only check for our_result = Y shares
* Mark as active if worker has a hashrate > 0, removes a query

Addresses #561, crons need to be updated to remove the active flag from
as the worker activity and check the hashrate instead.
 2013-08-07 09:20:08 +02:00
Sebastian Grewe
fafd75d994 Honor anonymous flag on mobile template 
Fixes #535
 2013-08-07 08:59:22 +02:00
Sebastian Grewe
d4a9af86c4 removed debug output 2013-08-06 09:26:43 +02:00
Sebastian Grewe
0b8243ab69 Fixing archiving of PPS, TXFees and Debits 
Emergency fix. Includes balance PPS calculation fix.

Addresses #563
 2013-08-06 09:24:01 +02:00
Sebastian Grewe
c55bf8354f Fixing bug with archived transactions 
This will fix #563, only mark transactions as archived that have been
confirmed.
 2013-08-05 23:00:24 +02:00
Sebastian Grewe
df28e77319 fixing payout cron display 2013-08-05 17:51:31 +02:00
Sebastian Grewe
367f057e6d Refactored monitoring page 
* Allow easier addition of new crons to the monitor list
* Make the data generation dynamic instead of hard to adjust lists

Fixes #559 upon merge.
 2013-08-05 17:45:56 +02:00
Sebastian Grewe
2cddc27130 fixing PPS locked balance 2013-08-05 10:54:32 +02:00
Sebastian Grewe
f675fc7055 Removed page generation PHP from settings 
Committed those by accident, so removed.
 2013-08-05 10:08:24 +02:00
Sebastian Grewe
4d77a7d299 Refactored admin panel settings 
This will allow easier integration of new settings managed by the admin
panel. Includes setting types, tooltips, tabs etc.

No open ticket, just figured I'd add this.
 2013-08-05 10:02:39 +02:00
Sebastian Grewe
2ced75b752 Merge pull request #556 from TheSerapher/issue-536 
Issue 536
 2013-08-05 00:20:53 -07:00
Sebastian Grewe
680fa46013 Merge pull request #555 from TheSerapher/issue-545 
Adding Admin MOTD
 2013-08-05 00:20:26 -07:00
Sebastian Grewe
d59b8ef563 Make block count on stats page configurable 
Fixes #549
 2013-08-05 09:18:52 +02:00
Sebastian Grewe
0c35a046e0 Merge pull request #554 from TheSerapher/issue-553 
Adding jQuery Mobile 1.3.2
 2013-08-04 12:57:15 -07:00
Sebastian Grewe
fa0e7379a6 Adding jQuery Mobile 1.3.2 
* Adding new CSS and JS files
* Adding missing images
* Removing old version
* Updated master template

Fixes #553
 2013-08-04 21:53:36 +02:00
Sebastian Grewe
c25e54f79c Adding Admin MOTD 
* Adding MOTD to admin settings
* Adding MOTD to smarty_globals as regular INFO popup

Fixes #545
 2013-08-01 16:25:43 +02:00
Sebastian Grewe
7bde00c452 properly display auto-confirmed tx 2013-08-01 12:48:55 +02:00
Sebastian Grewe
95825224a1 Adding archiving flag for transactions 
* Added new column to transactions table (`007_transactions.sql`)
* Added setArchived method to mark old transactions as archived
* Honor archived flag in getBalance and getLockedBalance

This will further address and fix #536 once merged.
 2013-08-01 12:16:59 +02:00
Sebastian Grewe
3c57d5bd0a fixing missing template warnings 2013-08-01 11:29:16 +02:00
Sebastian Grewe
4eb6c59cb3 Refactored getTransactions, unified admin/user view 
* Removed getAllTransactions method
* Unified getTransactions for users and admins
* Added filter abilities to user transaction view

This should speed up things a fair bit for transaction heavy pools.

Addresses #536
 2013-08-01 11:00:54 +02:00
Sebastian Grewe
52f58807b0 Refactored admin transactions 
* Properly generate the bind_params statement
* Extended from Base Class
* Added methods to Base Class

Addresses #536
 2013-08-01 10:40:49 +02:00
Sebastian Grewe
4b3534ce61 Fixing WHERE clause for getBalance call 
Addresses #536
 2013-08-01 10:38:20 +02:00
Sebastian Grewe
9e1f424742 Great performance increase on transaction queries 
This will address an issue with database including a lot of
transactions. No more nested queries that put unwanted strain on a DB.

Address #536
 2013-08-01 10:38:20 +02:00
Sebastian Grewe
60bf687d1c increased limit back to 30 2013-07-31 17:11:26 +02:00
Sebastian Grewe
68c8d29a01 removed line by accident 2013-07-31 17:10:26 +02:00
Sebastian Grewe
4c37ab4950 Find actual row count without LIMITs applied 
Addresses #542
 2013-07-31 17:09:30 +02:00
Sebastian Grewe
fd8b07f02a Removing orphaned credits from Sidebars 
This will remove some confusion for users.

Addresses #524
 2013-07-31 08:59:02 +02:00
Nicolas Schteinschraber
5a377d6106 Issue #537 2013-07-31 03:44:49 -03:00
Sebastian Grewe
86633e1603 Adding JS/CSS code to project 
Instead of calling remote sites, deploy the JS and CSS locally. Will
allow HTTPs sites to work properly.

Fixes #521
 2013-07-24 16:37:22 +02:00
Sebastian Grewe
c0b0d438b8 Catch errors on missing templates 
Pages that are missing a template will cause a error 500. We now catch
this and display a default string.

Fixes #513
 2013-07-24 14:56:34 +02:00
Sebastian Grewe
dcc0596c8f Merge pull request #519 from TheSerapher/issue-511 
Display network hashrate in public API
 2013-07-24 04:28:35 -07:00
Sebastian Grewe
b5eca59e58 Fixing alignment in mobile template 
Addresses #514
 2013-07-24 11:41:12 +02:00
Sebastian Grewe
e760cbdc03 Fixing mobile templates 
Addresses #514
 2013-07-24 11:39:59 +02:00
Sebastian Grewe
3f62612af9 Fixing mobile templates too 2013-07-24 11:30:16 +02:00
Sebastian Grewe
eca77d551c Changed percentages for invalids, pool efficiency 
This should address #514 with negative efficiencies. Formulas were
wrong.

Will fix #514 when merged.
 2013-07-24 10:00:27 +02:00
Sebastian Grewe
c7f952a27a Display network hashrate in public API 
Instead of 0 show the actual hashrate, still shows 0 if unable to
connect to RPC server.

Fixes #511
 2013-07-24 09:12:29 +02:00
Sebastian Grewe
777e160cf3 cleaning PHP Notice from log 2013-07-23 16:55:05 +02:00
Sebastian Grewe
c6a4df2975 Check coin address when updating account 
This will fix #506 and ensures valid addresses are added when updating
the account.
 2013-07-23 14:37:58 +02:00
Sebastian Grewe
35d1f5fa92 Merge pull request #498 from TheSerapher/manual-payout-cron 
Adding manual payout cron
 2013-07-23 05:36:49 -07:00
Sebastian Grewe
7209f570f4 properly fetch account balance 2013-07-23 14:16:20 +02:00
Sebastian Grewe
4f46e9f781 remove worker monitoring if notifications are disabled 2013-07-23 13:11:39 +02:00
Sebastian Grewe
760f1a679e Allow admin to disable notification system 
This addresses #497 and allows the admins to disable notifications
through the admin panel. Might be used by those relying on clients using
the API instead.

Once merged it will fix #497.
 2013-07-23 13:06:38 +02:00
Sebastian Grewe
a6c8d507dc Merge pull request #501 from TheSerapher/issue-260 
Issue 260
 2013-07-23 03:55:20 -07:00
Sebastian Grewe
9cb80c6fd9 Properly filter Debit transactions 2013-07-23 12:36:16 +02:00
Sebastian Grewe
9c2cefd2c3 adding blockexplorer link if URL configured 2013-07-23 12:10:32 +02:00
Sebastian Grewe
24a277312c fixing TXFee display and filter 2013-07-23 12:01:45 +02:00
Sebastian Grewe
fb24ad81ae fixing php warning 2013-07-23 11:52:01 +02:00
Sebastian Grewe
9899507839 Fix some reported issues in #260 2013-07-23 11:05:45 +02:00
Sebastian Grewe
63b942a7e1 Adding No Fee option to admin panel 
Admins can disable a users fee via admin panel now.

Fixes #260
 2013-07-23 10:56:45 +02:00
Sebastian Grewe
3cfef93580 WiP to disable fees for specific accounts 
* added new account table column: `no_fee`
* honor `no_fee` flag during payout process
* added upgrade SQL file for this feature

Address #260
 2013-07-23 10:56:45 +02:00
Sebastian Grewe
330169ae58 more fixes and log cleanup 2013-07-23 10:53:47 +02:00
Sebastian Grewe
ed259a5b44 properly deal with Fee_PPS and Donation_PPS 2013-07-23 09:21:11 +02:00
Sebastian Grewe
61cea524d1 properly use limit for pagination 2013-07-23 09:18:50 +02:00
Sebastian Grewe
728bfe8c9d properly filter Credit_PPS as confirmed 2013-07-23 09:18:04 +02:00
Sebastian Grewe
1a5d216b7a Allow adjusting the tx row limit 2013-07-23 09:08:57 +02:00
Sebastian Grewe
1d6cbd44a6 Adding new admin transaction view 
* Added transaction filters
* Added proper paging support
* Removed the tabs that caused confusion
* Added transaction status column

Fixes #404
 2013-07-23 09:03:36 +02:00
Sebastian Grewe
2c3eac1f67 proper coloring for start/end times 2013-07-22 16:47:50 +02:00
Sebastian Grewe
4b6582ac35 More colorful monitoring output 
* Added colorized start/end times
* Added Success/Error image for Active status
* Added color to runtime status
 2013-07-22 16:42:23 +02:00
Sebastian Grewe
ee5e2c46c6 Adding manual payout cron 
This will avoid double payouts via the website. Payouts will be
requested by users and processed by a cron. If, for whatever reason,
users do add two requests (it is checked if a payout exists) they would
only have one successful payout until their account balance is back up
to a save value to trigger the payout.

This should fix any issues with manual payouts being exploited through
the website. Will require some testing by others to ensure things work
as expected.
 2013-07-22 16:14:22 +02:00
Sebastian Grewe
44c31fe630 Merge pull request #500 from TheSerapher/issue-488 
Admin Panel Setting to disable/enable AP/MP
 2013-07-22 05:55:12 -07:00
Sebastian Grewe
00f7f3fadf Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-07-22 10:41:56 +02:00
obigal
93e36a8259 Cryptsy api support 2013-07-21 14:15:34 -04:00
obigal
ee2c90525c Cryptsy api support 2013-07-21 14:14:12 -04:00
Sebastian Grewe
1086d81f09 Merge pull request #495 from TheSerapher/issue-490 
Issue 490
 2013-07-21 10:26:05 -07:00
Sebastian Grewe
36a74b0bbf Fix transaction table, adjust transaction class 
* Ensure we also check newly added blocks for unconfirmed tx
* Only list orphaned transactions in the orphaned tab

Fixes #490
 2013-07-21 17:25:09 +02:00