git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update bill

Browse Source
This commit is contained in:
Aung Myo
2017-06-27 14:16:48 +06:30
parent c1646b812e
commit f762664912
6 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/bill_controller.rb
View File

@@ -32,7 +32,7 @@ class Api::BillController < Api::ApiController
#shop detail #shop detail
shop_details = Shop.find(1) shop_details = Shop.find(1)
customer= Customer.where('customer_id=' + @sale_data.customer_id) customer= Customer.find(@sale_data.customer_id)
# get member information # get member information
member_info = Customer.get_member_account(customer) member_info = Customer.get_member_account(customer)

1
app/controllers/base_origami_controller.rb
View File

@@ -14,5 +14,4 @@ class BaseOrigamiController < ActionController::Base
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end end
end end

1
app/helpers/origami/request_bills_helper.rb
View File

@@ -1,2 +1,3 @@
module Origami::RequestBillsHelper module Origami::RequestBillsHelper
end end

2
app/pdf/receipt_bill_pdf.rb
View File

@@ -83,7 +83,7 @@ class ReceiptBillPdf < Prawn::Document
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do
text "Receipt Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left text "Receipt Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left
end end

2
app/views/layouts/_header.html.erb
View File

@@ -33,7 +33,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %></li> <li><%= link_to "Orders ", transactions_orders_path, :tabindex =>"-1" %></li>
<li><%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %></li> <li><%= link_to "Sales ", transactions_sales_path, :tabindex =>"-1" %></li>
<!-- <li><%= link_to "Sales ", transactions_credit_notes_path, :tabindex =>"-1" %></li> --> <li><%= link_to "Credit Note ", transactions_credit_notes_path, :tabindex =>"-1" %></li>
</ul> </ul>
</li> </li>
<li class="navbar-nav mr-auto dropdown"> <li class="navbar-nav mr-auto dropdown">

1
config/application.rb
View File

@@ -15,5 +15,6 @@ module SXRestaurants
config.active_job.queue_adapter = :sidekiq config.active_job.queue_adapter = :sidekiq
# config.time_zone = 'Asia/Rangoon' # config.time_zone = 'Asia/Rangoon'
end end
end end