Use account allowed assets for goods pricing. Change item text in the…

… selectable asset list. Sort items by asset name.
markkacom · Oct 2, 2023 · 8d45898 · 8d45898
1 parent 1a6483b
commit 8d45898
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/app/plugins/transaction/fields/standard-field-types.js b/app/plugins/transaction/fields/standard-field-types.js
@@ -542,6 +542,7 @@ module.run(function (plugins, $q, $rootScope, $templateCache, $translate, nxt) {
    */
   plugin.addField('asset', {
     create: function (name, opts) {
+      opts.allowFIMK = true
       var scope = opts.$scope||$rootScope;
       var format_asset_label = function (data) {
         return [
@@ -590,8 +591,9 @@ module.run(function (plugins, $q, $rootScope, $templateCache, $translate, nxt) {
         label: opts.label,
         template: [
           '<a class="monospace">',
-            '<span class="font-bold">{{match.model.value + "&nbsp;" + match.model.name}}</span>&nbsp;&nbsp;',
-            '<span class="pull-right" ng-bind="match.model.accountName||match.model.accountRS"></span>',
+            '<span class="font-bold">{{match.model.name}}</span>&nbsp;&nbsp;',
+            '<span>{{match.model.value}}</span>&nbsp;&nbsp;',
+            //'<span class="pull-right" ng-bind="match.model.accountName||match.model.accountRS"></span>',
           '</a>'
         ].join(''),
         validate: function (text) {
@@ -610,25 +612,29 @@ module.run(function (plugins, $q, $rootScope, $templateCache, $translate, nxt) {
           }
           else {
             promise = opts.api.engine.socket().callAPIFunction({
-              requestType: 'searchAssets',
-              query: 'NAME:'+query+'*',
+              requestType: 'searchAssetsExt',
+              query: 'NAME:' + query + '*',
+              accountPrivateAllowed: opts.accountPrivateAllowed || '',
               firstIndex: 0,
               lastIndex: 15
-            });
+            })
           }
           promise.then(
             function (data) {
               var assets = query == "0" && opts.allowFIMK ? [] : data.assets || data.accountAssets || []
-              deferred.resolve(assets.map(
-                function (d) {
-                  return {
-                    value: d.asset,
-                    name: d.name,
-                    accountName: d.accountName,
-                    accountRS: d.accountRS
-                  };
-                }
-              ));
+              var result = assets.map(
+                  function (d) {
+                    return {
+                      value: d.asset,
+                      name: d.name,
+                      accountName: d.accountName,
+                      accountRS: d.accountRS
+                    };
+                  }
+              ).sort(function (a,b) {
+                return a.name > b.name ? 1 : (a.name < b.name ? -1 : 0) ;
+              })
+              deferred.resolve(result);
             }
           );
           return deferred.promise;

diff --git a/app/plugins/transaction/transactions/goods.js b/app/plugins/transaction/transactions/goods.js
@@ -117,6 +117,7 @@ module.run(function (plugins, modals, $q, $rootScope, nxt, publicKeyService) {
           //account: $rootScope.currentAccount.id_rs,
           value: '0',
           api: api,
+          accountPrivateAllowed: $rootScope.currentAccount.id_rs,
           onchange: function (items) {
             var currencyName = items.asset.value == '0'
                 ? 'FIMK'