Changeset 207 for trunk


Ignore:
Timestamp:
May 4, 2009, 10:09:30 PM (16 years ago)
Author:
george
Message:
  • Upraveno: Tarify přepočítat jen ručně a ne při každém načtení stránky.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/finance/clenove.php

    r204 r207  
    1010  {
    1111    $Finance = $this->System->Modules['Finance'];
    12           $this->System->Modules['Finance']->RecalculateTariffs(1);
     12          $this->System->Modules['Finance']->LoadTariffs(1);
    1313          if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
    1414

  • trunk/finance/finance.php

    r204 r207  
    121121    $this->TotalPaid = $Row['MonthlyTotal'];
    122122 
    123     $this->RecalculateTariffs($Period);
    124123    $this->LoadTariffs($Period);
    125124  }
    … …  
    181180    }
    182181                $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateMemberPayment');       
     182    $this->RecalculateTariffs(1);
     183    $this->RecalculateTariffs(0);
    183184    return($Output);
    184185  }

  • trunk/finance/manage.php

    r205 r207  
    475475
    476476    $Output .= $Finance->RecalculateSegmentParameters();
    477     $Output .= $Finance->RecalculateTariffs();
     477    $Output .= $Finance->LoadTariffs();
    478478    //$InvoiceGenerator->CustomGenerate();
    479479    $Output .= $Finance->RecalculateMemberPayment();
    … …  
    560560      }
    561561
    562       $Output .= $Finance->RecalculateTariffs();
    563562            $Finance->RecalculateMemberPayment();
    564563      //CreateMonthlyOverallBill();

  • trunk/finance/user_state.php

    r205 r207  
    1111  {
    1212          $Finance = &$this->System->Modules['Finance'];
    13           $this->System->Modules['Finance']->RecalculateTariffs(1);
     13          $this->System->Modules['Finance']->LoadTariffs(1);
    1414
    1515    if(array_key_exists('old', $_GET))

  • trunk/finance/zivnost.php

    r182 r207  
    7777  {
    7878          if(!$this->System->Modules['User']->CheckPermission('Finance', 'TradingStatus')) return('Nemáte oprávnění');
    79     $this->System->Modules['Finance']->RecalculateTariffs(1);
     79    $this->System->Modules['Finance']->LoadTariffs(1);
    8080    //TransformFinance();
    8181

  • trunk/webcam/webcam_refresh.php

    r41 r207  
    77  if((time() - $Config['Web']['WebcamRefresh']) >= $ModifyTime)
    88  {
    9     $Output = shell_exec('wget "http://kamera-stred/Webcam.jpg?MobilePass='.$Config['Web']['WebcamPassword'].'&V=2&Q=2&B=2&U=0" -O webcam_cache.jpg -T 2');
     9    $Output = shell_exec('wget "http://kamera-stred/Webcam.jpg?MobilePass='.$Config['Web']['WebcamPassword'].'&V=2&Q=2&B=2&U=0" -O webcam_cache.jpg -T 4');
    1010  if((strpos($Output, 'failed') === false) and (strpos($Output, 'error') === false))
    1111    shell_exec('mv -f webcam_cache.jpg webcam.jpg');
Note: See TracChangeset for help on using the changeset viewer.