From d061262a822de9a89f7de139665186c2e69b6304 Mon Sep 17 00:00:00 2001
From: "@ChristelLoftus" <christel@bob.co.za>
Date: Thu, 29 Aug 2024 12:00:12 +0200
Subject: [PATCH] cleanup
---
Observer/OrderCreateWebhook.php | 16 ----------------
Observer/OrderUpdateWebhook.php | 16 ----------------
Observer/OrderWebhookBase.php | 14 ++++++++++++++
3 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/Observer/OrderCreateWebhook.php b/Observer/OrderCreateWebhook.php
index 1b93779..678f2de 100644
--- a/Observer/OrderCreateWebhook.php
+++ b/Observer/OrderCreateWebhook.php
@@ -3,25 +3,9 @@
namespace BobGroup\BobGo\Observer;
use Magento\Framework\Event\Observer;
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\HTTP\Client\Curl;
-use BobGroup\BobGo\Model\Carrier\UData;
-use Psr\Log\LoggerInterface;
-use Magento\Store\Model\StoreManagerInterface;
class OrderCreateWebhook extends OrderWebhookBase
{
- protected Curl $curl;
- protected LoggerInterface $logger;
- protected StoreManagerInterface $storeManager;
-
- public function __construct(LoggerInterface $logger, Curl $curl, StoreManagerInterface $storeManager)
- {
- $this->logger = $logger;
- $this->curl = $curl;
- $this->storeManager = $storeManager;
- }
-
public function execute(Observer $observer)
{
$order = $observer->getEvent()->getOrder();
diff --git a/Observer/OrderUpdateWebhook.php b/Observer/OrderUpdateWebhook.php
index 03b96cb..3074bdd 100644
--- a/Observer/OrderUpdateWebhook.php
+++ b/Observer/OrderUpdateWebhook.php
@@ -3,25 +3,9 @@
namespace BobGroup\BobGo\Observer;
use Magento\Framework\Event\Observer;
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\HTTP\Client\Curl;
-use BobGroup\BobGo\Model\Carrier\UData;
-use Psr\Log\LoggerInterface;
-use Magento\Store\Model\StoreManagerInterface;
class OrderUpdateWebhook extends OrderWebhookBase
{
- protected Curl $curl;
- protected LoggerInterface $logger;
- protected StoreManagerInterface $storeManager;
-
- public function __construct(LoggerInterface $logger, Curl $curl, StoreManagerInterface $storeManager)
- {
- $this->logger = $logger;
- $this->curl = $curl;
- $this->storeManager = $storeManager;
- }
-
public function execute(Observer $observer)
{
$order = $observer->getEvent()->getOrder();
diff --git a/Observer/OrderWebhookBase.php b/Observer/OrderWebhookBase.php
index 9f2e83f..b17375e 100644
--- a/Observer/OrderWebhookBase.php
+++ b/Observer/OrderWebhookBase.php
@@ -4,9 +4,23 @@ namespace BobGroup\BobGo\Observer;
use BobGroup\BobGo\Model\Carrier\UData;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\HTTP\Client\Curl;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
abstract class OrderWebhookBase implements ObserverInterface
{
+ protected Curl $curl;
+ protected LoggerInterface $logger;
+ protected StoreManagerInterface $storeManager;
+
+ public function __construct(LoggerInterface $logger, Curl $curl, StoreManagerInterface $storeManager)
+ {
+ $this->logger = $logger;
+ $this->curl = $curl;
+ $this->storeManager = $storeManager;
+ }
+
protected function sendWebhook($order, $eventType)
{
// Webhook URL
--
GitLab