Remind about PayPal service fees

[hcoop/zz_old/portal.git] / location.sml

diff --git a/location.sml b/location.sml
index fd73de8..e4464d1 100644 (file)
--- a/location.sml
+++ b/location.sml
@@ -135,7 +135,7 @@ fun recordResidents () =
                addToParents (loc, count)
            end
     in
-       C.fold db folder NM.empty ($`SELECT loc, id, name, rname, bal, joined
+       C.fold db folder NM.empty ($`SELECT loc, id, name, rname, bal, joined, app, shares, paypal, checkout
                                     FROM Lives JOIN WebUser ON usr = id`)
     end
 
@@ -293,10 +293,11 @@ fun removeFromLocation (lives : lives) =
     end
 
 fun residentsOneLevel loc =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined FROM Lives, WebUser
-                                       WHERE loc = ^(C.intToSql loc)
-                                          AND usr = id
-                                       ORDER BY name`)
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout
+                                 FROM Lives, WebUser
+                                 WHERE loc = ^(C.intToSql loc)
+                                   AND usr = id
+                                 ORDER BY name`)
 
 fun alreadyExists (parent, name) =
     case C.oneRow (getDb ()) ($`SELECT COUNT( * ) FROM Location
@@ -315,4 +316,4 @@ fun subLocations par =
                                      WHERE parent ^(intOptToSqlCompare par)
                                      ORDER BY name`)
 
-end
\ No newline at end of file
+end