Update app.py

app.py

@@ -1200,7 +1200,6 @@ def item_movement_report():
     html = BASE_TEMPLATE.replace('__TITLE__', "Движение товаров").replace('__CONTENT__', ITEM_MOVEMENT_CONTENT).replace('__SCRIPTS__', ITEM_MOVEMENT_SCRIPTS)
     return render_template_string(html, inventory=inventory, movements=movements, product_id=product_id, variant_id=variant_id, selected_product=selected_product, selected_variant=selected_variant)
 
-
 @app.route('/reports/product_roi')
 @admin_required
 def product_roi_report():
@@ -3197,9 +3196,7 @@ INVENTORY_CONTENT = """
           <div id="modal-scanner-add" class="mb-2" style="display:none;"></div>
           <hr>
           <h6>Варианты товара</h6>
-          <div style="max-height: 40vh; overflow-y: auto; padding: 10px; border: 1px solid #dee2e6; border-radius: .25rem;" class="mb-2">
-            <div id="variants-container-add"></div>
-          </div>
+          <div id="variants-container-add"></div>
           <button type="button" class="btn btn-sm btn-outline-success mt-2" id="add-variant-btn-add">Добавить вариант</button>
         </div>
         <div class="modal-footer"><button type="submit" class="btn btn-primary">Сохранить</button></div>
@@ -3222,36 +3219,34 @@ INVENTORY_CONTENT = """
           </div>
           <hr>
           <h6>Варианты товара</h6>
-          <div style="max-height: 40vh; overflow-y: auto; padding: 10px; border: 1px solid #dee2e6; border-radius: .25rem;" class="mb-2">
-            <div id="variants-container-edit-{{ p.id }}">
-              {% for v in p.variants %}
-              <div class="card mb-3 variant-row">
-                  <div class="card-body">
-                      <input type="hidden" name="variant_id[]" value="{{ v.id }}">
-                      <div class="row g-2 align-items-center">
-                          <div class="col-12 col-md-3">
-                              <img src="{{ v.image_url if v.image_url else url_for('static', filename='placeholder.png') }}" class="img-thumbnail variant-preview mb-1" style="width: 80px; height: 80px; object-fit: cover;">
-                              <input type="file" class="form-control form-control-sm variant-image-upload" accept="image/*">
-                              <input type="hidden" class="variant-image-url-input" name="variant_image_url[]" value="{{ v.image_url }}">
-                          </div>
-                          <div class="col-12 col-md-9">
-                             <div class="row g-2">
-                                  <div class="col-12"><label>Название варианта</label><input type="text" name="variant_name[]" class="form-control" value="{{ v.option_value }}" required></div>
-                                  <div class="col-12 col-sm-4"><label>Цена Общая</label><input type="text" name="variant_price_regular[]" class="form-control" value="{{ v.get('price_regular', v.get('price'))|string|replace('.', ',') }}" inputmode="decimal"></div>
-                                  <div class="col-12 col-sm-4"><label>Цена Мин.</label><input type="text" name="variant_price_min[]" class="form-control" value="{{ v.get('price_min', '0.00')|string|replace('.', ',') }}" inputmode="decimal"></div>
-                                  <div class="col-12 col-sm-4"><label>Цена Опт.</label><input type="text" name="variant_price_wholesale[]" class="form-control" value="{{ v.get('price_wholesale', '0.00')|string|replace('.', ',') }}" inputmode="decimal"></div>
-                                  <div class="col-12 col-sm-6"><label>Себестоимость</label><input type="text" name="variant_cost_price[]" class="form-control" value="{{ v.cost_price|string|replace('.', ',') }}" inputmode="decimal"></div>
-                                  <div class="col-12 col-sm-6"><label>Остаток</label><input type="number" name="variant_stock[]" class="form-control" value="{{ v.stock }}"></div>
-                             </div>
-                          </div>
-                           <div class="col-12 text-end">
-                              <button type="button" class="btn btn-sm btn-danger remove-variant-btn"><i class="fas fa-times"></i> Удалить вариант</button>
-                          </div>
-                      </div>
-                  </div>
-              </div>
-              {% endfor %}
+          <div id="variants-container-edit-{{ p.id }}">
+            {% for v in p.variants %}
+            <div class="card mb-3 variant-row">
+                <div class="card-body">
+                    <input type="hidden" name="variant_id[]" value="{{ v.id }}">
+                    <div class="row g-2 align-items-center">
+                        <div class="col-12 col-md-3">
+                            <img src="{{ v.image_url if v.image_url else url_for('static', filename='placeholder.png') }}" class="img-thumbnail variant-preview mb-1" style="width: 80px; height: 80px; object-fit: cover;">
+                            <input type="file" class="form-control form-control-sm variant-image-upload" accept="image/*">
+                            <input type="hidden" class="variant-image-url-input" name="variant_image_url[]" value="{{ v.image_url }}">
+                        </div>
+                        <div class="col-12 col-md-9">
+                           <div class="row g-2">
+                                <div class="col-12"><label>Название варианта</label><input type="text" name="variant_name[]" class="form-control" value="{{ v.option_value }}" required></div>
+                                <div class="col-12 col-sm-4"><label>Цена Общая</label><input type="text" name="variant_price_regular[]" class="form-control" value="{{ v.get('price_regular', v.get('price'))|string|replace('.', ',') }}" inputmode="decimal"></div>
+                                <div class="col-12 col-sm-4"><label>Цена Мин.</label><input type="text" name="variant_price_min[]" class="form-control" value="{{ v.get('price_min', '0.00')|string|replace('.', ',') }}" inputmode="decimal"></div>
+                                <div class="col-12 col-sm-4"><label>Цена Опт.</label><input type="text" name="variant_price_wholesale[]" class="form-control" value="{{ v.get('price_wholesale', '0.00')|string|replace('.', ',') }}" inputmode="decimal"></div>
+                                <div class="col-12 col-sm-6"><label>Себестоимость</label><input type="text" name="variant_cost_price[]" class="form-control" value="{{ v.cost_price|string|replace('.', ',') }}" inputmode="decimal"></div>
+                                <div class="col-12 col-sm-6"><label>Остаток</label><input type="number" name="variant_stock[]" class="form-control" value="{{ v.stock }}"></div>
+                           </div>
+                        </div>
+                         <div class="col-12 text-end">
+                            <button type="button" class="btn btn-sm btn-danger remove-variant-btn"><i class="fas fa-times"></i> Удалить вариант</button>
+                        </div>
+                    </div>
+                </div>
             </div>
