Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -104,10 +104,12 @@ $(document).ready(function(){
  $('#qty-update').on('click', function(){
    var qty_weight = $("input[name='qty_weight']").val();

-    if(parseInt(qty_weight) > parseInt(original_value)){      
+    if(parseInt(qty_weight) >= parseInt(original_value)){      
      swal("Alert!", "Not allowed over quantity", "warning");
      return;
    }
+
+    
    
    var remarks = $("textarea[name='remarks']").val();
    var order_items_id = $(this).attr('data-id');