From 392b484666794723b2a5396ce288681d7111cf6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B3th=20Rich=C3=A1rd?= Date: Sun, 18 Mar 2018 17:37:52 +0100 Subject: [PATCH] bug fixes. added payment type to deposits --- _ajax/get_parent_data.php | 3 +- _class/class_money_deposit.php | 25 ++++++++++-- _class/class_payment_type.php | 41 ++++++++++++++++++++ _image/transaction.png | Bin 0 -> 10890 bytes _include/include_create.php | 11 ++++-- _include/include_information.php | 5 +-- _include/include_money_deposit.php | 9 +++-- event_handler.php | 7 ++-- index.php | 2 +- template/templates/money_deposit.tpl | 14 ++++--- template/templates/money_deposit_create.tpl | 17 +++++++- template/templates/money_deposit_update.tpl | 17 +++++++- template/templates/parent_create.tpl | 8 ++-- template/templates/setting_data_edit.tpl | 24 ++++++------ 14 files changed, 139 insertions(+), 44 deletions(-) create mode 100644 _class/class_payment_type.php create mode 100644 _image/transaction.png diff --git a/_ajax/get_parent_data.php b/_ajax/get_parent_data.php index bf04e13..74985fb 100755 --- a/_ajax/get_parent_data.php +++ b/_ajax/get_parent_data.php @@ -11,7 +11,6 @@ if ($_POST['parent_id'] == 'null') { $parent_query = "SELECT * FROM user_parent WHERE up_id = " . $_POST['parent_id']; $parent_assoc_array = $sql->assoc_array($parent_query); - $ret_array = array( $parent_assoc_array[0]['up_email'], $parent_assoc_array[0]['up_phone'], @@ -20,4 +19,4 @@ $ret_array = array( echo json_encode($ret_array); -?> \ No newline at end of file +?> diff --git a/_class/class_money_deposit.php b/_class/class_money_deposit.php index 69a3789..d45d171 100644 --- a/_class/class_money_deposit.php +++ b/_class/class_money_deposit.php @@ -10,6 +10,7 @@ class money_deposit { private $mod_user_kid; //OBJECT private $mod_date; private $mod_sum; + private $mod_payment_type; private $mod_deleted; public function set_mod_id($_id) { @@ -32,6 +33,10 @@ class money_deposit { $this->mod_sum = $_sum; } + public function set_mod_payment_type_pt_id($_payment_type) { + $this->mod_payment_type = $_payment_type; + } + public function set_mod_deleted($_deleted) { $this->mod_deleted = $_deleted; } @@ -48,6 +53,10 @@ class money_deposit { return $this->mod_user_kid; } + public function get_mod_payment_type_pt_id() { + return $this->mod_payment_type; + } + public function get_mod_date($_formatted = false) { return !$_formatted ? $this->mod_date : date("Y. m. d.", strtotime($this->mod_date)); @@ -55,7 +64,7 @@ class money_deposit { public function get_mod_date_day() { $day = date("d", strtotime($this->mod_date)); - if (substr($day, 0, 1) == '0') return substr($day, 1, 1); + if (substr($day, 0, 1) == '0') return substr($day, 1, 1); return date("d", strtotime($this->mod_date)); } @@ -89,25 +98,33 @@ class money_deposit { $new_user->set_user_data_by_id($value); $this->set_mod_user_kid($new_user); } + if ($field == "mod_payment_type") { + $new_pt = new payment_type(); + $new_pt->set_pt_data_by_id($value); + $this->set_mod_payment_type_pt_id($new_pt); + } + } } - public static function create_money_deposit($_user_id, $_date, $_sum) { + public static function create_money_deposit($_user_id, $_date, $_sum, $_pt) { global $sql; return $sql->insert_into('money_deposit', array( 'mod_user_kid_uk_id' => $_user_id, 'mod_date' => $_date, + 'mod_payment_type_pt_id' => $_pt, 'mod_sum' => $_sum ) ); } - public static function update_money_deposit($_user_id, $_date, $_sum, $_mod_id) { + public static function update_money_deposit($_user_id, $_date, $_sum, $_mod_id, $_pt) { global $sql; $sql->update_table('money_deposit', array( 'mod_user_kid_uk_id' => $_user_id, 'mod_date' => $_date, + 'mod_payment_type_pt_id' => $_pt, 'mod_sum' => $_sum ), array( 'mod_id' => $_mod_id @@ -118,4 +135,4 @@ class money_deposit { } -?> \ No newline at end of file +?> diff --git a/_class/class_payment_type.php b/_class/class_payment_type.php new file mode 100644 index 0000000..a23e532 --- /dev/null +++ b/_class/class_payment_type.php @@ -0,0 +1,41 @@ +pt_id = $_id; + } + + public function get_pt_id() { + return $this->pt_id; + } + + public function set_pt_name($_name) { + $this->pt_name = $_name; + } + + public function get_pt_name() { + return $this->pt_name; + } + + public function set_pt_data_by_id($_id) { + global $sql; + $mod_query = "SELECT * FROM payment_type WHERE pt_id = " . $_id . ";"; + $mod_assoc_array = $sql->assoc_array($mod_query); + foreach ($mod_assoc_array[0] as $field => $value) { + $function_name = "set_" . $field; + $this->$function_name($value); //alapadatok beállítása + } + + } + +} + +?> diff --git a/_image/transaction.png b/_image/transaction.png new file mode 100644 index 0000000000000000000000000000000000000000..092568d6a34b81b57812e597d9c62f505d28ad78 GIT binary patch literal 10890 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 zget_id()) { //COACH ARRAY $coach_data_query = "SELECT * FROM user_coach WHERE ua_deleted = 0;"; $coach_data_assoc_array = $sql->assoc_array($coach_data_query); - + $coach_array = array(); foreach ($coach_data_assoc_array as $coach_data) { @@ -116,7 +116,10 @@ switch ($this->get_id()) { $smarty->assign('user_kid_id', $_POST['mod_user_kid_uk_id']); } + $pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;'); + $smarty->assign('user_kids', $user_kids); + $smarty->assign('pt_assoc_array', $pt_assoc_array); $smarty->display('money_deposit_create.tpl'); break; @@ -142,7 +145,7 @@ switch ($this->get_id()) { //létrehozzá, és hozzáfűzi az ID-t a dátumhoz //visszatér a backup oldalra //backup classből hívogat, statikusan - + $new_bu_id = $sql->insert_into('backup', array('bu_date' => date('Y-m-d H:i:s'))); $sql->update_table('backup', array('bu_name' => date('Ymd_Hi') . '_' . $new_bu_id), array('bu_id' => $new_bu_id)); //log @@ -171,7 +174,7 @@ switch ($this->get_id()) { $camp_type_array[] = $new_ct; } $smarty->assign('camp_type_array', $camp_type_array); - + //labda típusok hozzáadása $shuttle_assoc_array = $sql->assoc_array("SELECT * FROM camp_shuttle_type WHERE cst_deleted = 0 ORDER BY cst_id ASC"); @@ -215,4 +218,4 @@ switch ($this->get_id()) { } -?> \ No newline at end of file +?> diff --git a/_include/include_information.php b/_include/include_information.php index 46a562f..fefc4f6 100644 --- a/_include/include_information.php +++ b/_include/include_information.php @@ -2,17 +2,16 @@ # INFORMÁCIÓK - $info_query = "SELECT setv_id FROM setting_value JOIN setting ON setv_setting_set_id = set_id WHERE set_name = 'Információk'"; + $info_query = "SELECT set_id FROM setting_value JOIN setting ON setv_setting_set_id = set_id WHERE set_name = 'Információk'"; $setv_id = $sql->single_variable($info_query); $new_setval = new setting_value(); $new_setval->set_setting_value_data_by_id($setv_id); - $smarty->assign('setting', $new_setval); $smarty->display('information.tpl'); -?> \ No newline at end of file +?> diff --git a/_include/include_money_deposit.php b/_include/include_money_deposit.php index e536380..e260d3b 100644 --- a/_include/include_money_deposit.php +++ b/_include/include_money_deposit.php @@ -21,11 +21,14 @@ if ($this->is_id()) { $user_kids[] = $new_kid; } + $pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;'); + $smarty->assign('user_kids', $user_kids); $smarty->assign("mod", $mod); + $smarty->assign('pt_assoc_array', $pt_assoc_array); $smarty->display("money_deposit_update.tpl"); - + } else { # BEFIZETÉS LISTA @@ -37,11 +40,11 @@ else { $new_mod = new money_deposit(); $new_mod->set_mod_data_by_id($mod['mod_id']); $mod_array[] = $new_mod; - } + } $smarty->assign("mod_array", $mod_array); $smarty->display("money_deposit.tpl"); } -?> \ No newline at end of file +?> diff --git a/event_handler.php b/event_handler.php index eb25d81..1982306 100644 --- a/event_handler.php +++ b/event_handler.php @@ -99,7 +99,7 @@ if (isset($_POST['action'])) { $kid->update_filters(); //filter update end log::register('update_member', $uid); - //header("Location: " . $actual_link); + header("Location: " . $actual_link); break; default: @@ -296,7 +296,7 @@ if (isset($_POST['action'])) { break; case 'money_deposit_create': # új befizetés létrehozása - $new_mod_id = money_deposit::create_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum']); + $new_mod_id = money_deposit::create_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_payment_type']); $tmp_user = new user_kid(); $tmp_user->set_user_data_by_id($_POST['mod_user_kid_uk_id']); log::register('new_money_deposit', $tmp_user->get_uk_name() . ': ' . $_POST['mod_sum']. ' Ft (' . $_POST['mod_date'] . ')'); @@ -304,7 +304,7 @@ if (isset($_POST['action'])) { break; case 'money_deposit_update': # befizetés módosítás - money_deposit::update_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_id']); + money_deposit::update_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_id'], $_POST['mod_payment_type']); $tmp_user = new user_kid(); $tmp_user->set_user_data_by_id($_POST['mod_user_kid_uk_id']); log::register('update_money_deposit', $tmp_user->get_uk_name() . ': ' . $_POST['mod_sum']. ' Ft (' . $_POST['mod_date'] . ')'); @@ -345,6 +345,7 @@ if (isset($_POST['action'])) { ) ); + header("Location: /admin/settings/".$_POST['set_id']); break; case 'camp_type_create': # tábor típus létrehozása diff --git a/index.php b/index.php index 1d9ea5b..64929cd 100644 --- a/index.php +++ b/index.php @@ -33,7 +33,7 @@ setlocale(LC_ALL, 'hu_HU'); - + get_mod_date()|substr:5:2 != $mod_array[$mod@index-1]->get_mod_date()|substr:5:2} - {$mod_array[$mod@index]->get_mod_date()|substr:0:4}. + {$mod_array[$mod@index]->get_mod_date()|substr:0:4}. {$months[$mod_array[$mod@index]->get_mod_date()|substr:5:2]} @@ -25,7 +25,11 @@ - +
- + {if $mod->get_mod_payment_type_pt_id() == 1} + + {else} + + {/if} {$mod->get_mod_user_kid()->get_uk_name()} @@ -37,7 +41,7 @@ {$mod->get_mod_sum()|number_format:0:'':' '} Ft
@@ -77,8 +81,8 @@ $( document ).ready(function() { var div_list = $( ".list" ).find( divs ); open_block(div_list[0].id); - + }); - \ No newline at end of file + diff --git a/template/templates/money_deposit_create.tpl b/template/templates/money_deposit_create.tpl index 4f2d19e..45f93a1 100644 --- a/template/templates/money_deposit_create.tpl +++ b/template/templates/money_deposit_create.tpl @@ -13,6 +13,19 @@ +
+ +
+ +
+
+
@@ -23,7 +36,7 @@
- +
@@ -31,4 +44,4 @@
-
\ No newline at end of file + diff --git a/template/templates/money_deposit_update.tpl b/template/templates/money_deposit_update.tpl index bf22175..66fa63f 100644 --- a/template/templates/money_deposit_update.tpl +++ b/template/templates/money_deposit_update.tpl @@ -17,6 +17,19 @@ +
+ +
+ +
+
+
@@ -27,7 +40,7 @@
- +
@@ -35,4 +48,4 @@
-
\ No newline at end of file + diff --git a/template/templates/parent_create.tpl b/template/templates/parent_create.tpl index 56e1db9..d76b552 100644 --- a/template/templates/parent_create.tpl +++ b/template/templates/parent_create.tpl @@ -1,7 +1,7 @@
- +
@@ -18,8 +18,8 @@
- -
+ +
@@ -29,4 +29,4 @@
-
\ No newline at end of file + diff --git a/template/templates/setting_data_edit.tpl b/template/templates/setting_data_edit.tpl index 095d621..ccdc81d 100644 --- a/template/templates/setting_data_edit.tpl +++ b/template/templates/setting_data_edit.tpl @@ -1,6 +1,6 @@ - + {if $setting->get_setv_setting()->get_set_setting_type_st_id() == 1}
@@ -14,7 +14,7 @@
- +
@@ -37,19 +37,19 @@
{foreach $backups as $backup} - {if + {if $backup@first || ( - $backups[$backup@index]->get_bu_date()|substr:5:2 != $backups[$backup@index-1]->get_bu_date()|substr:5:2 + $backups[$backup@index]->get_bu_date()|substr:5:2 != $backups[$backup@index-1]->get_bu_date()|substr:5:2 ) - + } - {if !$backup@first && + {if !$backup@first && $backups[$backup@index]->get_bu_date()|substr:5:2 != $backups[$backup@index-1]->get_bu_date()|substr:5:2 }
{/if} - {$backups[$backup@index]->get_bu_date()|substr:0:4}. + {$backups[$backup@index]->get_bu_date()|substr:0:4}. {$months[$backups[$backup@index]->get_bu_date()|substr:5:2]} @@ -57,7 +57,7 @@ {/if}
- {$backup->get_bu_date()|date_format:"%Y.%m.%d %H:%M"} #{$backup->get_bu_id()} + {$backup->get_bu_date()|date_format:"%Y.%m.%d %H:%M"} #{$backup->get_bu_id()}
@@ -114,8 +114,10 @@ $( document ).ready(function() { $( ".list" ).find( divs ).hide(); var div_list = $( ".list" ).find( divs ); - open_block(div_list[0].id); - + if (div_list[0] !== undefined) { + open_block(div_list[0].id); + } + }); @@ -133,4 +135,4 @@ function open_kid_menu(uk_id) { } - \ No newline at end of file +