mirror of
https://gitlab.com/t6353/sharee.bike.git
synced 2025-05-13 15:16:38 +02:00
CMS-Text for App units fix
This commit is contained in:
parent
3c52345c5e
commit
6b55802cf7
7 changed files with 37 additions and 19 deletions
|
@ -1794,6 +1794,7 @@ sub user_bikes_occupied {
|
|||
#called by user_bikes_occupied (bikes_occupied object)
|
||||
sub rentals(){
|
||||
my $self = shift;
|
||||
my $varenv_prim = shift;
|
||||
my $record = shift;
|
||||
my $auth = shift || "";
|
||||
my $withkey = shift || 0;
|
||||
|
@ -1810,7 +1811,7 @@ sub rentals(){
|
|||
|
||||
#$bw->log("rentals-rentalog",$pricing->{$id}->{rentalog},"");
|
||||
$pricing->{$id}->{rentalog} = "";#just for debuggiog, removed to reduce data in json
|
||||
my $return_feed->{$id} = $pri->fetch_rentalfeed(\%varenv,$record->{$id},$pricing->{$id});
|
||||
my $return_feed->{$id} = $pri->fetch_rentalfeed($varenv_prim,\%varenv,$record->{$id},$pricing->{$id});
|
||||
$return->{$id} = { %{ $pricing->{$id} }, %{ $return_feed->{$id} } };
|
||||
|
||||
my $bike_id = $return->{$id}->{bike};
|
||||
|
@ -1839,6 +1840,7 @@ sub rentals(){
|
|||
sub bikes_available(){
|
||||
my $self = shift;
|
||||
my $q = shift;
|
||||
my $varenv_prim = shift;
|
||||
my $varenv = shift;
|
||||
my $auth = shift;
|
||||
my $authed = 0;
|
||||
|
@ -1897,7 +1899,7 @@ sub bikes_available(){
|
|||
$record = $dbt->fetch_record($dbh,$pref) if(ref($bike_node) eq "ARRAY" && @{$bike_node}[0]);
|
||||
my $op_return = {};
|
||||
|
||||
my $td_template = $dbt->rental_description_template($varenv);
|
||||
my $td_template = $dbt->rental_description_template($varenv_prim);
|
||||
|
||||
foreach my $id (sort { $record->{$a}->{barcode} <=> $record->{$b}->{barcode} } keys (%$record)){
|
||||
$return->{$id}->{authed} = "$authed";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue