admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleaning : rename table mod_payment to payment_method

Browse source
This commit is contained in:
Dany De Bontridder 2019-08-06 21:55:59 +02:00
parent 9e2b09cd0a
commit 56007e9d3d
3 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
include/class/acc_payment.class.php
View file

@ -20,7 +20,7 @@
// Copyright Author Dany De Bontridder danydb@aevalys.eu
/*!\file
* \brief Handle the table mod_payment
* \brief Handle the table payment_method
*/
require_once NOALYSS_INCLUDE.'/lib/iselect.class.php';
require_once NOALYSS_INCLUDE.'/lib/icard.class.php';
@ -31,7 +31,7 @@ require_once NOALYSS_INCLUDE.'/class/fiche_def.class.php';
require_once NOALYSS_INCLUDE.'/constant.php';
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
/*!\brief Handle the table mod_payment
/*!\brief Handle the table payment_method
*\note the private data member are accessed via
- mp_id ==> id ( Primary key )
- mp_lib ==> lib (label)
@ -106,7 +106,7 @@ class Acc_Payment
public function insert()
{
if ( $this->verify() != 0 ) return;
$sql='INSERT INTO mod_payment(
$sql='INSERT INTO payment_method(
mp_lib, mp_jrn_def_id, mp_fd_id, mp_qcode,jrn_def_id)
VALUES ($1, $2, $3, upper($4),$5) returning mp_id';
$this->mp_id=$this->cn->exec_sql($sql,array(
@ -121,7 +121,7 @@ class Acc_Payment
{
if ( $this->verify() != 0 ) return;
$sql="update mod_payment set mp_lib=$1,mp_qcode=$2,mp_jrn_def_id=$3,mp_fd_id=$4,jrn_def_id=$5 ".
$sql="update payment_method set mp_lib=$1,mp_qcode=$2,mp_jrn_def_id=$3,mp_fd_id=$4,jrn_def_id=$5 ".
" where mp_id = $6";
$res=$this->cn->exec_sql(
$sql,
@ -134,22 +134,22 @@ class Acc_Payment
);
if ( strlen (trim($this->mp_jrn_def_id))==0)
$this->cn->exec_sql(
'update mod_payment '.
'update payment_method '.
'set mp_jrn_def_id = null where mp_id=$1',
array($this->mp_id));
if ( strlen (trim($this->jrn_def_id))==0)
$this->cn->exec_sql(
'update mod_payment '.
'update payment_method '.
'set mp_jrn_def_id = null where mp_id=$1',
array($this->mp_id));
if ( strlen (trim($this->mp_qcode))==0)
$this->cn->exec_sql(
'update mod_payment '.
'update payment_method '.
'set mp_qcode = null where mp_id=$1',
array($this->mp_id));
if ( strlen (trim($this->mp_fd_id))==0)
$this->cn->exec_sql(
'update mod_payment '.
'update payment_method '.
'set mp_fd_id = null where mp_id=$1',
array($this->mp_id));
@ -157,7 +157,7 @@ class Acc_Payment
public function load()
{
$sql='select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_def_id from mod_payment '.
$sql='select mp_id,mp_lib,mp_fd_id,mp_jrn_def_id,mp_qcode,jrn_def_id from payment_method '.
' where mp_id = $1';
$res=$this->cn->exec_sql(
$sql,
@ -177,7 +177,7 @@ class Acc_Payment
*/
public function delete()
{
$sql="delete from mod_payment where mp_id=$1";
$sql="delete from payment_method where mp_id=$1";
$this->cn->exec_sql($sql,array($this->mp_id));
}
/*!\brief retrieve all the data for all ledgers
@ -187,7 +187,7 @@ class Acc_Payment
public function get_all()
{
$sql='select mp_id,mp_lib '.
' from mod_payment order by mp_lib';
' from payment_method order by mp_lib';
$array=$this->cn->get_array($sql);
$ret=array();
if ( !empty($array) )
@ -209,7 +209,7 @@ class Acc_Payment
public function get_valide()
{
$sql='select mp_id '.
' from mod_payment '.
' from payment_method '.
' where jrn_def_id=$1 and mp_jrn_def_id is not null and '.
' (mp_fd_id is not null or mp_qcode is not null)';
$array=$this->cn->get_array($sql,array($this->jrn_def_id));

2
include/payment_middle.inc.php
View file

@ -134,7 +134,7 @@ $array=$cn->get_array("
j2.jrn_def_name as jrn_target,
fd_label,
coalesce(mp_qcode,'A choisir à l''encodage') as vw_name
from mod_payment as mp
from payment_method as mp
left join jrn_def as j on (j.jrn_def_id=mp.jrn_def_id)
left join jrn_def as j2 on (j2.jrn_def_id=mp.mp_jrn_def_id)
left join fiche_def as fd on (mp.mp_fd_id=fd.fd_id)

15
sql/upgrade.sql
View file

@ -1 +1,16 @@
update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25;
alter table mod_payment rename to payment_method;
alter table payment_method add column type_payment_id varchar(6);
comment on column payment_method.type_payment_id is 'Type of payment method';
create table type_payment_ref (id varchar(6 ) primary key,tp_description varchar(80) not null);
insert into type_payment_ref (id,tp_description) values ('CACRD','Carte de crédit'),
('CHCK','Chèque'),
('CASH','Liquide'),
('ELECT','Electronique'),
('VIRT','Virement');