From fbfc8d60daaca32ffb16c4d8735a0e75907ff490 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sun, 12 May 2013 16:58:48 +0200
Subject: [PATCH] adding new transaction class to manual payout through website

---
 public/include/pages/account/edit.inc.php     | 32 ++++++++++---------
 .../mmcFE/account/transactions/default.tpl    |  4 +--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php
index a4a38413..90cd06de 100644
--- a/public/include/pages/account/edit.inc.php
+++ b/public/include/pages/account/edit.inc.php
@@ -13,29 +13,31 @@ if ( ! $user->checkPin($_SESSION['USERDATA']['id'], $_POST['authPin']) && $_POST
 } else {
   switch ($_POST['do']) {
   case 'cashOut':
-    $dUserBalance = $user->getBalance($_SESSION['USERDATA']['id']);
-    $sUserSendAddress = $user->getLtcAddress($_SESSION['USERDATA']['id']);
-    $dUserPaid = $user->getPaid($_SESSION['USERDATA']['id']);
-    if ($dUserBalance > 0.1) {
+    $continue = true;
+    $dBalance = $transaction->getBalance($_SESSION['USERDATA']['id']);
+    $sCoinAddress = $user->getCoinAddress($_SESSION['USERDATA']['id']);
+    if ($dBalance > 0.1) {
       if ($bitcoin->can_connect() === true) {
         try {
-          $bitcoin->validateaddress($sUserSendAddress);
+          $bitcoin->validateaddress($sCoinAddress);
         } catch (BitcoinClientException $e) {
+          var_dump($e);
           $_SESSION['POPUP'][] = array('CONTENT' => 'Invalid payment address: ' . $sUserSendAddress, 'TYPE' => 'errormsg');
+          $continue = false;
         }
-        // Remove the transfer fee
-        $dUserBalance = $dUserBalance - 0.1;
-        try {
-          $bitcoin->sendtoaddress($sUserSendAddress, $dUserBalance);
-        } catch (BitcoinClientException $e) {
-          $_SESSION['POPUP'][] = array('CONTENT' => 'Failed to send LTC, please contact site support immidiately', 'TYPE' => 'errormsg');
+        if ($continue == true) {
+          // Remove the transfer fee and send to address
+          try {
+            $bitcoin->sendtoaddress($sCoinAddress, $dBalance - 0.1);
+          } catch (BitcoinClientException $e) {
+            $_SESSION['POPUP'][] = array('CONTENT' => 'Failed to send LTC, please contact site support immidiately', 'TYPE' => 'errormsg');
+            var_dump($e);
+            $continue = false;
+          }
         }
         // Set balance to 0, add to paid out, insert to ledger
-        if ( $user->setBalance($_SESSION['USERDATA']['id'], 0) && 
-          $user->setPaid($_SESSION['USERDATA']['id'], $dUserPaid + $dUserBalance) && 
-          $user->addLedger($_SESSION['USERDATA']['id'], $dUserBalance, $sUserSendAddress) ) {
+        if ($continue == true && $transaction->addTransaction($_SESSION['USERDATA']['id'], $dBalance, 'Debit_MP', NULL, $sCoinAddress))
           $_SESSION['POPUP'][] = array('CONTENT' => 'Transaction completed', 'TYPE' => 'success');
-        }
       } else {
         $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to pushpool service', 'TYPE' => 'errormsg');
       }
diff --git a/public/templates/mmcFE/account/transactions/default.tpl b/public/templates/mmcFE/account/transactions/default.tpl
index 3e243b9b..9ec3aad6 100644
--- a/public/templates/mmcFE/account/transactions/default.tpl
+++ b/public/templates/mmcFE/account/transactions/default.tpl
@@ -19,7 +19,7 @@
       </thead>
       <tbody style="font-size:12px;">
 {section transaction $TRANSACTIONS}
-        {if (($TRANSACTIONS[transaction].type == 'Credit' and $TRANSACTIONS[transaction].confirmations >= 120) or $TRANSACTIONS[transaction].type != 'Credit')}
+        {if (($TRANSACTIONS[transaction].type == 'Credit' and $TRANSACTIONS[transaction].confirmations >= $GLOBAL.confirmations) or $TRANSACTIONS[transaction].type != 'Credit')}
         <tr class="{cycle values="odd,even"}">
           <td>{$TRANSACTIONS[transaction].id}</td>
           <td>{$TRANSACTIONS[transaction].timestamp}</td>
@@ -50,7 +50,7 @@
       </thead>
       <tbody style="font-size:12px;">
 {section transaction $TRANSACTIONS}
-        {if $TRANSACTIONS[transaction].type == 'Credit' && $TRANSACTIONS[transaction].confirmations < 120}
+        {if $TRANSACTIONS[transaction].type == 'Credit' && $TRANSACTIONS[transaction].confirmations < $GLOBAL.confirmations}
         <tr class="{cycle values="odd,even"}">
           <td>{$TRANSACTIONS[transaction].id}</td>
           <td>{$TRANSACTIONS[transaction].timestamp}</td>