|
Lines 71-96
if (
Link Here
|
| 71 |
$branch = $userenv_branch; # fallback value |
71 |
$branch = $userenv_branch; # fallback value |
| 72 |
} |
72 |
} |
| 73 |
|
73 |
|
| 74 |
if ( $desk_id && ( !$userenv_desk or $userenv_desk ne $desk_id ) ) { |
74 |
if ( defined($desk_id) && ( !$userenv_desk || $userenv_desk ne $desk_id ) ) { |
| 75 |
my $desk = Koha::Desks->find( { desk_id => $desk_id } ); |
75 |
if ($desk_id) { |
| 76 |
my $old_desk_name = ''; |
76 |
|
| 77 |
if ($userenv_desk) { |
77 |
# A desk was selected |
| 78 |
$old_desk_name = Koha::Desks->find( { desk_id => $userenv_desk } )->desk_name; |
78 |
my $desk = Koha::Desks->find( { desk_id => $desk_id } ); |
|
|
79 |
$session->param( desk_name => $desk->desk_name ); |
| 80 |
$session->param( desk_id => $desk->desk_id ); |
| 81 |
} else { |
| 82 |
|
| 83 |
# "No desk" was explicitly selected - clear desk from session |
| 84 |
$session->clear( [ 'desk_name', 'desk_id' ] ); |
| 79 |
} |
85 |
} |
| 80 |
$session->param( desk_name => $desk->desk_name ); |
|
|
| 81 |
$session->param( desk_id => $desk->desk_id ); |
| 82 |
$updated = 1; |
86 |
$updated = 1; |
| 83 |
} else { |
87 |
} else { |
| 84 |
$desk_id = $userenv_desk; |
88 |
$desk_id = $userenv_desk; |
| 85 |
} |
89 |
} |
| 86 |
|
90 |
|
| 87 |
if ( defined($register_id) |
91 |
if ( defined($register_id) |
| 88 |
&& ( $userenv_register_id ne $register_id ) ) |
92 |
&& ( !$userenv_register_id || $userenv_register_id ne $register_id ) ) |
| 89 |
{ |
93 |
{ |
| 90 |
my $old_register_name = C4::Context->userenv->{'register_name'} || ''; |
94 |
if ($register_id) { |
| 91 |
my $register = Koha::Cash::Registers->find($register_id); |
95 |
|
| 92 |
$session->param( 'register_id', $register_id ); |
96 |
# A register was selected |
| 93 |
$session->param( 'register_name', $register ? $register->name : '' ); |
97 |
my $register = Koha::Cash::Registers->find($register_id); |
|
|
98 |
$session->param( 'register_id', $register_id ); |
| 99 |
$session->param( 'register_name', $register ? $register->name : '' ); |
| 100 |
} else { |
| 101 |
|
| 102 |
# "No register" was explicitly selected - clear register from session |
| 103 |
$session->clear( [ 'register_id', 'register_name' ] ); |
| 104 |
} |
| 94 |
$updated = 1; |
105 |
$updated = 1; |
| 95 |
} else { |
106 |
} else { |
| 96 |
$register_id = $userenv_register_id; |
107 |
$register_id = $userenv_register_id; |