| @@ -1623,17 +1623,8 @@ | ||
| 1623 | 1623 | 'description' => sprintf(__('If set, this image will be uploaded to %1$s and used to profile your store in the %1$s app for links to the order confirmation etc', 'woo-vipps'), Vipps::CompanyName()), |
| 1624 | 1624 | 'default' => 0, |
| 1625 | 1625 | ), |
| 1626 | 1626 | |
| 1627 | - | |
| 1628 | - 'use_flock' => array ( | |
| 1629 | - 'title' => __('Use flock() to lock orders for Express Checkout', 'woo-vipps'), | |
| 1630 | - 'label' => __('Use flock() to lock orders for Express Checkout', 'woo-vipps'), | |
| 1631 | - 'type' => 'checkbox', | |
| 1632 | - 'description' => __('Use the flock() system call to ensure orders are only finalized once. You can use this for normal setups, but probably not on Windows with IIS, and possibly not on distributed filesystems like NFS. If you don\t know what it is, probably do not use it. If you get duplicated shipping lines on some express orders, you may try using this', 'woo-vipps'), | |
| 1633 | - 'default' => 'no', | |
| 1634 | - ), | |
| 1635 | - | |
| 1636 | 1627 | 'delete_settings_on_deactivation' => array ( |
| 1637 | 1628 | 'title' => __('Delete plugin settings on deactivation', 'woo-vipps'), |
| 1638 | 1629 | 'label' => __('Delete plugin settings on deactivation', 'woo-vipps'), |
| 1639 | 1630 | 'type' => 'checkbox', |
| @@ -2433,15 +2424,8 @@ | ||
| 2433 | 2424 | } |
| 2434 | 2425 | // Something changed, so we are now going to sideeffect the order. IOK 2025-10-15 |
| 2435 | 2426 | $this->log(sprintf(__("%1\$s poll: Handling order: ", 'woo-vipps'), Vipps::CompanyName()) . " " . $orderid, 'debug'); |
| 2436 | 2427 | |
| 2437 | - // If we are in the process of getting a callback from vipps, don't update anything. Currently, Woo/WP has no locking mechanism, | |
| 2438 | - // and it isn't feasible to implement one portably. So this reduces somewhat the likelihood of races when this method is called | |
| 2439 | - // and callbacks happen at the same time. | |
| 2440 | - if (!$Vipps->lockOrder($order)) { | |
| 2441 | - return $oldstatus; | |
| 2442 | - } | |
| 2443 | - | |
| 2444 | 2428 | // Failsafe for rare bug when using Klarna Checkout with Vipps as an external payment method |
| 2445 | 2429 | // IOK 2024-01-09 ensure this is called only when order is complete/authorized |
| 2446 | 2430 | if ($ready) { |
| 2447 | 2431 | $this->reset_erroneous_payment_method($order); |
| @@ -2473,9 +2457,8 @@ | ||
| 2473 | 2457 | |
| 2474 | 2458 | } catch (Exception $e) { |
| 2475 | 2459 | $this->log(sprintf(__("Error getting payment details from %1\$s for order_id:",'woo-vipps'), $this->get_payment_method_name()) . $orderid . "\n" . $e->getMessage(), 'error'); |
| 2476 | 2460 | clean_post_cache($order->get_id()); |
| 2477 | - $Vipps->unlockOrder($order); | |
| 2478 | 2461 | return $oldstatus; |
| 2479 | 2462 | } |
| 2480 | 2463 | $order->save(); |
| 2481 | 2464 | |
| @@ -2508,9 +2491,8 @@ | ||
| 2508 | 2491 | $this->log(sprintf(__("No address information for order %2\$d, but there still might be an active %1\$s session for it, so do not cancel it.", 'woo-vipps'), Vipps::CheckoutName(), $order->get_id())); |
| 2509 | 2492 | } |
| 2510 | 2493 | } |
| 2511 | 2494 | clean_post_cache($order->get_id()); |
| 2512 | - $Vipps->unlockOrder($order); | |
| 2513 | 2495 | return $oldstatus; |
| 2514 | 2496 | } |
| 2515 | 2497 | } |
| 2516 | 2498 | |
| @@ -2546,9 +2528,8 @@ | ||
| 2546 | 2528 | |
| 2547 | 2529 | $order->save(); |
| 2548 | 2530 | clean_post_cache($order->get_id()); |
| 2549 | 2531 | $newstatus = $order->get_status(); |
| 2550 | - $Vipps->unlockOrder($order); | |
| 2551 | 2532 | return $newstatus; |
| 2552 | 2533 | } |
| 2553 | 2534 | |
| 2554 | 2535 | // IOK 2020-01-20 Previously was just a debugging tool, then was used to update postmeta values. Now is used as the main source of info |
