Skip to content

some fixes for easy work #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LiFeAiR wants to merge 10 commits into
base: master
Choose a base branch
from
Open

some fixes for easy work #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a396380
Update composer.json
LiFeAiR May 12, 2016
0028d35
Create MonetaWebServiceConnector.php
LiFeAiR May 12, 2016
9e3fd1c
Create MonetaWebServiceConnector.php
LiFeAiR May 12, 2016
257375e
Update MonetaSdkUtils.php
LiFeAiR May 16, 2016
5c99238
Update MonetaSdkUtils.php
LiFeAiR May 18, 2016
623e0e7
Update MonetaSdkMethods.php
LiFeAiR May 18, 2016
f317181
Delete MonetaWebServiceConnector.php
LiFeAiR May 18, 2016
3df6145
Update MonetaSdk.php
LiFeAiR May 24, 2016
c73c070
Update MonetaSdk.php
LiFeAiR May 24, 2016
69632d4
\Moneta\MonetaSdkUtils::requireView
LiFeAiR Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
"name": "integrationmonitoring/moneta-php-sdk",
"version": "master",
"license": "MIT",
"require": {
"php": ">=5.3.0",
"moneta/webservice": "dev-master"
},
"autoload": {
"psr-0" : {
"Moneta" : "src"
Expand Down
6 changes: 4 additions & 2 deletions src/Moneta/MonetaSdk.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public function processInputData($definedEventType = null)
$this->processForwardPaymentForm();
break;
case 'MonetaSendCallBack':
$this->processMonetaSendCallBack();
$processResultData = $this->processMonetaSendCallBack();
break;
case 'ForwardChoosePaymentSystemForm':
$this->processForwardChoosePaymentSystemForm();
Expand Down Expand Up @@ -566,6 +566,8 @@ private function processMonetaSendCallBack()
$processResultData['answer'] = 'FAIL';
$this->render = 'FAIL';
}

return $processResultData;
}

/**
Expand Down Expand Up @@ -728,4 +730,4 @@ private function pvtGetForwardDataArray($postData, $sdkFields)
return $forwardFields;
}

}
}
4 changes: 2 additions & 2 deletions src/Moneta/MonetaSdkMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ private function parseJsonException($data)
$this->error = true;

if ($this->getSettingValue('monetasdk_debug_mode')) {
MonetaSdkUtils::addToLog("parseJsonException:\n" . $data);
MonetaSdkUtils::addToLog("parseJsonException:\n" . print_r($data, true));
}

if (isset($data['detail']['faultDetail'])) {
Expand All @@ -1020,4 +1020,4 @@ private function parseJsonException($data)

}

}
}
22 changes: 11 additions & 11 deletions src/Moneta/MonetaSdkUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,20 @@ public static function getValueFromArray($value, $array)
*/
public static function requireView($viewName, $data, $externalPath = null)
{
$result = false;
if (!$externalPath && $externalPath != '') {
$viewFileName = __DIR__ . $externalPath . $viewName . '.php';
}
else {
$result = false;

if ($externalPath && $externalPath != '') {
$viewFileName = $externalPath . $viewName . '.php';
} else {
$viewFileName = __DIR__ . self::VIEW_FILES_PATH . $viewName . '.php';
}

if (file_exists($viewFileName)) {
if (file_exists($viewFileName)) {
ob_start();
require_once($viewFileName);
require($viewFileName);
$result = ob_get_contents();
ob_end_clean();
}
}

return $result;
}
Expand All @@ -138,8 +138,8 @@ public static function requireView($viewName, $data, $externalPath = null)
public static function handleEvent($eventName, $data, $externalPath = null)
{
$result = false;
if (!$externalPath && $externalPath != '') {
$eventFileName = __DIR__ . $externalPath . $eventName . '.php';
if ($externalPath && $externalPath != '') {
$eventFileName = $externalPath . $eventName . '.php';
}
else {
$eventFileName = __DIR__ . self::EVENTS_FILES_PATH . $eventName . '.php';
Expand Down Expand Up @@ -295,4 +295,4 @@ public static function getDateWithModification($modification = null)
return $result;
}

}
}
Loading