Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

2020-02-28 11:02:41 +06:30
parent 219612a3ee 75e9a63c50
commit aa30fbba39
33 changed files with 152 additions and 125 deletions
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -165,7 +165,7 @@

         </div>
         <div class="card-block">
-          <div class="card-text" id="order-detail-slimscroll" data-height="480">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
           <table class="table table-striped summary-items" id="order-items-table" >
             <thead>
               <tr>