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

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

@@ -38,6 +38,7 @@
                 <th>Company</th>
                 <th>Contact no</th>
                 <th>Email</th>
+                <th>Date of Birth</th>
               </tr>
             </thead>
 
@@ -47,11 +48,11 @@
                  <td>
                  <input type="radio" style="width:20px;" value="<%= crm_customer.customer_id %>" name="checkbox" class="checkbox_check" ></td>
                   <td><%= crm_customer.name %></td>
-                  <td><%= crm_customer.company %></td>
+                  <td><%= crm_customer.company rescue '-' %></td>
                   <td><%= crm_customer.contact_no %></td>
                   <td><%= crm_customer.email %></td>
                   <td>
-                  <%= link_to 'Destroy', crm_customer_path(crm_customer), method: :delete, data: { confirm: 'Are you sure?' } %>
+                  <%= crm_customer.date_of_birth rescue  '-' %>
                     
                   </td>
                  
@@ -84,8 +85,6 @@
     </div>
     <div class="form-group">
       <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %>
-
-      
     </div>
 
     <div class="form-group">
@@ -93,11 +92,11 @@
     </div>
 
     <div class="form-group">
-     <label>Date Of Birth</label>
-     <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%>
+     <%= f.input :date_of_birth,:class=>"form-control date_of_birth"%>
    </div>
 
    <div class="form-group">
+   <label>Select Member Group</label>
         <select class="selectpicker form-control col-md-12" name="member_group_id">
             <option>Select Member Group</option>
             <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
@@ -105,21 +104,11 @@
               <%= member.name %></option>
             <%end %>
           </select>    
-      </div>
-  
-
-  
-
-  <!--  <div class="form-group">
-    <%= f.input :membership_type, :class => "form-control col-md-6 membership_type" %>
   </div>
-  <div class="form-group">
-   <%= f.input :membership_authentication_code, :class => "form-control col-md-6 membership_authentication_code" %>
-  </div> -->
 
   <div class="form-group">
         <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
-        <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %>
+       <!--  <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> -->
   </div>
  <%end%>
 </div>
@@ -128,17 +117,6 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.css">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.js"></script>
 <script type="text/javascript">
-  $(function () {
-     if (jQuery().datepicker) {
-            $('.datepicker').datepicker({
-               format : 'dd-mm-yyyy',
-               autoclose: true
-            });
-            $('.datepicker').attr('ReadOnly','true');
-            $('.datepicker').css('cursor','pointer');
-      }
-     
-  });
 
   $(document).on('click',".checkbox_check",function(){
      if(this.checked){

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

@@ -316,7 +316,7 @@
                   sub_total = 0
                   if @selected_item_type == "Sale"
                     @selected_item.sale_items.each do |sale_item|
-                      sub_total += sale_item.qty*sale_item.unit_price
+                      sub_total += (sale_item.qty*sale_item.unit_price)
                 %>
                 <tr>
                   <td class='item-name'><%= sale_item.product_name %></td>
@@ -351,7 +351,7 @@
             <table class="table" id="order-charges-table" border="0">
               <tr>
                 <td class="charges-name"><strong>Sub Total:</strong></td>
-                <td class="item-attr"><strong id="order-sub-total"><%=sub_total%></strong></td>
+                <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
               </tr>
               <!-- <tr>
                 <td class="charges-name"><strong>Food:</strong></td>

app/views/origami/payments/show.html.erb

@@ -14,8 +14,8 @@
               <td><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></td>
             </tr>
             <tr>
-              <td><strong>Customer :</strong> Default Customer</td>
-              <td><strong>Points :</strong>  1234 </td>
+              <td><strong>Customer :</strong> <%= @sale_data.customer.name%></td>
+              <td><strong>Points :</strong>  <%= @balance %> </td>
             </tr>
           </table>
         </div>