diff --git a/app/assets/javascripts/channels/bill.js b/app/assets/javascripts/channels/bill.js
index 7fa2b77e..278e3d41 100755
--- a/app/assets/javascripts/channels/bill.js
+++ b/app/assets/javascripts/channels/bill.js
@@ -10,12 +10,13 @@ App.order = App.cable.subscriptions.create('BillChannel', {
     if(data.from == "" || hostname == data.from)
     {
     	if($('.table_'+data.table.id).hasClass('blue')){
-    		$('.table_'+data.table.id).removeClass('blue');
-       	$('.table_'+data.table.id).addClass('red');
-    	}else{
-    		$('.table_'+data.table.id).removeClass('orange');
-       	$('.table_'+data.table.id).addClass('red');
-    	} 
+        $('.table_'+data.table.id).removeClass('blue');
+        $('.table_'+data.table.id).removeClass('green');
+        $('.table_'+data.table.id).addClass('red');
+      }else{
+        $('.table_'+data.table.id).removeClass('orange');
+        $('.table_'+data.table.id).addClass('red');
+      } 
       $('.new_text_'+data.table.id).removeClass('hide');
       $('.new_text_'+data.table.id).text('billed');
     }
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 6f4980cc..56e6fbc8 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -37,7 +37,10 @@ class Origami::SalesController < BaseOrigamiController
              #  create sale item
              saleobj = Sale.find(sale_id)
              order.order_items.each do |orer_item|
-               saleobj.add_item (orer_item)
+                saleobj.add_item (orer_item)
+                if !orer_item.set_menu_items.nil?
+                  saleobj.add_sub_item(orer_item.set_menu_items)
+                end
              end
 
              # Re-compute for add
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 59351a85..93f7d236 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -383,6 +383,7 @@
                         <%
                           count = 0
                           @order_items.each do |order_item|
+                            set_item_prices = 0
                             count += 1
                         %>
                           <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
@@ -398,7 +399,9 @@
                               <% end %>
 
                               <% if !order_item.set_menu_items.nil?  
-                                JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
+                                JSON.parse(order_item.set_menu_items).each do |item_instance| 
+                                  set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
+                                %> 
                                 <br><span class="font-13">
                                   <%= item_instance["item_instance_name"] %>
                                     <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
@@ -410,10 +413,11 @@
                                     <% end %>
                                   </span> 
                               <% end 
+                              sub_total += set_item_prices
                               end %>
                             </td>
                             <td class='item-attr'><%= order_item.qty %></td>
-                            <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                            <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
                           </tr>
                         <%
                           end
diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb
index 543e33d0..84ad9da9 100755
--- a/app/views/origami/moveroom/move_dining.html.erb
+++ b/app/views/origami/moveroom/move_dining.html.erb
@@ -203,15 +203,43 @@
     unless @order_items.nil? || @order_items.empty?
      count = 0
      @order_items.each do |order_item |
+      set_item_prices = 0
       count += 1
       sub_total = sub_total + (order_item.price * order_item.qty)
 
       #unless order_item.price <= 0 %>
       <tr>
-       <td><%= count %></td>
-       <td class='item-name'><%= order_item.item_name %></td>
+        <td><%= count %></td>
+        <td class='item-name'>
+          <%= order_item.item_name %>
+          <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+            <% JSON.parse(order_item.options).each do |option| %>
+              <br><span class="font-13">
+                <%= option %>
+              </span>
+            <% end %>
+          <% end %>
+
+        <% if !order_item.set_menu_items.nil?  
+          JSON.parse(order_item.set_menu_items).each do |item_instance| 
+            set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
+          %> 
+          <br><span class="font-13">
+            <%= item_instance["item_instance_name"] %>
+              <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                <% (item_instance["options"]).each do |set_item_option| %>
+                  <br><span class="font-13">
+                    <%= set_item_option %>
+                  </span>
+                <% end %>
+              <% end %>
+            </span> 
+        <% end 
+          sub_total += set_item_prices
+        end %>
+        </td>
        <td class='item-attr'><%= order_item.qty %></td>
-       <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+       <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
      </tr>
      <%
          #end
@@ -231,12 +259,40 @@ if @status_sale == 'sale'
    <table class="table table-striped">
      <%
      @order_items.each do |order_item |
+        set_item_prices = 0
        %>
 
        <tr>
-         <td class='item-name'><%= order_item.item_name %></td>
-         <td class='item-attr'><%= order_item.qty %></td>
-         <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+          <td class='item-name'>
+            <%= order_item.item_name %>
+            <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+              <% JSON.parse(order_item.options).each do |option| %>
+                <br><span class="font-13">
+                  <%= option %>
+                </span>
+              <% end %>
+            <% end %>
+
+            <% if !order_item.set_menu_items.nil?  
+              JSON.parse(order_item.set_menu_items).each do |item_instance| 
+                set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
+              %> 
+              <br><span class="font-13">
+                <%= item_instance["item_instance_name"] %>
+                  <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                    <% (item_instance["options"]).each do |set_item_option| %>
+                      <br><span class="font-13">
+                        <%= set_item_option %>
+                      </span>
+                    <% end %>
+                  <% end %>
+                </span> 
+            <% end 
+              sub_total += set_item_prices
+            end %>
+          </td>
+          <td class='item-attr'><%= order_item.qty %></td>
+          <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
        </tr>
 
        <%
@@ -327,18 +383,28 @@ end
       change_to = $('#change_table_value').val();
       change_from = "<%= @dining.id %>";
       if (change_to == ""){
-        alert("Please Select Room")
+        swal({
+         title: "Alert!!",
+         text: 'Please Select Table !',
+         type: 'warning',
+        });
       }else{
         $.ajax({type: "POST",
           url: "<%= origami_moving_path %>",
           data: "change_from="+ change_from + "&change_to=" + change_to,
           success:function(result){
-            alert("Moving Success")
-            if (result.get_type == 'Table'){
-              window.location.href = '/origami/table/' + change_to;
-            }else{
-              window.location.href = '/origami/room/' + change_to;
-            }
+            // alert("Moving Success")
+            swal({
+             title: "Information!",
+             text: 'Moving Success',
+             type: 'success',
+            }, function (){
+             if (result.get_type == 'Table'){
+                window.location.href = '/origami/table/' + change_to;
+              }else{
+                window.location.href = '/origami/room/' + change_to;
+              }
+            });
           }
         });
       }
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 64102211..c15aeea8 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -204,15 +204,43 @@
         unless @order_items.nil? || @order_items.empty?
          count = 0
          @order_items.each do |order_item |
+          set_item_prices = 0
           count += 1
           sub_total = sub_total + (order_item.price * order_item.qty)
 
           #unless order_item.price <= 0 %>
           <tr>
-           <td><%= count %></td>
-           <td class='item-name'><%= order_item.item_name %></td>
+            <td><%= count %></td>
+            <td class='item-name'>
+              <%= order_item.item_name %>
+              <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+                <% JSON.parse(order_item.options).each do |option| %>
+                  <br><span class="font-13">
+                    <%= option %>
+                  </span>
+                <% end %>
+              <% end %>
+
+              <% if !order_item.set_menu_items.nil?  
+                JSON.parse(order_item.set_menu_items).each do |item_instance| 
+                  set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
+                %> 
+                <br><span class="font-13">
+                  <%= item_instance["item_instance_name"] %>
+                    <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                      <% (item_instance["options"]).each do |set_item_option| %>
+                        <br><span class="font-13">
+                          <%= set_item_option %>
+                        </span>
+                      <% end %>
+                    <% end %>
+                  </span> 
+              <% end 
+                sub_total += set_item_prices
+              end %>
+            </td>
            <td class='item-attr'><%= order_item.qty %></td>
-           <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+           <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
          </tr>
          <%
          #end
@@ -232,12 +260,40 @@ if @status_sale == 'sale'
    <table class="table table-striped">
      <%
      @order_items.each do |order_item |
+        set_item_prices = 0
        %>
 
        <tr>
-         <td class='item-name'><%= order_item.item_name %></td>
+        <td class='item-name'>
+          <%= order_item.item_name %>
+          <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %>
+            <% JSON.parse(order_item.options).each do |option| %>
+              <br><span class="font-13">
+                <%= option %>
+              </span>
+            <% end %>
+          <% end %>
+
+          <% if !order_item.set_menu_items.nil?  
+            JSON.parse(order_item.set_menu_items).each do |item_instance| 
+              set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
+            %> 
+            <br><span class="font-13">
+              <%= item_instance["item_instance_name"] %>
+                <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
+                  <% (item_instance["options"]).each do |set_item_option| %>
+                    <br><span class="font-13">
+                      <%= set_item_option %>
+                    </span>
+                  <% end %>
+                <% end %>
+              </span> 
+          <% end 
+            sub_total += set_item_prices
+          end %>
+        </td>
          <td class='item-attr'><%= order_item.qty %></td>
-         <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+         <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
        </tr>
 
        <%
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4a77a743..6ce32cad 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -367,6 +367,7 @@
                   <%
                   count = 0
                   @order_items.each do |order_item |
+                    set_item_prices = 0
                     count += 1
                   %>
                     <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
@@ -382,7 +383,9 @@
                         <% end %>
 
                        <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
-                          JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
+                          JSON.parse(order_item.set_menu_items).each do |item_instance| 
+                            set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f
+                        %> 
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>
                               <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
@@ -394,10 +397,11 @@
                               <% end %>
                             </span> 
                         <% end 
+                          sub_total += set_item_prices
                         end %>
                       </td>
                       <td class='item-attr'><%= order_item.qty %></td>
-                      <td class='item-attr'><%= order_item.qty*order_item.price %></td>
+                      <td class='item-attr'><%= (order_item.qty*order_item.price).to_f + set_item_prices %></td>
                     </tr>
 
                   <%