diff --git a/application/controllers/Profits.php b/application/controllers/Profits.php index ceb89ea8..a77885f3 100644 --- a/application/controllers/Profits.php +++ b/application/controllers/Profits.php @@ -1,5 +1,6 @@ load->model('Profits_model', 'profits'); } - /** * Loads the Profits page * @param int $character_id diff --git a/application/controllers/Transactions.php b/application/controllers/Transactions.php index 59cd0e07..46ca79f1 100644 --- a/application/controllers/Transactions.php +++ b/application/controllers/Transactions.php @@ -1,5 +1,6 @@ ' . Msg::DB_ERROR); } else { try { - $this->Updater_model->calculateProfits(); - //totals and history - $this->Updater_model->updateTotals(true, $username); + $this->load->model('Updater_profit_model', 'profits'); + $this->profits->beginProfitCalculation($username); + // update totals and history + $this->Updater_model->updateTotals(); // send email $this->db->where('iduser', $iduser); $query = $this->db->get('user'); diff --git a/application/models/internal/Autoexec_updater_model.php b/application/models/internal/Autoexec_updater_model.php new file mode 100644 index 00000000..ec45de69 --- /dev/null +++ b/application/models/internal/Autoexec_updater_model.php @@ -0,0 +1,30 @@ +db->select('username, iduser'); + $this->db->from('user'); + //$this->db->where('iduser <=', '1415'); + $this->db->order_by('iduser', 'asc'); + $query = $this->db->get(); + + $result = $query->result(); + + return $result; + } +} diff --git a/application/views/home/home_v.php b/application/views/home/home_v.php index 7712a7a2..7c7dfb05 100644 --- a/application/views/home/home_v.php +++ b/application/views/home/home_v.php @@ -16,12 +16,8 @@
-

Eve Trade Master 2.0

-

a web based profit tracker, asset manager and much more!

diff --git a/assets/luna/styles/sass/partials/_body.scss b/assets/luna/styles/sass/partials/_body.scss index 85240332..18c2c188 100644 --- a/assets/luna/styles/sass/partials/_body.scss +++ b/assets/luna/styles/sass/partials/_body.scss @@ -41,7 +41,7 @@ body { } .navbar-fixed-top { - position: initial; + position: inherit; margin-bottom: 0; }