Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 65ebb1a

Browse files
syypoosyypoo
committed
Fix branch merge errors
1 parent 9c914d0 commit 65ebb1a

File tree

187 files changed

+359
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+359
-432
lines changed

‎basic.json‎

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

‎init_qs.json‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎lang_res.json‎

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

‎platform_apps/tokens_sale.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
{
209209
"Name": "TsTransferAdmin",
210210
"Conditions": "ContractConditions(\"@1DeveloperCondition\")",
211-
"Value": "contract TsTransferAdmin {\n data {\n WalletStr string\n CurrencyType int\n AmountApl money\n TransferredDate string\n TransferredTime string\n }\n\n func getRoleId(name string) int {\n var rid int\n rid = Int(EcosysParam(name))\n if rid == 0 {\n warning Sprintf(LangRes(\"@1role_not_set_application_parameter\", \"en\"), name)\n }\n return rid\n }\n\n func dateAddTime(d, t string) string {\n var dt string\n if Contains(d, \"T00:00:00Z\") {\n d = Replace(d, \"T00:00:00Z\", \"\")\n }\n if Size(t) == 5 {\n dt = Sprintf(\"%v %v:00\", d, t)\n }\n return dt\n }\n\n conditions {\n $WAITING_MANAGER = 1\n $WAITING_SELLER = 2\n $FINISHED = 3\n $REJECTED = 4\n if $AmountApl <= 0 {\n warning \"invalid amount APLA\"\n }\n\n $transferredAt = UnixDateTime(dateAddTime($TransferredDate, $TransferredTime))\n if $transferredAt == 0 {\n warning \"invalid transfer datetime\"\n }\n $appId = Int(DBFind(\"@1applications\").Where({ecosystem:$ecosystem_id, name:\"Tokens sale\"}).One(\"id\"))\n if $appId == 0 {\n warning LangRes(\"@1app_not_found\", \"en\")\n }\n $currentRole = getRoleId(\"role_sale_admin\")\n if !RoleAccess($currentRole) {\n warning \"this action allowed only for role id #\" + $currentRole\n }\n\n if $CurrencyType <= 0 || $CurrencyType > 3 {\n warning \"Invalid Currency Type\"\n }\n\n if $CurrencyType == 1 {\n $wallet = DBFind(\"ts_wallets\").Where({wallet_btc: $WalletStr}).Row()\n }\n if $CurrencyType == 2 {\n $wallet = DBFind(\"ts_wallets\").Where({wallet_eth: $WalletStr}).Row()\n }\n if $CurrencyType == 3 {\n if $WalletStr == \"\" {\n warning LangRes(\"@1public_key_empty\", \"en\")\n }\n\n $WalletStr = Replace($WalletStr, \" \", \"\")\n if Size($WalletStr) < 128 {\n warning LangRes(\"@1key_too_short\", \"en\")\n }\n if Size($WalletStr) > 130 {\n warning LangRes(\"@1key_too_long\", \"en\")\n }\n var key_id_buyer int\n key_id_buyer = PubToID($WalletStr)\n if key_id_buyer == 0 {\n warning LangRes(\"@1public_key_invalid\", \"en\")\n }\n\n $wallet = DBFind(\"ts_wallets\").Where({key_id_buyer: key_id_buyer}).Row()\n }\n\n if !$wallet {\n warning \"Buyer wallet not found\"\n }\n }\n\n action {\n var sale map saleId int\n sale[\"key_id_buyer\"] = $wallet[\"key_id_buyer\"]\n sale[\"currency_type\"] = $CurrencyType\n sale[\"amount_apl\"] = $AmountApl\n sale[\"key_id_sale_apl_admin\"] = $key_id\n sale[\"created_at\"] = $time\n sale[\"buyer_transferred_at\"] = $transferredAt\n sale[\"status\"] = $WAITING_MANAGER\n\n saleId = DBInsert(\"ts_sales\", sale)\n\n // role Apla sales manager notification\n var params map title page string\n title = Sprintf(\"Check sale id %v\", saleId)\n page = \"ts_transfer_manager\"\n params[\"sale_id\"] = saleId\n $roleAplManager = getRoleId(\"role_sale_manager\")\n @1NotificationsSend(\"rid,sender,text_header,page_name,params_map,closure_type,current_role_id\", $roleAplManager, 2, title, page, params, 1, $currentRole)\n }\n}",
211+
"Value": "contract TsTransferAdmin {\n data {\n WalletStr string\n CurrencyType int\n AmountApl money\n TransferredDate string\n TransferredTime string\n }\n\n func getRoleId(name string) int {\n var rid int\n rid = Int(EcosysParam(name))\n if rid == 0 {\n warning Sprintf(LangRes(\"@1role_not_set_application_parameter\", \"en\"), name)\n }\n return rid\n }\n\n func dateAddTime(d, t string) string {\n var dt string\n if Contains(d, \"T00:00:00Z\") {\n d = Replace(d, \"T00:00:00Z\", \"\")\n }\n if Size(t) == 5 {\n dt = Sprintf(\"%v %v:00\", d, t)\n }\n return dt\n }\n\n conditions {\n $WAITING_MANAGER = 1\n $WAITING_SELLER = 2\n $FINISHED = 3\n $REJECTED = 4\n if $AmountApl <= 0 {\n warning \"invalid amount APLA\"\n }\n\n $transferredAt = UnixDateTime(dateAddTime($TransferredDate, $TransferredTime))\n if $transferredAt == 0 {\n warning \"invalid transfer datetime\"\n }\n\n $appId = Int(DBFind(\"@1applications\").Where({ecosystem:$ecosystem_id, name:\"Tokens sale\"}).One(\"id\"))\n if $appId == 0 {\n warning LangRes(\"@1app_not_found\", \"en\")\n }\n\n $currentRole = getRoleId(\"role_sale_admin\")\n if !RoleAccess($currentRole) {\n warning \"this action allowed only for role id #\" + $currentRole\n }\n\n if $CurrencyType <= 0 || $CurrencyType > 3 {\n warning \"Invalid Currency Type\"\n }\n\n if $CurrencyType == 1 {\n $wallet = DBFind(\"ts_wallets\").Where({wallet_btc: $WalletStr}).Row()\n }\n if $CurrencyType == 2 {\n $wallet = DBFind(\"ts_wallets\").Where({wallet_eth: $WalletStr}).Row()\n }\n if $CurrencyType == 3 {\n if $WalletStr == \"\" {\n warning LangRes(\"@1public_key_empty\", \"en\")\n }\n\n $WalletStr = Replace($WalletStr, \" \", \"\")\n if Size($WalletStr) < 128 {\n warning LangRes(\"@1key_too_short\", \"en\")\n }\n if Size($WalletStr) > 130 {\n warning LangRes(\"@1key_too_long\", \"en\")\n }\n var key_id_buyer int\n key_id_buyer = PubToID($WalletStr)\n if key_id_buyer == 0 {\n warning LangRes(\"@1public_key_invalid\", \"en\")\n }\n\n $wallet = DBFind(\"ts_wallets\").Where({key_id_buyer: key_id_buyer}).Row()\n }\n\n if !$wallet {\n warning \"Buyer wallet not found\"\n }\n }\n\n action {\n var sale map saleId int\n sale[\"key_id_buyer\"] = $wallet[\"key_id_buyer\"]\n sale[\"currency_type\"] = $CurrencyType\n sale[\"amount_apl\"] = $AmountApl\n sale[\"key_id_sale_apl_admin\"] = $key_id\n sale[\"created_at\"] = $time\n sale[\"buyer_transferred_at\"] = $transferredAt\n sale[\"status\"] = $WAITING_MANAGER\n\n saleId = DBInsert(\"ts_sales\", sale)\n\n // role Apla sales manager notification\n var params map title page string\n title = Sprintf(\"Check sale id %v\", saleId)\n page = \"ts_transfer_manager\"\n params[\"sale_id\"] = saleId\n $roleAplManager = getRoleId(\"role_sale_manager\")\n @1NotificationsSend(\"rid,sender,text_header,page_name,params_map,closure_type,current_role_id\", $roleAplManager, 2, title, page, params, 1, $currentRole)\n }\n}",
212212
"Type": "contracts"
213213
},
214214
{

‎platform_apps/tokens_sale/contracts/TsTransferAdmin.sim‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ contract TsTransferAdmin {
4040
if $transferredAt == 0 {
4141
warning "invalid transfer datetime"
4242
}
43+
4344
$appId = Int(DBFind("@1applications").Where({ecosystem:$ecosystem_id, name:"Tokens sale"}).One("id"))
4445
if $appId == 0 {
4546
warning LangRes("@1app_not_found", "en")
4647
}
48+
4749
$currentRole = getRoleId("role_sale_admin")
4850
if !RoleAccess($currentRole) {
4951
warning "this action allowed only for role id #" + $currentRole

‎src/basic/app_params/type_tokens_transfer.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@1resources_fees,@1emission_tokens,@1tokens_transfer,@1tokens_burn
1+
@1resources_fees,@1emission_tokens,@1tokens_transfer,@1tokens_burn

‎src/basic/menus/admin_menu.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ MenuItem(Title:$@1ecosystems$, Page:@1ecosystems_list, Icon:"icon-layers")
33
MenuItem(Title:$@1platform_parameters$, Page:@1sysparams_list, Icon:"icon-settings")
44
MenuItem(Title:$@1roles$, Page:@1roles_list, Icon:"icon-pie-chart")
55
MenuItem(Title:$@1tokens_refund$, Page:@1tokenrefund_list, Icon:"icon-shuffle")
6-
MenuItem(Title:$@1validators$, Page:@1sysparams_candidates_list, Icon:"icon-graduation")
6+
MenuItem(Title:$@1validators$, Page:@1sysparams_candidates_list, Icon:"icon-graduation")

‎src/basic/menus/default_menu.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ MenuItem(Title:$@1profile$, Page:@1profile_view, Icon:"icon-wallet")
22
MenuItem(Title:$@1messenger$, Page:@1messages_list, Icon:"icon-speech")
33
MenuItem(Title:$@1notifications$, Page:@1notifications_list, Icon:"icon-flag")
44
MenuItem(Title:$@1ecosystem_members$, Page:@1members_list, Icon:"icon-people")
5-
MenuItem(Title:$@1votings$, Page:@1voting_list, Icon:"icon-note")
5+
MenuItem(Title:$@1votings$, Page:@1voting_list, Icon:"icon-note")

‎src/basic/pages/default_page.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Include(@1profile)
1+
Include(@1profile)

‎src/basic/pages/ecosystems_list.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DBFind(#this_table#, src).Where(#where#).Order({"id": 1}).Limit(#pager_limit#).O
3232
If(#key#==#eco_id#){
3333
LinkPage(Body: `#value#`, Page: @1sysparams_metrics, PageParams:"Id=#key#")
3434
}
35-
)
35+
}
3636
}
3737
}.Custom(valued){
3838
If(#template_id#>0){

0 commit comments

Comments
 (0)