diff --git a/Logger/CustomLogger.php b/Logger/CustomLogger.php
deleted file mode 100644
index ced63ec67cdea6f7ad6e43cddd40713b472e1db6..0000000000000000000000000000000000000000
--- a/Logger/CustomLogger.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace BobGroup\BobGo\Logger;
-
-class CustomLogger extends \Monolog\Logger
-{
-}
diff --git a/Logger/Handler.php b/Logger/Handler.php
index 89a1aaeebcee7bf7e24f78be2647d4da91d3d909..21b3257a19cdf3f455f4a810a6e21df45b50ffb8 100644
--- a/Logger/Handler.php
+++ b/Logger/Handler.php
@@ -1,8 +1,8 @@
<?php
namespace BobGroup\BobGo\Logger;
-use Monolog\Logger;
use Magento\Framework\Logger\Handler\Base;
+use Monolog\Logger;
class Handler extends Base
{
diff --git a/Logger/Logger.php b/Logger/Logger.php
new file mode 100644
index 0000000000000000000000000000000000000000..7b4ab3c2368b58898b0ce6b8a32b88b2094ed892
--- /dev/null
+++ b/Logger/Logger.php
@@ -0,0 +1,8 @@
+<?php
+namespace BobGroup\BobGo\Logger;
+
+use Monolog\Logger as MonologLogger;
+
+class Logger extends MonologLogger
+{
+}
diff --git a/Model/Carrier/BobGo.php b/Model/Carrier/BobGo.php
index 32e58981e115edae015f810d6bf0a4017af72146..6925e71013abeb6c7a4a04be0caecd4508c18d73 100644
--- a/Model/Carrier/BobGo.php
+++ b/Model/Carrier/BobGo.php
@@ -1187,7 +1187,7 @@ use Magento\Quote\Model\Quote\Address\RateRequest;
use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
use Magento\Shipping\Model\Carrier\CarrierInterface;
use Magento\Shipping\Model\Rate\Result;
-use BobGroup\BobGo\Logger\CustomLogger;
+use BobGroup\BobGo\Logger\Logger;
class BobGo extends AbstractCarrierOnline implements CarrierInterface
{
@@ -1196,32 +1196,31 @@ class BobGo extends AbstractCarrierOnline implements CarrierInterface
protected $scopeConfig;
protected $httpClientFactory;
- protected $customLogger;
+ protected $logger;
public function __construct(
- ScopeConfigInterface $scopeConfig,
+ ScopeConfigInterface $scopeConfig,
\Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory,
- CustomLogger $customLogger,
- ZendClientFactory $httpClientFactory,
- array $data = []
- )
- {
+ Logger $logger,
+ ZendClientFactory $httpClientFactory,
+ array $data = []
+ ) {
$this->scopeConfig = $scopeConfig;
$this->httpClientFactory = $httpClientFactory;
- $this->customLogger = $customLogger;
- parent::__construct($scopeConfig, $rateErrorFactory, $customLogger, $data);
+ $this->logger = $logger;
+ parent::__construct($scopeConfig, $rateErrorFactory, $logger, $data);
}
public function collectRates(RateRequest $request)
{
- $this->customLogger->info('BobGo collectRates method called');
+ $this->logger->info('BobGo collectRates method called');
if (!$this->getConfigFlag('active')) {
- $this->customLogger->info('BobGo is not active');
+ $this->logger->info('BobGo is not active');
return false;
}
- $this->customLogger->info('BobGo is active, proceeding with rate collection');
+ $this->logger->info('BobGo is active, proceeding with rate collection');
$result = $this->_rateFactory->create();
@@ -1235,11 +1234,11 @@ class BobGo extends AbstractCarrierOnline implements CarrierInterface
'package_qty' => $request->getPackageQty(),
];
- $this->customLogger->info('Request parameters: ' . json_encode($params));
+ $this->logger->info('Request parameters: ' . json_encode($params));
try {
$apiResponse = $this->_fetchRatesFromApi($params);
- $this->customLogger->info('API response: ' . json_encode($apiResponse));
+ $this->logger->info('API response: ' . json_encode($apiResponse));
if ($apiResponse && isset($apiResponse['rates']) && !empty($apiResponse['rates'])) {
foreach ($apiResponse['rates'] as $rateData) {
@@ -1253,7 +1252,7 @@ class BobGo extends AbstractCarrierOnline implements CarrierInterface
$result->append($rate);
}
} else {
- $this->customLogger->info('No rates returned from API');
+ $this->logger->info('No rates returned from API');
$error = $this->_rateErrorFactory->create();
$error->setCarrier($this->_code);
$error->setCarrierTitle($this->getConfigData('title'));
@@ -1261,7 +1260,7 @@ class BobGo extends AbstractCarrierOnline implements CarrierInterface
return $error;
}
} catch (\Exception $e) {
- $this->customLogger->error('Error fetching rates from API: ' . $e->getMessage());
+ $this->logger->error('Error fetching rates from API: ' . $e->getMessage());
$error = $this->_rateErrorFactory->create();
$error->setCarrier($this->_code);
$error->setCarrierTitle($this->getConfigData('title'));
@@ -1287,20 +1286,20 @@ class BobGo extends AbstractCarrierOnline implements CarrierInterface
$responseBody = $response->getBody();
// Log the response body
- $this->customLogger->info('Response body: ' . var_export($responseBody, true));
+ $this->logger->info('Response body: ' . var_export($responseBody, true));
if ($responseBody === null) {
- $this->customLogger->error('API response body is null');
+ $this->logger->error('API response body is null');
return false;
}
if ($response->isSuccessful()) {
return json_decode($responseBody, true);
} else {
- $this->customLogger->error('API request failed with status: ' . $response->getStatus());
+ $this->logger->error('API request failed with status: ' . $response->getStatus());
}
} catch (\Exception $e) {
- $this->customLogger->error('Exception during API request: ' . $e->getMessage());
+ $this->logger->error('Exception during API request: ' . $e->getMessage());
}
return false;
diff --git a/composer.json b/composer.json
index 330819819a5b54bc71a50c1b976e70eb60a8303d..f908f860b03f7504ea1e174a657b88744791603d 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
"description": "Streamline your order fulfillments with Bob Go",
"require": {
"php": "~8.1.28",
+ "monolog/monolog": "1.16.0",
"magento/framework": "*"
},
"type": "magento2-module",
diff --git a/etc/di.xml b/etc/di.xml
index 817b31889564bfd78f15542b660366c72f767f28..fedc9eeb0003631811c48f5cc00d3e7e837e0d52 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
- <type name="BobGroup\BobGo\Logger\CustomLogger">
+ <type name="BobGroup\BobGo\Logger\Logger">
<arguments>
<argument name="name" xsi:type="string">bobgo</argument>
<argument name="handlers" xsi:type="array">
diff --git a/registration.php b/registration.php
index 57847be33ec1639f9bd361fafcb2678b2ed0ac8b..a1c0652ebfa296e0addf5d0254ce169a1bc34928 100644
--- a/registration.php
+++ b/registration.php
@@ -1,10 +1,8 @@
<?php
-//\Magento\Framework\Component\ComponentRegistrar::register(
-// \Magento\Framework\Component\ComponentRegistrar::MODULE,
-// 'BobGroup_BobGo',
-// __DIR__
-//);
+\Magento\Framework\Component\ComponentRegistrar::register(
+ \Magento\Framework\Component\ComponentRegistrar::MODULE,
+ 'BobGroup_BobGo',
+ __DIR__
+);
-use Magento\Framework\Component\ComponentRegistrar;
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'BobGroup_BobGo', __DIR__);