Pull from master

2018-04-05 11:49:42 +06:30
parent 9bf4047548
commit fc8b2d3b73
14 changed files with 222 additions and 54 deletions
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -405,9 +405,15 @@
                        <p class="hidden" id="set_item_code"></p>
                        <p></p>

-                        <div class="options-list">
+                        <div class="" id="modal-slimscroll" data-height="250">
+                        <div class="options-list" style="margin-top:-5px">
                        </div>

+                        <div class='selected-set-list'>
+
+                        </div>
+                      </div>
+
                  </div>
                  <div class="col-md-8">       
                     <div class="instance-list row"></div>