+            {% endfor %}
           </div>
           <button type="button" class="btn btn-sm btn-outline-success mt-2 add-variant-btn-edit" data-target-container="variants-container-edit-{{ p.id }}">Добавить вариант</button>
         </div>
@@ -3359,7 +3354,7 @@ document.addEventListener('DOMContentLoaded', () => {
     let currentScanner = null;
     let currentScannerContainer = null;
     const placeholderImg = "{{ url_for('static', filename='placeholder.png') }}";
-    const inventoryData = JSON.parse('{{ inventory|tojson|safe }}');
+    const inventoryData = {{ inventory|tojson|safe }};
     const isAdmin = {{ 'true' if session.admin_logged_in else 'false' }};
 
     function startScannerFor(containerId, inputElement, callback) {
@@ -3561,8 +3556,6 @@ document.addEventListener('DOMContentLoaded', () => {
                 </div>
             </div>
         `;
-        div.querySelector('.remove-variant-btn').addEventListener('click', () => div.remove());
-        div.querySelector('.variant-image-upload').addEventListener('change', (e) => handleImageUpload(e.target));
         return div;
     };
     
@@ -3572,20 +3565,22 @@ document.addEventListener('DOMContentLoaded', () => {
         }
     });
 
-    document.getElementById('add-variant-btn-add').addEventListener('click', () => {
-        document.getElementById('variants-container-add').appendChild(createVariantRow());
-    });
-    
-    document.querySelectorAll('.add-variant-btn-edit').forEach(btn => {
-        btn.addEventListener('click', (e) => {
-            const containerId = e.target.dataset.targetContainer;
-            document.getElementById(containerId).appendChild(createVariantRow());
-        });
-    });
-    
     document.body.addEventListener('click', e => {
+        if (e.target.closest('#add-variant-btn-add')) {
+            document.getElementById('variants-container-add').appendChild(createVariantRow());
+            return;
+        }
+        
+        const editAddBtn = e.target.closest('.add-variant-btn-edit');
+        if (editAddBtn) {
+            const containerId = editAddBtn.dataset.targetContainer;
+            document.getElementById(containerId).appendChild(createVariantRow());
+            return;
+        }
+        
         if (e.target.closest('.remove-variant-btn')) {
             e.target.closest('.variant-row').remove();
+            return;
         }
     });
     
@@ -4069,7 +4064,7 @@ ITEM_MOVEMENT_CONTENT = """
 ITEM_MOVEMENT_SCRIPTS = """
 <script>
 document.addEventListener('DOMContentLoaded', () => {
-    const inventoryData = JSON.parse('{{ inventory|tojson|safe }}');
+    const inventoryData = {{ inventory|tojson|safe }};
     const searchInput = document.getElementById('movement-search');
     const searchResults = document.getElementById('movement-search-results');
     const productIdInput = document.getElementById('movement-product-id');