fixes for validator

This commit is contained in:
Pavel 2020-04-24 13:49:14 +03:00 committed by GitHub
parent 1be638a970
commit 257b4a0c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions

BIN
retailcrm.zip Normal file

Binary file not shown.

View File

@ -38,10 +38,14 @@
declare(ticks = 1); declare(ticks = 1);
require_once __DIR__ . '/lib/RetailcrmCli.php'; require_once dirname(__FILE__) . '/lib/RetailcrmCli.php';
function retailcrmCliInterruptHandler($signo) { function retailcrmCliInterruptHandler($signo)
RetailcrmLogger::output('WARNING: Interrupt received, stopping...'); {
RetailcrmLogger::output(sprintf(
'WARNING: Interrupt received, stopping... (%s)',
print_r($signo, true)
));
RetailcrmCli::clearCurrentJob(null); RetailcrmCli::clearCurrentJob(null);
exit(1); exit(1);
} }
@ -50,5 +54,5 @@ if (php_sapi_name() == 'cli') {
$cli = new RetailcrmCli(__FILE__); $cli = new RetailcrmCli(__FILE__);
$cli->execute('retailcrmCliInterruptHandler'); $cli->execute('retailcrmCliInterruptHandler');
} else { } else {
include_once __DIR__ . DIRECTORY_SEPARATOR . 'index.php'; include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'index.php';
} }

View File

@ -504,7 +504,7 @@ class RetailCRM extends Module
); );
if (((float) $order['discountManualAmount']) > ((float) $params['order']->total_paid)) { if (((float) $order['discountManualAmount']) > ((float) $params['order']->total_paid)) {
$crmOrder['discountManualAmount'] = $params['order']->total_paid; $order['discountManualAmount'] = $params['order']->total_paid;
} }
try { try {