roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-13 23:26:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

App merchant-message

Browse source
This commit is contained in:
ragu 2023-05-15 11:39:26 +02:00
parent 9da4bd0cb0
commit 75a23dc3f4
5 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

34
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -45,7 +45,8 @@ sub handler {
my %varenv = $cf->envonline();
my $oprefix = $dbt->{operator}->{$varenv{dbname}}->{oprefix};
my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
my $lang="de";
my $lang="en";
$lang = lc($R::lang) if($R::lang);
my @keywords = $q->param;
my $debug=1;
my $user_agent = $q->user_agent();
@ -81,7 +82,7 @@ my $response = {
impress_html => "$dbt->{project_conf}->{Freiburg}->{impress_html}",
tariff_info_html => "$dbt->{project_conf}->{Freiburg}->{tariff_info_html}",
bike_info_html => "$dbt->{project_conf}->{Freiburg}->{bike_info_html}",
lang => "de",
lang => "$lang",
last_used_operator => {
operator_name => "sharee.bike | TeilRad GmbH",
operator_email => "hotline\@sharee.bike",
@ -95,10 +96,10 @@ my $response = {
};
if($varenv{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
$varenv{cms} = $dbt->fetch_cms($dbh,{ lang => $q->escapeHTML($R::lang) });
$varenv{cms} = $dbt->fetch_cms($dbh,{ lang => $q->escapeHTML($lang) });
}else{
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
$varenv{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $q->escapeHTML($R::lang) });
$varenv{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $q->escapeHTML($lang) });
}
my $aowner = 0;
@ -675,27 +676,34 @@ elsif($q->param('request') eq "stations_available"){
my ($auth,$authraw) = $apif->auth_verify($q);
my $user_agent_subversion = 1000;
#$user_agent = "3.0.348";#test
#$user_agent = "Meinkonrad/3.0.363";#test
$user_agent_subversion = $1 if($user_agent =~ /3\.0\.(\d+)/);
#merchant_message timerange
my $lnow = strftime("%Y-%m-%d %H:%M:%S", localtime(time));
my $localtime = Time::Piece->strptime($lnow, "%Y-%m-%d %H:%M:%S");
my $epoch_now = $localtime->epoch;
my $maintanance_start = Time::Piece->strptime("2023-03-06 00:00:00", "%Y-%m-%d %H:%M:%S");
my $maintanance_end = Time::Piece->strptime("2023-04-01 01:00:00", "%Y-%m-%d %H:%M:%S");
my $epoch_start = $maintanance_start->epoch;
my $epoch_end = $maintanance_end->epoch;
my $merchant_message_start = Time::Piece->strptime("2023-05-15 00:00:00", "%Y-%m-%d %H:%M:%S");
my $merchant_message_end = Time::Piece->strptime("2023-05-21 23:00:00", "%Y-%m-%d %H:%M:%S");
my $epoch_start = $merchant_message_start->epoch;
my $epoch_end = $merchant_message_end->epoch;
#App update message
if($user_agent_subversion <= 348){
if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){
$response->{merchant_message} = $varenv{cms}->{'App-update-message'}->{txt};
}else{
#if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){
#$response->{merchant_message} = $varenv{cms}->{'App-update-message'}->{txt};
#}else{
$response->{merchant_message} = $varenv{cms}->{'App-update-message-expired'}->{txt};
$apif->authout($q,$coo);
$dbt->update_operatorsloop($varenv{dbname},$authraw->{c_id},"update");
}
#}
}
#App merchant message
if($user_agent =~ /konrad/i){
if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){
$response->{merchant_message} = $varenv{cms}->{'App-merchant-message'}->{txt};
}
}
$response = { %$response, %$auth };