diff --git a/Observer/OrderCreateWebhook.php b/Observer/OrderCreateWebhook.php index 1b93779b39c902711df0be1fe1d70cbab3ed3698..678f2dee5df3b445e2124d56d535e561e5c99863 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 03b96cba532b41eb9059045d2f6b266642716a5d..3074bddd68e3a637b7fa8bd713a2ffe9552889d9 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 9f2e83f43f03de1e57c4c9bdc12f4df4a31b7d20..b17375e6f08e7e80c7f924f4fc56cb01ea41979c 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