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

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

@@ -55,9 +55,8 @@
         <div class="table-responsive">
           <table class="table table-striped">
             <thead>
-            <% puts "'''''''''''''''''''"
-            puts @response
-             if @response["status"] == true %>
+            <% 
+             if @response["data"].present? %>
                <tr>
                 <th colspan="5">Membership Transactions</th>
                 <% if @response["status"] == true %>

app/views/reports/daily_sale/index.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+  <li><a href="<%= dashboard_path %>">Home</a></li>
   <li>Daily Sale Report</li>
  </ul>
 </div>

app/views/reports/daily_sales/index.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+  <li><a href="<%= dashboard_path %>">Home</a></li>
   <li>Daily Sale Report</li>
  </ul>
 </div>

app/views/reports/receipt_no/index.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+  <li><a href="<%= dashboard_path %>">Home</a></li>
   <li>Receipt List Report</li>
  </ul>
 </div>

app/views/reports/sale_item/index.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+  <li><a href="<%= dashboard_path %>">Home</a></li>
   <li>Daily Sale Report</li>
  </ul>
 </div>

app/views/reports/sale_items/index.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
  <ul class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+  <li><a href="<%= dashboard_path %>">Home</a></li>
   <li>Daily Sale Report</li>
  </ul>
 </div>
@@ -11,13 +11,13 @@
 	<hr />
 </div>
 
-<div class="container">
+<!-- <div class="container">
 	<div class="row">
 		<div class="col-md-12 text-right">
 			<a href="javascript:export_to('<%=reports_sale_items_path%>.xls')" class = "btn btn-default">Export to Excel</a>
 		</div>	  			
 	</div>
-</div>
+</div> -->
 
 <div class="container margin-top-20">
 	<div class="card row">