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

app/controllers/origami/request_bills_controller.rb

@@ -8,6 +8,8 @@ class Origami::RequestBillsController < BaseOrigamiController
     check_booking = Booking.find_by_booking_id(booking_id)
     if check_booking.sale_id.nil?
       # Create Sale if it doesn't exist
+      puts "current_login_employee"
+      puts current_login_employee.name
       @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee)
       @sale_data = Sale.find_by_sale_id(@sale_id)
       @sale_items = SaleItem.where("sale_id=?",@sale_id)
@@ -33,5 +35,3 @@ class Origami::RequestBillsController < BaseOrigamiController
     redirect_to origami_path(@sale_data.sale_id)
   end
 end
-
-

app/views/crm/customers/index.html.erb

@@ -44,7 +44,7 @@
             <tbody>
               <% if @crm_customers.count > 0  %> 
                  <% @crm_customers.each do |crm_customer| %>
-                  
+                  <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
                     <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
@@ -55,7 +55,7 @@
                       <td><%= link_to 'Show', crm_customer_path(crm_customer) %></td>
                      
                     </tr>
-                    
+                    <% end %>
                   <% end %>
               <%else%>
                  <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
@@ -103,12 +103,12 @@
 
     <div class="form-group">
     <label>Date Of Birth</label>
-     <%= f.text_field :date_of_birth,:class=>"form-control datepicker"%>
+     <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
    </div>
 
    <div class="form-group">
    <label>Select Member Group</label>
-        <select class="selectpicker form-control col-md-12" name="member_group_id" >
+        <select class="selectpicker form-control col-md-12" name="member_group_id"  style="height: 40px" >
             <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
                <option value="<%= member.value %>">
               <%= member.name %></option>

app/views/origami/customers/index.html.erb

@@ -45,7 +45,7 @@
             <tbody>
               <% if @crm_customers.count > 0  %> 
                  <% @crm_customers.each do |crm_customer| %>
-                
+                 <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
                      <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
@@ -56,7 +56,7 @@
                       
                      
                     </tr>
-                   
+                    <% end %>
                   <% end %>
               <%else%>
                  <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
@@ -106,7 +106,7 @@
 
     <div class="form-group">
       <label>Date Of Birth</label>
-      <%= f.text_field :date_of_birth,:class=>"form-control datepicker"%>
+      <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
     </div>
 
     <div class="form-group">