Browse Source

Pro single > transaction updates

Vijayakrishnan Krishnan 4 years ago
parent
commit
f2898b3509
2 changed files with 8 additions and 10 deletions
  1. 3 0
      app/Console/Commands/GenerateTreeCommand.php
  2. 5 10
      generatecv/tree.txt

+ 3 - 0
app/Console/Commands/GenerateTreeCommand.php

@@ -940,6 +940,9 @@ class GenController {
                         "select(\"{$method->columns[$column]["query"]}\");\n" .
                         "echo (\$_r && count(\$_r)) ? \$_r[0]->result : '-'; ?>";
                 }
+                else if(isset($method->columns[$column]["getter"])) {
+                    $columnValue = $method->columns[$column]["getter"];
+                }
                 if(isset($method->columns[$column]["link"])) {
                     $hasLink = true;
                     $linkTarget = $method->columns[$column]["link"];

+ 5 - 10
generatecv/tree.txt

@@ -1042,16 +1042,11 @@ ADMIN
             bills
             transactions
                 id=pro_transaction.pro_id=>/transactions/view/UID/SUB_dashboard
-                add_credit_transaction:pro_transaction:createManualPlusForPro
-                    proUid:hidden=uid
-                    amount:number
-                    intendedResultingBalance:number
-                    customMemo
-                add_debit_transaction:pro_transaction:createManualPlusForPro
-                    proUid:hidden=uid
-                    amount:number
-                    intendedResultingBalance:number
-                    customMemo
+                !inc:@created_at,pro_id,client_id,plus_or_minus,reason_type,amount,resulting_balance
+                !qry:clients:select id, concat(name_last, ', ', name_first) as name_display from client
+                !qry:pros:select id, concat(name_last, ', ', name_first) as name_display from pro
+                !col:pro_id:Pro:~pros:name_display:id,=,$$pro_id:all
+                !col:client_id:Client:~clients:name_display:id,=,$$client_id:all
             sessions
             audit_log
     pro_rates|pro_rate|view|icon:funnel-dollar