Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Commit

Permalink
reset pilot pay bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Nabeel Shahzad committed Feb 20, 2011
1 parent b64e3ab commit acb8be8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions core/common/PilotData.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ public static function resetPilotPay($pilotid) {

$sql = "SELECT `pirepid`, `flighttime`, `pilotpay`
FROM " . TABLE_PREFIX . "pireps
WHERE `pilotid`={$pilotid} AND `accepted`=" . PIREP_REJECTED;
WHERE `pilotid`={$pilotid} AND `accepted`=".PIREP_ACCEPTED;

$results = DB::get_results($sql);

Expand Down Expand Up @@ -631,17 +631,17 @@ public static function resetPilotPay($pilotid) {
public static function updatePilotPay($pilotid, $flighthours) {

$sql = 'SELECT payrate
FROM ' . TABLE_PREFIX . 'ranks r, ' . TABLE_PREFIX . 'pilots p
WHERE p.rank=r.rank
AND p.pilotid=' . $pilotid;
FROM ' . TABLE_PREFIX . 'ranks r, ' . TABLE_PREFIX . 'pilots p
WHERE p.rank=r.rank
AND p.pilotid=' . $pilotid;

$payrate = DB::get_row($sql);

$payupdate = self::getPilotPay($flighthours, $payrate->payrate);

$sql = 'UPDATE ' . TABLE_PREFIX . 'pilots
SET totalpay=totalpay+' . $payupdate . '
WHERE pilotid=' . $pilotid;
SET totalpay=totalpay+' . $payupdate . '
WHERE pilotid=' . $pilotid;

DB::query($sql);

Expand Down
2 changes: 1 addition & 1 deletion core/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
953
954
2 changes: 1 addition & 1 deletion install/hashlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ a2f0d20af9ded067faecc313e40b3e5c *./core/common/PilotGroups.class.php
bc52aa6628bc11211e77eb06261f74dd *./core/common/SchedulesData.class.php
e9f63aad57ccafcb8a1b267953432cdd *./core/common/UserGroups.class.php
e45ee0c21e2f6cec822252e59a5adaad *./core/common/Countries.class.php
eff9e5b2462365a957f478c89ea2f569 *./core/common/PilotData.class.php
995dc88165a09ff0f1665e11d01fa3f5 *./core/common/PilotData.class.php
9daa436be5011122490d123c00326ff9 *./core/common/GoogleChart.class.php
c0c3bdb82e34dcb69589cd77e169a383 *./core/common/SettingsData.class.php
0b1afcfae4793133402aeea081826f3e *./core/common/NavData.class.php
Expand Down
24 changes: 12 additions & 12 deletions install/structure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
<field Field="hub" Type="smallint(6)" Null="NO" Key="" Default="0" Extra="" />
<field Field="fuelprice" Type="float" Null="NO" Key="" Default="0" Extra="" />
<field Field="chartlink" Type="text" Null="NO" Key="" Extra="" />
<key Table="phpvms_airports" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="289" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_airports" Non_unique="0" Key_name="icao" Seq_in_index="1" Column_name="icao" Collation="A" Cardinality="289" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_airports" Engine="InnoDB" Version="10" Row_format="Compact" Rows="289" Avg_row_length="226" Data_length="65536" Max_data_length="0" Index_length="16384" Data_free="11534336" Auto_increment="1507" Create_time="2011-01-18 00:43:18" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<key Table="phpvms_airports" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="553" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_airports" Non_unique="0" Key_name="icao" Seq_in_index="1" Column_name="icao" Collation="A" Cardinality="553" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_airports" Engine="InnoDB" Version="10" Row_format="Compact" Rows="487" Avg_row_length="134" Data_length="65536" Max_data_length="0" Index_length="16384" Data_free="11534336" Auto_increment="1507" Create_time="2011-01-18 00:43:18" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_awards">
<field Field="awardid" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand Down Expand Up @@ -256,7 +256,7 @@
<field Field="lastip" Type="varchar(25)" Null="YES" Key="" Default="" Extra="" />
<field Field="comment" Type="text" Null="YES" Key="" Extra="" />
<key Table="phpvms_pilots" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="pilotid" Collation="A" Cardinality="77" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_pilots" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="5" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_pilots" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="6" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pilots" Engine="InnoDB" Version="10" Row_format="Compact" Rows="77" Avg_row_length="638" Data_length="49152" Max_data_length="0" Index_length="16384" Data_free="11534336" Auto_increment="151" Create_time="2011-01-18 00:43:18" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_pirepcomments">
Expand Down Expand Up @@ -310,8 +310,8 @@
<field Field="source" Type="varchar(25)" Null="NO" Key="" Extra="" />
<field Field="exported" Type="tinyint(4)" Null="NO" Key="" Extra="" />
<field Field="rawdata" Type="blob" Null="NO" Key="" Extra="" />
<key Table="phpvms_pireps" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="pirepid" Collation="A" Cardinality="133" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pireps" Engine="InnoDB" Version="10" Row_format="Compact" Rows="144" Avg_row_length="1592" Data_length="229376" Max_data_length="0" Index_length="0" Data_free="11534336" Auto_increment="518" Create_time="2011-01-18 00:43:18" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<key Table="phpvms_pireps" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="pirepid" Collation="A" Cardinality="121" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_pireps" Engine="InnoDB" Version="10" Row_format="Compact" Rows="113" Avg_row_length="2029" Data_length="229376" Max_data_length="0" Index_length="0" Data_free="11534336" Auto_increment="518" Create_time="2011-01-18 00:43:18" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_pirepvalues">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand Down Expand Up @@ -357,13 +357,13 @@
<field Field="notes" Type="text" Null="NO" Key="" Extra="" />
<field Field="enabled" Type="int(11)" Null="NO" Key="" Default="1" Extra="" />
<field Field="bidid" Type="int(11)" Null="NO" Key="" Default="0" Extra="" />
<key Table="phpvms_schedules" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="193" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="64" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="flightnum" Seq_in_index="1" Column_name="flightnum" Collation="A" Cardinality="193" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="64" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="2" Column_name="arricao" Collation="A" Cardinality="193" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="0" Key_name="PRIMARY" Seq_in_index="1" Column_name="id" Collation="A" Cardinality="58" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="58" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="flightnum" Seq_in_index="1" Column_name="flightnum" Collation="A" Cardinality="58" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="1" Column_name="depicao" Collation="A" Cardinality="58" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="depicao_arricao" Seq_in_index="2" Column_name="arricao" Collation="A" Cardinality="58" Null="" Index_type="BTREE" Comment="" />
<key Table="phpvms_schedules" Non_unique="1" Key_name="code" Seq_in_index="1" Column_name="code" Collation="A" Cardinality="4" Null="" Index_type="BTREE" Comment="" />
<options Name="phpvms_schedules" Engine="InnoDB" Version="10" Row_format="Compact" Rows="49" Avg_row_length="1337" Data_length="65536" Max_data_length="0" Index_length="65536" Data_free="11534336" Auto_increment="117" Create_time="2011-02-20 22:32:25" Collation="latin1_swedish_ci" Create_options="" Comment="" />
<options Name="phpvms_schedules" Engine="InnoDB" Version="10" Row_format="Compact" Rows="193" Avg_row_length="339" Data_length="65536" Max_data_length="0" Index_length="65536" Data_free="11534336" Auto_increment="117" Create_time="2011-02-20 22:32:25" Collation="latin1_swedish_ci" Create_options="" Comment="" />
</table_structure>
<table_structure name="phpvms_sessions">
<field Field="id" Type="int(11)" Null="NO" Key="PRI" Extra="auto_increment" />
Expand Down

0 comments on commit acb8be8

Please sign in to comment.