Skip to content

Commit 9331dd4

Browse files
c01nd01rc01nd01r
authored
Merge pull request #1 from c01nd01r/master
Добавлена поддержка для актуальной версии модуля sale
2 parents 74cf106 + b1f4778 commit 9331dd4

File tree

4 files changed

+89
-91
lines changed

4 files changed

+89
-91
lines changed

‎armax.umkaonline/install/index.php‎

Lines changed: 84 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -9,99 +9,97 @@
99

1010
Class armax_umkaonline extends CModule
1111
{
12-
const MODULE_ID = 'armax.umkaonline';
13-
const CASHBOX_HANDLER_DB = 'Armax\\\UmkaOnline';
14-
var $MODULE_ID = 'armax.umkaonline';
15-
var $MODULE_VERSION;
16-
var $MODULE_VERSION_DATE;
17-
var $MODULE_NAME;
18-
var $MODULE_DESCRIPTION;
19-
var $MODULE_CSS;
20-
var $strError = '';
21-
22-
function __construct()
23-
{
24-
$arModuleVersion = array();
25-
include(dirname(__FILE__)."/version.php");
26-
$this->MODULE_VERSION = $arModuleVersion["VERSION"];
27-
$this->MODULE_VERSION_DATE = $arModuleVersion["VERSION_DATE"];
28-
$this->MODULE_NAME = GetMessage("armax.umkaonline_MODULE_NAME");
29-
$this->MODULE_DESCRIPTION = GetMessage("armax.umkaonline_MODULE_DESC");
30-
31-
$this->PARTNER_NAME = GetMessage("armax.umkaonline_PARTNER_NAME");
32-
$this->PARTNER_URI = GetMessage("armax.umkaonline_PARTNER_URI");
33-
}
34-
35-
public function InstallEvents()
36-
{
12+
const MODULE_ID = 'armax.umkaonline';
13+
const CASHBOX_HANDLER_DB = 'Armax\\\UmkaOnline';
14+
var $MODULE_ID = 'armax.umkaonline';
15+
var $MODULE_VERSION;
16+
var $MODULE_VERSION_DATE;
17+
var $MODULE_NAME;
18+
var $MODULE_DESCRIPTION;
19+
var $MODULE_CSS;
20+
var $strError = '';
21+
22+
function __construct()
23+
{
24+
$arModuleVersion = array();
25+
include(dirname(__FILE__)."/version.php");
26+
$this->MODULE_VERSION = $arModuleVersion["VERSION"];
27+
$this->MODULE_VERSION_DATE = $arModuleVersion["VERSION_DATE"];
28+
$this->MODULE_NAME = GetMessage("armax.umkaonline_MODULE_NAME");
29+
$this->MODULE_DESCRIPTION = GetMessage("armax.umkaonline_MODULE_DESC");
30+
31+
$this->PARTNER_NAME = GetMessage("armax.umkaonline_PARTNER_NAME");
32+
$this->PARTNER_URI = GetMessage("armax.umkaonline_PARTNER_URI");
33+
}
34+
35+
public function InstallEvents()
36+
{
3737
EventManager::getInstance()->registerEventHandler("sale", "OnGetCustomCashboxHandlers", self::MODULE_ID, "CUmkaOnline", "registerMainClass");
38-
return true;
39-
}
38+
return true;
39+
}
4040

41-
public function UnInstallEvents()
42-
{
41+
public function UnInstallEvents()
42+
{
4343
EventManager::getInstance()->unRegisterEventHandler("sale", "OnGetCustomCashboxHandlers", self::MODULE_ID, "CUmkaOnline", "registerMainClass");
44-
return true;
45-
}
46-
47-
private function getLogDirPath() {
48-
return Application::getDocumentRoot() . '/umkaonline';
44+
return true;
45+
}
46+
47+
private function getLogDirPath() {
48+
return Application::getDocumentRoot() . '/umkaonline';
49+
}
50+
51+
public function InstallFiles()
52+
{
53+
CopyDirFiles(__DIR__."/files/logs",$this->getLogDirPath());
54+
55+
return true;
56+
}
57+
58+
public function UnInstallDB()
59+
{
60+
if (Loader::includeModule('sale')) {
61+
// Битрикс показывает ошибку вместо списка касс,
62+
// если касса активна и система не может найти ее обработчик.
63+
// Найдем все наши кассы и деактивируем их не удаляя данные.
64+
65+
// Данные для записи в колонку 'ACTIVE' - отключение кассы
66+
$cashbox_db_off = array('ACTIVE' => 'N');
67+
68+
// Запрос на получение списка касс с обработчиком этого модуля
69+
70+
$dbRes = CashboxTable::getList(
71+
array(
72+
'select' => array('ID'),
73+
'filter' => array('HANDLER' => self::CASHBOX_HANDLER_DB),
74+
)
75+
);
76+
77+
// Получаем кассы
78+
while ($cashbox = $dbRes->fetch())
79+
{
80+
// Отключаем каждую кассу
81+
Manager::update($cashbox['ID'], $cashbox_db_off);
82+
}
83+
84+
return true;
4985
}
5086

51-
public function InstallFiles()
52-
{
53-
CopyDirFiles(
54-
__DIR__."/files/logs",
55-
$this->getLogDirPath()
56-
);
57-
58-
return true;
59-
}
60-
61-
public function UnInstallDB()
62-
{
63-
if (Loader::includeModule('sale')) {
64-
// Áèòðèêñ ïîêàçûâàåò îøèáêó âìåñòî ñïèñêà êàññ,
65-
// åñëè êàññà àêòèâíà è ñèñòåìà íå ìîæåò íàéòè åå îáðàáîò÷èê.
66-
// Íàéäåì âñå íàøè êàññû è äåàêòèâèðóåì èõ íå óäàëÿÿ äàííûå.
67-
68-
// Äàííûå äëÿ çàïèñè â êîëîíêó 'ACTIVE' - îòêëþ÷åíèå êàññû
69-
$cashbox_db_off = array('ACTIVE' => 'N');
70-
71-
// Çàïðîñ íà ïîëó÷åíèå ñïèñêà êàññ ñ îáðàáîò÷èêîì ýòîãî ìîäóëÿ
72-
73-
$dbRes = CashboxTable::getList(
74-
array(
75-
'select' => array('ID'),
76-
'filter' => array('HANDLER' => self::CASHBOX_HANDLER_DB),
77-
)
78-
);
79-
80-
// Ïîëó÷àåì êàññû
81-
while ($cashbox = $dbRes->fetch())
82-
{
83-
// Îòêëþ÷àåì êàæäóþ êàññó
84-
Manager::update($cashbox['ID'], $cashbox_db_off);
85-
}
86-
87-
return true;
88-
}
89-
return false;
90-
}
87+
return false;
88+
}
9189

9290

93-
public function DoInstall()
94-
{
95-
$this->InstallFiles();
96-
$this->InstallEvents();
97-
RegisterModule(self::MODULE_ID);
98-
}
91+
public function DoInstall()
92+
{
93+
$this->InstallFiles();
94+
$this->InstallEvents();
95+
RegisterModule(self::MODULE_ID);
96+
}
9997

100-
public function DoUninstall()
101-
{
102-
$this->UnInstallDB();
103-
$this->UnInstallEvents();
104-
UnRegisterModule(self::MODULE_ID);
105-
}
98+
public function DoUninstall()
99+
{
100+
$this->UnInstallDB();
101+
$this->UnInstallEvents();
102+
UnRegisterModule(self::MODULE_ID);
103+
}
106104
}
107105

‎armax.umkaonline/install/version.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?
22
$arModuleVersion = array(
3-
"VERSION" => "1.1.2",
4-
"VERSION_DATE" => "2019-03-01 18:00:00"
3+
"VERSION" => "1.1.3",
4+
"VERSION_DATE" => "2020-08-03 18:00:00"
55
);
66
?>

‎armax.umkaonline/lib/UmkaOnline.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ public function printImmediately(Check $check)
489489
}
490490

491491
$checkQuery = static::buildCheckQuery($check);
492-
$validateResult = $this->validate($checkQuery);
492+
$validateResult = $this->validateCheckQuery($checkQuery);
493493
if (!$validateResult->isSuccess())
494494
{
495495
return $validateResult;
@@ -628,7 +628,7 @@ public function check(Check $check)
628628
* @param array $checkData
629629
* @return Result
630630
*/
631-
protected function validate(array $checkData)
631+
protected function validateCheckQuery(array $checkData)
632632
{
633633
$result = new Result();
634634

‎armax.umkaonline/version_control.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sale,18.5.10
1+
sale,20.0.675

0 commit comments

Comments
 (0)