conflict data

2018-02-06 18:12:59 +06:30
parent 7a055470e8 21538f38f8
commit 41aa840eb2
13 changed files with 145 additions and 41 deletions
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -214,7 +214,7 @@
 <div class="col-lg-1 col-md-1 col-sm-1">
   <button type="button" class="btn bg-default btn-block " id='back'><i class="material-icons">reply</i>Back</button>
   <% if @sale_status != 'completed' %>
-     <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button>
+     <!-- <button type="button" class="btn bg-blue btn-block" id='move'>MOVE</button> -->
   <% end %>
   <!-- <button type="button" id="re-print" class="btn btn-primary btn-block">Re.Print</button> -->
 </div>