Skip to content

Commit 532fe67

Browse files
author
Travis CI
committed
Autobuild N.618 [ci skip]
1 parent 3cc1901 commit 532fe67

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

basic.json

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

ecosystem_apps/crowdfunding.json

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

ecosystem_apps/land_registry.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ecosystem_apps/token_sale.json

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

platform_apps/questionnaire.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

platform_apps/ratings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
{
173173
"Name": "r_ratings",
174174
"Conditions": "ContractConditions(\"@1DeveloperCondition\")",
175-
"Value": "SetVar(this_page, @1r_ratings).(this_table, @1keys)\nInclude(@1pager_header)\n\nSetTitle($@1r_ratings$)\nSpan(Class: text-muted h5 m0 mb ml-lg, Body: Span(Class: ml-sm, Body: \"$@1r_desc$\"))\n\nDBFind(\"@1applications\").Where({\"ecosystem\": \"#ecosystem_id#\", \"name\": \"Ratings\"}).Vars(application)\nSetVar(admin_roles, AppParam(Ecosystem: #ecosystem_id#, App: #application_id#, Name: ratings_admin_role))\nDBFind(\"@1roles_participants\").Where({\"ecosystem\": \"#ecosystem_id#\", \"$and\": [{\"role->id\": {\"$in\": [#admin_roles#]}}, {\"role->id\": \"#role_id#\"}], \"member->account\": \"#account_id#\", \"deleted\": 0}).Vars(admin_access)\nIf(#admin_access_id# > 0){\n SetVar(isManager,1)\n}\nIf(#isManager#==1){\n AddToolButton(Title: $@1r_rating_group$, Page: @1r_rating_group, Icon: icon-drawer).Popup(Header: $@1r_rating_group$, Width: \"50\")\n}\n\nIf(#search#){\n SetVar(where, {\"ecosystem\": \"#ecosystem_id#\", \"account\": {\"$neq\": \"#guest_account#\"}, \"deleted\": 0, \"account\": {\"$ilike\": \"#search#\"}})\n}.Else{\n SetVar(where, {\"ecosystem\": \"#ecosystem_id#\", \"account\": {\"$neq\": \"#guest_account#\"}, \"deleted\": 0})\n}\n\nDiv(list-group-item ml-lg mr-lg pt-lg){\n SetVar(search_name, $@1wallet$)\n Include(@1search)\n}\n\nDBFind(#this_table#, src).Where(#where#).Order({\"account\": 1}).Limit(#pager_limit#).Offset(#pager_offset#).Count(count).Custom(_id){\n SetVar(Name: style_text, Value: \"text-normal\")\n SetVar(Name: style_link, Value: \"text-primary\")\n Span(Class: h6 text-muted, Body: #account#)\n SetVar(m_account,)\n DBFind(\"@1members\").Where({\"ecosystem\": \"#ecosystem_id#\", \"account\": \"#account#\"}).Vars(m)\n If(#m_account#){\n SetVar(image_id, #m_image_id#)\n SetVar(member_name, #m_member_name#)\n }.Else{\n SetVar(image_id, 0)\n SetVar(member_name, #account#)\n }\n}.Custom(_account){\n Button(Class: btn-xs btn-link, Page: @1r_accruals, PageParams: \"Account=#account#\"){\n Span(Class: h5, Body: $@1view$)\n }\n}.Custom(_rating){\n SetVar(rating_amount, 0).(member, #account#)\n DBFind(\"@1r_ratings\", r).Where({\"ecosystem\": \"#ecosystem_id#\", \"member\": \"#member#\"}).Vars(rating)\n Span(#rating_amount#)\n}.Custom(_username){\n LinkPage(Class: #style_link# h5 text-bold, Page: @1profile_view, PageParams: \"v_account=#account#\"){\n If(#image_id#>0){\n Image(Src: Binary().ById(#image_id#), Class: img-circle).Style(height: 30px;width: 30px; border: 1px solid #5A5D63; margin-right: 10px;)\n Span(#member_name#)\n }.Else{\n Div(){\n Span(Em(Class: fa icon-user fa-2x mr)).(#member_name#)\n }.Style(display:flex; align-items:center;)\n }\n }\n}.Custom(_actions){\n If(#isManager#==1){\n Button(Page:@1r_rating_member, PageParams: \"MemberAccount=#account#\", Class: btn bg-gray-lighter fa fa-plus pull-right).Popup(Header:$@1r_change_rating$, Width: 50)\n }\n}\n\nDiv(fullscreen){\n Div(table-responsive ml-lg mr-lg){\n Div(list-group-item){\n If(#count# > 0){\n Table(src, \"$@1name$=_username,$@1r_accruals$=_account,$@1r_rating$=_rating,=_actions\")\n }.Else{\n Div(text-center h4 text-muted){\n $@1members$ $@1not_founded$\n }\n }\n }.Style(\n margin-top:-15px;\n tbody > tr:nth-of-type(odd) {\n background-color: #f8f9fc;\n }\n )\n }\n}\nDiv(mt-sm ml-lg mr-sm mb-sm){\n Include(@1pager)\n}",
175+
"Value": "SetVar(this_page, @1r_ratings).(this_table, @1keys)\nInclude(@1pager_header)\n\nSetTitle($@1r_ratings$)\nSpan(Class: text-muted h5 m0 mb ml-lg, Body: Span(Class: ml-sm, Body: \"$@1r_desc$\"))\n\nDBFind(\"@1applications\").Where({\"ecosystem\": \"#ecosystem_id#\", \"name\": \"Ratings\"}).Vars(application)\nSetVar(admin_roles, AppParam(Ecosystem: #ecosystem_id#, App: #application_id#, Name: ratings_admin_role))\nDBFind(\"@1roles_participants\").Where({\"ecosystem\": \"#ecosystem_id#\", \"$and\": [{\"role->id\": {\"$in\": [#admin_roles#]}}, {\"role->id\": \"#role_id#\"}], \"member->account\": \"#account_id#\", \"deleted\": 0}).Vars(admin_access)\nIf(#admin_access_id# > 0){\n SetVar(isManager,1)\n}\nIf(#isManager#==1){\n AddToolButton(Title: $@1r_rating_group$, Page: @1r_rating_group, Icon: icon-drawer).Popup(Header: $@1r_rating_group$, Width: \"50\")\n}\n\nIf(#search#){\n SetVar(where, {\"ecosystem\": \"#ecosystem_id#\", \"deleted\": 0, \"$and\": [{\"account\": {\"$ilike\": \"#search#\"}}, {\"account\": {\"$neq\": \"#guest_account#\"}}]})\n}.Else{\n SetVar(where, {\"ecosystem\": \"#ecosystem_id#\", \"account\": {\"$neq\": \"#guest_account#\"}, \"deleted\": 0})\n}\n\nDiv(list-group-item ml-lg mr-lg pt-lg){\n SetVar(search_name, $@1wallet$)\n Include(@1search)\n}\n\nDBFind(#this_table#, src).Where(#where#).Order({\"account\": 1}).Limit(#pager_limit#).Offset(#pager_offset#).Count(count).Custom(_id){\n SetVar(Name: style_text, Value: \"text-normal\")\n SetVar(Name: style_link, Value: \"text-primary\")\n Span(Class: h6 text-muted, Body: #account#)\n SetVar(m_account,)\n DBFind(\"@1members\").Where({\"ecosystem\": \"#ecosystem_id#\", \"account\": \"#account#\"}).Vars(m)\n If(#m_account#){\n SetVar(image_id, #m_image_id#)\n SetVar(member_name, #m_member_name#)\n }.Else{\n SetVar(image_id, 0)\n SetVar(member_name, #account#)\n }\n}.Custom(_account){\n Button(Class: btn-xs btn-link, Page: @1r_accruals, PageParams: \"Account=#account#\"){\n Span(Class: h5, Body: $@1view$)\n }\n}.Custom(_rating){\n SetVar(rating_amount, 0).(member, #account#)\n DBFind(\"@1r_ratings\", r).Where({\"ecosystem\": \"#ecosystem_id#\", \"member\": \"#member#\"}).Vars(rating)\n Span(#rating_amount#)\n}.Custom(_username){\n LinkPage(Class: #style_link# h5 text-bold, Page: @1profile_view, PageParams: \"v_account=#account#\"){\n If(#image_id#>0){\n Image(Src: Binary().ById(#image_id#), Class: img-circle).Style(height: 30px;width: 30px; border: 1px solid #5A5D63; margin-right: 10px;)\n Span(#member_name#)\n }.Else{\n Div(){\n Span(Em(Class: fa icon-user fa-2x mr)).(#member_name#)\n }.Style(display:flex; align-items:center;)\n }\n }\n}.Custom(_actions){\n If(#isManager#==1){\n Button(Page:@1r_rating_member, PageParams: \"MemberAccount=#account#\", Class: btn bg-gray-lighter fa fa-plus pull-right).Popup(Header:$@1r_change_rating$, Width: 50)\n }\n}\n\nDiv(fullscreen){\n Div(table-responsive ml-lg mr-lg){\n Div(list-group-item){\n If(#count# > 0){\n Table(src, \"$@1name$=_username,$@1r_accruals$=_account,$@1r_rating$=_rating,=_actions\")\n }.Else{\n Div(text-center h4 text-muted){\n $@1members$ $@1not_founded$\n }\n }\n }.Style(\n margin-top:-15px;\n tbody > tr:nth-of-type(odd) {\n background-color: #f8f9fc;\n }\n )\n }\n}\nDiv(mt-sm ml-lg mr-sm mb-sm){\n Include(@1pager)\n}",
176176
"Menu": "default_menu",
177177
"Type": "pages"
178178
},

