From 4636d44b3b6303459bb11d372c3c660b1a0e32c0 Mon Sep 17 00:00:00 2001 From: timoj Date: Fri, 11 Dec 2020 11:06:47 +0100 Subject: [PATCH 1/4] Fix for processing webhooks --- CHANGELOG.md | 6 ++++++ readme.txt | 2 ++ woocommerce-wuunder.php | 16 ++++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40ef348..8ba434d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ## Released +## [2.7.20](https://github.com/wuunder/wuunder-webshopplugin-woocommerce/tag/2.7.20) - 2020-12-11 + +### Fixed + +- Fix hook used for webhook processing + ## [2.7.19](https://github.com/wuunder/wuunder-webshopplugin-woocommerce/tag/2.7.19) - 2020-07-02 ### Added diff --git a/readme.txt b/readme.txt index 1c5e65c..60c6c5f 100644 --- a/readme.txt +++ b/readme.txt @@ -97,6 +97,8 @@ You can best contact us via info@wearewuunder.com 7. Eenvoudig labels printen == Changelog == += 2.7.20 = +* Fix hook used for webhook processing = 2.7.19 = * Fix rparcelshop error * Added support for multi-site Wordpress diff --git a/woocommerce-wuunder.php b/woocommerce-wuunder.php index 146314b..c0014b2 100644 --- a/woocommerce-wuunder.php +++ b/woocommerce-wuunder.php @@ -81,12 +81,12 @@ public function __construct() { add_action('wp_ajax_wuunder_parcelshoplocator_get_selected_parcelshop', 'wcwp_getSelectedParcelshop'); add_action('wp_ajax_nopriv_wuunder_parcelshoplocator_get_selected_parcelshop', 'wcwp_getSelectedParcelshop'); - add_action( 'wp_loaded', function () { + add_action( 'init', function () { if ( false !== strpos( $_SERVER['REQUEST_URI'], '/wuunder/webhook' ) && 'POST' === $_SERVER['REQUEST_METHOD'] ) { $this->wcwp_webhook(); exit; } - } ); + }, 20 ); if ( version_compare( WOOCOMMERCE_VERSION, '3.7', '>=' )) { add_action( 'wp_loaded', array(WC_Wuunder_Settings::class, 'wcwp_save_action_for_update_settings' ) ); } @@ -130,10 +130,14 @@ public function wcwp_webhook() { } elseif ( 'track_and_trace_updated' === $data['action'] ) { // This is the 2nd webhook $order = wc_get_order( $orderId ); - $note = __( 'Het pakket is aangemeld bij: ' . $data['carrier_name'] . '\n De track and trace code is: ' . $data['track_and_trace_code'] ); - $order->add_order_note( $note ); - $order->save(); - $errorRedirect = false; + if ($order) { + $note = __( 'Het pakket is aangemeld bij: ' . $data['carrier_name'] . '\n De track and trace code is: ' . $data['track_and_trace_code'] ); + $order->add_order_note( $note ); + $order->save(); + $errorRedirect = false; + } else { + wcwp_log( 'error', 'T&T webhook for unknown order with id: ' . $orderId ); + } } if ( $errorRedirect ) { From ce43264b4830401f2701ecb9ae4c1af03d2bd2b9 Mon Sep 17 00:00:00 2001 From: timoj Date: Fri, 11 Dec 2020 11:06:57 +0100 Subject: [PATCH 2/4] . --- includes/wcwuunder-create.php | 2 +- woocommerce-wuunder.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php index f6504f3..84b6353 100644 --- a/includes/wcwuunder-create.php +++ b/includes/wcwuunder-create.php @@ -13,7 +13,7 @@ public function __construct() $this->version_obj = array( 'product' => 'Woocommerce extension', 'version' => array( - 'build' => '2.7.19', + 'build' => '2.7.20', 'plugin' => '2.0'), 'platform' => array( 'name' => 'Woocommerce', diff --git a/woocommerce-wuunder.php b/woocommerce-wuunder.php index c0014b2..b8fe517 100644 --- a/woocommerce-wuunder.php +++ b/woocommerce-wuunder.php @@ -3,7 +3,7 @@ * Plugin Name: Wuunder for-woocommerce * Plugin URI: https://wearewuunder.com/wuunder-voor-webshops/ * Description: Wuunder shipping plugin - * Version: 2.7.19 + * Version: 2.7.20 * Author: Wuunder * Author URI: http://wearewuunder.com */ @@ -57,7 +57,7 @@ class Woocommerce_Wuunder { public static $plugin_path; public static $plugin_basename; - const VERSION = '2.7.19'; + const VERSION = '2.7.20'; public function __construct() { From 23839bcf3023ae4ac2dbe09548913d7e5d50356f Mon Sep 17 00:00:00 2001 From: timoj Date: Fri, 11 Dec 2020 13:56:03 +0100 Subject: [PATCH 3/4] fix notice undefined index --- includes/wcwuunder-create.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php index 84b6353..0ef1823 100644 --- a/includes/wcwuunder-create.php +++ b/includes/wcwuunder-create.php @@ -410,7 +410,7 @@ public function wcwp_add_listing_actions($order) href=" " - class=" button tips " + class=" button tips " style="background:#8dcc00; height:2em; width:2em; padding:3px;" alt="" data-tip=""> Date: Mon, 14 Dec 2020 10:08:15 +0100 Subject: [PATCH 4/4] fixed notice error --- includes/wcwuunder-create.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/wcwuunder-create.php b/includes/wcwuunder-create.php index 0ef1823..bea393f 100644 --- a/includes/wcwuunder-create.php +++ b/includes/wcwuunder-create.php @@ -137,7 +137,9 @@ private function wcwp_setBookingConfig($orderId) $bookingConfig->setHeight($this->wcwp_roundButNull($dimensions[2])); $bookingConfig->setWeight($totalWeight ? $totalWeight : null); $bookingConfig->setCustomerReference($orderId); - $bookingConfig->setPreferredServiceLevel((count($order->get_items('shipping')) > 0) ? $this->wcwp_get_filter_from_shippingmethod(reset($order->get_items('shipping'))->get_method_id()) : ''); + + $order_items = $order->get_items('shipping'); + $bookingConfig->setPreferredServiceLevel((count($order->get_items('shipping')) > 0) ? $this->wcwp_get_filter_from_shippingmethod(reset($order_items)->get_method_id()) : ''); $bookingConfig->setSource($this->version_obj); $orderMeta = get_post_meta($orderId);