Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fk_type subscription list via api REST

Browse Source 
v10 to dev
This commit is contained in:
ptibogxiv
2020-03-03 11:58:15 +01:00
committed by GitHub
parent 5e6ee7888c
commit 060df57cb1
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
htdocs/adherents/class/adherent.class.php
View File

@@ -1377,48 +1377,49 @@ class Adherent extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
$sql = "SELECT c.rowid, c.fk_adherent, c.subscription, c.note, c.fk_bank,"; $sql = "SELECT c.rowid, c.fk_adherent, c.fk_type, c.subscription, c.note, c.fk_bank,";
$sql.= " c.tms as datem,"; $sql .= " c.tms as datem,";
$sql.= " c.datec as datec,"; $sql .= " c.datec as datec,";
$sql.= " c.dateadh as dateh,"; $sql .= " c.dateadh as dateh,";
$sql.= " c.datef as datef"; $sql .= " c.datef as datef";
$sql.= " FROM ".MAIN_DB_PREFIX."subscription as c"; $sql .= " FROM ".MAIN_DB_PREFIX."subscription as c";
$sql.= " WHERE c.fk_adherent = ".$this->id; $sql .= " WHERE c.fk_adherent = ".$this->id;
$sql.= " ORDER BY c.dateadh"; $sql .= " ORDER BY c.dateadh";
dol_syslog(get_class($this)."::fetch_subscriptions", LOG_DEBUG); dol_syslog(get_class($this)."::fetch_subscriptions", LOG_DEBUG);
$resql=$this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
$this->subscriptions=array(); $this->subscriptions = array();
$i=0; $i = 0;
while ($obj = $this->db->fetch_object($resql)) while ($obj = $this->db->fetch_object($resql))
{ {
if ($i==0) if ($i == 0)
{ {
$this->first_subscription_date=$this->db->jdate($obj->datec); $this->first_subscription_date = $this->db->jdate($obj->datec);
$this->first_subscription_date_start=$this->db->jdate($obj->dateh); $this->first_subscription_date_start = $this->db->jdate($obj->dateh);
$this->first_subscription_date_end=$this->db->jdate($obj->datef); $this->first_subscription_date_end = $this->db->jdate($obj->datef);
$this->first_subscription_amount=$obj->subscription; $this->first_subscription_amount = $obj->subscription;
} }
$this->last_subscription_date=$this->db->jdate($obj->datec); $this->last_subscription_date = $this->db->jdate($obj->datec);
$this->last_subscription_date_start=$this->db->jdate($obj->datef); $this->last_subscription_date_start = $this->db->jdate($obj->datef);
$this->last_subscription_date_end=$this->db->jdate($obj->datef); $this->last_subscription_date_end = $this->db->jdate($obj->datef);
$this->last_subscription_amount=$obj->subscription; $this->last_subscription_amount = $obj->subscription;
$subscription=new Subscription($this->db); $subscription = new Subscription($this->db);
$subscription->id=$obj->rowid; $subscription->id = $obj->rowid;
$subscription->fk_adherent=$obj->fk_adherent; $subscription->fk_adherent = $obj->fk_adherent;
$subscription->amount=$obj->subscription; $subscription->fk_type = $obj->fk_type;
$subscription->note=$obj->note; $subscription->amount = $obj->subscription;
$subscription->fk_bank=$obj->fk_bank; $subscription->note = $obj->note;
$subscription->datem=$this->db->jdate($obj->datem); $subscription->fk_bank = $obj->fk_bank;
$subscription->datec=$this->db->jdate($obj->datec); $subscription->datem = $this->db->jdate($obj->datem);
$subscription->dateh=$this->db->jdate($obj->dateh); $subscription->datec = $this->db->jdate($obj->datec);
$subscription->datef=$this->db->jdate($obj->datef); $subscription->dateh = $this->db->jdate($obj->dateh);
$subscription->datef = $this->db->jdate($obj->datef);
$this->subscriptions[]=$subscription; $this->subscriptions[] = $subscription;
$i++; $i++;
} }
@@ -1426,7 +1427,7 @@ class Adherent extends CommonObject
} }
else else
{ {
$this->error=$this->db->error().' sql='.$sql; $this->error = $this->db->error().' sql='.$sql;
return -1; return -1;
} }
} }