platform_apps/token_emission.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
{
191191
"Name": "TeBurn",
192192
"Conditions": "ContractConditions(\"@1DeveloperCondition\")",
193-
"Value": "contract TeBurn {\n data {\n Amount money\n }\n\n func checkSender() {\n var sender_map map\n sender_map = DBFind(\"@1keys\").Where({\"account\": $account_id, \"deleted\": 0, \"ecosystem\": $ecosystem_id}).Row()\n\n if !sender_map {\n warning Sprintf(LangRes(\"@1sender_x_invalid\", \"en\"), $account_id)\n }\n if Int(sender_map[\"blocked\"]) != 0 {\n warning LangRes(\"@1sender_blocked\", \"en\")\n }\n if Int(sender_map[\"deleted\"]) != 0 {\n warning LangRes(\"@1sender_deleted\", \"en\")\n }\n if Money(sender_map[\"amount\"]) < $Amount {\n warning LangRes(\"@1amount_less_than_needed\", \"en\")\n }\n }\n\n conditions {\n if $ecosystem_id == 1 {\n warning LangRes(\"@1burning_blocked\", \"en\")\n }\n\n checkSender() //check the sender\n\n //check amount\n if $Amount == 0 {\n warning LangRes(\"@1amount_zero\", \"en\")\n }\n if $Amount < 0 {\n warning LangRes(\"@1amount_less_zero\", \"en\")\n }\n\n $item = DBFind(\"@1ecosystems\").WhereId($ecosystem_id).Row()\n if $item[\"type_withdraw\"] == 1 {\n warning LangRes(\"@1burning_blocked\", \"en\")\n }\n }\n\n action {\n var mb map\n var burn map arr array\n burn[\"type\"] = \"burn\"\n burn[\"time\"] = Str($block_time)\n burn[\"val\"] = Money($Amount)\n arr = JSONDecode($item[\"emission_amount\"])\n arr = Append(arr, burn)\n mb[\"emission_amount\"] = JSONEncode(arr)\n DBUpdate(\"@1ecosystems\", $ecosystem_id, mb)\n\n var m map guest_account string\n guest_account = IdToAddress($guest_key)\n m[\"sender_id\"] = $account_id\n m[\"recipient_id\"] = guest_account\n m[\"amount\"] = $Amount\n m[\"comment\"] = \"New burn\"\n m[\"block_id\"] = $block\n m[\"txhash\"] = $txhash\n m[\"ecosystem\"] = $ecosystem_id\n m[\"type\"] = 4\n m[\"created_at\"] = $block_time\n DBInsert(\"@1history\", m)\n\n DBUpdateExt(\"@1keys\", {\"account\": $account_id, \"deleted\": 0, \"ecosystem\": $ecosystem_id}, {\"-amount\": $Amount})\n DBUpdateExt(\"@1keys\", {\"account\": guest_account, \"deleted\": 0, \"ecosystem\": $ecosystem_id}, {\"+amount\": $Amount})\n }\n}",
193+
"Value": "contract TeBurn {\n data {\n Amount money\n }\n\n func checkSender() {\n var sender_map map\n sender_map = DBFind(\"@1keys\").Where({\"account\": $account_id, \"deleted\": 0, \"ecosystem\": $ecosystem_id}).Row()\n\n if !sender_map {\n warning Sprintf(LangRes(\"@1sender_x_invalid\", \"en\"), $account_id)\n }\n if Int(sender_map[\"blocked\"]) != 0 {\n warning LangRes(\"@1sender_blocked\", \"en\")\n }\n if Int(sender_map[\"deleted\"]) != 0 {\n warning LangRes(\"@1sender_deleted\", \"en\")\n }\n if Money(sender_map[\"amount\"]) < $Amount {\n warning LangRes(\"@1amount_less_than_needed\", \"en\")\n }\n }\n\n conditions {\n if $ecosystem_id == 1 {\n warning LangRes(\"@1burning_blocked\", \"en\")\n }\n\n checkSender() //check the sender\n\n //check amount\n if $Amount == 0 {\n warning LangRes(\"@1amount_zero\", \"en\")\n }\n if $Amount < 0 {\n warning LangRes(\"@1amount_less_zero\", \"en\")\n }\n\n $item = DBFind(\"@1ecosystems\").WhereId($ecosystem_id).Row()\n if $item[\"type_withdraw\"] == 1 {\n warning LangRes(\"@1burning_blocked\", \"en\")\n }\n }\n\n action {\n var mb map\n var burn map arr array\n burn[\"type\"] = \"burn\"\n burn[\"time\"] = Str($block_time)\n burn[\"val\"] = Money($Amount)\n arr = JSONDecode($item[\"emission_amount\"])\n arr = Append(arr, burn)\n mb[\"emission_amount\"] = JSONEncode(arr)\n DBUpdate(\"@1ecosystems\", $ecosystem_id, mb)\n\n var m map guest_account string\n guest_account = IdToAddress(Int($guest_key))\n m[\"sender_id\"] = AddressToId($account_id)\n m[\"recipient_id\"] = AddressToId(guest_account)\n m[\"amount\"] = $Amount\n m[\"comment\"] = \"New burn\"\n m[\"block_id\"] = $block\n m[\"txhash\"] = $txhash\n m[\"ecosystem\"] = $ecosystem_id\n m[\"type\"] = 4\n m[\"created_at\"] = $block_time\n DBInsert(\"@1history\", m)\n\n DBUpdateExt(\"@1keys\", {\"account\": $account_id, \"deleted\": 0, \"ecosystem\": $ecosystem_id}, {\"-amount\": $Amount})\n DBUpdateExt(\"@1keys\", {\"account\": guest_account, \"deleted\": 0, \"ecosystem\": $ecosystem_id}, {\"+amount\": $Amount})\n }\n}",
194194
"Type": "contracts"
195195
},
196196
{

0 commit comments

Comments
 (0)