fix #93

mollie · Dec 3, 2021 · 972fa72 · 972fa72
1 parent 63e1826
commit 972fa72
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/lib/Checkout/AbstractCheckout.php b/lib/Checkout/AbstractCheckout.php
@@ -518,7 +518,7 @@ public static function sendReminders(): void
             return;
         }
 
-        $remindables = Shop::Container()->getDB()->executeQueryPrepared("SELECT kId FROM xplugin_ws5_mollie_orders WHERE dReminder IS NULL AND dCreated < NOW() - INTERVAL :d HOUR AND cStatus IN ('created','open', 'expired', 'failed', 'canceled')", [
+        $remindables = Shop::Container()->getDB()->executeQueryPrepared("SELECT kId FROM xplugin_ws5_mollie_orders WHERE (dReminder IS NULL OR dReminder = '0000-00-00 00:00:00') AND dCreated < NOW() - INTERVAL :d MINUTE AND cStatus IN ('created','open', 'expired', 'failed', 'canceled')", [
             ':d' => $reminder
         ], 2);
         foreach ($remindables as $remindable) {
@@ -544,6 +544,9 @@ public static function sendReminder($kId): bool
 
         // filter paid and storno
         if (!$order->kBestellung || (int)$order->cStatus > BESTELLUNG_STATUS_IN_BEARBEITUNG || (int)$order->cStatus < 0) {
+            $order->dReminder = date('Y-m-d H:i:s');
+            $order->save();
+
             return true;
         }
         $oBestellung = new Bestellung($order->kBestellung);

diff --git a/lib/Checkout/OrderCheckout.php b/lib/Checkout/OrderCheckout.php
@@ -54,9 +54,9 @@ class OrderCheckout extends AbstractCheckout
      */
     public function create(array $paymentOptions = []): Order
     {
-        if ($this->getModel()->orderId) {
+        if ($this->getModel()->cOrderId) {
             try {
-                $this->order = $this->getAPI()->getClient()->orders->get($this->getModel()->orderId, ['embed' => 'payments']);
+                $this->order = $this->getAPI()->getClient()->orders->get($this->getModel()->cOrderId, ['embed' => 'payments']);
                 if (in_array($this->order->status, [OrderStatus::STATUS_COMPLETED, OrderStatus::STATUS_PAID, OrderStatus::STATUS_AUTHORIZED, OrderStatus::STATUS_PENDING], true)) {
                     throw new RuntimeException(self::Plugin('ws5_mollie')->getLocalization()->getTranslation('errAlreadyPaid'));
                 }

diff --git a/lib/Checkout/PaymentCheckout.php b/lib/Checkout/PaymentCheckout.php
@@ -38,7 +38,7 @@ class PaymentCheckout extends AbstractCheckout
      */
     public function create(array $paymentOptions = []): Payment
     {
-        if ($this->getModel()->orderId) {
+        if ($this->getModel()->cOrderId) {
             try {
                 $this->payment = $this->getAPI()->getClient()->payments->get($this->getModel()->cOrderId);
                 if ($this->payment->status === PaymentStatus::STATUS_OPEN) {

diff --git a/lib/Hook/Queue.php b/lib/Hook/Queue.php
@@ -111,8 +111,7 @@ public static function headPostGet(): void
                 if (self::Plugin('ws5_mollie')->getConfig()->getValue('resetMethod') !== 'on') {
                     $options['method'] = $checkout->getModel()->cMethod;
                 }
-
-                $mollie = $checkout->create($options); // Order::repayOrder($orderModel->getOrderId(), $options, $api);
+                $mollie = $checkout->create($options);
                 $url    = $mollie->getCheckoutUrl();
 
                 header('Location: ' . $url);