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

app/controllers/api/bill_controller.rb

@@ -29,7 +29,12 @@ class Api::BillController < Api::ApiController
     @sale_items = SaleItem.where("sale_id=?",@sale_id)
 
     unique_code = "ReceiptBillPdf"
+    #shop detail
+    shop_details = Shop.find(1)
+
     customer= Customer.where('customer_id=' + @sale_data.customer_id)
+    # get member information
+    member_info = Customer.get_member_account(customer)
 
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
@@ -38,7 +43,7 @@ class Api::BillController < Api::ApiController
     item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
     printer = Printer::ReceiptPrinter.new(print_settings)
-    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts)
+    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
   end
 
 

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">