Skip to content

Commit

Permalink
Remove unused balance tariff method and fix labels
Browse files Browse the repository at this point in the history
  • Loading branch information
tvup committed Apr 30, 2024
1 parent da210f8 commit 1329a9f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
18 changes: 1 addition & 17 deletions app/Http/Controllers/ElController.php
Original file line number Diff line number Diff line change
Expand Up @@ -569,21 +569,6 @@ private function getTSOOperatorSystemtariff(string $operator) : array
return $this->getChargePrice($operator, $chargeType, $chargeTypeCode, $note, $startDate, $endDate);
}

/**
* @param string $operator
* @return array<int, float>
*/
private function getTSOOperatorBalancetariff(string $operator) : array
{
$chargeType = 'D03';
$chargeTypeCode = '45013';
$note = 'Balancetarif for forbrug';
$startDate = '2024-01-01';
$endDate = '2024-12-31';

return $this->getChargePrice($operator, $chargeType, $chargeTypeCode, $note, $startDate, $endDate);
}

/**
* @param string $operator
* @return array<int, float>
Expand Down Expand Up @@ -621,7 +606,6 @@ public function apiGetTotalPriceToday(string $glnNumber) : array
}
$tsoNetTariffPrices = $this->getTSOOperatorNettariff('Energinet Systemansvar A/S (SYO)');
$tsoSystemTariffPrices = $this->getTSOOperatorSystemtariff('Energinet Systemansvar A/S (SYO)');
$tsoBalanceTariffPrices = $this->getTSOOperatorBalancetariff('Energinet Systemansvar A/S (SYO)');
$tsoAfgiftTariffPrices = $this->getTSOOperatorAfgifttariff('Energinet Systemansvar A/S (SYO)');

$totalPrice = [];
Expand All @@ -633,7 +617,7 @@ public function apiGetTotalPriceToday(string $glnNumber) : array
$totalPrice[] = [
'time' => $now2->addHours($i)->toDateTimeString(),
'price' => round(
($gridprices[$j] + ($spotPrices[$i] / 1000) + $tsoNetTariffPrices[0] + $tsoSystemTariffPrices[0] + $tsoBalanceTariffPrices[0] + $tsoAfgiftTariffPrices[0]) * 1.25,
($gridprices[$j] + ($spotPrices[$i] / 1000) + $tsoNetTariffPrices[0] + $tsoSystemTariffPrices[0] + $tsoAfgiftTariffPrices[0]) * 1.25,
2
),
];
Expand Down
4 changes: 2 additions & 2 deletions resources/views/el.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
</div>

<div class="form-group">
<label for="exampleInputEmail1">{{ __('Subscription price pr. month by balance supplier ex. VAT in DKK.') }}</label>
<label for="subscription">{{ __('Subscription price pr. month by balance supplier ex. VAT in DKK.') }}</label>
<input type="text" name="subscription" id="subscription" class="form-control" required="" value="{{ old('subscription') ? : 23.20}}">
</div>
<div class="form-group">
<label for="exampleInputEmail1">{{ __('Overhead by balance supplier on spot price ex. VAT in DKK.') }}</label>
<label for="overhead">{{ __('Overhead by balance supplier on spot price ex. VAT in DKK.') }}</label>
<input type="text" name="overhead" id="overhead" class="form-control" required="" value="{{ old('overhead') ? : 0.015}}">
</div>

Expand Down

0 comments on commit 1329a9f

Please sign in to comment.