tothbt/code-cegled
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes. added payment type to deposits

Browse Source
This commit is contained in:
Tóth Richárd
2018-03-18 17:37:52 +01:00
parent 1e4aff020f
commit 392b484666
14 changed files with 139 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_ajax/get_parent_data.php
View File

@@ -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'],

21
_class/class_money_deposit.php
View File

@@ -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));
@@ -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

41
_class/class_payment_type.php Normal file
View File

@@ -0,0 +1,41 @@
<?php
/*
PAYMENT TYPE CLASS
*/
class payment_type {
private $pt_id;
private $pt_name;
public function set_pt_id($_id) {
$this->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
}
}
}
?>

BIN
_image/transaction.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

3
_include/include_create.php
View File

@@ -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;

3
_include/include_information.php
View File

@@ -2,13 +2,12 @@
# 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');

3
_include/include_money_deposit.php
View File

@@ -21,9 +21,12 @@ 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");
}

7
event_handler.php
View File

@@ -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

2
index.php
View File

@@ -33,7 +33,7 @@ setlocale(LC_ALL, 'hu_HU');
<meta name="msapplication-TileImage" content="/_image/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<?php

6
template/templates/money_deposit.tpl
View File

@@ -25,7 +25,11 @@
<table class="money">
<tr>
<td class="icon">
<img src="/_image/deposit.png">
{if $mod->get_mod_payment_type_pt_id() == 1}
<img src="/_image/deposit.png">
{else}
<img src="/_image/transaction.png">
{/if}
</td>
<td>
{$mod->get_mod_user_kid()->get_uk_name()}

13
template/templates/money_deposit_create.tpl
View File

@@ -13,6 +13,19 @@
</div>
</div>
<div>
<label class="desc" for="mod_payment_type">Befizetés típusa:</label>
<div>
<select name="mod_payment_type" id="mod_payment_type">
{foreach $pt_assoc_array as $pt_array}
<option value="{$pt_array.pt_id}">
{$pt_array.pt_name}
</option>
{/foreach}
</select>
</div>
</div>
<div>
<label class="desc" id="title1" for="mod_date">Dátum:</label>
<div><input type="text" name="mod_date" id="mod_date" value="{$today}" required></div>

13
template/templates/money_deposit_update.tpl
View File

@@ -17,6 +17,19 @@
</div>
</div>
<div>
<label class="desc" for="mod_payment_type">Típus:</label>
<div>
<select name="mod_payment_type" id="mod_payment_type">
{foreach $pt_assoc_array as $pt_array}
<option value="{$pt_array.pt_id}"{if $pt_array.pt_id == $mod->get_mod_payment_type_pt_id()} selected{/if}>
{$pt_array.pt_name}
</option>
{/foreach}
</select>
</div>
</div>
<div>
<label class="desc" id="title1" for="mod_date">Dátum:</label>
<div><input type="text" name="mod_date" id="mod_date" value="{$mod->get_mod_date()}" required></div>

4
template/templates/parent_create.tpl
View File

@@ -18,8 +18,8 @@
</div>
<div>
<label class="desc" id="title1" for="up_phone">Facebook:</label>
<div><input type="text" name="up_phone" id="up_phone"></div>
<label class="desc" id="title1" for="up_facebook">Facebook:</label>
<div><input type="text" name="up_facebook" id="up_facebook"></div>
</div>
<div>

4
template/templates/setting_data_edit.tpl
View File

@@ -114,7 +114,9 @@ $( 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);
}
});