| @@ -1309,14 +1309,8 @@ | ||
| 1309 | 1309 | WC()->session->set('vipps_address_hash', false); |
| 1310 | 1310 | } |
| 1311 | 1311 | |
| 1312 | 1312 | if (is_a($order, 'WC_Order') && $order->get_status() == 'pending') { |
| 1313 | - // We want to kill orders that have failed, or that the user has abandoned. To do this, | |
| 1314 | - // we must ensure that no race or other mechanism kills the order while or after being paid. | |
| 1315 | - // if order is in the process of being finalized, don't kill it | |
| 1316 | - if (Vipps::instance()->isLocked($order)) { | |
| 1317 | - return false; | |
| 1318 | - } | |
| 1319 | 1313 | // Get it again to ensure we have all the info, and check status again |
| 1320 | 1314 | clean_post_cache($order->get_id()); |
| 1321 | 1315 | $order = wc_get_order($order->get_id()); |
| 1322 | 1316 | if ($order->get_status() != 'pending') return false; |
| @@ -1603,9 +1597,9 @@ | ||
| 1603 | 1597 | } else { |
| 1604 | 1598 | // specialcase some known methods so they get brands, and put the label into the description |
| 1605 | 1599 | if ($shipping_method && is_a($shipping_method, 'WC_Shipping_Method') && get_class($shipping_method) == 'WC_Shipping_Method_Bring_Pro') { |
| 1606 | 1600 | $m2['brand'] = "POSTEN"; |
| 1607 | - $m2['description'] = $rate->get_label(); | |
| 1601 | + $m2['description'] = html_entity_decode($rate->get_label()); | |
| 1608 | 1602 | } |
| 1609 | 1603 | $m2['brand'] = apply_filters('woo_vipps_shipping_method_brand', $m2['brand'],$shipping_method, $rate); |
| 1610 | 1604 | } |
| 1611 | 1605 | |
