diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php index 5c4499d56cc..aba1b19fef7 100644 --- a/includes/admin/meta-boxes/class-wc-meta-box-order-data.php +++ b/includes/admin/meta-boxes/class-wc-meta-box-order-data.php @@ -153,7 +153,7 @@ class WC_Meta_Box_Order_Data { $payment_gateways = array(); } - $payment_method = ! empty( $order->payment_method ) ? $order->payment_method : ''; + $payment_method = ! empty( $order->get_payment_method() ) ? $order->get_payment_method() : ''; $order_type_object = get_post_type_object( $post->post_type ); wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' ); diff --git a/includes/api/class-wc-rest-order-refunds-controller.php b/includes/api/class-wc-rest-order-refunds-controller.php index baf4c56c62b..74716c1e730 100644 --- a/includes/api/class-wc-rest-order-refunds-controller.php +++ b/includes/api/class-wc-rest-order-refunds-controller.php @@ -299,8 +299,8 @@ class WC_REST_Order_Refunds_Controller extends WC_REST_Posts_Controller { $order = wc_get_order( $order_data ); - if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) { - $result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() ); + if ( isset( $payment_gateways[ $order->get_payment_method() ] ) && $payment_gateways[ $order->get_payment_method() ]->supports( 'refunds' ) ) { + $result = $payment_gateways[ $order->get_payment_method() ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() ); if ( is_wp_error( $result ) ) { return $result; diff --git a/includes/api/class-wc-rest-orders-controller.php b/includes/api/class-wc-rest-orders-controller.php index f8f32b50365..cfb07021c76 100644 --- a/includes/api/class-wc-rest-orders-controller.php +++ b/includes/api/class-wc-rest-orders-controller.php @@ -145,7 +145,7 @@ class WC_REST_Orders_Controller extends WC_REST_Posts_Controller { 'total_tax' => wc_format_decimal( $order->get_total_tax(), $dp ), 'billing' => array(), 'shipping' => array(), - 'payment_method' => $order->payment_method, + 'payment_method' => $order->get_payment_method(), 'payment_method_title' => $order->get_payment_method_title(), 'transaction_id' => $order->get_transaction_id(), 'customer_ip_address' => $order->customer_ip_address, diff --git a/includes/api/legacy/v1/class-wc-api-orders.php b/includes/api/legacy/v1/class-wc-api-orders.php index 2f698cf6405..9bf090035ae 100644 --- a/includes/api/legacy/v1/class-wc-api-orders.php +++ b/includes/api/legacy/v1/class-wc-api-orders.php @@ -133,7 +133,7 @@ class WC_API_Orders extends WC_API_Resource { 'order_discount' => wc_format_decimal( $order->get_order_discount(), 2 ), 'shipping_methods' => $order->get_shipping_method(), 'payment_details' => array( - 'method_id' => $order->payment_method, + 'method_id' => $order->get_payment_method(), 'method_title' => $order->get_payment_method_title(), 'paid' => isset( $order->paid_date ), ), diff --git a/includes/api/legacy/v2/class-wc-api-orders.php b/includes/api/legacy/v2/class-wc-api-orders.php index 9477f196303..1b9586d02b1 100644 --- a/includes/api/legacy/v2/class-wc-api-orders.php +++ b/includes/api/legacy/v2/class-wc-api-orders.php @@ -171,7 +171,7 @@ class WC_API_Orders extends WC_API_Resource { 'total_discount' => wc_format_decimal( $order->get_total_discount(), $dp ), 'shipping_methods' => $order->get_shipping_method(), 'payment_details' => array( - 'method_id' => $order->payment_method, + 'method_id' => $order->get_payment_method(), 'method_title' => $order->get_payment_method_title(), 'paid' => isset( $order->paid_date ), ), @@ -1614,8 +1614,8 @@ class WC_API_Orders extends WC_API_Resource { $order = wc_get_order( $order_id ); - if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) { - $result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() ); + if ( isset( $payment_gateways[ $order->get_payment_method() ] ) && $payment_gateways[ $order->get_payment_method() ]->supports( 'refunds' ) ) { + $result = $payment_gateways[ $order->get_payment_method() ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() ); if ( is_wp_error( $result ) ) { return $result; diff --git a/includes/api/legacy/v3/class-wc-api-orders.php b/includes/api/legacy/v3/class-wc-api-orders.php index 9fbcea1df32..8f4bf0bc654 100644 --- a/includes/api/legacy/v3/class-wc-api-orders.php +++ b/includes/api/legacy/v3/class-wc-api-orders.php @@ -177,7 +177,7 @@ class WC_API_Orders extends WC_API_Resource { 'total_discount' => wc_format_decimal( $order->get_total_discount(), $dp ), 'shipping_methods' => $order->get_shipping_method(), 'payment_details' => array( - 'method_id' => $order->payment_method, + 'method_id' => $order->get_payment_method(), 'method_title' => $order->get_payment_method_title(), 'paid' => isset( $order->paid_date ), ), @@ -1659,8 +1659,8 @@ class WC_API_Orders extends WC_API_Resource { $order = wc_get_order( $order_id ); - if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) { - $result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() ); + if ( isset( $payment_gateways[ $order->get_payment_method() ] ) && $payment_gateways[ $order->get_payment_method() ]->supports( 'refunds' ) ) { + $result = $payment_gateways[ $order->get_payment_method() ]->process_refund( $order_id, $refund->get_refund_amount(), $refund->get_refund_reason() ); if ( is_wp_error( $result ) ) { return $result; diff --git a/includes/class-wc-ajax.php b/includes/class-wc-ajax.php index 3ddd3b76fc3..df2a00d3472 100644 --- a/includes/class-wc-ajax.php +++ b/includes/class-wc-ajax.php @@ -2221,8 +2221,8 @@ class WC_AJAX { if ( WC()->payment_gateways() ) { $payment_gateways = WC()->payment_gateways->payment_gateways(); } - if ( isset( $payment_gateways[ $order->payment_method ] ) && $payment_gateways[ $order->payment_method ]->supports( 'refunds' ) ) { - $result = $payment_gateways[ $order->payment_method ]->process_refund( $order_id, $refund_amount, $refund_reason ); + if ( isset( $payment_gateways[ $order->get_payment_method() ] ) && $payment_gateways[ $order->get_payment_method() ]->supports( 'refunds' ) ) { + $result = $payment_gateways[ $order->get_payment_method() ]->process_refund( $order_id, $refund_amount, $refund_reason ); do_action( 'woocommerce_refund_processed', $refund, $result ); diff --git a/includes/cli/class-wc-cli-order.php b/includes/cli/class-wc-cli-order.php index a2e078da7b4..edede90158e 100644 --- a/includes/cli/class-wc-cli-order.php +++ b/includes/cli/class-wc-cli-order.php @@ -646,7 +646,7 @@ class WC_CLI_Order extends WC_CLI_Command { 'total_discount' => wc_format_decimal( $order->get_total_discount(), $dp ), 'shipping_methods' => $order->get_shipping_method(), 'payment_details' => array( - 'method_id' => $order->payment_method, + 'method_id' => $order->get_payment_method(), 'method_title' => $order->get_payment_method_title(), 'paid' => isset( $order->paid_date ), ), diff --git a/includes/gateways/bacs/class-wc-gateway-bacs.php b/includes/gateways/bacs/class-wc-gateway-bacs.php index d390091a64b..4e6f2d59f0a 100644 --- a/includes/gateways/bacs/class-wc-gateway-bacs.php +++ b/includes/gateways/bacs/class-wc-gateway-bacs.php @@ -246,7 +246,7 @@ class WC_Gateway_BACS extends WC_Payment_Gateway { */ public function email_instructions( $order, $sent_to_admin, $plain_text = false ) { - if ( ! $sent_to_admin && 'bacs' === $order->payment_method && $order->has_status( 'on-hold' ) ) { + if ( ! $sent_to_admin && 'bacs' === $order->get_payment_method() && $order->has_status( 'on-hold' ) ) { if ( $this->instructions ) { echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL; } diff --git a/includes/gateways/cheque/class-wc-gateway-cheque.php b/includes/gateways/cheque/class-wc-gateway-cheque.php index 83a4f3c5647..0aff21a2ab8 100644 --- a/includes/gateways/cheque/class-wc-gateway-cheque.php +++ b/includes/gateways/cheque/class-wc-gateway-cheque.php @@ -97,7 +97,7 @@ class WC_Gateway_Cheque extends WC_Payment_Gateway { * @param bool $plain_text */ public function email_instructions( $order, $sent_to_admin, $plain_text = false ) { - if ( $this->instructions && ! $sent_to_admin && 'cheque' === $order->payment_method && $order->has_status( 'on-hold' ) ) { + if ( $this->instructions && ! $sent_to_admin && 'cheque' === $order->get_payment_method() && $order->has_status( 'on-hold' ) ) { echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL; } } diff --git a/includes/gateways/cod/class-wc-gateway-cod.php b/includes/gateways/cod/class-wc-gateway-cod.php index a4e502569e7..a5286f8d86e 100644 --- a/includes/gateways/cod/class-wc-gateway-cod.php +++ b/includes/gateways/cod/class-wc-gateway-cod.php @@ -233,7 +233,7 @@ class WC_Gateway_COD extends WC_Payment_Gateway { * @param bool $plain_text */ public function email_instructions( $order, $sent_to_admin, $plain_text = false ) { - if ( $this->instructions && ! $sent_to_admin && 'cod' === $order->payment_method ) { + if ( $this->instructions && ! $sent_to_admin && 'cod' === $order->get_payment_method() ) { echo wpautop( wptexturize( $this->instructions ) ) . PHP_EOL; } } diff --git a/includes/gateways/paypal/class-wc-gateway-paypal.php b/includes/gateways/paypal/class-wc-gateway-paypal.php index 0603e828dc0..645bff371d1 100644 --- a/includes/gateways/paypal/class-wc-gateway-paypal.php +++ b/includes/gateways/paypal/class-wc-gateway-paypal.php @@ -315,7 +315,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway { public function capture_payment( $order_id ) { $order = wc_get_order( $order_id ); - if ( 'paypal' === $order->payment_method && 'pending' === get_post_meta( $order->get_id(), '_paypal_status', true ) && $order->get_transaction_id() ) { + if ( 'paypal' === $order->get_payment_method() && 'pending' === get_post_meta( $order->get_id(), '_paypal_status', true ) && $order->get_transaction_id() ) { $this->init_api(); $result = WC_Gateway_Paypal_API_Handler::do_capture( $order ); diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php index b1dab7389e2..589201723d5 100644 --- a/includes/shortcodes/class-wc-shortcode-checkout.php +++ b/includes/shortcodes/class-wc-shortcode-checkout.php @@ -159,7 +159,7 @@ class WC_Shortcode_Checkout { - payment_method, $order_id ); ?> + get_payment_method(), $order_id ); ?>
payment_method ] ) ? $payment_gateways[ $order->payment_method ] : false; + return isset( $payment_gateways[ $order->get_payment_method() ] ) ? $payment_gateways[ $order->get_payment_method() ] : false; } /** diff --git a/templates/checkout/thankyou.php b/templates/checkout/thankyou.php index ab4c810bddd..145dbb0a7ee 100644 --- a/templates/checkout/thankyou.php +++ b/templates/checkout/thankyou.php @@ -61,7 +61,7 @@ if ( $order ) : ?> - payment_method, $order->get_id() ); ?> + get_payment_method(), $order->get_id() ); ?> get_id() ); ?>