Edit Addorder.js and Shop name

2018-04-06 18:16:20 +06:30
parent 30da4f37b3
commit 460ed991af
5 changed files with 12 additions and 9 deletions
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -409,11 +409,7 @@ $(function() {
                        +'</div>'
              $(".selected-set-list").append(set);
          }else{
-<<<<<<< HEAD
-             swal("Alert !", 'Maximum Qty is  ' + max_qty + "  items", "warning");
-=======
             swal("Alert !", 'Maximum Select is  ' + max_qty + "  items", "warning");
->>>>>>> 8217b7c2f27f5b38b27425929d01b789da0583fd
          }
        // }
        $('#set_unit_price').text(price);