diff --git a/assets/css/admin.scss b/assets/css/admin.scss index a9388aa057e..8d8b4727694 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -1413,6 +1413,10 @@ ul.wc_coupon_list_block { .refunded-total { color: $red; } + + .label-highlight { + font-weight: bold; + } } .refund-actions { diff --git a/includes/admin/meta-boxes/views/html-order-items.php b/includes/admin/meta-boxes/views/html-order-items.php index 2981b467db4..f5dd34f972e 100644 --- a/includes/admin/meta-boxes/views/html-order-items.php +++ b/includes/admin/meta-boxes/views/html-order-items.php @@ -147,7 +147,7 @@ if ( wc_tax_enabled() ) { - get_subtotal(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_subtotal(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> get_total_discount() ) : ?> @@ -155,7 +155,7 @@ if ( wc_tax_enabled() ) { - - get_total_discount(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_total_discount(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -164,7 +164,7 @@ if ( wc_tax_enabled() ) { - get_total_fees(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_total_fees(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -176,7 +176,7 @@ if ( wc_tax_enabled() ) { - get_shipping_total(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_shipping_total(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -189,7 +189,7 @@ if ( wc_tax_enabled() ) { label ); ?>: - amount, array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + amount, array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -201,7 +201,7 @@ if ( wc_tax_enabled() ) { : - get_total(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_total(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -209,16 +209,31 @@ if ( wc_tax_enabled() ) {
- get_status(), array( 'processing', 'completed', 'refunded' ) ) && ! empty( $order->get_date_paid() ) ) : ?> + get_status(), array( 'processing', 'completed', 'refunded' ), true ) && ! empty( $order->get_date_paid() ) ) : ?> - + + + + +
::
- get_total(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_total(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+ + get_payment_method_title() ) { + /* translators: 1: payment date. 2: payment method */ + echo esc_html( sprintf( __( '%1$s via %2$s', 'woocommerce' ), $order->get_date_paid()->date_i18n( get_option( 'date_format' ) ), $order->get_payment_method_title() ) ); + } else { + echo esc_html( $order->get_date_paid()->date_i18n( get_option( 'date_format' ) ) ); + } + ?> + +
@@ -230,16 +245,16 @@ if ( wc_tax_enabled() ) { : - -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> get_id() ); ?> - : + : - get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -301,11 +316,11 @@ if ( wc_tax_enabled() ) { : - -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> : - get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> + get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?> @@ -386,7 +401,7 @@ if ( wc_tax_enabled() ) { ?> - + @@ -426,18 +441,17 @@ if ( wc_tax_enabled() ) { get_results( "SELECT * FROM {$wpdb->prefix}woocommerce_tax_rates ORDER BY tax_rate_name LIMIT 100" ); - + $rates = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}woocommerce_tax_rates ORDER BY tax_rate_name LIMIT 100" ); foreach ( $rates as $rate ) { echo ' - - ' . ( isset( $classes_options[ $rate->tax_rate_class ] ) ? $classes_options[ $rate->tax_rate_class ] : '-' ) . ' - ' . WC_Tax::get_rate_code( $rate ) . ' - ' . WC_Tax::get_rate_percent( $rate ) . ' + + ' . ( isset( $classes_options[ $rate->tax_rate_class ] ) ? esc_html( $classes_options[ $rate->tax_rate_class ] ) : '-' ) . ' + ' . esc_html( WC_Tax::get_rate_code( $rate ) ) . ' + ' . esc_html( WC_Tax::get_rate_percent( $rate ) ) . ' - '; // WPCS: XSS ok. + '; } ?>