Andrei | правки после натяжки новой карточки товара

wp-content/themes/cosmopet/modules/shop/CosmopetProduct.php

@@ -10,6 +10,7 @@ class CosmopetProduct extends TimberProduct {
         'pa_compound',
         'pa_dog-size',
         'pa_reproductive-status',
+        'pa_treats_type',
         'pa_age-of-the-cat',
         'pa_age-of-the-dog',
         'pa_series',
@@ -189,6 +190,7 @@ class CosmopetProduct extends TimberProduct {
             return [];
         }
         
+
         $args = array(
             'posts_per_page' => -1,
             'post_type' => 'product',
@@ -209,10 +211,14 @@ class CosmopetProduct extends TimberProduct {
         $siblings_with_weights = [];
         foreach ($siblings as $sibling) {
             $weight = $sibling->get_weight();
-            $siblings_with_weights[] = [
-                'post' => $sibling,
-                'weight' => floatval($weight) // Ensure weight is treated as a number
-            ];
+            $sibling_terms = get_the_terms($sibling->id, 'pa_collection');
+            if ($sibling_terms) {
+                if ($sibling_terms[0]->term_id == $term)
+                    $siblings_with_weights[] = [
+                    'post' => $sibling,
+                    'weight' => floatval($weight) // Ensure weight is treated as a number
+                ];
+            } 
         }
 
         // Sort by weight
@@ -440,6 +446,7 @@ class CosmopetProduct extends TimberProduct {
             'pa_compound' => pll__('ВКУС КОРМА'),
             'pa_reproductive-status' => pll__('ВИД КОШКИ'),
             'pa_series' => pll__('СЕРИЯ'),
+            'pa_treats_type' => pll__('ТИП ЛАКОМСТВА'),
         ];
         
         return $labels[$taxonomy] ?? wc_attribute_label($taxonomy);

wp-content/themes/cosmopet/modules/shop/components/product-card/assets/css/product-card.css

@@ -111,7 +111,9 @@ background: radial-gradient(278.91% 196.13% at 128.36% -48.29%, #ee6868 0%, #569
 }
 .--treats-salmon.main-food_products-card{
    --accent-color: #7c007a;
-   
+}
+.--treats-fish.main-food_products-card{
+   --accent-color: #7c007a;
 }
 .--treats-duck.main-food_products-card{
    --accent-color: #326e70;
@@ -348,14 +350,20 @@ background: radial-gradient(278.91% 196.13% at 128.36% -48.29%, #ee6868 0%, #569
 }
 
 .main-food_products-card-bottom-nv{
-  padding: 10px 30px;
-  font-size: 18px;
+  padding: 10px 20px;
+  font-size: 11px;
   text-transform: uppercase;
   background-color: #fff;
   border-radius: 100px;
   color: var(--accent-color);
+  align-self: stretch;
+  display: flex;
+  align-items: center;
 }
 
+.main-food_products-card-bottom-price{
+    flex-shrink: 0;
+}
 @media (max-width: 1200px) {
     .main-food_products-card-bottom-nv{
     font-size: 10px;
@@ -365,7 +373,4 @@ background: radial-gradient(278.91% 196.13% at 128.36% -48.29%, #ee6868 0%, #569
     display: flex;
     align-items: center;
 }
-.main-food_products-card-bottom-price{
-    flex-shrink: 0;
-}
 }

wp-content/themes/cosmopet/modules/shop/components/product-card/assets/js/product-card.js

@@ -30,7 +30,7 @@ jQuery(document).ready(function() {
       slider.append(
         '<div class="swiper-slide">' +
           '<div class="main-food_products-card-img">' +
-            '<img src="' + image + '" alt="' + productCard.find('.product-title').text() + '">' +
+            '<img src="' + image['url'] + '" alt="'+ image['alt'] + '">' +
           '</div>' +
         '</div>'
       );

wp-content/themes/cosmopet/modules/shop/components/product-single--new/assets/css/product-style.css

@@ -112,8 +112,8 @@
 }
 
 .product_main.--treats-fish{
-  --bg-color: #D7E6F3;
-  --accent-color: #0066cc;
+  --bg-color: #F3D7F3;
+  --accent-color: #7c007a;
 }
 
 .product_main.--treats-turkey{
@@ -511,6 +511,7 @@ margin-top: 8px;
       border-radius: 24px;
       padding: 10px 20px;
       position: relative;
+      overflow: hidden;
     }
 
     .product-gallery__thumbsSlider .swiper-slide-thumb-active {

wp-content/themes/cosmopet/temp-functions/custom-admin-panel-logic.php

@@ -50,6 +50,7 @@ add_action('woocommerce_product_options_dimensions', function () {
             'desc_tip' => true,
             'options' => array(
                 'кг' => 'кг (по умолчанию)',
+                'г' => 'г',
                 'мл' => 'мл',
                 'л' => 'л',
             )

wp-content/themes/cosmopet/views/woocommerce/product-card.twig

@@ -22,7 +22,7 @@
                 {{item.title}}
             </a>
             
-            {% set size_siblings = post.getSizeSiblings %}
+            {% set size_siblings = item.getSizeSiblings %}
             {% if size_siblings %}
                 <div class="main-food_products-card__weight">
                     

wp-content/themes/cosmopet/views/woocommerce/single-product.twig

@@ -22,18 +22,21 @@
         </div>
         <div class="product_main {{ post.getTasteClass() }}">
             <div class="product-info">
-                <h1 class="product-title --pc">
+                <div class="div">                <h1 class="product-title --pc">
                     {{post.title}}
                 </h1>
                 <div class="product-contains">
                     <h2 class="product-block-title">{{ fn('pll_e', 'СОСТАВ') }}</h2>
                     <div class="product-contains-text">{{ post.getComposition }}</div>
-                </div>
+                </div></div>
+
                 {% set nutritional_value = post.nutritional_value %}
                 {% set vitamins = post.vitamins %}
-                {% if nutritional_value or vitamins %}
+                {% set has_nutritional = nutritional_value and (nutritional_value.protein is not empty or nutritional_value.fat is not empty or nutritional_value.fiber is not empty or nutritional_value.ash is not empty) %}
+                {% set has_vitamins = vitamins and (vitamins.vitamin_a_me is not empty or vitamins.vitamin_d3_me is not empty) %}
+                {% if has_nutritional or has_vitamins %}                
                 <div class="product-values">
-                    {% if nutritional_value  %}
+                    {% if has_nutritional  %}
                     <h2 class="product-values-title">{{ fn('pll_e', 'ПИЩЕВАЯ ЦЕННОСТЬ') }}</h2>
                     <div class="product-values-list">
 
@@ -64,8 +67,8 @@
                        
                     </div>
                     {% endif %}
-                    {% set vitamins = post.vitamins %}
-                    {% if vitamins %}
+                   
+                    {% if has_vitamins %}
                     <div class="product-vitamins">
                         <div class="product-vitamins-title">
                             {{ fn('pll_e', 'Витамины и питательные вещества на кг') }}
@@ -329,10 +332,10 @@
             <div class="close-button">×</div>
 <h2 class="product-values-title">{{ fn('pll_e', 'ПИЩЕВАЯ ЦЕННОСТЬ') }}</h2>
 <div class="mform__info__c">
-    {% if nutritional_value or vitamins %}
+    {% if has_nutritional or has_vitamins %}
     <div class="mform__info__col">
                 <div class="product-values">
-                    {% if nutritional_value  %}
+                    {% if has_nutritional  %}
                    
                     <div class="product-values-list">
 
@@ -348,6 +351,13 @@
                             <div class="product-values-item-val">{{nutritional_value.fat}}</div>
                         </div>
                         {% endif %}
+                        {% if nutritional_value.carbohydrates %}
+                        <div class="product-values-item">
+                            <div class="product-values-item__name">{{ fn('pll_e', 'Углеводы') }}</div>
+                            <div class="product-values-item-val">{{nutritional_value.carbohydrates}}</div>
+                        </div>
+                        {% endif %}
+                        
                         {% if nutritional_value.fiber %}
                         <div class="product-values-item">
                             <div class="product-values-item__name">{{ fn('pll_e', 'Сырая клетчатка') }}</div>
@@ -422,8 +432,7 @@
                 </div>
     </div>
     <div class="mform__info__col">
-                            {% set vitamins = post.vitamins %}
-                    {% if vitamins %}
+                    {% if has_vitamins %}
                     <div class="product-vitamins">
                         <div class="product-vitamins-title">
                             {{ fn('pll_e', 'Витамины и питательные вещества на кг') }}