Bug fixes

atomzakk · atomzakk · commit 3cc190170eed · 2019-08-19T02:28:56.000+03:00
diff --git a/ecosystem_apps/crowdfunding/contracts/CreateStartup.sim b/ecosystem_apps/crowdfunding/contracts/CreateStartup.sim
@@ -110,7 +110,7 @@ contract CreateStartup {
         information["description"] = $Description
         information["link"] = $SiteLink
 
-        $member_name = DBFind("@1members").Where("ecosystem": $ecosystem_id, "account": $account_id).One("member_name")
+        $member_name = DBFind("@1members").Where({"ecosystem": $ecosystem_id, "account": $account_id}).One("member_name")
         creator["account"] = $account_id
         if $member_name {
             creator["member_name"] = $member_name
diff --git a/ecosystem_apps/crowdfunding/pages/startup_list.ptl b/ecosystem_apps/crowdfunding/pages/startup_list.ptl
@@ -12,13 +12,13 @@ DBFind("@1roles_participants").Where({"ecosystem": "#ecosystem_id#", "$and": [{"
 DBFind("@1roles_participants").Where({"ecosystem": "#ecosystem_id#", "$and": [{"role->id": {"$in": [#investor_role#]}}, {"role->id": "#role_id#"}], "member->account": "#account_id#", "deleted": 0}).Vars(investor_access)
 
 If(#page_par# == 0){
-    SetVar(type_filter, `"status": 0`)
+    SetVar(type_filter, `, "status": 0`)
 }.ElseIf(#page_par# == 1){
-    SetVar(type_filter, `"status": 1`)
+    SetVar(type_filter, `, "status": 1`)
 }.ElseIf(#page_par# == 2){
-    SetVar(type_filter, `"status": {"$gte": 2}`)
+    SetVar(type_filter, `, "status": {"$gte": 2}`)
 }.ElseIf(#page_par# == -1){
-    SetVar(type_filter, `"status": "-1"`)
+    SetVar(type_filter, `, "status": "-1"`)
 }
 
 If(#startup_access_id# > 0){
@@ -44,21 +44,21 @@ If(#global_access# == 1){
 
     If(#search#){
         If(#startup_access_id# > 0){
-            SetVar(where, {"deleted": 0, "#type_filter#", "informations->name": {"$ilike": "#search#"}})
+            SetVar(where, {"deleted": 0, "informations->name": {"$ilike": "#search#"} #type_filter#})
         }.ElseIf(#investor_access_id# > 0){
-            SetVar(where, {"deleted": 0, "#type_filter#", "informations->name": {"$ilike": "#search#"}})
+            SetVar(where, {"deleted": 0, "informations->name": {"$ilike": "#search#"} #type_filter#})
         }.ElseIf(#admin_access_id# > 0){
-            SetVar(where, {"#type_filter#", "informations->name": {"$ilike": "#search#"}})
+            SetVar(where, {"informations->name": {"$ilike": "#search#"} #type_filter#})
         }.Else{
             SetVar(where, {"status": 10})
         }
     }.Else{
         If(#startup_access_id# > 0){
-            SetVar(where, {"#type_filter#", "deleted": 0})
+            SetVar(where, {"deleted": 0 #type_filter#})
         }.ElseIf(#investor_access_id# > 0){
-            SetVar(where, {"#type_filter#", "deleted": 0})
+            SetVar(where, {"deleted": 0 #type_filter#})
         }.ElseIf(#admin_access_id# > 0){
-            SetVar(where, {"#type_filter#"})
+            SetVar(where, {#type_filter#})
         }.Else{
             SetVar(where, {"status": 10})
         }
diff --git a/ecosystem_apps/crowdfunding/pages/startup_view.ptl b/ecosystem_apps/crowdfunding/pages/startup_view.ptl
@@ -1,5 +1,7 @@
 DBFind("@1startups").WhereId(#stid#).Columns("id,collected_percent,date_created,collected_amount,informations,informations->name,informations->description,informations->link,date_started,date_ended,required_amount,min_investment,share_capital,ecosystem,deleted,creator,creator->member_name,creator->account,status").Vars(view)
-DBFind("@1roles").Where({"role_name": "Investor", "deleted": 0,"ecosystem": "#ecosystem_id#"}).Columns("id,role_name,deleted,ecosystem").Vars(check_role_invest)
+DBFind("@1applications").Where({"ecosystem": "#ecosystem_id#", "name": "Crowdfunding"}).Vars(application)
+SetVar(investor_role, AppParam(Ecosystem: #ecosystem_id#, App: #application_id#, Name: crowdfunding_investor_role))
+DBFind("@1roles_participants").Where({"ecosystem": "#ecosystem_id#", "$and": [{"role->id": {"$in": [#investor_role#]}}, {"role->id": "#role_id#"}], "member->account": "#account_id#", "deleted": 0}).Vars(investor_access)
 
 Div(content-wrapper){
     Div(row){
@@ -115,7 +117,7 @@ Div(content-wrapper){
                         }
                     }
                 }
-                If(And(#check_role_invest_id# == #role_id#,#view_status# == 1)){
+                If(And(#investor_access_id# > 0, #view_status# == 1)){
                     Div(list-group-item){
                         Div(row){
                             Div(col-lg-8 col-lg-offset-2 text-center){
diff --git a/ecosystem_apps/land_registry/pages/lr_view.ptl b/ecosystem_apps/land_registry/pages/lr_view.ptl
@@ -471,7 +471,7 @@ If(#object_id# > 0){
                                 }
                                 Div(Class: short-name text-bold, Body: #buyer_member_name#)
                             }
-                            Div(Class: text-muted m0, Body: ($lr_owner$))
+                            Div(Class: text-muted m0, Body: ($lr_buyer$))
                         }
                     }
                 }
diff --git a/ecosystem_apps/token_sale/contracts/TsFreeWalletAdd.sim b/ecosystem_apps/token_sale/contracts/TsFreeWalletAdd.sim
@@ -28,6 +28,6 @@ contract TsFreeWalletAdd {
     }
 
     action {
-        DBInsert("ts_wallets", {"wallet_btc": $WalletBtc, "wallet_eth": $WalletEth})
+        DBInsert("ts_wallets", {"wallet_btc": $WalletBtc, "wallet_eth": $WalletEth, "buyer_account": 0, "signer_account": 0})
     }
 }
diff --git a/ecosystem_apps/token_sale/contracts/TsKeyApprove.sim b/ecosystem_apps/token_sale/contracts/TsKeyApprove.sim
@@ -74,7 +74,7 @@ contract TsKeyApprove {
     action {
         var pub_bytes bytes
         pub_bytes = HexToPub($PublicKey)
-        DBInsert("@1keys", {"account": $userAccount, "deleted": 0, "pub": pub_bytes, "ecosystem": 1})
+        DBInsert("@1keys", {"id": $userKey, "account": $userAccount, "deleted": 0, "pub": pub_bytes, "ecosystem": 1})
         var start_balance money
         start_balance = Money(1000000000000000)
         @1TokensSend("Recipient,Amount", $userAccount, start_balance)
diff --git a/ecosystem_apps/token_sale/pages/ts_free_wallets.ptl b/ecosystem_apps/token_sale/pages/ts_free_wallets.ptl
@@ -9,9 +9,9 @@ If(And(#admin_role_id# > 0, #role_id# == #admin_role_id#)){
 }
 
 If(#search#){
-    SetVar(where, {"$and": [{"deleted":0}, {"buyer_account":0}, {"$or":[{"wallet_btc": {"$ilike": "#search#"}}, {"wallet_eth": {"$ilike": "#search#"}}]}]})
+    SetVar(where, {"$and": [{"deleted": 0}, {"buyer_account": 0}, {"$or": [{"wallet_btc": {"$ilike": "#search#"}}, {"wallet_eth": {"$ilike": "#search#"}}]}]})
 }.Else{
-    SetVar(where, {"$and": [{"deleted":0}, {"buyer_account":0}]})
+    SetVar(where, {"$and": [{"deleted": 0}, {"buyer_account": 0}]})
 }
 
 Div(list-group-item ml-lg mr-lg pt-lg){
diff --git a/ecosystem_apps/token_sale/pages/ts_sales.ptl b/ecosystem_apps/token_sale/pages/ts_sales.ptl
@@ -13,13 +13,13 @@ If(And(#admin_role_id# > 0, #role_id# == #admin_role_id#)){
 }
 
 If(#search#){
-    SetVar(where, {"id": "#search#"})
+    SetVar(where, {"buyer_account": {"$ilike": "#search#"}})
 }.Else{
     SetVar(where, {"id": {"$gt": 0}})
 }
 
 Div(list-group-item ml-lg mr-lg pt-lg){
-    SetVar(search_name, LangRes(@1account))
+    SetVar(search_name, LangRes(@1wallet))
     Include(@1search)
 }
 
diff --git a/ecosystem_apps/token_sale/tables/ts_sales.json b/ecosystem_apps/token_sale/tables/ts_sales.json
@@ -67,7 +67,7 @@
     {
         "conditions": "false",
         "name": "buyer_account",
-        "type": "number"
+        "type": "varchar"
     },
     {
         "conditions": "ContractAccess(\"@1TsTransferReject\",\"@1TsTransferManager\",\"@1TsTransferAdmin\",\"@1TsTransferSeller\")",
diff --git a/platform_apps/questionnaire/contracts/QOperations.sim b/platform_apps/questionnaire/contracts/QOperations.sim
@@ -1,17 +1,17 @@
 contract QOperations {
     data {
         Id int "optional"
-        Description string
-        Question string
-        Answer string
         Operation string
+        Description string "optional"
+        Question string "optional"
+        Answer string "optional"
         Notifications bool "optional"
         Hide bool "optional"
         Change bool "optional"
         AuGroups int "optional"
         AuRoles int "optional"
-        EndDate string
-        EndTime string
+        EndDate string "optional"
+        EndTime string "optional"
     }
 
     func trimZeroTime(s string) string {
diff --git a/platform_apps/ratings/pages/r_ratings.ptl b/platform_apps/ratings/pages/r_ratings.ptl
@@ -15,7 +15,7 @@ If(#isManager#==1){
 }
 
 If(#search#){
-    SetVar(where, {"ecosystem": "#ecosystem_id#", "account": {"$neq": "#guest_account#"}, "deleted": 0, "account": {"$ilike": "#search#"}})
+    SetVar(where, {"ecosystem": "#ecosystem_id#", "deleted": 0, "$and": [{"account": {"$ilike": "#search#"}}, {"account": {"$neq": "#guest_account#"}}]})
 }.Else{
     SetVar(where, {"ecosystem": "#ecosystem_id#", "account": {"$neq": "#guest_account#"}, "deleted": 0})
 }
diff --git a/platform_apps/token_emission/contracts/TeBurn.sim b/platform_apps/token_emission/contracts/TeBurn.sim
@@ -54,9 +54,9 @@ contract TeBurn {
         DBUpdate("@1ecosystems", $ecosystem_id, mb)
 
         var m map guest_account string
-        guest_account = IdToAddress($guest_key)
-        m["sender_id"] = $account_id
-        m["recipient_id"] = guest_account
+        guest_account = IdToAddress(Int($guest_key))
+        m["sender_id"] = AddressToId($account_id)
+        m["recipient_id"] = AddressToId(guest_account)
         m["amount"] = $Amount
         m["comment"] = "New burn"
         m["block_id"] = $block
diff --git a/src/basic/contracts/TokensIncDeposit.sim b/src/basic/contracts/TokensIncDeposit.sim
@@ -4,7 +4,7 @@ contract TokensIncDeposit {
     }
 
     conditions {
-        $amount = DBFind("@1keys").Where("account": $account_id, "deleted": 0).Row()
+        $amount = DBFind("@1keys").Where({"account": $account_id, "deleted": 0}).Row()
         if Money($Amount) > (Money($amount["amount"]) - Money($amount["deposit"])){
             warning LangRes("@1insufficient_funds", "en")
         }
diff --git a/src/basic/pages/members_list.ptl b/src/basic/pages/members_list.ptl
@@ -10,7 +10,7 @@ If(And(#role_id# == #role_admin#, #ecosystem_id# != 1)){
 }
 
 If(#search#){
-    SetVar(where, {"ecosystem": "#ecosystem_id#", "account": {"$neq": "#guest_account#"}, "deleted": 0, "account": {"$ilike": "#search#"}})
+    SetVar(where, {"ecosystem": "#ecosystem_id#", "deleted": 0, "$and": [{"account": {"$ilike": "#search#"}}, {"account": {"$neq": "#guest_account#"}}]})
 }.Else{
     SetVar(where, {"ecosystem": "#ecosystem_id#", "account": {"$neq": "#guest_account#"}, "deleted": 0})
 }
diff --git a/src/basic/pages/members_list_admin.ptl b/src/basic/pages/members_list_admin.ptl
@@ -10,7 +10,7 @@ If(And(#role_id# == #role_admin#, #ecosystem_id# != 1)){
 }
 
 If(#search#){
-    SetVar(where, {"ecosystem": "#ecosystem_id#", "account": {"$neq": "#guest_account#"}, "account": {"$ilike": "#search#"}})
+    SetVar(where, {"ecosystem": "#ecosystem_id#", "$and": [{"account": {"$ilike": "#search#"}}, {"account": {"$neq": "#guest_account#"}}]})
 }.Else{
     SetVar(where, {"ecosystem": "#ecosystem_id#", "account": {"$neq": "#guest_account#"}})
 }
diff --git a/src/basic/pages/select_wallet.ptl b/src/basic/pages/select_wallet.ptl
@@ -8,7 +8,7 @@ If(#page_par#){
 }
 
 If(#search#){
-    SetVar(where, {"ecosystem": "#EcosystemId#", "account": {"$neq": "#guest_account#"}, "deleted": 0, "account": {"$ilike": "#search#"}})
+    SetVar(where, {"ecosystem": "#EcosystemId#", "deleted": 0, "$and": [{"account": {"$ilike": "#search#"}}, {"account": {"$neq": "#guest_account#"}}]})
 }.Else{
     SetVar(where, {"ecosystem": "#EcosystemId#", "account": {"$neq": "#guest_account#"}, "deleted": 0})
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`DBFind("@1startups").WhereId(#stid#).Columns("id,collected_percent,date_created,collected_amount,informations,informations->name,informations->description,informations->link,date_started,date_ended,required_amount,min_investment,share_capital,ecosystem,deleted,creator,creator->member_name,creator->account,status").Vars(view)`
`2`		`-DBFind("@1roles").Where({"role_name": "Investor", "deleted": 0,"ecosystem": "#ecosystem_id#"}).Columns("id,role_name,deleted,ecosystem").Vars(check_role_invest)`
	`2`	`+DBFind("@1applications").Where({"ecosystem": "#ecosystem_id#", "name": "Crowdfunding"}).Vars(application)`
	`3`	`+SetVar(investor_role, AppParam(Ecosystem: #ecosystem_id#, App: #application_id#, Name: crowdfunding_investor_role))`
	`4`	`+DBFind("@1roles_participants").Where({"ecosystem": "#ecosystem_id#", "$and": [{"role->id": {"$in": [#investor_role#]}}, {"role->id": "#role_id#"}], "member->account": "#account_id#", "deleted": 0}).Vars(investor_access)`
`3`	`5`
`4`	`6`	`Div(content-wrapper){`
`5`	`7`	`Div(row){`
`@@ -115,7 +117,7 @@ Div(content-wrapper){`
`115`	`117`	`}`
`116`	`118`	`}`
`117`	`119`	`}`
`118`		`- If(And(#check_role_invest_id# == #role_id#,#view_status# == 1)){`
	`120`	`+ If(And(#investor_access_id# > 0, #view_status# == 1)){`
`119`	`121`	`Div(list-group-item){`
`120`	`122`	`Div(row){`
`121`	`123`	`Div(col-lg-8 col-lg-offset-2 text-center){`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ If(#object_id# > 0){`
`471`	`471`	`}`
`472`	`472`	`Div(Class: short-name text-bold, Body: #buyer_member_name#)`
`473`	`473`	`}`
`474`		`- Div(Class: text-muted m0, Body: ($lr_owner$))`
	`474`	`+ Div(Class: text-muted m0, Body: ($lr_buyer$))`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ contract TsFreeWalletAdd {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`action {`
`31`		`- DBInsert("ts_wallets", {"wallet_btc": $WalletBtc, "wallet_eth": $WalletEth})`
	`31`	`+ DBInsert("ts_wallets", {"wallet_btc": $WalletBtc, "wallet_eth": $WalletEth, "buyer_account": 0, "signer_account": 0})`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ If(And(#admin_role_id# > 0, #role_id# == #admin_role_id#)){`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`If(#search#){`
`12`		`- SetVar(where, {"$and": [{"deleted":0}, {"buyer_account":0}, {"$or":[{"wallet_btc": {"$ilike": "#search#"}}, {"wallet_eth": {"$ilike": "#search#"}}]}]})`
	`12`	`+ SetVar(where, {"$and": [{"deleted": 0}, {"buyer_account": 0}, {"$or": [{"wallet_btc": {"$ilike": "#search#"}}, {"wallet_eth": {"$ilike": "#search#"}}]}]})`
`13`	`13`	`}.Else{`
`14`		`- SetVar(where, {"$and": [{"deleted":0}, {"buyer_account":0}]})`
	`14`	`+ SetVar(where, {"$and": [{"deleted": 0}, {"buyer_account": 0}]})`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`Div(list-group-item ml-lg mr-lg pt-lg){`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ If(And(#admin_role_id# > 0, #role_id# == #admin_role_id#)){`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`If(#search#){`
`16`		`- SetVar(where, {"id": "#search#"})`
	`16`	`+ SetVar(where, {"buyer_account": {"$ilike": "#search#"}})`
`17`	`17`	`}.Else{`
`18`	`18`	`SetVar(where, {"id": {"$gt": 0}})`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`Div(list-group-item ml-lg mr-lg pt-lg){`
`22`		`- SetVar(search_name, LangRes(@1account))`
	`22`	`+ SetVar(search_name, LangRes(@1wallet))`
`23`	`23`	`Include(@1search)`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`{`
`68`	`68`	`"conditions": "false",`
`69`	`69`	`"name": "buyer_account",`
`70`		`- "type": "number"`
	`70`	`+ "type": "varchar"`
`71`	`71`	`},`
`72`	`72`	`{`
`73`	`73`	`"conditions": "ContractAccess(\"@1TsTransferReject\",\"@1TsTransferManager\",\"@1TsTransferAdmin\",\"@1TsTransferSeller\")",`