Browse Source

Fixes #61. Redundant named constant.

devel
Jonathan Rosenbaum 7 years ago
parent
commit
17684f6e10
  1. 5
      Connections/database_functions.php
  2. 3
      json/transaction.php

5
Connections/database_functions.php

@ -49,15 +49,12 @@ define("MEMBERSHIP_DISCOUNT",10); // PERCENTAGE
/********* /*********
STAND TIME STAND TIME
**********/ **********/
// Determines the behaviour of Stand Time (transaction_type_id) // Determines the hourly cost for Stand Time (transaction_type_id)
define("STAND_TIME_HOURLY_RATE",10); // IN DOLLARS define("STAND_TIME_HOURLY_RATE",10); // IN DOLLARS
// Define how much time over 1hr is allowed before charging for the next hour. // Define how much time over 1hr is allowed before charging for the next hour.
define("STAND_TIME_GRACE_PERIOD",15); // IN MINUTES 1 - 59 define("STAND_TIME_GRACE_PERIOD",15); // IN MINUTES 1 - 59
// Define hourly cost for stand time
define("STAND_TIME_VALUE",10); // IN DOLLARS
// Define how many free days of stand time are allotted after purchase of a bike // Define how many free days of stand time are allotted after purchase of a bike
define("FREE_STAND_TIME_PERIOD",30); // IN DAYS define("FREE_STAND_TIME_PERIOD",30); // IN DAYS

3
json/transaction.php

@ -14,7 +14,6 @@ $change_fund = CHANGE_FUND;
$csv_directory = CSV_DIRECTORY; $csv_directory = CSV_DIRECTORY;
$stand_time_hourly_rate = STAND_TIME_HOURLY_RATE; $stand_time_hourly_rate = STAND_TIME_HOURLY_RATE;
$stand_time_grace_period = STAND_TIME_GRACE_PERIOD; $stand_time_grace_period = STAND_TIME_GRACE_PERIOD;
$stand_time_value = STAND_TIME_VALUE;
$free_stand_time_period = FREE_STAND_TIME_PERIOD; $free_stand_time_period = FREE_STAND_TIME_PERIOD;
$timezone = TIMEZONE; $timezone = TIMEZONE;
$sweat_equity_limit = SWEAT_EQUITY_LIMIT; $sweat_equity_limit = SWEAT_EQUITY_LIMIT;
@ -160,7 +159,7 @@ $membership_discount = MEMBERSHIP_DISCOUNT;
$result["volunteer_discount"] = $volunteer_discount; $result["volunteer_discount"] = $volunteer_discount;
$result["special_volunteer_hours_qualification"] = $special_volunteer_hours_qualification; $result["special_volunteer_hours_qualification"] = $special_volunteer_hours_qualification;
$result["special_volunteer_discount"] = $special_volunteer_discount; $result["special_volunteer_discount"] = $special_volunteer_discount;
$result["stand_time_value"] = $stand_time_value; $result["stand_time_value"] = $stand_time_hourly_rate;
$result["redeem_one_to_one"] = $redeem_one_to_one; $result["redeem_one_to_one"] = $redeem_one_to_one;
$volunteers[] = $result; $volunteers[] = $result;
} }

Loading…
Cancel
Save