From f157d03109766bb639c854eb04e9d2f786763a7d Mon Sep 17 00:00:00 2001 From: maksim Date: Tue, 24 Jun 2025 08:48:40 +0300 Subject: [PATCH] =?UTF-8?q?Task=206945=20|=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=81=D1=82=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=86=D0=B5=20=D1=83=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkout/assets/css/checkout.css | 47 +++++++++++++++++++ .../cosmopet/temp-functions/modules-logic.php | 2 +- .../temp-functions/woocommerce-logic.php | 5 +- .../woocommerce/checkout/review-order.php | 1 + 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/wp-content/themes/cosmopet/modules/shop/components/checkout/assets/css/checkout.css b/wp-content/themes/cosmopet/modules/shop/components/checkout/assets/css/checkout.css index f27fe37..13f7168 100644 --- a/wp-content/themes/cosmopet/modules/shop/components/checkout/assets/css/checkout.css +++ b/wp-content/themes/cosmopet/modules/shop/components/checkout/assets/css/checkout.css @@ -696,3 +696,50 @@ .form-row{ margin-top: 1rem; } + + +.woocommerce-order-overview{ +} + +.woocommerce .woocommerce-customer-details .woocommerce-column__title, .woocommerce-order-details__title{ + margin-bottom: .5em; + margin-top: 1em; +} + +.woocommerce ul.order_details{ + margin: 3rem 0; +} + +.woocommerce .woocommerce-customer-details address p{ + margin-top: .5em; +} + +.woocommerce .woocommerce-customer-details .woocommerce-customer-details--email::before, +.woocommerce .woocommerce-customer-details .woocommerce-customer-details--phone::before { + margin-top: -.25em; +} + +.woocommerce-order-overview__order.order{ + display: flex; + flex-direction: column; +} + +.woocommerce-order{ + max-width: calc(100% - 30px); + margin-right: auto; + margin-left: auto; +} + +@media (max-width: 640px) { + .woocommerce ul.order_details li { + margin-right:0em; + font-size: .715em; + line-height: 1.3; + border-right: none; + border-bottom: 1px dashed #cfc8d8; + padding-right: 2em; + width: 100%; + padding-top: 0.5rem; + padding-bottom: 0.5rem; +} +} \ No newline at end of file diff --git a/wp-content/themes/cosmopet/temp-functions/modules-logic.php b/wp-content/themes/cosmopet/temp-functions/modules-logic.php index 57e3cbe..35f2ebb 100644 --- a/wp-content/themes/cosmopet/temp-functions/modules-logic.php +++ b/wp-content/themes/cosmopet/temp-functions/modules-logic.php @@ -336,7 +336,7 @@ include_module('layout'); add_action('wp', 'my_custom_checkout_code'); function my_custom_checkout_code() { - if (function_exists('is_checkout') && is_checkout() && !is_order_received_page()) { + if (function_exists('is_checkout')) { include_component('shop', 'checkout'); } } diff --git a/wp-content/themes/cosmopet/temp-functions/woocommerce-logic.php b/wp-content/themes/cosmopet/temp-functions/woocommerce-logic.php index 4537a23..fb20694 100644 --- a/wp-content/themes/cosmopet/temp-functions/woocommerce-logic.php +++ b/wp-content/themes/cosmopet/temp-functions/woocommerce-logic.php @@ -220,8 +220,9 @@ function remove_view_cart_button_js() { function custom_remove_woocommerce_styles_on_checkout( $enqueue_styles ) { - if ( is_checkout() ) { - return []; // Удаляет все стандартные стили WooCommerce только на странице checkout + // Если это страница оформления заказа, но НЕ страница "Спасибо за заказ" + if ( is_checkout() && ! is_wc_endpoint_url( 'order-received' ) ) { + return []; // Удаляем стандартные стили WooCommerce } return $enqueue_styles; diff --git a/wp-content/themes/cosmopet/woocommerce/checkout/review-order.php b/wp-content/themes/cosmopet/woocommerce/checkout/review-order.php index 84ed9a4..90610c2 100644 --- a/wp-content/themes/cosmopet/woocommerce/checkout/review-order.php +++ b/wp-content/themes/cosmopet/woocommerce/checkout/review-order.php @@ -16,6 +16,7 @@ */ defined( 'ABSPATH' ) || exit; + ?>