fixed conflit addorder.js

2020-03-24 10:52:19 +06:30
parent df2b19e89f a62d2a0585
commit c324c26f36
3 changed files with 27 additions and 108 deletions
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -337,7 +337,7 @@
    <div class="modal-footer">
      <div class="mr-auto">
        <h4 class=" pull-left d-inline">Total : <span id="total_price"></span></h4>
-        <div id="wanring_text" class="d-inline text-danger" style="margin-left: 50px"></div>
+        <h5 id="wanring_text" class="d-inline text-danger" style="margin-left: 50px"></h5>
      </div>
      <div class="row">
        <div class="col-md-4">
--- a/app/views/foodcourt/orders/app_orders.html.erb
+++ b/app/views/foodcourt/orders/app_orders.html.erb
@@ -495,6 +495,12 @@
  </div>
 </div>
 <script type="text/javascript">
+
+  $(document).ready( function() {
+    if ("<%= @pending %>" || "<%= @booking %>") { // adjust column gap
+      $('.card-columns').css('column-gap', '0.3rem')
+    }
+  })
  
  $('#pay').on('click', function () {
    var cashier_type = 'food_court';