Merge pull request #165 from uplink42/dev

fixed bug with totals
uplink42 · Apr 25, 2017 · 8d4f9d6 · 8d4f9d6
2 parents 118d05d + 10ab51a
commit 8d4f9d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/application/controllers/Updater.php b/application/controllers/Updater.php
@@ -87,7 +87,7 @@ public function index()
                                 $this->load->model('Updater_profit_model', 'profits');
                                 $this->profits->beginProfitCalculation($username);
                                 // update totals and history
-                                $this->Updater_model->updateTotals();
+                                $this->Updater_model->updateTotals($username);
                                 $this->db->trans_complete();
 
                                 if ($this->db->trans_status() === false) {

diff --git a/application/controllers/internal/Async_procedure.php b/application/controllers/internal/Async_procedure.php
@@ -47,7 +47,7 @@ public function index($iduser)
                 $this->load->model('Updater_profit_model', 'profits');
                 $this->profits->beginProfitCalculation($username);
                 // update totals and history
-                $this->Updater_model->updateTotals(true, $username);
+                $this->Updater_model->updateTotals($username, true);
 		        // send email
                 $this->db->where('iduser', $iduser);
                 $query = $this->db->get('user');

diff --git a/application/models/Updater_model.php b/application/models/Updater_model.php
@@ -727,14 +727,8 @@ public function setNewInfo() : void
      * @param  string|null  $user   username
      * @return array              result list, only for non global update
      */
-    public function updateTotals(bool $global = false, string $user = null)
+    public function updateTotals(string $user = null, bool $global = false)
     {
-        if (!$global) {
-            $username = $this->username;
-        } else {
-            $username = $user;
-        }
-
         $this->db->select('name, character_eve_idcharacter');
         $this->db->where('username', $username);
         $character_list = $this->db->get('v_user_characters');