ProPeace/de.forumzfd.twinglecampaign
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove $origin parameter

Browse source 
it isn't necessary anymore because I use my own APIs to get the data always in the Twingle format
This commit is contained in:
Marc Michalsky forumZFD 2020-12-15 14:49:31 +01:00
parent f10b920465
commit a9ebd8c514
Signed by untrusted user who does not match committer: marc.koch
GPG key ID: 12406554CFB028B9
4 changed files with 11 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CRM/TwingleCampaign/BAO/Campaign.php
View file

@ -14,10 +14,6 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
// OUT means: coming from the CiviCRM database
public const OUT = 'OUT';
public const CIVICRM = 'CIVICRM';
public const TWINGLE = 'TWINGLE';
protected $className;
protected $id;
@ -35,31 +31,18 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
* @param array $campaign
* Result array of Twingle API call
*
* @param string $origin
* Origin of the arrays. It can be one of two constants:
* Campaign::TWINGLE|CIVICRM
*
* @throws Exception
*/
protected function __construct(array $campaign, string $origin) {
protected function __construct(array $campaign) {
$tmpClassName = explode('_', get_class($this));
$this->className = array_pop($tmpClassName);
// If values come from CiviCRM Campaign API
if ($origin == self::CIVICRM) {
// Set id (campaign id) attribute
$this->id = $campaign['id'];
// Translate custom field names into Twingle field names
$this->translateCustomFields($campaign, self::OUT);
// Translate keys and values
//self::formatValues($campaign, self::OUT);
self::translateKeys($campaign, self::OUT);
}
// Set campaign values
$this->update($campaign);
// Filter project values
$filter = Cache::getInstance()->getTemplates()[$this->className];

13
CRM/TwingleCampaign/BAO/TwingleEvent.php
View file

@ -15,14 +15,10 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
* Result array of Twingle API call to
* https://project.twingle.de/api/$project_id/event
*
* @param string $origin
* Origin of the arrays. It can be one of two constants:
* TwingleEvent::TWINGLE|CIVICRM
*
* @throws Exception
*/
protected function __construct(array $event, string $origin) {
parent::__construct($event, $origin);
protected function __construct(array $event) {
parent::__construct($event);
$this->prefix = 'twingle_event_';
$this->values['campaign_type_id'] = 'twingle_event';
@ -60,10 +56,7 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
// Instantiate TwingleEvent
try {
$event = new self(
$values,
self::TWINGLE
);
$event = new self($values);
} catch (Exception $e) {
$errorMessage = $e->getMessage();

12
CRM/TwingleCampaign/BAO/TwingleProject.php
View file

@ -13,15 +13,12 @@ class CRM_TwingleCampaign_BAO_TwingleProject extends Campaign {
* Result array of Twingle API call to
* https://project.twingle.de/api/by-organisation/$organisation_id
*
* @param string $origin
* Origin of the arrays. It can be one of two constants:
* TwingleProject::TWINGLE|CIVICRM
* @param int|null $id
*
* @throws \Exception
*/
function __construct(array $project, string $origin, int $id = NULL) {
parent::__construct($project, $origin);
function __construct(array $project, int $id = NULL) {
parent::__construct($project);
$this->id = $id;
$this->prefix = 'twingle_project_';
@ -58,10 +55,7 @@ class CRM_TwingleCampaign_BAO_TwingleProject extends Campaign {
// Instantiate TwingleProject
try {
$project = new self(
$values,
self::TWINGLE
);
$project = new self($values);
} catch (Exception $e) {
$errorMessage = $e->getMessage();