Merge commit '2fdab9efecfc647500a4ef2d9132cf034f44e70e' into merge-igor

markkacom · Mar 3, 2016 · 51de1f2 · 51de1f2
2 parents fa500c2 + 2fdab9e
commit 51de1f2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ announcements
 styles/main.css
 market-maker.rb
 languages.json
-market-maker.rb
+market-maker.rb
+.idea
diff --git a/app/partials/merchant-terminal.html b/app/partials/merchant-terminal.html
@@ -48,10 +48,18 @@ <h2>Amount <b>{{amountNXT}}</b> {{symbol}}</h2>
             </span>
           </div>
         </p>
+        <p>
+          <div class="form-group">
+            <span class="form-control-static">
+              <!-- <label class="control-label">Message</label> -->
+              <div>{{paramMessage}}</div>
+            </span>
+          </div>
+        </p>
         <p>
           <a class="btn btn-lg pull-right" ng-class="{'btn-success':!success,'btn-default':success}" href
             ng-click="payNow()" ng-show="currentAccount" ng-disabled="success">
-            <span ng-show="!success"><i class="fa fa-1x fa-paper-plane-o fa-fw"></i>&nbsp;&nbsp;<span>Pay now</span></span>
+            <span ng-show="!success"><i class="fa fa-1x fa-paper-plane-o fa-fw"></i>&nbsp;&nbsp;<span>Pay</span></span>
             <span ng-show="success"><i class="fa fa-1x fa-check fa-fw"></i></span>
           </a>
           <a class="btn btn-lg btn-success pull-right" href ng-click="signin()" ng-show="!currentAccount">
@@ -60,4 +68,4 @@ <h2>Amount <b>{{amountNXT}}</b> {{symbol}}</h2>
       </div>
     </div>
   </div>
-</div>
+</div>
diff --git a/app/plugins/transaction/partials/transaction-modal.html b/app/plugins/transaction/partials/transaction-modal.html
@@ -372,7 +372,7 @@ <h3 class="panel-title"><center><b ng-bind="items.title"></b></center></h3>
             </tab>
           </tabset>
         </div>
-        <div class="radio">
+        <div class="radio" ng-init="items.txnMessageType='note'">
           <label ng-if= "items.abc">
             <input type="radio" name="type" ng-model="items.txnMessageType" value="note"
               ng-disabled="sendSuccess">Private Note&nbsp;
@@ -436,7 +436,7 @@ <h3 class="panel-title"><center><b ng-bind="items.title"></b></center></h3>
     <div class="form-group">
       <div class="col-xs-6">
         <button ng-show="!sendSuccess && !isSending" class="btn btn-block btn-primary" ng-click="close()"
-          ng-disabled="!transactionCreateForm.$valid">Send</button>
+          ng-disabled="!transactionCreateForm.$valid">Pay Now</button>
         <button ng-show="isSending" class="btn btn-block btn-success" disabled>
           <i class="fa fa-circle-o-notch fa-spin pull-left"></i>&nbsp;&nbsp;Sending
         </button>
@@ -447,4 +447,4 @@ <h3 class="panel-title"><center><b ng-bind="items.title"></b></center></h3>
       </div>
     </div>
   </div>
-</div>
+</div>