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

update requestby in sail

Browse Source
This commit is contained in:
Aung Myo
2017-06-15 10:20:26 +06:30
parent 29d5b134da
commit 8cb40783a4
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/transactions/orders_controller.rb
View File

@@ -13,7 +13,7 @@ class Transactions::OrdersController < ApplicationController
end end
end end
@orders = Kaminari.paginate_array(orders).page(params[:page]).per(2) @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50)
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @orders } format.json { render json: @orders }

16
app/controllers/transactions/sales_controller.rb
View File

@@ -10,12 +10,18 @@ class Transactions::SalesController < ApplicationController
today = Date.today today = Date.today
if receipt_no.nil? if receipt_no.nil?
@sales = Sale.order("sale_id") sales = Sale.order("sale_id desc")
#@products = Product.order("name").page(params[:page]).per(5)
else else
@sales = Sale.search(receipt_no) order = Sale.search(receipt_no)
end if order.count > 0
@sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) sales = order
else
sales = Sale.order("sale_id desc")
end
end
@sales = Kaminari.paginate_array(sales).page(params[:page]).per(50)
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @sales } format.json { render json: @sales }

7
app/models/sale.rb
View File

@@ -57,10 +57,9 @@ class Sale < ApplicationRecord
self.tax_type = "exclusive" self.tax_type = "exclusive"
# set cashier by current login # set cashier by current login
# TODO: requested_by is string , can't cast to id. error occur. please fix self.cashier_id = requested_by.id
# self.cashier_id = requested_by.id self.cashier_name = requested_by.name
self.cashier_name = requested_by self.requested_by = requested_by.name
self.requested_by = requested_by
self.requested_at = DateTime.now.utc self.requested_at = DateTime.now.utc

2
app/views/transactions/sales/index.html.erb
View File

@@ -57,7 +57,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<%= paginate @sales %>
</div> </div>
</div> </div>