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

fixed report print

Browse Source
This commit is contained in:
NyanLinHtut
2019-05-30 14:04:46 +06:30
parent b6b761bec3
commit a3e8509ea5
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/reports/shiftsale_controller.rb
View File

@@ -52,14 +52,11 @@ class Reports::ShiftsaleController < BaseReportController
shift_id = params[:id] shift_id = params[:id]
@shift = ShiftSale.find_by_id(shift_id) @shift = ShiftSale.find_by_id(shift_id)
shift_obj = ShiftSale.where('id =?',shift_id) shift_obj = ShiftSale.where('id =?',shift_id)
puts "shift obj!!!!!"
puts shift_obj.to_json
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
close_cashier_pdf = Lookup.collection_of("print_settings") close_cashier_pdf = Lookup.collection_of("print_settings")
puts "close !!!!"
puts close_cashier_pdf
unique_code = "CloseCashierPdf" unique_code = "CloseCashierPdf"

3
app/models/sale.rb
View File

@@ -959,7 +959,8 @@ def self.get_by_shiftsales(from,to,shift)
:credit_sales => shift_sale.credit_sales, :credit_sales => shift_sale.credit_sales,
:other_sales => shift_sale.other_sales.to_f, :other_sales => shift_sale.other_sales.to_f,
:foc_sales => foc, :foc_sales => foc,
:grand_total => shift_sale.grand_total :grand_total => shift_sale.grand_total,
:shift_id => shift_sale.id
} }
end end

2
app/views/reports/shiftsale/index.html.erb
View File

@@ -65,7 +65,7 @@
<!-- <th>Rounding Adj</th> --> <!-- <th>Rounding Adj</th> -->
<th><%= t("views.right_panel.detail.grand_total") %></th> <th><%= t("views.right_panel.detail.grand_total") %></th>
<th>Print</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>