mirror of
https://gitlab.com/t6353/sharee.bike.git
synced 2025-05-11 22:37:27 +02:00
Add methode send_occupied2hotline. Fix pricing rental duration. Adding countries
This commit is contained in:
ragu
parent
7dcf48db2c
commit
b53156d502
8 changed files with 374 additions and 58 deletions
|
|
@ -907,7 +907,7 @@ sub booking_request(){
|
|||
my $response_text = "";
|
||||
|
||||
#state and lock_state is only defined if requestes incl. occupied
|
||||
$bw->log("log booking_request bike:$bike, state:$state, lock_state:$lock_state, tarif:$ct_tariff->{barcode}, auth:$auth->{c_id}",$auth->{txt08},"");
|
||||
$bw->log("log booking_request bike=$bike, auth=$auth->{c_id}, state=$state, lock_state=$lock_state, tarif=$ct_tariff->{barcode}",$auth->{txt08},"");
|
||||
|
||||
my $update_adr = {
|
||||
table => "contentadr",
|
||||
|
|
@ -1165,10 +1165,13 @@ sub booking_update(){
|
|||
my $lock_charge = $q->param('voltage') || "";
|
||||
my $gps_age_minutes = "";
|
||||
$gps_age_minutes = $gps_data->{gps_age_minutes} if($q->param('gps_age'));
|
||||
my $logging = "log booking_update bike:$bike, userID:$auth->{c_id}, state:$state, lock_state:$lock_state, lock_charge:$lock_charge, gps:$gps_data->{gps}, gps_age_minutes:$gps_age_minutes";
|
||||
|
||||
my $logvalues = "state=$state, lock_state=$lock_state, lock_charge=$lock_charge, gps=$gps_data->{gps}, gps_age_minutes=$gps_age_minutes";
|
||||
my $logging = "log booking_update bike=$bike, userID=$auth->{c_id}, $logvalues";
|
||||
$bw->log("$logging",$auth->{c_id},"");
|
||||
|
||||
my $log_stamp = strftime "%d.%m.%Y %H:%M:%S", localtime;
|
||||
$update_pos->{txt24} = $record_pos->{txt24} . "\n- $log_stamp $logging";
|
||||
$update_pos->{txt24} = $record_pos->{txt24} . "\n- $log_stamp $logvalues";
|
||||
$dbt->update_record($dbh,$update_pos,$record_pos);
|
||||
|
||||
my $Ilockit_GUID = "";
|
||||
|
|
@ -1187,7 +1190,7 @@ sub booking_update(){
|
|||
};
|
||||
$record_pos = $dbt->fetch_tablerecord($dbh,$booking_pos);
|
||||
my $if_gps = $gps_data->{gps} || "";
|
||||
$bw->log("log smartlock lock_state $bike $lock_state | int10 $record_pos->{int10} | int20 $record_pos->{int20} | if_gps $if_gps",$booking_values,"");
|
||||
$bw->log("log smartlock lock_state=$bike $lock_state, int10=$record_pos->{int10}, int20=$record_pos->{int20}, if_gps=$if_gps",$booking_values,"");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,264 @@ sub country_code(){
|
|||
'SK' => 'Slowakei',
|
||||
'FI' => 'Finnland',
|
||||
'SE' => 'Schweden',
|
||||
'GB' => 'Vereinigtes Königreich'
|
||||
'GB' => 'Vereinigtes Königreich',
|
||||
};
|
||||
return $country;
|
||||
}
|
||||
|
||||
sub country_code_all(){
|
||||
my $self = shift;
|
||||
my $country = {
|
||||
'--' => '----------------------',
|
||||
'AF' => 'Afghanistan',
|
||||
'AX' => 'Åland Islands',
|
||||
'AL' => 'Albania',
|
||||
'DZ' => 'Algeria',
|
||||
'AS' => 'American Samoa',
|
||||
'AD' => 'Andorra',
|
||||
'AO' => 'Angola',
|
||||
'AI' => 'Anguilla',
|
||||
'AQ' => 'Antarctica',
|
||||
'AG' => 'Antigua and Barbuda',
|
||||
'AR' => 'Argentina',
|
||||
'AM' => 'Armenia',
|
||||
'AW' => 'Aruba',
|
||||
'AU' => 'Australia',
|
||||
'AT' => 'Austria',
|
||||
'AZ' => 'Azerbaijan',
|
||||
'BS' => 'Bahamas',
|
||||
'BH' => 'Bahrain',
|
||||
'BD' => 'Bangladesh',
|
||||
'BB' => 'Barbados',
|
||||
'BY' => 'Belarus',
|
||||
'BE' => 'Belgium',
|
||||
'BZ' => 'Belize',
|
||||
'BJ' => 'Benin',
|
||||
'BM' => 'Bermuda',
|
||||
'BT' => 'Bhutan',
|
||||
'BO' => 'Bolivia (Plurinational State of)',
|
||||
'BQ' => 'Bonaire, Sint Eustatius and Saba',
|
||||
'BA' => 'Bosnia and Herzegovina',
|
||||
'BW' => 'Botswana',
|
||||
'BV' => 'Bouvet Island',
|
||||
'BR' => 'Brazil',
|
||||
'IO' => 'British Indian Ocean Territory',
|
||||
'BN' => 'Brunei Darussalam',
|
||||
'BG' => 'Bulgaria',
|
||||
'BF' => 'Burkina Faso',
|
||||
'BI' => 'Burundi',
|
||||
'CV' => 'Cabo Verde',
|
||||
'KH' => 'Cambodia',
|
||||
'CM' => 'Cameroon',
|
||||
'CA' => 'Canada',
|
||||
'KY' => 'Cayman Islands',
|
||||
'CF' => 'Central African Republic',
|
||||
'TD' => 'Chad',
|
||||
'CL' => 'Chile',
|
||||
'CN' => 'China',
|
||||
'CX' => 'Christmas Island',
|
||||
'CC' => 'Cocos (Keeling) Islands',
|
||||
'CO' => 'Colombia',
|
||||
'KM' => 'Comoros',
|
||||
'CG' => 'Congo',
|
||||
'CD' => 'Congo, Democratic Republic of the',
|
||||
'CK' => 'Cook Islands',
|
||||
'CR' => 'Costa Rica',
|
||||
'CI' => 'Côte d\'Ivoire',
|
||||
'HR' => 'Croatia',
|
||||
'CU' => 'Cuba',
|
||||
'CW' => 'Curaçao',
|
||||
'CY' => 'Cyprus',
|
||||
'CZ' => 'Czechia',
|
||||
'DK' => 'Denmark',
|
||||
'DJ' => 'Djibouti',
|
||||
'DM' => 'Dominica',
|
||||
'DO' => 'Dominican Republic',
|
||||
'EC' => 'Ecuador',
|
||||
'EG' => 'Egypt',
|
||||
'SV' => 'El Salvador',
|
||||
'GQ' => 'Equatorial Guinea',
|
||||
'ER' => 'Eritrea',
|
||||
'EE' => 'Estonia',
|
||||
'SZ' => 'Eswatini',
|
||||
'ET' => 'Ethiopia',
|
||||
'FK' => 'Falkland Islands (Malvinas)',
|
||||
'FO' => 'Faroe Islands',
|
||||
'FJ' => 'Fiji',
|
||||
'FI' => 'Finland',
|
||||
'FR' => 'France',
|
||||
'GF' => 'French Guiana',
|
||||
'PF' => 'French Polynesia',
|
||||
'TF' => 'French Southern Territories',
|
||||
'GA' => 'Gabon',
|
||||
'GM' => 'Gambia',
|
||||
'GE' => 'Georgia',
|
||||
#'DE' => 'Germany',
|
||||
'GH' => 'Ghana',
|
||||
'GI' => 'Gibraltar',
|
||||
'GR' => 'Greece',
|
||||
'GL' => 'Greenland',
|
||||
'GD' => 'Grenada',
|
||||
'GP' => 'Guadeloupe',
|
||||
'GU' => 'Guam',
|
||||
'GT' => 'Guatemala',
|
||||
'GG' => 'Guernsey',
|
||||
'GN' => 'Guinea',
|
||||
'GW' => 'Guinea-Bissau',
|
||||
'GY' => 'Guyana',
|
||||
'HT' => 'Haiti',
|
||||
'HM' => 'Heard Island and McDonald Islands',
|
||||
'VA' => 'Holy See',
|
||||
'HN' => 'Honduras',
|
||||
'HK' => 'Hong Kong',
|
||||
'HU' => 'Hungary',
|
||||
'IS' => 'Iceland',
|
||||
'IN' => 'India',
|
||||
'ID' => 'Indonesia',
|
||||
'IR' => 'Iran (Islamic Republic of)',
|
||||
'IQ' => 'Iraq',
|
||||
'IE' => 'Ireland',
|
||||
'IM' => 'Isle of Man',
|
||||
'IL' => 'Israel',
|
||||
'IT' => 'Italy',
|
||||
'JM' => 'Jamaica',
|
||||
'JP' => 'Japan',
|
||||
'JE' => 'Jersey',
|
||||
'JO' => 'Jordan',
|
||||
'KZ' => 'Kazakhstan',
|
||||
'KE' => 'Kenya',
|
||||
'KI' => 'Kiribati',
|
||||
'KP' => 'Korea (Democratic People\'s Republic of)',
|
||||
'KR' => 'Korea, Republic of',
|
||||
'KW' => 'Kuwait',
|
||||
'KG' => 'Kyrgyzstan',
|
||||
'LA' => 'Lao People\'s Democratic Republic',
|
||||
'LV' => 'Latvia',
|
||||
'LB' => 'Lebanon',
|
||||
'LS' => 'Lesotho',
|
||||
'LR' => 'Liberia',
|
||||
'LY' => 'Libya',
|
||||
'LI' => 'Liechtenstein',
|
||||
'LT' => 'Lithuania',
|
||||
'LU' => 'Luxembourg',
|
||||
'MO' => 'Macao',
|
||||
'MG' => 'Madagascar',
|
||||
'MW' => 'Malawi',
|
||||
'MY' => 'Malaysia',
|
||||
'MV' => 'Maldives',
|
||||
'ML' => 'Mali',
|
||||
'MT' => 'Malta',
|
||||
'MH' => 'Marshall Islands',
|
||||
'MQ' => 'Martinique',
|
||||
'MR' => 'Mauritania',
|
||||
'MU' => 'Mauritius',
|
||||
'YT' => 'Mayotte',
|
||||
'MX' => 'Mexico',
|
||||
'FM' => 'Micronesia (Federated States of)',
|
||||
'MD' => 'Moldova, Republic of',
|
||||
'MC' => 'Monaco',
|
||||
'MN' => 'Mongolia',
|
||||
'ME' => 'Montenegro',
|
||||
'MS' => 'Montserrat',
|
||||
'MA' => 'Morocco',
|
||||
'MZ' => 'Mozambique',
|
||||
'MM' => 'Myanmar',
|
||||
'NA' => 'Namibia',
|
||||
'NR' => 'Nauru',
|
||||
'NP' => 'Nepal',
|
||||
'NL' => 'Netherlands',
|
||||
'NC' => 'New Caledonia',
|
||||
'NZ' => 'New Zealand',
|
||||
'NI' => 'Nicaragua',
|
||||
'NE' => 'Niger',
|
||||
'NG' => 'Nigeria',
|
||||
'NU' => 'Niue',
|
||||
'NF' => 'Norfolk Island',
|
||||
'MK' => 'North Macedonia',
|
||||
'MP' => 'Northern Mariana Islands',
|
||||
'NO' => 'Norway',
|
||||
'OM' => 'Oman',
|
||||
'PK' => 'Pakistan',
|
||||
'PW' => 'Palau',
|
||||
'PS' => 'Palestine, State of',
|
||||
'PA' => 'Panama',
|
||||
'PG' => 'Papua New Guinea',
|
||||
'PY' => 'Paraguay',
|
||||
'PE' => 'Peru',
|
||||
'PH' => 'Philippines',
|
||||
'PN' => 'Pitcairn',
|
||||
'PL' => 'Poland',
|
||||
'PT' => 'Portugal',
|
||||
'PR' => 'Puerto Rico',
|
||||
'QA' => 'Qatar',
|
||||
'RE' => 'Réunion',
|
||||
'RO' => 'Romania',
|
||||
'RU' => 'Russian Federation',
|
||||
'RW' => 'Rwanda',
|
||||
'BL' => 'Saint Barthélemy',
|
||||
'SH' => 'Saint Helena, Ascension and Tristan da Cunha',
|
||||
'KN' => 'Saint Kitts and Nevis',
|
||||
'LC' => 'Saint Lucia',
|
||||
'MF' => 'Saint Martin (French part)',
|
||||
'PM' => 'Saint Pierre and Miquelon',
|
||||
'VC' => 'Saint Vincent and the Grenadines',
|
||||
'WS' => 'Samoa',
|
||||
'SM' => 'San Marino',
|
||||
'ST' => 'Sao Tome and Principe',
|
||||
'SA' => 'Saudi Arabia',
|
||||
'SN' => 'Senegal',
|
||||
'RS' => 'Serbia',
|
||||
'SC' => 'Seychelles',
|
||||
'SL' => 'Sierra Leone',
|
||||
'SG' => 'Singapore',
|
||||
'SX' => 'Sint Maarten (Dutch part)',
|
||||
'SK' => 'Slovakia',
|
||||
'SI' => 'Slovenia',
|
||||
'SB' => 'Solomon Islands',
|
||||
'SO' => 'Somalia',
|
||||
'ZA' => 'South Africa',
|
||||
'GS' => 'South Georgia and the South Sandwich Islands',
|
||||
'SS' => 'South Sudan',
|
||||
'ES' => 'Spain',
|
||||
'LK' => 'Sri Lanka',
|
||||
'SD' => 'Sudan',
|
||||
'SR' => 'Suriname',
|
||||
'SJ' => 'Svalbard and Jan Mayen',
|
||||
'SE' => 'Sweden',
|
||||
'CH' => 'Switzerland',
|
||||
'SY' => 'Syrian Arab Republic',
|
||||
'TW' => 'Taiwan, Province of China',
|
||||
'TJ' => 'Tajikistan',
|
||||
'TZ' => 'Tanzania, United Republic of',
|
||||
'TH' => 'Thailand',
|
||||
'TL' => 'Timor-Leste',
|
||||
'TG' => 'Togo',
|
||||
'TK' => 'Tokelau',
|
||||
'TO' => 'Tonga',
|
||||
'TT' => 'Trinidad and Tobago',
|
||||
'TN' => 'Tunisia',
|
||||
'TR' => 'Turkey',
|
||||
'TM' => 'Turkmenistan',
|
||||
'TC' => 'Turks and Caicos Islands',
|
||||
'TV' => 'Tuvalu',
|
||||
'UG' => 'Uganda',
|
||||
'UA' => 'Ukraine',
|
||||
'AE' => 'United Arab Emirates',
|
||||
'GB' => 'United Kingdom of Great Britain and Northern Ireland',
|
||||
'US' => 'United States of America',
|
||||
'UM' => 'United States Minor Outlying Islands',
|
||||
'UY' => 'Uruguay',
|
||||
'UZ' => 'Uzbekistan',
|
||||
'VU' => 'Vanuatu',
|
||||
'VE' => 'Venezuela (Bolivarian Republic of)',
|
||||
'VN' => 'Viet Nam',
|
||||
'VG' => 'Virgin Islands (British)',
|
||||
'VI' => 'Virgin Islands (U.S.)',
|
||||
'WF' => 'Wallis and Futuna',
|
||||
'EH' => 'Western Sahara',
|
||||
'YE' => 'Yemen',
|
||||
'ZM' => 'Zambia',
|
||||
'ZW' => 'Zimbabwe',
|
||||
};
|
||||
return $country;
|
||||
}
|
||||
|
|
@ -456,17 +713,6 @@ sub newline(){
|
|||
return $txtxx;
|
||||
}
|
||||
|
||||
#Komplettset compset logic
|
||||
sub compsum(){
|
||||
my $self = shift;
|
||||
my ($main_id,$lang,$owner) = @_;
|
||||
my $ct4rel = $db->collect_ct4rel("content",$main_id,$lang);#hash
|
||||
my $ctpers4rel = $db->collect_ctpers4rel($main_id,$lang,$owner);#hash
|
||||
%$ct4rel = (%$ctpers4rel, %$ct4rel);#hash slice
|
||||
return $ct4rel;
|
||||
}
|
||||
|
||||
|
||||
# Rounding like "Kaufmannsrunden"
|
||||
# Descr. http://de.wikipedia.org/wiki/Rundung
|
||||
# Inspired by
|
||||
|
|
@ -596,3 +842,5 @@ sub pathrun(){
|
|||
}
|
||||
|
||||
1;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -44,23 +44,6 @@ sub round(){
|
|||
return $rounded;
|
||||
}
|
||||
|
||||
#converts clock-time to minutes
|
||||
sub clock_minutes {
|
||||
my $self = shift;
|
||||
my $clockfloat = shift;# like 12:35
|
||||
my $day = 0;
|
||||
my $hour = 0;
|
||||
my $min = 0;
|
||||
|
||||
($hour,$min) = split(/:/, $clockfloat);
|
||||
($day,$hour) = split(/\sday\s/, $hour) if($hour =~ /\sday\s/);
|
||||
$hour += 24 * $day if($day && $day > 0);
|
||||
my $minutes = $min;
|
||||
$minutes = ($hour * 60) + $min if($hour && $hour > 0);
|
||||
|
||||
return $minutes;
|
||||
}
|
||||
|
||||
#for one freed rental
|
||||
#depends on operator, only 1 rental get freed_time
|
||||
sub count_freedrental {
|
||||
|
|
@ -141,14 +124,18 @@ sub counting_rental {
|
|||
#main counting rental time and convert it to minute
|
||||
my $dt0 = DateTime::Format::Pg->parse_datetime($computed_start_time);
|
||||
my $dt1 = DateTime::Format::Pg->parse_datetime($computed_end_time);
|
||||
|
||||
my $dur10 = $dt1->subtract_datetime($dt0);
|
||||
my ($durdd,$durhh,$durmm) = $dur10->in_units( 'days', 'hours','minutes' );
|
||||
my ($durmonth,$durdd,$durhh,$durmm) = $dur10->in_units( 'months', 'days', 'hours','minutes' );
|
||||
$durhh = sprintf('%.2d',$durhh);
|
||||
$durmm = sprintf('%.2d',$durmm);
|
||||
my $real_clock = "$durhh:$durmm";
|
||||
$real_clock = "$durdd day $durhh:$durmm" if($durdd);
|
||||
$real_clock = "$durmonth month $durdd day $durhh:$durmm" if($durmonth);
|
||||
my $computed_clock = $real_clock;
|
||||
my $rental_minute = $self->clock_minutes($computed_clock);
|
||||
my $dur = $dt0->delta_ms($dt1);
|
||||
my $rental_minute = $dur->{minutes};
|
||||
|
||||
|
||||
#if end_station == start_station and rental minutes < 5 minutes, then 0
|
||||
$rental_minute = 0 if($ctpos->{int04} && $ctpos->{int06} && $ctpos->{int04} == $ctpos->{int06} && $rental_minute && $rental_minute < 5);
|
||||
|
|
@ -162,7 +149,9 @@ sub counting_rental {
|
|||
#convert tariff unit by minute time
|
||||
my $tariff_unitbyminute = 60;#defaults to Stundentarif
|
||||
if($ctpos->{time01} && $ctpos->{time01} =~ /[1-9]/){
|
||||
$tariff_unitbyminute = $self->clock_minutes($ctpos->{time01});
|
||||
my ($dhh,$dmm) = split(/:/,$ctpos->{time01});
|
||||
$tariff_unitbyminute = $dmm if($dmm && $dmm > 0);
|
||||
$tariff_unitbyminute = ($dhh * 60) + $dmm if($dhh && $dhh > 0);
|
||||
}
|
||||
|
||||
#substract free time from rental time ex. 00:30 Min/Gratis
|
||||
|
|
@ -175,13 +164,17 @@ sub counting_rental {
|
|||
$dt0->add( hours => $dhh, minutes => $dmm ) if(looks_like_number($dhh) && looks_like_number($dmm));
|
||||
|
||||
my $cdur10 = $dt1->subtract_datetime($dt0);
|
||||
my ($durdd,$durhh,$durmm) = $cdur10->in_units( 'days', 'hours','minutes' );
|
||||
my ($durmonth,$durdd,$durhh,$durmm) = $cdur10->in_units( 'months', 'days', 'hours','minutes' );
|
||||
$durhh = sprintf('%.2d',$durhh);
|
||||
$durmm = sprintf('%.2d',$durmm);
|
||||
$computed_clock = "$durhh:$durmm";
|
||||
$computed_clock = "$durdd day $durhh:$durmm" if($durdd);
|
||||
$rental_minute = $self->clock_minutes($computed_clock);
|
||||
#print "$computed_clock|$rental_minute";
|
||||
$computed_clock = "$durmonth month $durdd day $durhh:$durmm" if($durmonth);
|
||||
$rental_minute = 0;
|
||||
if($dt1 > $dt0){
|
||||
my $dur = $dt0->delta_ms($dt1);
|
||||
$rental_minute = $dur->{minutes};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue