diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb
index 5742670e..49d5632c 100644
--- a/app/controllers/origami/surveys_controller.rb
+++ b/app/controllers/origami/surveys_controller.rb
@@ -1,2 +1,18 @@
 class Origami::SurveysController < ApplicationController
+	def new
+		@survey = Account.new
+	end
+
+	def create
+		@survey = Account.new(survey_params)
+		respond_to do |format|
+		  if @survey.save
+		    format.html { redirect_to settings_accounts_url, notice: 'survey was successfully created.' }
+		    format.json { render :index, status: :created, location: @survey }
+		  else
+		    format.html { render :new }
+		    format.json { render json: settings_accounts_url.errors, status: :unprocessable_entity }
+		  end
+		end
+	end
 end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 92b7e777..22ff45dd 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -319,6 +319,7 @@
              Back
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect">Add Order</button>
+          <button type="button" id="survey" class="btn btn-block bg-blue waves-effect">Survey</button>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" disabled>Customer</button>
@@ -395,6 +396,19 @@
             window.location.href = '/origami/order/' + order_id;
         });
 
+        // bind survey to order or sale
+        $("#survey").on('click', function () {
+            var sale = $('#sale_id').val();
+            if (sale) {
+                var sale_id = sale
+            } else {
+                var sale_id = $('#save_order_id').attr('data-order');
+            }
+            var table_id = $('.tables').attr("data-id");
+
+            window.location.href = '/origami/' + sale_id + "/survey"
+        });
+
         // bind customer to order or sale
         $("#customer").on('click', function () {
             var sale = $('#sale_id').val();
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index a8ed45a3..6b8be876 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -306,6 +306,7 @@
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-default btn-block" id='back'><i class="fa fa-arrow-left"></i> Back</button>
    <button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
+   <button type="button" id="survey" class="btn btn-block bg-blue waves-effect">Survey</button>
    <% if @room.bookings.length >= 1 %>
      <% if @status_order == 'order' && @status_sale != 'sale' %>
        <!-- <button type="button" class="btn bg-blue btn-block" >Add Order</button> -->
@@ -409,6 +410,19 @@ $(document).ready(function(){
       window.location.href = '/origami/order/' + order_id;
   });
 
+  // bind survey to order or sale
+  $("#survey").on('click', function () {
+      var sale = $('#sale_id').val();
+      if (sale) {
+          var sale_id = sale
+      } else {
+          var sale_id = $('#save_order_id').attr('data-order');
+      }
+      var table_id = $('.tables').attr("data-id");
+
+      window.location.href = '/origami/' + sale_id + "/survey"
+  });
+
   // bind customer to order or sale
   $("#customer").on('click', function(){
     var sale = $('#sale_id').val();
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
new file mode 100755
index 00000000..5badaff4
--- /dev/null
+++ b/app/views/origami/surveys/_form.html.erb
@@ -0,0 +1,42 @@
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+   <%= simple_form_for([:settings,@settings_account]) do |f| %>
+   <%= f.error_notification %>
+   <div class="form-inputs p-l-10">
+    <%= f.input :title ,:input_html=>{:class=>"col-md-10"},:required=>true%>
+    <%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"},:required=>true %>
+    <%= f.input :discount %>
+    <%= f.input :point %>
+    <%= f.input :bonus %>
+    <%= f.input :rebate %>
+  </div>
+  <div class="form-actions">
+    <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
+  </div>
+  <% end %>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+  <div class="card">
+    <div class="body">
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.title_txt") %> <br>
+        2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.account_type_txt") %> <br>
+        3) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %> <br>
+        4) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+        5) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %> <br>
+        6) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+    </div>
+  </div>  
+</div>
+</div>
diff --git a/app/views/origami/surveys/_survey.json.jbuilder b/app/views/origami/surveys/_survey.json.jbuilder
new file mode 100755
index 00000000..1a0e4aa8
--- /dev/null
+++ b/app/views/origami/surveys/_survey.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! settings_account, :id, :title, :account_type, :created_at, :updated_at
+json.url settings_account_url(settings_account, format: :json)
diff --git a/app/views/origami/surveys/edit.html.erb b/app/views/origami/surveys/edit.html.erb
new file mode 100755
index 00000000..96fca006
--- /dev/null
+++ b/app/views/origami/surveys/edit.html.erb
@@ -0,0 +1,12 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>"><%= t("views.right_panel.detail.account") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
+    </span>
+  </ol>
+</div>
+
+ <%= render 'form', settings_account: @settings_account %>
diff --git a/app/views/origami/surveys/index.html.erb b/app/views/origami/surveys/index.html.erb
new file mode 100755
index 00000000..5ffcbff5
--- /dev/null
+++ b/app/views/origami/surveys/index.html.erb
@@ -0,0 +1,77 @@
+<div class="page-header">
+ <ol class="breadcrumb">
+  <li class="breadcrumb-item"><a href="<%= dashboard_path  %>"><%= t("views.right_panel.button.home") %></a></li>
+  <li class="breadcrumb-item active"><%= t("views.right_panel.detail.account") %></li>
+  <span class="float-right">
+    <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+  </span>
+</ol>
+</div>
+
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
+    <div class="m-b-10 clearfix">
+      <%= link_to t("views.btn.new"),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+    </div>
+    <div class="card">
+      <table class="table table-striped">
+        <thead>
+          <tr>
+            <th><%= t("views.right_panel.detail.title") %></th>
+            <th><%= t("views.right_panel.detail.account_type") %></th>
+            <th><%= t("views.right_panel.detail.discount") %></th>
+            <th><%= t("views.right_panel.detail.point") %></th>
+            <th><%= t("views.right_panel.detail.bonus") %></th>
+            <th><%= t("views.right_panel.detail.rebate") %></th>
+            <th><%= t("views.right_panel.detail.actions") %></th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <% @settings_accounts.each do |account| %>
+          <tr>
+            <td><%= account.title %></td>
+            <td><%=  %><%= account.account_type == 1 ? "Expense" : "Income"%></td>
+            <td><%= account.discount %></td>
+            <td><%= account.point %></td>
+            <td><%= account.bonus %></td>
+            <td><%= account.rebate %></td>
+            <td>
+              <%= link_to t("views.btn.show"), settings_account_path(account),:class => 'btn btn-info btn-sm waves-effect' %>
+              <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %> 
+            </td>
+          </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+          <p>
+          1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %> <br>
+          3) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %> <br>
+          4) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+          5) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %> <br>
+          6) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+          7) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+          <p>
+          1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+          </p>
+          <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+          <p>
+            1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+            2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+          </p>
+      </div>
+    </div>  
+  </div>
+</div>
+
diff --git a/app/views/origami/surveys/index.json.jbuilder b/app/views/origami/surveys/index.json.jbuilder
new file mode 100755
index 00000000..10158c29
--- /dev/null
+++ b/app/views/origami/surveys/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @settings_accounts, partial: 'settings_accounts/settings_account', as: :settings_account
diff --git a/app/views/origami/surveys/new.html.erb b/app/views/origami/surveys/new.html.erb
new file mode 100755
index 00000000..630ae543
--- /dev/null
+++ b/app/views/origami/surveys/new.html.erb
@@ -0,0 +1,12 @@
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>"><%= t("views.right_panel.detail.account") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
+    </span>
+  </ol>
+</div>
+
+ <%= render 'form', settings_account: @settings_account %>
\ No newline at end of file
diff --git a/app/views/origami/surveys/show.html.erb b/app/views/origami/surveys/show.html.erb
new file mode 100755
index 00000000..4c28f27c
--- /dev/null
+++ b/app/views/origami/surveys/show.html.erb
@@ -0,0 +1,84 @@
+<!--  -->
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>"><%= t("views.right_panel.detail.account") %></a></li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
+    </span>
+  </ol>
+</div>
+
+<br/>
+
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="card-block">
+        <h4 class="card-title">Account</h4>
+        <table class="table">
+          <thead>
+            <tr>
+              <th><%= t("views.right_panel.detail.title") %></th>
+              <th><%= t("views.right_panel.detail.account_type") %></th>
+              <!-- <th>Can get Discount</th> -->
+              <th><%= t("views.right_panel.detail.can_get_points") %></th>
+              <!-- <th>Can get Bonus</th> -->
+              <th><%= t("views.right_panel.detail.can_rebate") %></th>
+              <th><%= t("views.right_panel.detail.actions") %></th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr>
+              <td><%= @settings_account.title %></td>
+              <td><%= @settings_account.account_type %></td>
+              <!-- <td><%= @settings_account.discount %></td> -->
+              <td><%= @settings_account.point %></td>
+              <!-- <td><%= @settings_account.bonus %></td> -->
+              <td><%= @settings_account.rebate %></td>
+
+              <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account),:class => 'btn btn-primary btn-sm waves-effect' %>
+                <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" data-method="delete">
+                    <%= t("views.btn.delete") %>
+                </button>
+
+                <span class="hidden" id="delete_text">
+                    <h6>Are you sure you want to delete this row ?</h6>
+                    <h6>This action can't be undo. </h6> 
+                </span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.title") %> - <%= t("views.right_panel.detail.title_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        2) <%= t("views.right_panel.detail.account_type") %> - <%= t("views.right_panel.detail.account_type_txt") %> <br>
+        3) <%= t("views.right_panel.detail.can_get_points") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_txt") %> <br>
+        4) <%= t("views.right_panel.detail.can_rebate") %> - <%= t("views.right_panel.detail.status_txt2") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        5) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.account_txt") %> <br>
+        </p>
+      </div>
+    </div>  
+  </div>
+</div>
+
diff --git a/app/views/origami/surveys/show.json.jbuilder b/app/views/origami/surveys/show.json.jbuilder
new file mode 100755
index 00000000..e9673454
--- /dev/null
+++ b/app/views/origami/surveys/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "settings_accounts/settings_account", settings_account: @settings_account