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

lease can be chosen from money deposit form

Browse Source
This commit is contained in:
Tóth Richárd
2019-08-26 16:16:55 +02:00
parent 5bef1596f4
commit 502531afaf
9 changed files with 215 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
_ajax/get_lease_sum.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
//tag listánál ez adja vissza a keresés eredményét
ini_set('include_path', '../_class/');
include('class_sql.php');
if ($_SERVER['HTTP_HOST'] == 'cegledcoach.hu') $sql = new sql('bcd_mysql','root','','badminton_coach');
else $sql = new sql('localhost','livingsp_coach','R186er012qw5','livingsp_badminton');
if (empty($_GET['lease_id'])) {
echo json_encode(null);
}
else {
$l_query = "SELECT l_sum FROM lease WHERE l_id = " . $_GET['lease_id'];
$l_sum = $sql->single_variable($l_query);
echo json_encode($l_sum);
}
?>

22
_class/class_money_deposit.php
View File

@@ -12,6 +12,7 @@ class money_deposit {
private $mod_money_income; //OBJECT
private $mod_deleted;
private $mod_sets_expire_date;
private $mod_lease_l_id; //OBJECT
public function set_mod_id($_id) {
$this->mod_id = $_id;
@@ -41,6 +42,10 @@ class money_deposit {
$this->mod_sets_expire_date = $_sets_expire_date;
}
public function set_mod_lease_l_id($_lease_l_id) {
$this->mod_lease_l_id = $_lease_l_id;
}
public function get_mod_id() {
return $this->mod_id;
}
@@ -69,6 +74,10 @@ class money_deposit {
return $this->mod_sets_expire_date;
}
public function get_mod_lease_l_id() {
return $this->mod_lease_l_id;
}
public function set_mod_data_by_id($_id) {
global $sql;
$mod_query = "SELECT * FROM money_deposit WHERE mod_id = " . $_id . ";";
@@ -87,10 +96,15 @@ class money_deposit {
$new_mi->set_mi_data_by_id($value);
$this->set_mod_money_income($new_mi);
}
if ($field == "mod_lease_l_id" && $value !== null) {
$new_l = new lease();
$new_l->set_l_data_by_id($value);
$this->set_mod_lease_l_id($new_l);
}
}
}
public static function create_money_deposit($_user_id, $_date, $_sum, $_pt, $_sets_date = false) {
public static function create_money_deposit($_user_id, $_date, $_sum, $_lease, $_pt = 1, $_sets_date = false) {
global $sql;
$income_id = $sql->insert_into('money_income', array(
@@ -113,11 +127,12 @@ class money_deposit {
return $sql->insert_into('money_deposit', array(
'mod_user_kid_uk_id' => $_user_id,
'mod_money_income_mi_id' => $income_id,
'mod_sets_expire_date' => $_sets_date
'mod_sets_expire_date' => $_sets_date,
'mod_lease_l_id' => $_lease,
));
}
public static function update_money_deposit($_user_id, $_date, $_sum, $_mod_id, $_pt, $_mi_id) {
public static function update_money_deposit($_user_id, $_date, $_sum, $_lease, $_mod_id, $_pt, $_mi_id) {
global $sql;
$sql->update_table('money_income', array(
//'mod_user_kid_uk_id' => $_user_id,
@@ -130,6 +145,7 @@ class money_deposit {
$sql->update_table('money_deposit', array(
'mod_user_kid_uk_id' => $_user_id,
'mod_lease_l_id' => $_lease,
), array(
'mod_id' => $_mod_id
));

11
_include/include_create.php
View File

@@ -132,6 +132,17 @@ switch ($this->get_id()) {
$pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;');
//bérlettípusok
$l_assoc_array = $sql->assoc_array('SELECT * FROM lease WHERE l_deleted = 0 ORDER BY l_name ASC;');
$l_array = array();
foreach ($l_assoc_array as $key => $lease) {
$new_lease = new lease();
$new_lease->set_l_data_by_id($lease['l_id']);
$l_array[] = $new_lease;
}
$smarty->assign('lease_array',$l_array);
$smarty->assign('user_kids', $user_kids);
$smarty->assign('pt_assoc_array', $pt_assoc_array);
$smarty->display('money_deposit_create.tpl');

13
_include/include_money_deposit.php
View File

@@ -3,10 +3,6 @@
# HA NINCS ID, AKKOR BEFIZETÉS LISTA
# HA VAN ID, AKKOR BEFIZETÉS ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
if ($this->is_id()) {
# ADOTT BEFIZETÉS ADATINAK MEGTEKINTÉSE/MÓDOSÍTÁSA
$mod = new money_deposit();
@@ -23,7 +19,16 @@ if ($this->is_id()) {
$pt_assoc_array = $sql->assoc_array('SELECT * FROM payment_type ORDER BY pt_id ASC;');
$l_assoc_array = $sql->assoc_array('SELECT * FROM lease WHERE l_deleted = 0 ORDER BY l_name ASC;');
$l_array = array();
foreach ($l_assoc_array as $key => $lease) {
$new_lease = new lease();
$new_lease->set_l_data_by_id($lease['l_id']);
$l_array[] = $new_lease;
}
$smarty->assign('lease_array',$l_array);
$smarty->assign('user_kids', $user_kids);
$smarty->assign("mod", $mod);
$smarty->assign('pt_assoc_array', $pt_assoc_array);

4
event_handler.php
View File

@@ -290,7 +290,7 @@ if (isset($_POST['action'])) {
# új befizetés létrehozása
$sets_date = (isset($_POST['mod_sets_expire_date']) && $_POST['mod_sets_expire_date']) ? $_POST['mod_sets_expire_date'] : false;
$new_mod_id = money_deposit::create_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_payment_type'], $sets_date);
$new_mod_id = money_deposit::create_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_lease_l_id'], 1, $sets_date);
$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'] . ')');
@@ -305,7 +305,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'], $_POST['mod_payment_type'], $_POST['mi_id']);
money_deposit::update_money_deposit($_POST['mod_user_kid_uk_id'], $_POST['mod_date'], $_POST['mod_sum'], $_POST['mod_lease_l_id'], $_POST['mod_id'], 1, $_POST['mi_id']);
$tmp_user = new user_kid();
$tmp_user->set_user_data_by_id($_POST['mod_user_kid_uk_id']);
$tmp_user->update_balance();

10
queries/lease_201908241.sql
View File

@@ -28,3 +28,13 @@ CREATE TABLE `lease_training_type` (
INSERT INTO `log_category` (`logc_id`, `logc_name`, `logc_title`, `logc_type`, `logc_table`, `logc_field`, `logc_selector`) VALUES (NULL, 'new_lease', 'Új bérlettípus', '1', 'lease', 'l_name', 'l_id');
INSERT INTO `log_category` (`logc_id`, `logc_name`, `logc_title`, `logc_type`, `logc_table`, `logc_field`, `logc_selector`) VALUES (NULL, 'update_lease', 'Bérlettípus módosítása', '1', 'lease', 'l_name', 'l_id');
INSERT INTO `log_category` (`logc_id`, `logc_name`, `logc_title`, `logc_type`, `logc_table`, `logc_field`, `logc_selector`) VALUES (NULL, 'delete_lease', 'Bérlettípus törlése', '1', 'lease', 'l_name', 'l_id');
ALTER TABLE `money_deposit`
ADD COLUMN `mod_lease_l_id` INT NULL DEFAULT NULL,
ADD INDEX `fk_money_deposit_2_idx` (`mod_lease_l_id` ASC);
ALTER TABLE `money_deposit`
ADD CONSTRAINT `fk_money_deposit_2`
FOREIGN KEY (`mod_lease_l_id`)
REFERENCES `lease` (`l_id`)
ON DELETE SET NULL
ON UPDATE CASCADE;

41
template/templates/money_deposit_create.tpl
View File

@@ -13,7 +13,7 @@
</div>
</div>
<div>
{* <div>
<label class="desc" for="mod_payment_type">Fizetés típusa:</label>
<div>
<select name="mod_payment_type" id="mod_payment_type">
@@ -24,13 +24,27 @@
{/foreach}
</select>
</div>
</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>
</div>
<div>
<label for="mod_lease_l_id">Bérlettípus:</label>
<div>
<select name="mod_lease_l_id" id="mod_lease_l_id">
<option value="null">Nincs beállítva</option>
{foreach $lease_array as $lease}
<option value="{$lease->get_l_id()}">
{$lease->get_l_name()}
</option>
{/foreach}
</select>
</div>
</div>
<div>
<label class="desc" id="title1" for="mod_sum">Összeg:</label>
<div><input type="text" name="mod_sum" id="mod_sum" required></div>
@@ -46,6 +60,27 @@
<input class="button black" type="submit" value="Mentés">
</div>
</div>
</form>
</div>
<script type="text/javascript">
$('#mod_lease_l_id').on('change', function() {
var leaseId = $('#mod_lease_l_id option:selected').val();
$.ajax({
url: '/_ajax/get_lease_sum.php',
data: {
'lease_id' : leaseId
},
success: function(data, status, jqXHR) {
var pdata = JSON.parse(data);
if (null == pdata) {
$('#mod_sum').val('');
}
else {
$('#mod_sum').val(pdata);
}
}
});
});
</script>

42
template/templates/money_deposit_update.tpl
View File

@@ -18,7 +18,7 @@
</div>
</div>
<div>
{* <div>
<label class="desc" for="mod_payment_type">Fizetés típusa:</label>
<div>
<select name="mod_payment_type" id="mod_payment_type">
@@ -29,19 +29,32 @@
{/foreach}
</select>
</div>
</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_money_income()->get_mi_date()}" required></div>
</div>
<div>
<label for="mod_lease_l_id">Bérlettípus:</label>
<div>
<select name="mod_lease_l_id" id="mod_lease_l_id">
<option value="null">Nincs beállítva</option>
{foreach $lease_array as $lease}
<option value="{$lease->get_l_id()}" {if $lease->get_l_id() == $mod->get_mod_lease_l_id()->get_l_id()}selected{/if}>
{$lease->get_l_name()}
</option>
{/foreach}
</select>
</div>
</div>
<div>
<label class="desc" id="title1" for="mod_sum">Összeg:</label>
<div><input type="text" name="mod_sum" id="mod_sum" value="{$mod->get_mod_money_income()->get_mi_sum()}" required></div>
</div>
<div>
<div>
<input class="button black" type="submit" value="Mentés">
@@ -50,3 +63,26 @@
</form>
</div>
<script type="text/javascript">
$('#mod_lease_l_id').on('change', function() {
var leaseId = $('#mod_lease_l_id option:selected').val();
$.ajax({
url: '/_ajax/get_lease_sum.php',
data: {
'lease_id' : leaseId
},
success: function(data, status, jqXHR) {
var pdata = JSON.parse(data);
if (null == pdata) {
$('#mod_sum').val('');
}
else {
$('#mod_sum').val(pdata);
}
}
});
});
</script>

2
template/templates/training_data_create.tpl
View File

@@ -152,7 +152,7 @@
},
success: function(data, status, jqXHR) {
let pdata = JSON.parse(data);
console.log(pdata);
//console.log(pdata);
if (null === pdata) {
$('#tr_price').val('');
return;