Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-11-16 20:48:58 +06:30
parent 384c0f2dd2 c0733d7c48
commit f18947789c
23 changed files with 772 additions and 87 deletions
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -215,7 +215,7 @@ class Origami::DiscountsController < BaseOrigamiController
      else 
          response = {"status": false, "message": "You have no selected discount item" }
      end
-      puts "discount"
+      puts "discountttttttttttt"
      puts response.to_json
      # Re-calc All Amount in Sale
      if response["status"] == true