diff --git a/retailcrm.zip b/retailcrm.zip new file mode 100644 index 0000000..869da12 Binary files /dev/null and b/retailcrm.zip differ diff --git a/retailcrm/cli.php b/retailcrm/cli.php index 2204437..a0f3049 100644 --- a/retailcrm/cli.php +++ b/retailcrm/cli.php @@ -38,10 +38,14 @@ declare(ticks = 1); -require_once __DIR__ . '/lib/RetailcrmCli.php'; +require_once dirname(__FILE__) . '/lib/RetailcrmCli.php'; -function retailcrmCliInterruptHandler($signo) { - RetailcrmLogger::output('WARNING: Interrupt received, stopping...'); +function retailcrmCliInterruptHandler($signo) +{ + RetailcrmLogger::output(sprintf( + 'WARNING: Interrupt received, stopping... (%s)', + print_r($signo, true) + )); RetailcrmCli::clearCurrentJob(null); exit(1); } @@ -50,5 +54,5 @@ if (php_sapi_name() == 'cli') { $cli = new RetailcrmCli(__FILE__); $cli->execute('retailcrmCliInterruptHandler'); } else { - include_once __DIR__ . DIRECTORY_SEPARATOR . 'index.php'; + include_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'index.php'; } diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php index 0c1b2d3..3402eb9 100644 --- a/retailcrm/retailcrm.php +++ b/retailcrm/retailcrm.php @@ -504,7 +504,7 @@ class RetailCRM extends Module ); if (((float) $order['discountManualAmount']) > ((float) $params['order']->total_paid)) { - $crmOrder['discountManualAmount'] = $params['order']->total_paid; + $order['discountManualAmount'] = $params['order']->total_paid; } try {