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

2017-10-23 14:45:28 +06:30
parent 52b29e251f b7db48d6d7
commit d63d309481
2 changed files with 3 additions and 2 deletions
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -328,7 +328,8 @@ $(function(){
        // });
      });
    }
-
+console.log(instance_attributes);
+console.log("hi")
    // selected_arr = []
    // $(selected_item).each(function(i){
    //   $.ajax({
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -1,4 +1,4 @@
-class Origami::AddordersController < BaseOrigamiController
+class Origami::AddordersController < ApplicationController#BaseOrigamiController
  # before_action :set_dining, only: [:detail]

  def index