[PT-1311] Prevent WAWI sync for pending orders. (#48)

Author: tikohov20

README.md

@@ -19,7 +19,8 @@ JTL 5 Integration plugin for Mondu Payment.
 3. Configure the fields:
    * API Sandbox Mode: Select yes to point the plugin to the sandbox environment
    * Fill in API Secret
-   * Fill in Webhooks Secret
+   * Save configuration
+   * Click register webhooks button
 
 **Configure Payment Methods**
 

Src/Controllers/Frontend/InvoicesController.php

@@ -4,14 +4,11 @@
 
 use JTL\Shop;
 use Plugin\MonduPayment\PaymentMethod\MonduPayment;
+use Plugin\MonduPayment\Src\Exceptions\DatabaseQueryException;
 use Plugin\MonduPayment\Src\Helpers\Response;
-use Plugin\MonduPayment\Src\Middlewares\CheckWebhookSecret;
 use Plugin\MonduPayment\Src\Models\MonduInvoice;
 use Plugin\MonduPayment\Src\Models\MonduOrder;
-use Plugin\MonduPayment\Src\Models\Order;
-use Plugin\MonduPayment\Src\Services\ConfigService;
 use Plugin\MonduPayment\Src\Support\Http\Request;
-use Plugin\MonduPayment\Src\Support\HttpClients\MonduClient;
 
 class WebhookController
 {
@@ -22,23 +19,15 @@ class WebhookController
         MonduPayment::STATE_DECLINED => \BESTELLUNG_STATUS_STORNO,
     ];
 
-    private MonduClient $monduClient;
     private Request $request;
     private MonduInvoice $monduInvoice;
     private MonduOrder $monduOrder;
-    private Order $order;
-    private CheckWebhookSecret $checkWebhookSecret;
-    private ConfigService $configService;
 
     public function __construct()
     {
-        $this->monduClient = new MonduClient();
         $this->request = new Request;
         $this->monduInvoice = new MonduInvoice();
         $this->monduOrder = new MonduOrder();
-        $this->order = new Order();
-        $this->checkWebhookSecret = new CheckWebhookSecret();
-        $this->configService = new ConfigService();
     }
 
     public function index()
@@ -69,9 +58,9 @@ private function handleWebhook()
     }
 
     /**
-     * @param $params
-     *
+     * @param $requestData
      * @return array
+     * @throws DatabaseQueryException
      */
     public function handleOrderStateChanged($requestData)
     {
@@ -82,39 +71,48 @@ public function handleOrderStateChanged($requestData)
 
         $monduOrder = $this->getOrder($params['order_id']);
 
-        if ($monduOrder) {
-            $this->monduOrder->update(['state' => $params['order_state']], $monduOrder->id);
+        if (!$monduOrder) {
+            return [['message' => 'Order not found'], Response::HTTP_NOT_FOUND];
+        }
 
-            if (isset(self::MONDU_JTL_MAPPING[$params['order_state']])) {
-                $this->updateOrderStatus($monduOrder, self::MONDU_JTL_MAPPING[$params['order_state']]);
-            }
+        $this->monduOrder->update(['state' => $params['order_state']], $monduOrder->id);
 
-            return [['message' => 'ok'], Response::HTTP_OK];
+        if (isset(self::MONDU_JTL_MAPPING[$params['order_state']])) {
+            $this->updateOrderStatus($monduOrder, self::MONDU_JTL_MAPPING[$params['order_state']]);
         }
 
-        return [['message' => 'Order not found'], Response::HTTP_NOT_FOUND];
+        if ($params['order_state'] === MonduPayment::STATE_CONFIRMED) {
+            $this->unlockOrderForWawiSync($monduOrder);
+        }
+
+        return [['message' => 'ok'], Response::HTTP_OK];
     }
 
     /**
-     * @param $params
+     * @param $requestData
      * @param $state
      *
      * @return array
      */
-    public function handleInvoiceStateChanged($requestData, $state)
+    public function handleInvoiceStateChanged($requestData, $state): array
     {
         $params = [
             'invoice_uuid' => $requestData['invoice_uuid']
         ];
 
         $monduInvoice = $this->getInvoice($params['invoice_uuid']);
 
-        if ($monduInvoice) {
+        if (!$monduInvoice) {
+            return [['message' => 'Invoice not found'], Response::HTTP_NOT_FOUND];
+        }
+
+        try {
             $this->monduInvoice->update(['state' => $state], $monduInvoice->id);
-            return [['message' => 'ok'], Response::HTTP_OK];
+        } catch (DatabaseQueryException $e) {
+            return [['message' => 'Invoice not found'], Response::HTTP_NOT_FOUND];
         }
 
-        return [['message' => 'Invoice not found'], Response::HTTP_NOT_FOUND];
+        return [['message' => 'ok'], Response::HTTP_OK];
     }
 
     /**
@@ -140,15 +138,29 @@ private function getInvoice($invoiceUuid)
     /**
      * @param $monduOrder
      * @param $status
-     * @return int
+     * @return void
      */
     private function updateOrderStatus($monduOrder, $status)
     {
         Shop::Container()->getDB()->update(
             'tbestellung',
             'kBestellung',
             $monduOrder->order_id,
-            (object)['cStatus' => $status]
+            (object) ['cStatus' => $status]
+        );
+    }
+
+    /**
+     * @param $monduOrder
+     * @return void
+     */
+    private function unlockOrderForWawiSync($monduOrder)
+    {
+        Shop::Container()->getDB()->update(
+            'tbestellung',
+            'kBestellung',
+            $monduOrder->order_id,
+            (object) ['cAbgeholt' => 'N']
         );
     }
 }

Src/Controllers/Frontend/WebhookController.php

@@ -7,7 +7,7 @@
     <PluginID>MonduPayment</PluginID>
     <XMLVersion>100</XMLVersion>
     <ShopVersion>5.0.0</ShopVersion>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <CreateDate>2022-06-07</CreateDate>
     <Install>
         <Hooks>