diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 348a518a..18d24dc4 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -241,7 +241,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @junctionpaycount = 0.0
       @credit = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
-      @balance = 0.00
+      @balance = 0
       @accountable_type = ''
       @table_no = ''
       @dining  = ''
@@ -311,7 +311,7 @@ class Origami::PaymentsController < BaseOrigamiController
         if response["status"]==true
          response["account_data"].each do |res|
           if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount"
-             @balance += res["balance"]
+             @balance = @balance.to_f + res["balance"].to_f
             #  @accountable_type = res["accountable_type"]
              @accountable_type = "Rebate Balance"
           end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index a84f6ca7..5cd22054 100755
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -31,6 +31,8 @@ class Origami::TableInvoicesController < BaseOrigamiController
 
   def show
     @table = DiningFacility.find(params[:table_id])
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
     shop        =  Shop::ShopDetail  
     @sale_array = Array.new
     @table.bookings.each do |booking|
diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb
index 216e5eea..f6317dc3 100644
--- a/app/views/origami/table_invoices/show.html.erb
+++ b/app/views/origami/table_invoices/show.html.erb
@@ -156,6 +156,15 @@
  <!-- Column Three -->
  <div class="col-lg-1 col-md-1 col-sm-1">
    <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
+  <% if ENV["SERVER_MODE"] == "cloud" %>
+    <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+  <% else %>
+    <%if @membership.discount && @sale.customer.membership_id %>
+      <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+    <%else%>
+      <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+    <%end%> 
+  <% end %>
    <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
    <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
    <button type="button" data-toggle="modal" data-target="#voidModal" class="btn bg-danger btn-block" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
@@ -163,6 +172,38 @@
 </div>
 </div>
 
+<!-- membership paymentmodal -->
+<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
+<span class="hidden" id="member_discount"><%= @membership.discount%></span>
+<span class="hidden" id="membership_id"><%= @sale.customer.membership_id rescue 0%></span>
+<div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+            </div>
+            <div class="modal-body">
+               <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
+                 <option value="Cash">Cash</option>
+                 <option value="Credit">Credit</option>
+                <% @payment_methods.each do |pay| %>
+                  <option value="<%= pay.payment_method %>">
+                    <%= pay.payment_method %>
+                  </option>
+                <%end %>
+                
+                </select>   
+            </div>
+            <div class="modal-footer  p-r-30">
+                <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                &nbsp;  &nbsp;
+               <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- membership paymentmodal -->
+
 <div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -212,6 +253,24 @@
 </div>
 <script>
 $(document).ready(function(){
+  /* start check first bill or not*/
+    var receipt_no = "";
+    if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+      receipt_no = ($("#receipt_no").html()).trim();
+    }
+    
+    discount="<%= @membership.discount%>"
+    if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+      if (discount) {
+        if(checkReceiptNoInFirstBillData(receipt_no,"")){
+          $("#pay").show();
+        }else{
+          $("#pay").hide();
+        }
+      }
+    }
+  /* end check first bill or not*/
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;
@@ -222,6 +281,68 @@ $(document).ready(function(){
 //    window.location.href = '/origami/sale/<%= @sale.id %>/payment';
 // });
 
+// Print for first bill
+  $("#first_bill").on('click', function () {
+      var sale_id = '<%= @sale.id %>';
+      var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+
+      $.ajax({
+          type: "GET",
+          url: ajax_url,
+          success: function (result) {
+            receipt_no = ($("#receipt_no").html()).trim();
+            if((receipt_no!=undefined) && (receipt_no!=""))
+              createReceiptNoInFirstBillData(receipt_no,"");
+            
+            location.reload();
+          }
+      });  
+  });
+
+  $(".choose_payment").on('click', function () {
+    $( "#loading_wrapper").show();
+
+      var sale_id = '<%= @sale.id %>';
+      type = $('.payment_method').val();
+      if(parseInt(jQuery.inArray("Credit", type)) == -1){
+        if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
+           calculate_member_discount(sale_id,"Card");
+           
+        }else{
+          calculate_member_discount(sale_id,"Cash");
+        }         
+      }
+      var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+      $.ajax({
+          type: "GET",
+          url: ajax_url,
+          success: function (result) {
+              $( "#loading_wrapper" ).hide();
+              receipt_no = ($("#receipt_no").html()).trim();
+              if((receipt_no!=undefined) && (receipt_no!=""))
+                createReceiptNoInFirstBillData(receipt_no,type);
+                location.reload();
+          }
+      });  
+  });
+
+  function calculate_member_discount(sale_id,type) {
+    var sub_total = $('#sub-total').text();
+     if (type == "Cash") {
+       is_card = false
+     }else{
+      is_card = true
+     }
+    $.ajax({
+      type: "POST",
+      url: "/origami/" + sale_id + "/member_discount",
+      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+      async: false,
+      success:function(result){ 
+      }
+    });
+  }
+
 $('#pay').on('click',function() {
    var sale_id = '<%= @sale.id %>';