diff --git a/_class/class_money_deposit.php b/_class/class_money_deposit.php
index a528407..69a3789 100644
--- a/_class/class_money_deposit.php
+++ b/_class/class_money_deposit.php
@@ -93,7 +93,7 @@ class money_deposit {
}
- public function create_money_deposit($_user_id, $_date, $_sum) {
+ public static function create_money_deposit($_user_id, $_date, $_sum) {
global $sql;
return $sql->insert_into('money_deposit', array(
'mod_user_kid_uk_id' => $_user_id,
@@ -103,7 +103,7 @@ class money_deposit {
);
}
- public function update_money_deposit($_user_id, $_date, $_sum, $_mod_id) {
+ public static function update_money_deposit($_user_id, $_date, $_sum, $_mod_id) {
global $sql;
$sql->update_table('money_deposit', array(
'mod_user_kid_uk_id' => $_user_id,
diff --git a/_class/class_money_expense.php b/_class/class_money_expense.php
index e2c3b80..3f175ac 100644
--- a/_class/class_money_expense.php
+++ b/_class/class_money_expense.php
@@ -106,10 +106,10 @@ class money_expense {
));
}
- public static function update_money_expense_category($_name, $_date, $_item, $_sum, $_moxc_id, $_id) {
+ public static function update_money_expense($_name, $_date, $_item, $_sum, $_moxc_id, $_id) {
global $sql;
- $sql->update_table('money_expense_category',
+ $sql->update_table('money_expense',
array(
'mox_name' => $_name,
'mox_date' => $_date,
diff --git a/_include/include_delete_money_expense.php b/_include/include_delete_money_expense.php
index ac66fc9..32a0ce7 100644
--- a/_include/include_delete_money_expense.php
+++ b/_include/include_delete_money_expense.php
@@ -2,7 +2,9 @@
if ($this->is_id()) {
$sql->update_table('money_expense', array('mox_deleted' => 1), array('mox_id' => $this->get_id()));
- log::register('delete_mox', $this->get_id());
+ $mox = new money_expense();
+ $mox->set_mox_data_by_id($this->get_id());
+ log::register('delete_mox', $mox->get_mox_item() . ": " . $mox->get_mox_sum() . " Ft");
header("Location: /admin/money_expense");
}
diff --git a/_include/include_delete_money_expense_category.php b/_include/include_delete_money_expense_category.php
index 115c0ca..362345f 100644
--- a/_include/include_delete_money_expense_category.php
+++ b/_include/include_delete_money_expense_category.php
@@ -3,6 +3,14 @@
if ($this->is_id()) {
$sql->update_table('money_expense_category', array('moxc_deleted' => 1), array('moxc_id' => $this->get_id()));
log::register('delete_moxc', $this->get_id());
+
+ //akiknek ez a moxc_id van beállítva, azoknál null-ra állítjuk
+ $mox_query = "SELECT mox_id FROM money_expense WHERE mox_money_expense_category_moxc_id = " . $this->get_id();
+ $mox_assoc_array = $sql->assoc_array($mox_query);
+ foreach ($mox_assoc_array as $uk_id) {
+ $sql->update_table('money_expense', array('mox_money_expense_category_moxc_id' => 'null'), array('mox_id' => $uk_id['mox_id']));
+ }
+
header("Location: /admin/money_expense_category");
}
diff --git a/event_handler.php b/event_handler.php
index 61dcb43..85aef4b 100644
--- a/event_handler.php
+++ b/event_handler.php
@@ -273,13 +273,13 @@ if (isset($_POST['action'])) {
case 'mox_create':
# befizetés létrehozása
$new_mox_id = money_expense::create_money_expense($_POST['mox_name'], $_POST['mox_date'], $_POST['mox_item'], $_POST['mox_sum'], $_POST['mox_moxc_id']);
- log::register('new_mox', $new_mox_id);
+ log::register('new_mox', $_POST['mox_item'] . ": " . $_POST['mox_sum'] . " Ft");
header("Location: /admin/money_expense");
break;
case 'mox_update':
# befizetés módosítása
money_expense::update_money_expense($_POST['mox_name'], $_POST['mox_date'], $_POST['mox_item'], $_POST['mox_sum'], $_POST['mox_moxc_id'], $_POST['mox_id']);
- log::register('update_mox', $_POST['mox_id']);
+ log::register('update_mox', $_POST['mox_item'] . ": " . $_POST['mox_sum'] . " Ft");
header("Location: /admin/money_expense");
case 'settings_data_edit':
$sql->update_table('setting_value',
diff --git a/template/templates/money_expense_data_edit.tpl b/template/templates/money_expense_data_edit.tpl
index 5f68282..e4962d0 100644
--- a/template/templates/money_expense_data_edit.tpl
+++ b/template/templates/money_expense_data_edit.tpl
@@ -3,8 +3,8 @@
-
-
+
+