Skip to content
This repository was archived by the owner on Jul 29, 2020. It is now read-only.

Commit cec6d0e

Browse files
committed
release 1.11
Support for PDF exports language change method FlexiBeeRW:refresh removed
1 parent ffbaef6 commit cec6d0e

6 files changed

Lines changed: 55 additions & 29 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"require": {
1212
"php": ">=5.6 <7.3",
1313
"ext-curl": "*",
14-
"vitexsoftware/ease-framework": "dev-master *"
14+
"vitexsoftware/ease-framework": ">=1.5"
1515
},
1616
"autoload": {
1717
"psr-4": {

nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ auxiliary.org-netbeans-modules-php-phpunit.test_2e_run_2e_phpunit_2e_only=false
1313
file.reference.share-php=../../../../../usr/share/php
1414
include.path=\
1515
${file.reference.share-php}
16-
php.version=PHP_56
16+
php.version=PHP_71
1717
source.encoding=UTF-8
1818
src.dir=src
1919
tags.asp=false

src/FlexiPeeHP/FlexiBeeRO.php

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class FlexiBeeRO extends \Ease\Sand
2626
*
2727
* @var string
2828
*/
29-
public static $libVersion = '1.10';
29+
public static $libVersion = '1.11';
3030

3131
/**
3232
* Základní namespace pro komunikaci s FlexiBee.
@@ -2192,22 +2192,46 @@ public static function flexiDateTimeToDateTime($flexidatetime)
21922192
* Získá dokument v daném formátu
21932193
* Obtain document in given format
21942194
*
2195-
* @param string $format pdf/csv/xml/json/ ...
2196-
* @param string $reportName Template used to generate PDF
2195+
* @link https://www.flexibee.eu/api/dokumentace/ref/pdf/ PDF Exports
2196+
*
2197+
* @param string $format pdf/csv/xml/json/ ...
2198+
* @param string $reportName Template used to generate PDF
2199+
* @param string $lang cs|sk|en|de Template language used to generate PDF
2200+
* @param boolean $sign sign resulting PDF by certificate ?
21972201
*
21982202
* @return string|null filename downloaded or none
21992203
*/
2200-
public function getInFormat($format, $reportName = null)
2204+
public function getInFormat($format, $reportName = null, $lang = null,$sign = false)
22012205
{
22022206
$response = null;
22032207
if ($this->setFormat($format)) {
22042208
$urlParams = [];
2209+
switch ($format) {
2210+
case 'pdf':
2211+
switch ($lang) {
2212+
case 'cs':
2213+
case 'sk':
2214+
case 'en':
2215+
case 'de':
2216+
$urlParams['report-lang'] = $lang;
2217+
break;
2218+
case null:
2219+
break;
2220+
default:
2221+
throw new \Ease\Exception('Unknown language '.$lang.' for PDF export');
2222+
break;
2223+
}
2224+
if(boolval($sign) === true){
2225+
$urlParams['report-sign'] = 'true';
2226+
}
2227+
break;
2228+
case 'html':
2229+
$urlParams['inDesktopApp'] = 'true';
2230+
break;
2231+
}
22052232
if (!empty($reportName)) {
22062233
$urlParams['report-name'] = $reportName;
22072234
}
2208-
if ($format == 'html') {
2209-
$urlParams['inDesktopApp'] = 'true';
2210-
}
22112235
if (($this->doCurlRequest(\Ease\Shared::addUrlParams($this->apiURL,
22122236
$urlParams), 'GET') == 200)) {
22132237
$response = $this->lastCurlResponse;

src/FlexiPeeHP/FlexiBeeRW.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -445,18 +445,6 @@ public function sync($data = null)
445445
return ($insertResult + $loadResult) == 401;
446446
}
447447

448-
/**
449-
* Insert current data into FlexiBee and load actual record data back
450-
*
451-
* @deprecated since version 1.8.9
452-
*
453-
* @return boolean Operation success
454-
*/
455-
public function refresh()
456-
{
457-
return $this->sync();
458-
}
459-
460448
/**
461449
* Perform given action (if availble) on current evidence/record
462450
* @url https://demo.flexibee.eu/devdoc/actions

testing/src/FlexiPeeHP/FlexiBeeROTest.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,20 @@ public function testFlexiDateTimeToDateTime()
12001200
FlexiBeeRO::flexiDateTimeToDateTime('2017-09-26T10:00:53.755+02:00')->getTimestamp());
12011201
}
12021202

1203+
/**
1204+
* @covers FlexiPeeHP\FlexiBeeRO::takeData
1205+
*/
1206+
public function testTakeData()
1207+
{
1208+
$this->object->takeData(['id'=>1]);
1209+
$this->assertEquals( constant('FLEXIBEE_URL') .'/'.constant('FLEXIBEE_COMPANY') . '/1', $this->object->getApiURL());
1210+
1211+
$this->object->dataReset();
1212+
$this->object->takeData(['kod'=>'test']);
1213+
$this->assertEquals(constant('FLEXIBEE_URL') .'/'.constant('FLEXIBEE_COMPANY') . '/code:TEST', $this->object->getApiURL());
1214+
}
1215+
1216+
12031217
/**
12041218
* @covers FlexiPeeHP\FlexiBeeRO::setDataValue
12051219
*/
@@ -1321,12 +1335,17 @@ public function testSendUnsent()
13211335
}
13221336

13231337
/**
1338+
* @expectedException Ease\Exception
1339+
* @expectedExceptionMessage Unknown language ua for PDF export
13241340
* @covers FlexiPeeHP\FlexiBeeRO::getInFormat
13251341
*/
13261342
public function testGetInFormat()
13271343
{
13281344
$this->object->evidence = 'test';
13291345
$this->object->getInFormat('html', 'test');
1346+
$this->object->getInFormat('pdf', 'test');
1347+
$this->object->getInFormat('pdf', 'test','cs',true);
1348+
$this->object->getInFormat('pdf', 'error','ua',false);
13301349
}
13311350

13321351
/**

testing/src/FlexiPeeHP/FlexiBeeRWTest.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,21 +207,16 @@ public function testGetJsonizedData()
207207
$this->object->getJsonizedData();
208208
}
209209

210-
/**
211-
* @covers FlexiPeeHP\FlexiBeeRW::refresh
212-
*/
213-
public function testRefresh()
214-
{
215-
$this->object->setMyKey('ext:test:'.\Ease\Sand::randomNumber());
216-
$this->object->refresh();
217-
}
210+
218211

219212
/**
220213
* @covers FlexiPeeHP\FlexiBeeRW::insertToFlexiBee
221214
*/
222215
public function testInsertToFlexiBee()
223216
{
224217
$this->object->insertToFlexiBee(['id' => 'ext:test:'.time()]);
218+
$this->object->setData(['id' => 'ext:test:'.time()], true);
219+
$this->object->insertToFlexiBee();
225220
}
226221

227222
/**

0 commit comments

Comments
 (0)