From 569a39b153133ebd66bca75c2e371122f8ba1d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Tue, 21 Oct 2025 15:05:18 +0000 Subject: [PATCH] scheduler fixes --- .../BimIT-eCommerceInvoices/amazonWDT/B2BReader.php | 8 ++++---- .../BimIT-eCommerceInvoices/amazonWDT/amazonWZ.php | 2 +- .../BimIT-eCommerceInvoices/amazonWDT/localVatReader.php | 2 +- .../BimIT-eCommerceInvoices/amazonWDT/wdtReader.php | 4 ++-- .../BimIT-eCommerceInvoices/importBaselinkerInvoices.php | 9 ++++++++- modules/Schedulers/Scheduler.php | 4 ---- modules/Schedulers/_AddJobsHere.php | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/B2BReader.php b/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/B2BReader.php index 9cff5445..e0dfcbf5 100644 --- a/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/B2BReader.php +++ b/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/B2BReader.php @@ -5,11 +5,11 @@ ini_set('display_errors', 1); /* DELETE FROM ecommerce_invoices_products WHERE invoice_id IN ( - SELECT id FROM ecommerce_invoices WHERE origin='amazon b2b' AND register_date LIKE '2025-04-%'); -DELETE FROM ecommerce_invoices WHERE origin='amazon b2b' AND register_date LIKE '2025-04-%'; + SELECT id FROM ecommerce_invoices WHERE origin='amazon b2b' AND register_date LIKE '2025-09-%'); +DELETE FROM ecommerce_invoices WHERE origin='amazon b2b' AND register_date LIKE '2025-09-%'; */ -$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/08-2025.csv'; +$filename = getcwd() . '/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/files/09-2025.csv'; $handle = fopen($filename, 'r'); if ($handle === false) { die('Cannot open file: ' . $filename); @@ -38,7 +38,7 @@ foreach ($b2b as $el) { foreach ($groupedB2B as $invoiceNo => $invoice) { if (checkInvoice($invoiceNo)) { - echo 'Invoice already exists' . PHP_EOL; + echo 'Invoice already exists: '.$invoiceNo.'
' ; continue; } diff --git a/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/amazonWZ.php b/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/amazonWZ.php index cdcd76a5..08c21158 100644 --- a/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/amazonWZ.php +++ b/modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/amazonWDT/amazonWZ.php @@ -1,7 +1,7 @@ invoices; + brecho($invoices); + usort($invoices, function ($a, $b) { return $a->date_add - $b->date_add; }); @@ -54,7 +57,7 @@ function importFVKOR($seriesId) $IMPORT_CORRECTION_START_ID = 2106464; - $dbRes = $db->query("SELECT id FROM ecommerce_invoices WHERE origin = 'Allegro' AND type = 'correcting' AND series_id = '$seriesId' ORDER BY id DESC LIMIT 1"); + $dbRes = $db->query("SELECT id FROM ecommerce_invoices WHERE type = 'correcting' AND series_id = '$seriesId' ORDER BY CAST(id AS UNSIGNED) DESC LIMIT 1"); $lastImportId = $db->fetchByAssoc($dbRes)['id']; if ($lastImportId == null) { $lastImportId = $IMPORT_CORRECTION_START_ID; @@ -62,10 +65,13 @@ function importFVKOR($seriesId) $lastImportId++; //get next } + brecho($lastImportId); + $invoicesRes = loadInvoices($baselinker_config['token'], $lastImportId, $seriesId); $invoices = $invoicesRes->invoices; + brecho($invoices); usort($invoices, function ($a, $b) { return $a->date_add - $b->date_add; }); @@ -118,6 +124,7 @@ function addInvoice($i) if ($db->last_error) { + brecho($db->last_error); return; } // delete products for this invoice if exists diff --git a/modules/Schedulers/Scheduler.php b/modules/Schedulers/Scheduler.php index 6663062a..d707ab40 100755 --- a/modules/Schedulers/Scheduler.php +++ b/modules/Schedulers/Scheduler.php @@ -219,7 +219,6 @@ class Scheduler extends SugarBean { */ function fireQualified() { if(empty($this->id)) { // execute only if we have an instance - $GLOBALS['log']->fatal('Scheduler called fireQualified() in a non-instance'); return false; } @@ -228,10 +227,8 @@ class Scheduler extends SugarBean { //_pp('now: '.$now); _pp($validTimes); if(is_array($validTimes) && in_array($now, $validTimes)) { - $GLOBALS['log']->debug('----->Scheduler found valid job ('.$this->name.') for time GMT('.$now.')'); return true; } else { - $GLOBALS['log']->debug('----->Scheduler did NOT find valid job ('.$this->name.') for time GMT('.$now.')'); return false; } } @@ -340,7 +337,6 @@ class Scheduler extends SugarBean { $this->cleanJobLog(); $allSchedulers = $this->get_full_list('', 'schedulers.status=\'Active\''); - if(!empty($allSchedulers)) { foreach($allSchedulers as $focus) { if($focus->fireQualified()) { diff --git a/modules/Schedulers/_AddJobsHere.php b/modules/Schedulers/_AddJobsHere.php index a9faa8cf..c8ba9dd0 100644 --- a/modules/Schedulers/_AddJobsHere.php +++ b/modules/Schedulers/_AddJobsHere.php @@ -77,7 +77,7 @@ function importApiloInvoices() { require_once('modules/EcmInvoiceOuts/BimIT-eCommerceInvoices/importApiloInvoices.php'); $GLOBALS['log']->bimit('_addJobsHere, importApiloInvoices file loadded'); $GLOBALS['log']->bimit('_addJobsHere, importApiloInvoices importInvoices() fired'); - $res = importInvoices(); + $res = apilo_importInvoices(); $GLOBALS['log']->bimit('_addJobsHere, importApiloInvoices finished', $res); return true; } catch (Exception $e) {