|
|
@@ -18,11 +18,11 @@ class TransfersController < ApplicationController
|
|
|
if current_user.usertype == 'A'
|
|
|
@transfers = Transfer.all.includes(:user, :received_by).order('id DESC, transfer_date DESC')
|
|
|
elsif current_user.usertype == 'G' || current_user.usertype == 'C'
|
|
|
- @received = Transfer.includes(:user, :received_by).where(destiny_id: current_user.pointsale_id).order('id DESC, transfer_date DESC')
|
|
|
- @sent = Transfer.includes(:user, :received_by).where(origin_id: current_user.pointsale_id).order('id DESC, transfer_date DESC')
|
|
|
+ @received = Transfer.includes(:user, :received_by).where(destiny_id: current_user.pointsale_id, destiny_is_pointsale: 1).order('id DESC, transfer_date DESC')
|
|
|
+ @sent = Transfer.includes(:user, :received_by).where(origin_id: current_user.pointsale_id, origin_is_pointsale: 1).order('id DESC, transfer_date DESC')
|
|
|
elsif current_user.usertype == 'S'
|
|
|
- @received = Transfer.includes(:user, :received_by).where(destiny_id: current_user.warehouse_id).order('id DESC, transfer_date DESC')
|
|
|
- @sent = Transfer.includes(:user, :received_by).where(origin_id: current_user.warehouse_id).order('id DESC, transfer_date DESC')
|
|
|
+ @received = Transfer.includes(:user, :received_by).where(destiny_id: current_user.warehouse_id, destiny_is_pointsale: 0).order('id DESC, transfer_date DESC')
|
|
|
+ @sent = Transfer.includes(:user, :received_by).where(origin_id: current_user.warehouse_id, origin_is_pointsale: 0).order('id DESC, transfer_date DESC')
|
|
|
end
|
|
|
end
|
|
|
|